alxarafe / alixar

dolibarr/htdocs/core/class/stats.class.php

Indentation +499 added lines, -499 removed lines

@@ -29,116 +29,22 @@ 
  */
 abstract class Stats
 {
-	protected $db;
-	var $_lastfetchdate=array();	// Dates of cache file read by methods
-	var $cachefilesuffix='';		// Suffix to add to name of cache file (to avoid file name conflicts)
-
-	/**
-	 * Return nb of elements by month for several years
-	 *
-	 * @param 	int		$endyear		Start year
-	 * @param 	int		$startyear		End year
-	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
+    protected $db;
+    var $_lastfetchdate=array();	// Dates of cache file read by methods
+    var $cachefilesuffix='';		// Suffix to add to name of cache file (to avoid file name conflicts)
+
+    /**
+     * Return nb of elements by month for several years
+     *
+     * @param 	int		$endyear		Start year
+     * @param 	int		$startyear		End year
+     * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
      *	@param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
-	 * @return 	array					Array of values
-	 */
-	function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay=0, $format=0)
-	{
-		global $conf,$user,$langs;
-
-	    if ($startyear > $endyear) return -1;
-
-		$datay=array();
-
-		// Search into cache
-		if (! empty($cachedelay))
-	    {
-	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-	    }
-
-		$newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-		$newmask='0644';
-
-		$nowgmt = dol_now();
-
-		$foundintocache=0;
-		if ($cachedelay > 0)
-		{
-			$filedate=dol_filemtime($newpathofdestfile);
-			if ($filedate >= ($nowgmt - $cachedelay))
-			{
-				$foundintocache=1;
-
-				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-			}
-			else
-			{
-				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-			}
-		}
-		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
-		{
-			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-			$data = json_decode(file_get_contents($newpathofdestfile), true);
-		}
-		else
-		{
-			$year=$startyear;
-			while ($year <= $endyear)
-			{
-				$datay[$year] = $this->getNbByMonth($year, $format);
-				$year++;
-			}
-
-			$data = array();
-
-			for ($i = 0 ; $i < 12 ; $i++)
-			{
-				$data[$i][]=$datay[$endyear][$i][0];
-				$year=$startyear;
-				while($year <= $endyear)
-				{
-					$data[$i][]=$datay[$year][$i][1];
-					$year++;
-				}
-			}
-		}
-
-		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
-		{
-			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
-			$fp = fopen($newpathofdestfile, 'w');
-			fwrite($fp, json_encode($data));
-			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-			@chmod($newpathofdestfile, octdec($newmask));
-
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
-		}
-
-		// return array(array('Month',val1,val2,val3),...)
-		return $data;
-	}
-
-	/**
-	 * Return amount of elements by month for several years.
-	 * Criterias used to build request are defined into the constructor of parent class into xxx/class/xxxstats.class.php
-	 * The caller of class can add more filters into sql request by adding criteris into the $stats->where property just after
-	 * calling constructor.
-	 *
-	 * @param	int		$endyear		Start year
-	 * @param	int		$startyear		End year
-	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-     * @param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
-	 * @return 	array					Array of values
-	 */
-	function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay=0, $format=0)
-	{
-		global $conf,$user,$langs;
+     * @return 	array					Array of values
+     */
+    function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay=0, $format=0)
+    {
+        global $conf,$user,$langs;
 
         if ($startyear > $endyear) return -1;
 
@@ -147,8 +53,8 @@ 
         // Search into cache
         if (! empty($cachedelay))
         {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
         }
 
         $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
@@ -159,122 +65,216 @@ 
         $foundintocache=0;
         if ($cachedelay > 0)
         {
-        	$filedate=dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache=1;
+            $filedate=dol_filemtime($newpathofdestfile);
+            if ($filedate >= ($nowgmt - $cachedelay))
+            {
+                $foundintocache=1;
+
+                $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+            }
+            else
+            {
+                dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+            }
+        }
+        // Load file into $data
+        if ($foundintocache)    // Cache file found and is not too old
+        {
+            dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+            $data = json_decode(file_get_contents($newpathofdestfile), true);
+        }
+        else
+        {
+            $year=$startyear;
+            while ($year <= $endyear)
+            {
+                $datay[$year] = $this->getNbByMonth($year, $format);
+                $year++;
+            }
+
+            $data = array();
+
+            for ($i = 0 ; $i < 12 ; $i++)
+            {
+                $data[$i][]=$datay[$endyear][$i][0];
+                $year=$startyear;
+                while($year <= $endyear)
+                {
+                    $data[$i][]=$datay[$year][$i][1];
+                    $year++;
+                }
+            }
+        }
+
+        // Save cache file
+        if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
+        {
+            dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
+            if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+            $fp = fopen($newpathofdestfile, 'w');
+            fwrite($fp, json_encode($data));
+            fclose($fp);
+            if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+            @chmod($newpathofdestfile, octdec($newmask));
+
+            $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+        }
+
+        // return array(array('Month',val1,val2,val3),...)
+        return $data;
+    }
+
+    /**
+     * Return amount of elements by month for several years.
+     * Criterias used to build request are defined into the constructor of parent class into xxx/class/xxxstats.class.php
+     * The caller of class can add more filters into sql request by adding criteris into the $stats->where property just after
+     * calling constructor.
+     *
+     * @param	int		$endyear		Start year
+     * @param	int		$startyear		End year
+     * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
+     * @param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
+     * @return 	array					Array of values
+     */
+    function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay=0, $format=0)
+    {
+        global $conf,$user,$langs;
 
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
-        	{
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
+        if ($startyear > $endyear) return -1;
+
+        $datay=array();
+
+        // Search into cache
+        if (! empty($cachedelay))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+        }
+
+        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+        $newmask='0644';
+
+        $nowgmt = dol_now();
+
+        $foundintocache=0;
+        if ($cachedelay > 0)
+        {
+            $filedate=dol_filemtime($newpathofdestfile);
+            if ($filedate >= ($nowgmt - $cachedelay))
+            {
+                $foundintocache=1;
+
+                $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+            }
+            else
+            {
+                dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+            }
         }
 
         // Load file into $data
         if ($foundintocache)    // Cache file found and is not too old
         {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+            dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+            $data = json_decode(file_get_contents($newpathofdestfile), true);
         }
         else
-		{
-			$year=$startyear;
-			while($year <= $endyear)
-			{
-				$datay[$year] = $this->getAmountByMonth($year, $format);
-				$year++;
-			}
-
-			$data = array();
-			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for ($i = 0 ; $i < 12 ; $i++)
-			{
-				$data[$i][]=$datay[$endyear][$i][0];	// set label
-				$year=$startyear;
-				while($year <= $endyear)
-				{
-					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
-					$year++;
-				}
-			}
-		}
-
-		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
-		{
-			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
-			$fp = fopen($newpathofdestfile, 'w');
-			if ($fp)
-			{
-				fwrite($fp, json_encode($data));
-				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Return average of entity by month for several years
-	 *
-	 * @param	int		$endyear		Start year
-	 * @param	int		$startyear		End year
-	 * @return 	array					Array of values
-	 */
-	function getAverageByMonthWithPrevYear($endyear,$startyear)
-	{
+        {
+            $year=$startyear;
+            while($year <= $endyear)
+            {
+                $datay[$year] = $this->getAmountByMonth($year, $format);
+                $year++;
+            }
+
+            $data = array();
+            // $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
+            for ($i = 0 ; $i < 12 ; $i++)
+            {
+                $data[$i][]=$datay[$endyear][$i][0];	// set label
+                $year=$startyear;
+                while($year <= $endyear)
+                {
+                    $data[$i][]=$datay[$year][$i][1];	// set yval for x=i
+                    $year++;
+                }
+            }
+        }
+
+        // Save cache file
+        if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
+        {
+            dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
+            if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+            $fp = fopen($newpathofdestfile, 'w');
+            if ($fp)
+            {
+                fwrite($fp, json_encode($data));
+                fclose($fp);
+                if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                @chmod($newpathofdestfile, octdec($newmask));
+            }
+            else dol_syslog("Failed to write cache file", LOG_ERR);
+            $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Return average of entity by month for several years
+     *
+     * @param	int		$endyear		Start year
+     * @param	int		$startyear		End year
+     * @return 	array					Array of values
+     */
+    function getAverageByMonthWithPrevYear($endyear,$startyear)
+    {
         if ($startyear > $endyear) return -1;
 
         $datay=array();
 
-		$year=$startyear;
-		while($year <= $endyear)
-		{
-			$datay[$year] = $this->getAverageByMonth($year);
-			$year++;
-		}
-
-		$data = array();
-
-		for ($i = 0 ; $i < 12 ; $i++)
-		{
-			$data[$i][]=$datay[$endyear][$i][0];
-			$year=$startyear;
-			while($year <= $endyear)
-			{
-				$data[$i][]=$datay[$year][$i][1];
-				$year++;
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Return count, and sum of products
-	 *
-	 * @param	int		$year			Year
-	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-	 * @return 	array					Array of values
-	 */
-	function getAllByProductEntry($year,$cachedelay=0)
-	{
-		global $conf,$user,$langs;
+        $year=$startyear;
+        while($year <= $endyear)
+        {
+            $datay[$year] = $this->getAverageByMonth($year);
+            $year++;
+        }
+
+        $data = array();
+
+        for ($i = 0 ; $i < 12 ; $i++)
+        {
+            $data[$i][]=$datay[$endyear][$i][0];
+            $year=$startyear;
+            while($year <= $endyear)
+            {
+                $data[$i][]=$datay[$year][$i][1];
+                $year++;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Return count, and sum of products
+     *
+     * @param	int		$year			Year
+     * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
+     * @return 	array					Array of values
+     */
+    function getAllByProductEntry($year,$cachedelay=0)
+    {
+        global $conf,$user,$langs;
 
         $datay=array();
 
         // Search into cache
         if (! empty($cachedelay))
         {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
         }
 
         $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
@@ -285,324 +285,324 @@ 
         $foundintocache=0;
         if ($cachedelay > 0)
         {
-        	$filedate=dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache=1;
-
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
-        	{
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
+            $filedate=dol_filemtime($newpathofdestfile);
+            if ($filedate >= ($nowgmt - $cachedelay))
+            {
+                $foundintocache=1;
+
+                $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+            }
+            else
+            {
+                dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+            }
         }
 
         // Load file into $data
         if ($foundintocache)    // Cache file found and is not too old
         {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+            dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+            $data = json_decode(file_get_contents($newpathofdestfile), true);
         }
         else
-		{
-			$data=$this->getAllByProduct($year);
-			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
-		}
-
-		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
-		{
-			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
-			$fp = fopen($newpathofdestfile, 'w');
-			if ($fp)
-			{
-				fwrite($fp, json_encode($data));
-				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
-		}
-
-		return $data;
-	}
-
-
-	// Here we have low level of shared code called by XxxStats.class.php
-
-
-	/**
-	 * 	Return nb of elements by year
-	 *
-	 *	@param	string	$sql		SQL request
-	 * 	@return	array
-	 */
-	function _getNbByYear($sql)
-	{
-		$result = array();
-
-		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$row = $this->db->fetch_row($resql);
-				$result[$i] = $row;
-				$i++;
-			}
-			$this->db->free($resql);
-		}
-		else {
-			dol_print_error($this->db);
-		}
-		return $result;
-	}
-
-	/**
-	 * 	Return nb of elements, total amount and avg amount each year
-	 *
-	 *	@param	string	$sql	SQL request
-	 * 	@return	array			Array with nb, total amount, average for each year
-	 */
-	function _getAllByYear($sql)
-	{
-		$result = array();
-
-		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$row = $this->db->fetch_object($resql);
-				$result[$i]['year'] = $row->year;
-				$result[$i]['nb'] = $row->nb;
-				if($i>0 && $row->nb) $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
-				$result[$i]['total'] = $row->total;
-				if($i>0 && $row->total) $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
-				$result[$i]['avg'] = $row->avg;
-				if($i>0 && $row->avg) $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
-				// For some $sql only
-				if (isset($row->weighted))
-				{
-				    $result[$i]['weighted'] = $row->weighted;
-				    if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
-				}
-				$i++;
-			}
-			$this->db->free($resql);
-		}
-		else {
-			dol_print_error($this->db);
-		}
-		return $result;
-	}
-
-	/**
-	 *     Renvoie le nombre de proposition par mois pour une annee donnee
-	 *
+        {
+            $data=$this->getAllByProduct($year);
+            //					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
+        }
+
+        // Save cache file
+        if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
+        {
+            dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
+            if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+            $fp = fopen($newpathofdestfile, 'w');
+            if ($fp)
+            {
+                fwrite($fp, json_encode($data));
+                fclose($fp);
+                if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                @chmod($newpathofdestfile, octdec($newmask));
+            }
+            $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+        }
+
+        return $data;
+    }
+
+
+    // Here we have low level of shared code called by XxxStats.class.php
+
+
+    /**
+     * 	Return nb of elements by year
+     *
+     *	@param	string	$sql		SQL request
+     * 	@return	array
+     */
+    function _getNbByYear($sql)
+    {
+        $result = array();
+
+        dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $row = $this->db->fetch_row($resql);
+                $result[$i] = $row;
+                $i++;
+            }
+            $this->db->free($resql);
+        }
+        else {
+            dol_print_error($this->db);
+        }
+        return $result;
+    }
+
+    /**
+     * 	Return nb of elements, total amount and avg amount each year
+     *
+     *	@param	string	$sql	SQL request
+     * 	@return	array			Array with nb, total amount, average for each year
+     */
+    function _getAllByYear($sql)
+    {
+        $result = array();
+
+        dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $row = $this->db->fetch_object($resql);
+                $result[$i]['year'] = $row->year;
+                $result[$i]['nb'] = $row->nb;
+                if($i>0 && $row->nb) $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+                $result[$i]['total'] = $row->total;
+                if($i>0 && $row->total) $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+                $result[$i]['avg'] = $row->avg;
+                if($i>0 && $row->avg) $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+                // For some $sql only
+                if (isset($row->weighted))
+                {
+                    $result[$i]['weighted'] = $row->weighted;
+                    if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+                }
+                $i++;
+            }
+            $this->db->free($resql);
+        }
+        else {
+            dol_print_error($this->db);
+        }
+        return $result;
+    }
+
+    /**
+     *     Renvoie le nombre de proposition par mois pour une annee donnee
+     *
      *     @param   int		$year       Year
      *     @param   string	$sql        SQL
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
      *     @return	array				Array of nb each month
-	 */
-	function _getNbByMonth($year, $sql, $format=0)
-	{
-		global $langs;
-
-		$result=array();
-		$res=array();
-
-		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0; $j = 0;
-			while ($i < $num)
-			{
-				$row = $this->db->fetch_row($resql);
-				$j = $row[0] * 1;
-				$result[$j] = $row[1];
-				$i++;
-			}
-			$this->db->free($resql);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		for ($i = 1 ; $i < 13 ; $i++)
-		{
-			$res[$i] = (isset($result[$i])?$result[$i]:0);
-		}
-
-		$data = array();
-
-		for ($i = 1 ; $i < 13 ; $i++)
-		{
-			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
-			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
-			//$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
-		}
-
-		return $data;
-	}
-
-
-	/**
-	 *     Renvoie le nombre d'element par mois pour une annee donnee
-	 *
-	 *     @param	int		$year       Year
-	 *     @param   string	$sql		SQL
+     */
+    function _getNbByMonth($year, $sql, $format=0)
+    {
+        global $langs;
+
+        $result=array();
+        $res=array();
+
+        dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0; $j = 0;
+            while ($i < $num)
+            {
+                $row = $this->db->fetch_row($resql);
+                $j = $row[0] * 1;
+                $result[$j] = $row[1];
+                $i++;
+            }
+            $this->db->free($resql);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        for ($i = 1 ; $i < 13 ; $i++)
+        {
+            $res[$i] = (isset($result[$i])?$result[$i]:0);
+        }
+
+        $data = array();
+
+        for ($i = 1 ; $i < 13 ; $i++)
+        {
+            $month='unknown';
+            if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+            elseif ($format == 1) $month=$i;
+            elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+            //$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
+            //$month=dol_substr($month,0,3);
+            $data[$i-1] = array($month, $res[$i]);
+        }
+
+        return $data;
+    }
+
+
+    /**
+     *     Renvoie le nombre d'element par mois pour une annee donnee
+     *
+     *     @param	int		$year       Year
+     *     @param   string	$sql		SQL
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
-	 *     @return	array
-	 */
-	function _getAmountByMonth($year, $sql, $format=0)
-	{
-		global $langs;
-
-		$result=array();
-		$res=array();
-
-		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-		  	{
-		  		$row = $this->db->fetch_row($resql);
-		  		$j = $row[0] * 1;
-		  		$result[$j] = $row[1];
-		  		$i++;
-		  	}
-		  	$this->db->free($resql);
-		}
+     *     @return	array
+     */
+    function _getAmountByMonth($year, $sql, $format=0)
+    {
+        global $langs;
+
+        $result=array();
+        $res=array();
+
+        dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+                {
+                    $row = $this->db->fetch_row($resql);
+                    $j = $row[0] * 1;
+                    $result[$j] = $row[1];
+                    $i++;
+                }
+                $this->db->free($resql);
+        }
         else dol_print_error($this->db);
 
-		for ($i = 1 ; $i < 13 ; $i++)
-		{
-			$res[$i] = (int) round((isset($result[$i])?$result[$i]:0));
-		}
-
-		$data = array();
-
-		for ($i = 1 ; $i < 13 ; $i++)
-		{
-			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
-			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
-			//$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
-		}
-
-		return $data;
-	}
-
-	/**
-	 *	   Renvoie le montant moyen par mois pour une annee donnee
-	 *
+        for ($i = 1 ; $i < 13 ; $i++)
+        {
+            $res[$i] = (int) round((isset($result[$i])?$result[$i]:0));
+        }
+
+        $data = array();
+
+        for ($i = 1 ; $i < 13 ; $i++)
+        {
+            $month='unknown';
+            if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+            elseif ($format == 1) $month=$i;
+            elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+            //$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
+            //$month=dol_substr($month,0,3);
+            $data[$i-1] = array($month, $res[$i]);
+        }
+
+        return $data;
+    }
+
+    /**
+     *	   Renvoie le montant moyen par mois pour une annee donnee
+     *
      *     @param	int		$year       Year
      *     @param  	string	$sql        SQL
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
-	 *     @return	array
-	 */
-	function _getAverageByMonth($year, $sql, $format=0)
-	{
-		global $langs;
-
-		$result=array();
-		$res=array();
-
-		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0; $j = 0;
-			while ($i < $num)
-			{
-		  		$row = $this->db->fetch_row($resql);
-		  		$j = $row[0] * 1;
-		  		$result[$j] = $row[1];
-		  		$i++;
-		  	}
-		  	$this->db->free($resql);
-		}
+     *     @return	array
+     */
+    function _getAverageByMonth($year, $sql, $format=0)
+    {
+        global $langs;
+
+        $result=array();
+        $res=array();
+
+        dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0; $j = 0;
+            while ($i < $num)
+            {
+                    $row = $this->db->fetch_row($resql);
+                    $j = $row[0] * 1;
+                    $result[$j] = $row[1];
+                    $i++;
+                }
+                $this->db->free($resql);
+        }
         else dol_print_error($this->db);
 
-		for ($i = 1 ; $i < 13 ; $i++)
-		{
-			$res[$i] = (isset($result[$i])?$result[$i]:0);
-		}
+        for ($i = 1 ; $i < 13 ; $i++)
+        {
+            $res[$i] = (isset($result[$i])?$result[$i]:0);
+        }
 
-		$data = array();
+        $data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
-		{
-			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
-			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
-			//$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
-		}
+        for ($i = 1 ; $i < 13 ; $i++)
+        {
+            $month='unknown';
+            if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+            elseif ($format == 1) $month=$i;
+            elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+            //$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
+            //$month=dol_substr($month,0,3);
+            $data[$i-1] = array($month, $res[$i]);
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
 
-	/**
-	 *	   Return number or total of product refs
-	 *
+    /**
+     *	   Return number or total of product refs
+     *
      *     @param  	string	$sql        SQL
      *     @param	int		$limit		Limit
      *     @return	array
-	 */
-	function _getAllByProduct($sql, $limit=10)
-	{
-		global $langs;
-
-		$result=array();
-		$res=array();
-
-		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0; $other=0;
-			while ($i < $num)
-			{
-		  		$row = $this->db->fetch_row($resql);
-		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0],$row[1]);	// Ref of product, nb
-		  		else $other += $row[1];
-		  		$i++;
-		  	}
-		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
-		  	$this->db->free($resql);
-		}
+     */
+    function _getAllByProduct($sql, $limit=10)
+    {
+        global $langs;
+
+        $result=array();
+        $res=array();
+
+        dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0; $other=0;
+            while ($i < $num)
+            {
+                    $row = $this->db->fetch_row($resql);
+                    if ($i < $limit || $num == $limit) $result[$i] = array($row[0],$row[1]);	// Ref of product, nb
+                    else $other += $row[1];
+                    $i++;
+                }
+                if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+                $this->db->free($resql);
+        }
         else dol_print_error($this->db);
 
-		return $result;
-	}
+        return $result;
+    }
 }
 

Spacing +113 added lines, -113 removed lines

@@ -30,8 +30,8 @@ 
 abstract class Stats
 {
 	protected $db;
-	var $_lastfetchdate=array();	// Dates of cache file read by methods
-	var $cachefilesuffix='';		// Suffix to add to name of cache file (to avoid file name conflicts)
+	var $_lastfetchdate = array(); // Dates of cache file read by methods
+	var $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)
 
 	/**
 	 * Return nb of elements by month for several years
@@ -42,35 +42,35 @@ 
      *	@param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 * @return 	array					Array of values
 	 */
-	function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay=0, $format=0)
+	function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
 	    if ($startyear > $endyear) return -1;
 
-		$datay=array();
+		$datay = array();
 
 		// Search into cache
-		if (! empty($cachedelay))
+		if (!empty($cachedelay))
 	    {
 	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 	    }
 
-		$newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-		$newmask='0644';
+		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+		$newmask = '0644';
 
 		$nowgmt = dol_now();
 
-		$foundintocache=0;
+		$foundintocache = 0;
 		if ($cachedelay > 0)
 		{
-			$filedate=dol_filemtime($newpathofdestfile);
+			$filedate = dol_filemtime($newpathofdestfile);
 			if ($filedate >= ($nowgmt - $cachedelay))
 			{
-				$foundintocache=1;
+				$foundintocache = 1;
 
-				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
 			}
 			else
 			{
@@ -85,7 +85,7 @@ 
 		}
 		else
 		{
-			$year=$startyear;
+			$year = $startyear;
 			while ($year <= $endyear)
 			{
 				$datay[$year] = $this->getNbByMonth($year, $format);
@@ -94,13 +94,13 @@ 
 
 			$data = array();
 
-			for ($i = 0 ; $i < 12 ; $i++)
+			for ($i = 0; $i < 12; $i++)
 			{
-				$data[$i][]=$datay[$endyear][$i][0];
-				$year=$startyear;
-				while($year <= $endyear)
+				$data[$i][] = $datay[$endyear][$i][0];
+				$year = $startyear;
+				while ($year <= $endyear)
 				{
-					$data[$i][]=$datay[$year][$i][1];
+					$data[$i][] = $datay[$year][$i][1];
 					$year++;
 				}
 			}
@@ -110,14 +110,14 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+			if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 			@chmod($newpathofdestfile, octdec($newmask));
 
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
 		// return array(array('Month',val1,val2,val3),...)
@@ -136,35 +136,35 @@ 
      * @param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 * @return 	array					Array of values
 	 */
-	function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay=0, $format=0)
+	function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
         if ($startyear > $endyear) return -1;
 
-        $datay=array();
+        $datay = array();
 
         // Search into cache
-        if (! empty($cachedelay))
+        if (!empty($cachedelay))
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
         }
 
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask='0644';
+        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+        $newmask = '0644';
 
         $nowgmt = dol_now();
 
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0)
         {
-        	$filedate=dol_filemtime($newpathofdestfile);
+        	$filedate = dol_filemtime($newpathofdestfile);
         	if ($filedate >= ($nowgmt - $cachedelay))
         	{
-        		$foundintocache=1;
+        		$foundintocache = 1;
 
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
         	}
         	else
         	{
@@ -180,8 +180,8 @@ 
         }
         else
 		{
-			$year=$startyear;
-			while($year <= $endyear)
+			$year = $startyear;
+			while ($year <= $endyear)
 			{
 				$datay[$year] = $this->getAmountByMonth($year, $format);
 				$year++;
@@ -189,13 +189,13 @@ 
 
 			$data = array();
 			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for ($i = 0 ; $i < 12 ; $i++)
+			for ($i = 0; $i < 12; $i++)
 			{
-				$data[$i][]=$datay[$endyear][$i][0];	// set label
-				$year=$startyear;
-				while($year <= $endyear)
+				$data[$i][] = $datay[$endyear][$i][0]; // set label
+				$year = $startyear;
+				while ($year <= $endyear)
 				{
-					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
+					$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
 					$year++;
 				}
 			}
@@ -205,17 +205,17 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
 			else dol_syslog("Failed to write cache file", LOG_ERR);
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
 		return $data;
@@ -228,14 +228,14 @@ 
 	 * @param	int		$startyear		End year
 	 * @return 	array					Array of values
 	 */
-	function getAverageByMonthWithPrevYear($endyear,$startyear)
+	function getAverageByMonthWithPrevYear($endyear, $startyear)
 	{
         if ($startyear > $endyear) return -1;
 
-        $datay=array();
+        $datay = array();
 
-		$year=$startyear;
-		while($year <= $endyear)
+		$year = $startyear;
+		while ($year <= $endyear)
 		{
 			$datay[$year] = $this->getAverageByMonth($year);
 			$year++;
@@ -243,13 +243,13 @@ 
 
 		$data = array();
 
-		for ($i = 0 ; $i < 12 ; $i++)
+		for ($i = 0; $i < 12; $i++)
 		{
-			$data[$i][]=$datay[$endyear][$i][0];
-			$year=$startyear;
-			while($year <= $endyear)
+			$data[$i][] = $datay[$endyear][$i][0];
+			$year = $startyear;
+			while ($year <= $endyear)
 			{
-				$data[$i][]=$datay[$year][$i][1];
+				$data[$i][] = $datay[$year][$i][1];
 				$year++;
 			}
 		}
@@ -264,33 +264,33 @@ 
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
 	 * @return 	array					Array of values
 	 */
-	function getAllByProductEntry($year,$cachedelay=0)
+	function getAllByProductEntry($year, $cachedelay = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-        $datay=array();
+        $datay = array();
 
         // Search into cache
-        if (! empty($cachedelay))
+        if (!empty($cachedelay))
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
         }
 
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask='0644';
+        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+        $newmask = '0644';
 
         $nowgmt = dol_now();
 
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0)
         {
-        	$filedate=dol_filemtime($newpathofdestfile);
+        	$filedate = dol_filemtime($newpathofdestfile);
         	if ($filedate >= ($nowgmt - $cachedelay))
         	{
-        		$foundintocache=1;
+        		$foundintocache = 1;
 
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
         	}
         	else
         	{
@@ -306,7 +306,7 @@ 
         }
         else
 		{
-			$data=$this->getAllByProduct($year);
+			$data = $this->getAllByProduct($year);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
 
@@ -314,16 +314,16 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
 		return $data;
@@ -344,7 +344,7 @@ 
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -374,7 +374,7 @@ 
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -384,16 +384,16 @@ 
 				$row = $this->db->fetch_object($resql);
 				$result[$i]['year'] = $row->year;
 				$result[$i]['nb'] = $row->nb;
-				if($i>0 && $row->nb) $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+				if ($i > 0 && $row->nb) $result[$i - 1]['nb_diff'] = ($result[$i - 1]['nb'] - $row->nb) / $row->nb * 100;
 				$result[$i]['total'] = $row->total;
-				if($i>0 && $row->total) $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+				if ($i > 0 && $row->total) $result[$i - 1]['total_diff'] = ($result[$i - 1]['total'] - $row->total) / $row->total * 100;
 				$result[$i]['avg'] = $row->avg;
-				if($i>0 && $row->avg) $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+				if ($i > 0 && $row->avg) $result[$i - 1]['avg_diff'] = ($result[$i - 1]['avg'] - $row->avg) / $row->avg * 100;
 				// For some $sql only
 				if (isset($row->weighted))
 				{
 				    $result[$i]['weighted'] = $row->weighted;
-				    if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+				    if ($i > 0 && $row->weighted) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
 				}
 				$i++;
 			}
@@ -413,15 +413,15 @@ 
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
      *     @return	array				Array of nb each month
 	 */
-	function _getNbByMonth($year, $sql, $format=0)
+	function _getNbByMonth($year, $sql, $format = 0)
 	{
 		global $langs;
 
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -440,22 +440,22 @@ 
 			dol_print_error($this->db);
 		}
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$res[$i] = (isset($result[$i])?$result[$i]:0);
+			$res[$i] = (isset($result[$i]) ? $result[$i] : 0);
 		}
 
 		$data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			$month = 'unknown';
+			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			elseif ($format == 1) $month = $i;
+			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
+			$data[$i - 1] = array($month, $res[$i]);
 		}
 
 		return $data;
@@ -470,16 +470,16 @@ 
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 *     @return	array
 	 */
-	function _getAmountByMonth($year, $sql, $format=0)
+	function _getAmountByMonth($year, $sql, $format = 0)
 	{
 		global $langs;
 
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -495,22 +495,22 @@ 
 		}
         else dol_print_error($this->db);
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$res[$i] = (int) round((isset($result[$i])?$result[$i]:0));
+			$res[$i] = (int) round((isset($result[$i]) ? $result[$i] : 0));
 		}
 
 		$data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			$month = 'unknown';
+			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			elseif ($format == 1) $month = $i;
+			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
+			$data[$i - 1] = array($month, $res[$i]);
 		}
 
 		return $data;
@@ -524,15 +524,15 @@ 
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 *     @return	array
 	 */
-	function _getAverageByMonth($year, $sql, $format=0)
+	function _getAverageByMonth($year, $sql, $format = 0)
 	{
 		global $langs;
 
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -548,22 +548,22 @@ 
 		}
         else dol_print_error($this->db);
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$res[$i] = (isset($result[$i])?$result[$i]:0);
+			$res[$i] = (isset($result[$i]) ? $result[$i] : 0);
 		}
 
 		$data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			$month = 'unknown';
+			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			elseif ($format == 1) $month = $i;
+			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
+			$data[$i - 1] = array($month, $res[$i]);
 		}
 
 		return $data;
@@ -577,27 +577,27 @@ 
      *     @param	int		$limit		Limit
      *     @return	array
 	 */
-	function _getAllByProduct($sql, $limit=10)
+	function _getAllByProduct($sql, $limit = 10)
 	{
 		global $langs;
 
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i = 0; $other=0;
+			$i = 0; $other = 0;
 			while ($i < $num)
 			{
 		  		$row = $this->db->fetch_row($resql);
-		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0],$row[1]);	// Ref of product, nb
+		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0], $row[1]); // Ref of product, nb
 		  		else $other += $row[1];
 		  		$i++;
 		  	}
-		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
 		  	$this->db->free($resql);
 		}
         else dol_print_error($this->db);

Braces +99 added lines, -53 removed lines

@@ -46,7 +46,9 @@ 
 	{
 		global $conf,$user,$langs;
 
-	    if ($startyear > $endyear) return -1;
+	    if ($startyear > $endyear) {
+	        return -1;
+	    }
 
 		$datay=array();
 
@@ -71,19 +73,19 @@ 
 				$foundintocache=1;
 
 				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
 		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
+		if ($foundintocache) {
+		    // Cache file found and is not too old
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		}
-		else
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		} else
 		{
 			$year=$startyear;
 			while ($year <= $endyear)
@@ -110,11 +112,15 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (! dol_is_dir($conf->user->dir_temp)) {
+			    dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+			if (! empty($conf->global->MAIN_UMASK)) {
+			    $newmask=$conf->global->MAIN_UMASK;
+			}
 			@chmod($newpathofdestfile, octdec($newmask));
 
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
@@ -140,7 +146,9 @@ 
 	{
 		global $conf,$user,$langs;
 
-        if ($startyear > $endyear) return -1;
+        if ($startyear > $endyear) {
+            return -1;
+        }
 
         $datay=array();
 
@@ -165,20 +173,20 @@ 
         		$foundintocache=1;
 
         		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
+        	} else
         	{
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
 
         // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+            // Cache file found and is not too old
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
-        else
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+        } else
 		{
 			$year=$startyear;
 			while($year <= $endyear)
@@ -205,16 +213,21 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (! dol_is_dir($conf->user->dir_temp)) {
+			    dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (! empty($conf->global->MAIN_UMASK)) {
+				    $newmask=$conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
+			} else {
+			    dol_syslog("Failed to write cache file", LOG_ERR);
 			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
 		}
 
@@ -230,7 +243,9 @@ 
 	 */
 	function getAverageByMonthWithPrevYear($endyear,$startyear)
 	{
-        if ($startyear > $endyear) return -1;
+        if ($startyear > $endyear) {
+            return -1;
+        }
 
         $datay=array();
 
@@ -291,20 +306,20 @@ 
         		$foundintocache=1;
 
         		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
+        	} else
         	{
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
 
         // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+            // Cache file found and is not too old
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
-        else
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+        } else
 		{
 			$data=$this->getAllByProduct($year);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
@@ -314,13 +329,17 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (! dol_is_dir($conf->user->dir_temp)) {
+			    dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (! empty($conf->global->MAIN_UMASK)) {
+				    $newmask=$conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
@@ -356,8 +375,7 @@ 
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -384,22 +402,29 @@ 
 				$row = $this->db->fetch_object($resql);
 				$result[$i]['year'] = $row->year;
 				$result[$i]['nb'] = $row->nb;
-				if($i>0 && $row->nb) $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+				if($i>0 && $row->nb) {
+				    $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+				}
 				$result[$i]['total'] = $row->total;
-				if($i>0 && $row->total) $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+				if($i>0 && $row->total) {
+				    $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+				}
 				$result[$i]['avg'] = $row->avg;
-				if($i>0 && $row->avg) $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+				if($i>0 && $row->avg) {
+				    $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+				}
 				// For some $sql only
 				if (isset($row->weighted))
 				{
 				    $result[$i]['weighted'] = $row->weighted;
-				    if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+				    if($i>0 && $row->weighted) {
+				        $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+				    }
 				}
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -434,8 +459,7 @@ 
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -450,9 +474,13 @@ 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
 			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			if ($format == 0) {
+			    $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			} elseif ($format == 1) {
+			    $month=$i;
+			} elseif ($format == 2) {
+			    $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			}
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
 			$data[$i-1] = array($month, $res[$i]);
@@ -492,8 +520,9 @@ 
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else {
+            dol_print_error($this->db);
+        }
 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
@@ -505,9 +534,13 @@ 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
 			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			if ($format == 0) {
+			    $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			} elseif ($format == 1) {
+			    $month=$i;
+			} elseif ($format == 2) {
+			    $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			}
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
 			$data[$i-1] = array($month, $res[$i]);
@@ -545,8 +578,9 @@ 
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else {
+            dol_print_error($this->db);
+        }
 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
@@ -558,9 +592,13 @@ 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
 			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			if ($format == 0) {
+			    $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			} elseif ($format == 1) {
+			    $month=$i;
+			} elseif ($format == 2) {
+			    $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			}
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
 			$data[$i-1] = array($month, $res[$i]);
@@ -593,14 +631,22 @@ 
 			while ($i < $num)
 			{
 		  		$row = $this->db->fetch_row($resql);
-		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0],$row[1]);	// Ref of product, nb
-		  		else $other += $row[1];
+		  		if ($i < $limit || $num == $limit) {
+		  		    $result[$i] = array($row[0],$row[1]);
+		  		}
+		  		// Ref of product, nb
+		  		else {
+		  		    $other += $row[1];
+		  		}
 		  		$i++;
 		  	}
-		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+		  	if ($num > $limit) {
+		  	    $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else {
+            dol_print_error($this->db);
+        }
 
 		return $result;
 	}

dolibarr/htdocs/core/class/html.formfile.class.php

Indentation +1761 added lines, -1761 removed lines

@@ -34,312 +34,312 @@ 
  */
 class FormFile
 {
-	private $db;
+    private $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+    /**
+     * @var string Error code (or message)
+     */
+    public $error;
 
-	public $numoffiles;
-	public $infofiles;			// Used to return informations by function getDocumentsLink
+    public $numoffiles;
+    public $infofiles;			// Used to return informations by function getDocumentsLink
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numoffiles=0;
-	}
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numoffiles=0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Show form to upload a new file.
-	 *
-	 *  @param  string		$url			Url
-	 *  @param  string		$title			Title zone (Title or '' or 'none')
-	 *  @param  int			$addcancel		1=Add 'Cancel' button
-	 *	@param	int			$sectionid		If upload must be done inside a particular ECM section (is sectionid defined, sectiondir must not be)
-	 * 	@param	int			$perm			Value of permission to allow upload
-	 *  @param  int			$size          		Length of input file area. Deprecated.
-	 *  @param	Object		$object			Object to use (when attachment is done on an element)
-	 *  @param	string		$options		Add an option column
-	 *  @param	integer		$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). @deprecated 2 should never be used and if 1 is used, option should no be enabled.
-	 *  @param	string		$savingdocmask		Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
-	 *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
-	 *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
-	 *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
-	 *	@param	string		$sectiondir		If upload must be done inside a particular directory (is sectiondir defined, sectionid must not be)
-	 * 	@return	int							<0 if KO, >0 if OK
-	 */
-	function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='', $sectiondir='')
-	{
+    /**
+     *  Show form to upload a new file.
+     *
+     *  @param  string		$url			Url
+     *  @param  string		$title			Title zone (Title or '' or 'none')
+     *  @param  int			$addcancel		1=Add 'Cancel' button
+     *	@param	int			$sectionid		If upload must be done inside a particular ECM section (is sectionid defined, sectiondir must not be)
+     * 	@param	int			$perm			Value of permission to allow upload
+     *  @param  int			$size          		Length of input file area. Deprecated.
+     *  @param	Object		$object			Object to use (when attachment is done on an element)
+     *  @param	string		$options		Add an option column
+     *  @param	integer		$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). @deprecated 2 should never be used and if 1 is used, option should no be enabled.
+     *  @param	string		$savingdocmask		Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
+     *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
+     *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
+     *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
+     *	@param	string		$sectiondir		If upload must be done inside a particular directory (is sectiondir defined, sectionid must not be)
+     * 	@return	int							<0 if KO, >0 if OK
+     */
+    function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='', $sectiondir='')
+    {
         // phpcs:enable
-		global $conf,$langs, $hookmanager;
-		$hookmanager->initHooks(array('formfile'));
-
-
-		if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
-
-		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
-		{
-			// TODO: Check this works with 2 forms on same page
-			// TODO: Check this works with GED module, otherwise, force useajax to 0
-			// TODO: This does not support option savingdocmask
-			// TODO: This break feature to upload links too
-			return $this->_formAjaxFileUpload($object);
-		}
-		else
-	   	{
-			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
-			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
-				return 1;
-			}
-
-			$maxlength=$size;
-
-			$out = "\n\n<!-- Start form attach new file -->\n";
-
-			if (empty($title)) $title=$langs->trans("AttachANewFile");
-			if ($title != 'none') $out.=load_fiche_titre($title, null, null);
-
-			$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
-			$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
-			$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';
-			$out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-			$out .= '<table width="100%" class="nobordernopadding">';
-			$out .= '<tr>';
-
-			if (! empty($options)) $out .= '<td>'.$options.'</td>';
-
-			$out .= '<td class="valignmiddle nowrap">';
-
-			$max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
-			$maxphp=@ini_get('upload_max_filesize');	// En inconnu
-			if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
-			if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
-			if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
-			if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
-			// Now $max and $maxphp are in Kb
-			$maxmin = $max;
-			if ($maxphp > 0) $maxmin=min($max,$maxphp);
-
-			if ($maxmin > 0)
-			{
-				// MAX_FILE_SIZE doit précéder le champ input de type file
-				$out .= '<input type="hidden" name="max_file_size" value="'.($maxmin*1024).'">';
-			}
-
-			$out .= '<input class="flat minwidth400" type="file"';
-			$out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
-			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-			$out .= (!empty($accept)?' accept="'.$accept.'"':' accept=""');
-			$out .= '>';
-			$out .= ' ';
-			$out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';
-			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-			$out .= '>';
-
-			if ($addcancel)
-			{
-				$out .= ' &nbsp; ';
-				$out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-			}
-
-			if (! empty($conf->global->MAIN_UPLOAD_DOC))
-			{
-				if ($perm)
-				{
-					$langs->load('other');
-					$out .= ' ';
-					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
-				}
-			}
-			else
-			{
-				$out .= ' ('.$langs->trans("UploadDisabled").')';
-			}
-			$out .= "</td></tr>";
-
-			if ($savingdocmask)
-			{
-				$out .= '<tr>';
-   				if (! empty($options)) $out .= '<td>'.$options.'</td>';
-				$out .= '<td valign="middle" class="nowrap">';
-				$out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
-				$out .= '</td>';
-				$out .= '</tr>';
-			}
-
-			$out .= "</table>";
-
-			$out .= '</form>';
-			if (empty($sectionid)) $out .= '<br>';
-
-			$out .= "\n<!-- End form attach new file -->\n";
-
-			if ($linkfiles)
-			{
-				$out .= "\n<!-- Start form link new url -->\n";
-				$langs->load('link');
-				$title = $langs->trans("LinkANewFile");
-				$out .= load_fiche_titre($title, null, null);
-				$out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">';
-				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">';
-				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">';
-				$out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-				$out .= '<div class="valignmiddle" >';
-				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
-				$out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
-				$out .= '</div>';
-				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
-				$out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
-				$out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
-				$out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
-				$out .= '</div>';
-				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				$out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
-				$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-				$out .= '>';
-				$out .= '</div>';
-				$out .= '</div>';
-				$out .= '<div class="clearboth"></div>';
-				$out .= '</form><br>';
-
-				$out .= "\n<!-- End form link new url -->\n";
-			}
-
-			$parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''), 'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
-			$res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
-			if (empty($res))
-			{
-				print '<div class="attacharea attacharea'.$htmlname.'">';
-				print $out;
-				print '</div>';
-			}
-			print $hookmanager->resPrint;
-
-			return 1;
-		}
-	}
+        global $conf,$langs, $hookmanager;
+        $hookmanager->initHooks(array('formfile'));
+
+
+        if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
+
+        if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
+        {
+            // TODO: Check this works with 2 forms on same page
+            // TODO: Check this works with GED module, otherwise, force useajax to 0
+            // TODO: This does not support option savingdocmask
+            // TODO: This break feature to upload links too
+            return $this->_formAjaxFileUpload($object);
+        }
+        else
+            {
+            //If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
+            if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
+                return 1;
+            }
+
+            $maxlength=$size;
+
+            $out = "\n\n<!-- Start form attach new file -->\n";
+
+            if (empty($title)) $title=$langs->trans("AttachANewFile");
+            if ($title != 'none') $out.=load_fiche_titre($title, null, null);
+
+            $out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
+            $out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
+            $out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';
+            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+            $out .= '<table width="100%" class="nobordernopadding">';
+            $out .= '<tr>';
+
+            if (! empty($options)) $out .= '<td>'.$options.'</td>';
+
+            $out .= '<td class="valignmiddle nowrap">';
+
+            $max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
+            $maxphp=@ini_get('upload_max_filesize');	// En inconnu
+            if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
+            if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
+            if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
+            if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
+            // Now $max and $maxphp are in Kb
+            $maxmin = $max;
+            if ($maxphp > 0) $maxmin=min($max,$maxphp);
+
+            if ($maxmin > 0)
+            {
+                // MAX_FILE_SIZE doit précéder le champ input de type file
+                $out .= '<input type="hidden" name="max_file_size" value="'.($maxmin*1024).'">';
+            }
+
+            $out .= '<input class="flat minwidth400" type="file"';
+            $out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
+            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+            $out .= (!empty($accept)?' accept="'.$accept.'"':' accept=""');
+            $out .= '>';
+            $out .= ' ';
+            $out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';
+            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+            $out .= '>';
+
+            if ($addcancel)
+            {
+                $out .= ' &nbsp; ';
+                $out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+            }
+
+            if (! empty($conf->global->MAIN_UPLOAD_DOC))
+            {
+                if ($perm)
+                {
+                    $langs->load('other');
+                    $out .= ' ';
+                    $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
+                }
+            }
+            else
+            {
+                $out .= ' ('.$langs->trans("UploadDisabled").')';
+            }
+            $out .= "</td></tr>";
+
+            if ($savingdocmask)
+            {
+                $out .= '<tr>';
+                    if (! empty($options)) $out .= '<td>'.$options.'</td>';
+                $out .= '<td valign="middle" class="nowrap">';
+                $out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
+                $out .= '</td>';
+                $out .= '</tr>';
+            }
+
+            $out .= "</table>";
+
+            $out .= '</form>';
+            if (empty($sectionid)) $out .= '<br>';
+
+            $out .= "\n<!-- End form attach new file -->\n";
+
+            if ($linkfiles)
+            {
+                $out .= "\n<!-- Start form link new url -->\n";
+                $langs->load('link');
+                $title = $langs->trans("LinkANewFile");
+                $out .= load_fiche_titre($title, null, null);
+                $out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">';
+                $out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">';
+                $out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">';
+                $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+                $out .= '<div class="valignmiddle" >';
+                $out .= '<div class="inline-block" style="padding-right: 10px;">';
+                if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
+                $out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
+                $out .= '</div>';
+                $out .= '<div class="inline-block" style="padding-right: 10px;">';
+                if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
+                $out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
+                $out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
+                $out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
+                $out .= '</div>';
+                $out .= '<div class="inline-block" style="padding-right: 10px;">';
+                $out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
+                $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+                $out .= '>';
+                $out .= '</div>';
+                $out .= '</div>';
+                $out .= '<div class="clearboth"></div>';
+                $out .= '</form><br>';
+
+                $out .= "\n<!-- End form link new url -->\n";
+            }
+
+            $parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''), 'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
+            $res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
+            if (empty($res))
+            {
+                print '<div class="attacharea attacharea'.$htmlname.'">';
+                print $out;
+                print '</div>';
+            }
+            print $hookmanager->resPrint;
+
+            return 1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Show the box with list of available documents for object
-	 *
-	 *      @param      string				$modulepart         propal, facture, facture_fourn, ...
-	 *      @param      string				$modulesubdir       Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-	 *      @param      string				$filedir            Directory to scan
-	 *      @param      string				$urlsource          Url of origin page (for return)
-	 *      @param      int					$genallowed         Generation is allowed (1/0 or array of formats)
-	 *      @param      int					$delallowed         Remove is allowed (1/0)
-	 *      @param      string				$modelselected      Model to preselect by default
-	 *      @param      integer				$allowgenifempty	Show warning if no model activated
-	 *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
-	 *      @param      int					$iconPDF            Show only PDF icon with link (1/0)
-	 * 		@param		int					$notused	        Not used
-	 * 		@param		integer				$noform				Do not output html form tags
-	 * 		@param		string				$param				More param on http links
-	 * 		@param		string				$title				Title to show on top of form
-	 * 		@param		string				$buttonlabel		Label on submit button
-	 * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
-	 * 		@return		int										<0 if KO, number of shown files if OK
-	 *      @deprecated                                         Use print xxx->showdocuments() instead.
-	 */
-	function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
-	{
+    /**
+     *      Show the box with list of available documents for object
+     *
+     *      @param      string				$modulepart         propal, facture, facture_fourn, ...
+     *      @param      string				$modulesubdir       Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+     *      @param      string				$filedir            Directory to scan
+     *      @param      string				$urlsource          Url of origin page (for return)
+     *      @param      int					$genallowed         Generation is allowed (1/0 or array of formats)
+     *      @param      int					$delallowed         Remove is allowed (1/0)
+     *      @param      string				$modelselected      Model to preselect by default
+     *      @param      integer				$allowgenifempty	Show warning if no model activated
+     *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
+     *      @param      int					$iconPDF            Show only PDF icon with link (1/0)
+     * 		@param		int					$notused	        Not used
+     * 		@param		integer				$noform				Do not output html form tags
+     * 		@param		string				$param				More param on http links
+     * 		@param		string				$title				Title to show on top of form
+     * 		@param		string				$buttonlabel		Label on submit button
+     * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
+     * 		@return		int										<0 if KO, number of shown files if OK
+     *      @deprecated                                         Use print xxx->showdocuments() instead.
+     */
+    function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
+    {
         // phpcs:enable
-		$this->numoffiles=0;
-		print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$notused,$noform,$param,$title,$buttonlabel,$codelang);
-		return $this->numoffiles;
-	}
-
-	/**
-	 *      Return a string to show the box with list of available documents for object.
-	 *      This also set the property $this->numoffiles
-	 *
-	 *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule_temp', ...)
-	 *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-	 *      @param      string				$filedir            Directory to scan
-	 *      @param      string				$urlsource          Url of origin page (for return)
-	 *      @param      int					$genallowed         Generation is allowed (1/0 or array list of templates)
-	 *      @param      int					$delallowed         Remove is allowed (1/0)
-	 *      @param      string				$modelselected      Model to preselect by default
-	 *      @param      integer				$allowgenifempty	Allow generation even if list of template ($genallowed) is empty (show however a warning)
-	 *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
-	 *      @param      int					$iconPDF            Deprecated, see getDocumentsLink
-	 * 		@param		int					$notused	        Not used
-	 * 		@param		integer				$noform				Do not output html form tags
-	 * 		@param		string				$param				More param on http links
-	 * 		@param		string				$title				Title to show on top of form
-	 * 		@param		string				$buttonlabel		Label on submit button
-	 * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
-	 * 		@param		string				$morepicto			Add more HTML content into cell with picto
-	 *      @param      Object              $object             Object when method is called from an object card.
-	 *      @param		int					$hideifempty		Hide section of generated files if there is no file
-	 * 		@return		string              					Output string with HTML array of documents (might be empty string)
-	 */
-	function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null,$hideifempty=0)
-	{
-		// Deprecation warning
-		if (! empty($iconPDF)) {
-			dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
-		}
-
-		global $langs, $conf, $user, $hookmanager;
-		global $form;
-
-		if (! is_object($form)) $form=new Form($this->db);
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		// For backward compatibility
-		if (! empty($iconPDF)) {
-			return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
-		}
-
-		// Add entity in $param
-		$param.= 'entity='.(!empty($object->entity)?$object->entity:$conf->entity);
-
-		$printer=0;
-		if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport','livraison')))	// The direct print feature is implemented only for such elements
-		{
-			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
-		}
-
-		$hookmanager->initHooks(array('formfile'));
-
-		// Get list of files
-		$file_list=null;
-		if (! empty($filedir))
-		{
-			$file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
-		}
-		if ($hideifempty && empty($file_list)) return '';
-
-		$out='';
-		$forname='builddoc';
-		$headershown=0;
-		$showempty=0;
-		$i=0;
-
-		$out.= "\n".'<!-- Start show_document -->'."\n";
-		//print 'filedir='.$filedir;
-
-		if (preg_match('/massfilesarea_/', $modulepart))
-		{
-			$out.='<div id="show_files"><br></div>'."\n";
-			$title=$langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
-			$title.='<script type="text/javascript" language="javascript">
+        $this->numoffiles=0;
+        print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$notused,$noform,$param,$title,$buttonlabel,$codelang);
+        return $this->numoffiles;
+    }
+
+    /**
+     *      Return a string to show the box with list of available documents for object.
+     *      This also set the property $this->numoffiles
+     *
+     *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule_temp', ...)
+     *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+     *      @param      string				$filedir            Directory to scan
+     *      @param      string				$urlsource          Url of origin page (for return)
+     *      @param      int					$genallowed         Generation is allowed (1/0 or array list of templates)
+     *      @param      int					$delallowed         Remove is allowed (1/0)
+     *      @param      string				$modelselected      Model to preselect by default
+     *      @param      integer				$allowgenifempty	Allow generation even if list of template ($genallowed) is empty (show however a warning)
+     *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
+     *      @param      int					$iconPDF            Deprecated, see getDocumentsLink
+     * 		@param		int					$notused	        Not used
+     * 		@param		integer				$noform				Do not output html form tags
+     * 		@param		string				$param				More param on http links
+     * 		@param		string				$title				Title to show on top of form
+     * 		@param		string				$buttonlabel		Label on submit button
+     * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
+     * 		@param		string				$morepicto			Add more HTML content into cell with picto
+     *      @param      Object              $object             Object when method is called from an object card.
+     *      @param		int					$hideifempty		Hide section of generated files if there is no file
+     * 		@return		string              					Output string with HTML array of documents (might be empty string)
+     */
+    function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null,$hideifempty=0)
+    {
+        // Deprecation warning
+        if (! empty($iconPDF)) {
+            dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
+        }
+
+        global $langs, $conf, $user, $hookmanager;
+        global $form;
+
+        if (! is_object($form)) $form=new Form($this->db);
+
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        // For backward compatibility
+        if (! empty($iconPDF)) {
+            return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
+        }
+
+        // Add entity in $param
+        $param.= 'entity='.(!empty($object->entity)?$object->entity:$conf->entity);
+
+        $printer=0;
+        if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport','livraison')))	// The direct print feature is implemented only for such elements
+        {
+            $printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
+        }
+
+        $hookmanager->initHooks(array('formfile'));
+
+        // Get list of files
+        $file_list=null;
+        if (! empty($filedir))
+        {
+            $file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
+        }
+        if ($hideifempty && empty($file_list)) return '';
+
+        $out='';
+        $forname='builddoc';
+        $headershown=0;
+        $showempty=0;
+        $i=0;
+
+        $out.= "\n".'<!-- Start show_document -->'."\n";
+        //print 'filedir='.$filedir;
+
+        if (preg_match('/massfilesarea_/', $modulepart))
+        {
+            $out.='<div id="show_files"><br></div>'."\n";
+            $title=$langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
+            $title.='<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
 					jQuery(\'#togglemassfilesarea\').click(function() {
 						if (jQuery(\'#togglemassfilesarea\').attr(\'ref\') == "shown")
@@ -358,1489 +358,1489 @@ 
 					});
 				});
 				</script>';
-		}
-
-		$titletoshow=$langs->trans("Documents");
-		if (! empty($title)) $titletoshow=$title;
-
-		// Show table
-		if ($genallowed)
-		{
-			$modellist=array();
-
-			if ($modulepart == 'company')
-			{
-				$showempty=1;
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
-					$modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'propal')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
-					$modellist=ModelePDFPropales::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'supplier_proposal')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
-					$modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'commande')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
-					$modellist=ModelePDFCommandes::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'expedition')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-					$modellist=ModelePDFExpedition::liste_modeles($this->db);
-				}
-			}
+        }
+
+        $titletoshow=$langs->trans("Documents");
+        if (! empty($title)) $titletoshow=$title;
+
+        // Show table
+        if ($genallowed)
+        {
+            $modellist=array();
+
+            if ($modulepart == 'company')
+            {
+                $showempty=1;
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
+                    $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'propal')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
+                    $modellist=ModelePDFPropales::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'supplier_proposal')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
+                    $modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'commande')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
+                    $modellist=ModelePDFCommandes::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'expedition')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
+                    $modellist=ModelePDFExpedition::liste_modeles($this->db);
+                }
+            }
             elseif ($modulepart == 'reception')
             {
                 if (is_array($genallowed)) $modellist=$genallowed;
                 else
                 {
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
-					$modellist = ModelePdfReception::liste_modeles($this->db);
-				}
-            }
-			elseif ($modulepart == 'livraison')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
-					$modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'ficheinter')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
-					$modellist=ModelePDFFicheinter::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'facture')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-					$modellist=ModelePDFFactures::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'contract')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
-					$modellist=ModelePDFContract::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'project')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
-					$modellist=ModelePDFProjects::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'project_task')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
-					$modellist=ModelePDFTask::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'product')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
-					$modellist=ModelePDFProduct::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'product_batch')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
-					$modellist=ModelePDFProductBatch::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'stock')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
-					$modellist=ModelePDFStock::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'movement')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
-					$modellist=ModelePDFMovement::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'export')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
-					$modellist=ModeleExports::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
-					$modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
-					$modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'supplier_payment')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
-					$modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'remisecheque')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
-					$modellist=ModeleChequeReceipts::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'donation')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
-					$modellist=ModeleDon::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'member')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
-					$modellist=ModelePDFCards::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'agenda' || $modulepart == 'actions')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
-					$modellist=ModeleAction::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'expensereport')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
-					$modellist=ModeleExpenseReport::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'unpaid')
-			{
-				$modellist='';
-			}
-			elseif ($modulepart == 'user')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
-					$modellist=ModelePDFUser::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'usergroup')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
-					$modellist=ModelePDFUserGroup::liste_modeles($this->db);
-				}
-			}
-			else
-			{
-				// For normalized standard modules
-				$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
-				if (file_exists($file))
-				{
-					$res=include_once $file;
-				}
-				// For normalized external modules
-				else
-				{
-					$file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
-					$res=include_once $file;
-				}
-				$class='ModelePDF'.ucfirst($modulepart);
-				if (class_exists($class))
-				{
-					$modellist=call_user_func($class.'::liste_modeles',$this->db);
-				}
-				else
-				{
-					dol_print_error($this->db,'Bad value for modulepart');
-					return -1;
-				}
-			}
-
-			// Set headershown to avoid to have table opened a second time later
-			$headershown=1;
-
-			$buttonlabeltoshow=$buttonlabel;
-			if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
-
-			if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
-			if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
-			$out.= '<input type="hidden" name="action" value="builddoc">';
-			$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-			$out.= load_fiche_titre($titletoshow, '', '');
-			$out.= '<div class="div-table-responsive-no-min">';
-			$out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
-
-			$out.= '<tr class="liste_titre">';
-
-			$addcolumforpicto=($delallowed || $printer || $morepicto);
-			$out.= '<th align="center" colspan="'.(3+($addcolumforpicto?1:0)).'" class="formdoc liste_titre maxwidthonsmartphone">';
-
-			// Model
-			if (! empty($modellist))
-			{
-				$out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-				{
-					$arraykeys=array_keys($modellist);
-					$modelselected=$arraykeys[0];
-				}
-				$out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				if ($conf->use_javascript_ajax)
-				{
-					$out.= ajax_combobox('model');
-				}
-			}
-			else
-			{
-				$out.= '<div class="float">'.$langs->trans("Files").'</div>';
-			}
-
-			// Language code (if multilang)
-			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-				$formadmin=new FormAdmin($this->db);
-				$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
-				$morecss='maxwidth150';
-				if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
-				$out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
-			}
-			else
-			{
-				$out.= '&nbsp;';
-			}
-
-			// Button
-			$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-			$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
-			$genbutton.= '>';
-			if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
-			{
-			   	$langs->load("errors");
-			   	$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
-			}
-			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-			if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
-			$out.= $genbutton;
-			$out.= '</th>';
-
-			if (!empty($hookmanager->hooks['formfile']))
-			{
-				foreach($hookmanager->hooks['formfile'] as $module)
-				{
-					if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
-				}
-			}
-			$out.= '</tr>';
-
-			// Execute hooks
-			$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
-			if (is_object($hookmanager))
-			{
-				$reshook = $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']);
-				$out.= $hookmanager->resPrint;
-			}
-		}
-
-		// Get list of files
-		if (! empty($filedir))
-		{
-			$link_list = array();
-			if (is_object($object))
-			{
-				require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-				$link = new Link($this->db);
-				$sortfield = $sortorder = null;
-				$res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
-			}
-
-			$out.= '<!-- html.formfile::showdocuments -->'."\n";
-
-			// Show title of array if not already shown
-			if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart))
-				&& ! $headershown)
-			{
-				$headershown=1;
-				$out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
-				$out.= '<div class="div-table-responsive-no-min">';
-				$out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
-			}
-
-			// Loop on each file found
-			if (is_array($file_list))
-			{
-				foreach($file_list as $file)
-				{
-					// Define relative path for download link (depends on module)
-					$relativepath=$file["name"];										// Cas general
-					if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
-					if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
-
-					$out.= '<tr class="oddeven">';
-
-					$documenturl = DOL_URL_ROOT.'/document.php';
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
-
-					// Show file name with link to download
-					$out.= '<td class="minwidth200">';
-					$out.= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
-					$mime=dol_mimetype($relativepath,'',0);
-					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
-					$out.= ' target="_blank">';
-					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]);
-					$out.= dol_trunc($file["name"], 150);
-					$out.= '</a>'."\n";
-					$out.= $this->showPreview($file,$modulepart,$relativepath,0,$param);
-					$out.= '</td>';
-
-					// Show file size
-					$size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"]));
-					$out.= '<td align="right" class="nowrap">'.dol_print_size($size,1,1).'</td>';
-
-					// Show file date
-					$date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
-					$out.= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
-
-					if ($delallowed || $printer || $morepicto)
-					{
-						$out.= '<td class="right nowraponall">';
-						if ($delallowed)
-						{
-							$tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
-							$out.= '<a href="'.$tmpurlsource.(strpos($tmpurlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
-							$out.= ($param?'&amp;'.$param:'');
-							//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
-							//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
-							$out.= '">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
-						}
-						if ($printer)
-						{
-							//$out.= '<td align="right">';
-							$out.= '<a class="paddingleft" href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
-							$out.= ($param?'&amp;'.$param:'');
-							$out.= '">'.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').'</a>';
-						}
-						if ($morepicto)
-						{
-							$morepicto=preg_replace('/__FILENAMEURLENCODED__/',urlencode($relativepath),$morepicto);
-							$out.=$morepicto;
-						}
-						$out.='</td>';
-					}
-
-					if (is_object($hookmanager))
-					{
-						$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
-						$res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
-						if (empty($res))
-						{
-							$out.= $hookmanager->resPrint;		// Complete line
-							$out.= '</tr>';
-						}
-						else $out = $hookmanager->resPrint;		// Replace line
-			  		}
-				}
-
-				$this->numoffiles++;
-			}
-			// Loop on each link found
-			if (is_array($link_list))
-			{
-				$colspan=2;
-
-				foreach($link_list as $file)
-				{
-					$out.='<tr class="oddeven">';
-					$out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
-					$out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-					$out.=$file->label;
-					$out.='</a>';
-					$out.='</td>';
-					$out.='<td align="right">';
-					$out.=dol_print_date($file->datea,'dayhour');
-					$out.='</td>';
-					if ($delallowed || $printer || $morepicto) $out.='<td></td>';
-					$out.='</tr>'."\n";
-				}
-				$this->numoffiles++;
-			}
-
-		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
-			{
-				$out.='<tr><td colspan="'.(3+($addcolumforpicto?1:0)).'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
-			}
-		}
-
-		if ($headershown)
-		{
-			// Affiche pied du tableau
-			$out.= "</table>\n";
-			$out.= "</div>\n";
-			if ($genallowed)
-			{
-				if (empty($noform)) $out.= '</form>'."\n";
-			}
-		}
-		$out.= '<!-- End show_document -->'."\n";
-		//return ($i?$i:$headershown);
-		return $out;
-	}
-
-	/**
-	 *	Show a Document icon with link(s)
-	 *  You may want to call this into a div like this:
-	 *  print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
-	 *
-	 *	@param	string	$modulepart		propal, facture, facture_fourn, ...
-	 *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-	 *	@param	string	$filedir		Full path to directory to scan
-	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
-	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
-	 */
-	function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter='')
-	{
-		global $conf, $langs;
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$out='';
-		$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
-
-		$entity = 1; // Without multicompany
-
-		// Get object entity
-		if (! empty($conf->multicompany->enabled))
-		{
-			preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir,'/').'$/', $filedir, $regs);
-			$entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
-		}
-
-		// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
-		// @TODO Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
-		if (! empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
-		{
-			$filterforfilesearch = preg_quote(basename($modulesubdir),'/');
-		}
-		else
-		{
-			$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
-		}
-		$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// We also discard .meta and .png preview
-
-		//var_dump($file_list);
-		// For ajax treatment
-		$out.= '<!-- html.formfile::getDocumentsLink -->'."\n";
-		if (! empty($file_list))
-		{
-			$out='<dl class="dropdown inline-block">
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
+                    $modellist = ModelePdfReception::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'livraison')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
+                    $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'ficheinter')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
+                    $modellist=ModelePDFFicheinter::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'facture')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+                    $modellist=ModelePDFFactures::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'contract')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
+                    $modellist=ModelePDFContract::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'project')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
+                    $modellist=ModelePDFProjects::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'project_task')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
+                    $modellist=ModelePDFTask::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'product')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
+                    $modellist=ModelePDFProduct::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'product_batch')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
+                    $modellist=ModelePDFProductBatch::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'stock')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
+                    $modellist=ModelePDFStock::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'movement')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
+                    $modellist=ModelePDFMovement::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'export')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
+                    $modellist=ModeleExports::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
+                    $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
+                    $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'supplier_payment')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
+                    $modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'remisecheque')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
+                    $modellist=ModeleChequeReceipts::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'donation')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
+                    $modellist=ModeleDon::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'member')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
+                    $modellist=ModelePDFCards::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'agenda' || $modulepart == 'actions')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
+                    $modellist=ModeleAction::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'expensereport')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
+                    $modellist=ModeleExpenseReport::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'unpaid')
+            {
+                $modellist='';
+            }
+            elseif ($modulepart == 'user')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
+                    $modellist=ModelePDFUser::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'usergroup')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
+                    $modellist=ModelePDFUserGroup::liste_modeles($this->db);
+                }
+            }
+            else
+            {
+                // For normalized standard modules
+                $file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
+                if (file_exists($file))
+                {
+                    $res=include_once $file;
+                }
+                // For normalized external modules
+                else
+                {
+                    $file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
+                    $res=include_once $file;
+                }
+                $class='ModelePDF'.ucfirst($modulepart);
+                if (class_exists($class))
+                {
+                    $modellist=call_user_func($class.'::liste_modeles',$this->db);
+                }
+                else
+                {
+                    dol_print_error($this->db,'Bad value for modulepart');
+                    return -1;
+                }
+            }
+
+            // Set headershown to avoid to have table opened a second time later
+            $headershown=1;
+
+            $buttonlabeltoshow=$buttonlabel;
+            if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
+
+            if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
+            if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
+            $out.= '<input type="hidden" name="action" value="builddoc">';
+            $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+            $out.= load_fiche_titre($titletoshow, '', '');
+            $out.= '<div class="div-table-responsive-no-min">';
+            $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
+
+            $out.= '<tr class="liste_titre">';
+
+            $addcolumforpicto=($delallowed || $printer || $morepicto);
+            $out.= '<th align="center" colspan="'.(3+($addcolumforpicto?1:0)).'" class="formdoc liste_titre maxwidthonsmartphone">';
+
+            // Model
+            if (! empty($modellist))
+            {
+                $out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
+                if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+                {
+                    $arraykeys=array_keys($modellist);
+                    $modelselected=$arraykeys[0];
+                }
+                $out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+                if ($conf->use_javascript_ajax)
+                {
+                    $out.= ajax_combobox('model');
+                }
+            }
+            else
+            {
+                $out.= '<div class="float">'.$langs->trans("Files").'</div>';
+            }
+
+            // Language code (if multilang)
+            if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+                $formadmin=new FormAdmin($this->db);
+                $defaultlang=$codelang?$codelang:$langs->getDefaultLang();
+                $morecss='maxwidth150';
+                if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
+                $out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
+            }
+            else
+            {
+                $out.= '&nbsp;';
+            }
+
+            // Button
+            $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+            $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
+            $genbutton.= '>';
+            if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
+            {
+                    $langs->load("errors");
+                    $genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+            }
+            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
+            if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
+            $out.= $genbutton;
+            $out.= '</th>';
+
+            if (!empty($hookmanager->hooks['formfile']))
+            {
+                foreach($hookmanager->hooks['formfile'] as $module)
+                {
+                    if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
+                }
+            }
+            $out.= '</tr>';
+
+            // Execute hooks
+            $parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
+            if (is_object($hookmanager))
+            {
+                $reshook = $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']);
+                $out.= $hookmanager->resPrint;
+            }
+        }
+
+        // Get list of files
+        if (! empty($filedir))
+        {
+            $link_list = array();
+            if (is_object($object))
+            {
+                require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+                $link = new Link($this->db);
+                $sortfield = $sortorder = null;
+                $res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
+            }
+
+            $out.= '<!-- html.formfile::showdocuments -->'."\n";
+
+            // Show title of array if not already shown
+            if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart))
+                && ! $headershown)
+            {
+                $headershown=1;
+                $out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
+                $out.= '<div class="div-table-responsive-no-min">';
+                $out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
+            }
+
+            // Loop on each file found
+            if (is_array($file_list))
+            {
+                foreach($file_list as $file)
+                {
+                    // Define relative path for download link (depends on module)
+                    $relativepath=$file["name"];										// Cas general
+                    if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+                    if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
+
+                    $out.= '<tr class="oddeven">';
+
+                    $documenturl = DOL_URL_ROOT.'/document.php';
+                    if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+
+                    // Show file name with link to download
+                    $out.= '<td class="minwidth200">';
+                    $out.= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
+                    $mime=dol_mimetype($relativepath,'',0);
+                    if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
+                    $out.= ' target="_blank">';
+                    $out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]);
+                    $out.= dol_trunc($file["name"], 150);
+                    $out.= '</a>'."\n";
+                    $out.= $this->showPreview($file,$modulepart,$relativepath,0,$param);
+                    $out.= '</td>';
+
+                    // Show file size
+                    $size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"]));
+                    $out.= '<td align="right" class="nowrap">'.dol_print_size($size,1,1).'</td>';
+
+                    // Show file date
+                    $date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
+                    $out.= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
+
+                    if ($delallowed || $printer || $morepicto)
+                    {
+                        $out.= '<td class="right nowraponall">';
+                        if ($delallowed)
+                        {
+                            $tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
+                            $out.= '<a href="'.$tmpurlsource.(strpos($tmpurlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
+                            $out.= ($param?'&amp;'.$param:'');
+                            //$out.= '&modulepart='.$modulepart; // TODO obsolete ?
+                            //$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
+                            $out.= '">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+                        }
+                        if ($printer)
+                        {
+                            //$out.= '<td align="right">';
+                            $out.= '<a class="paddingleft" href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
+                            $out.= ($param?'&amp;'.$param:'');
+                            $out.= '">'.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').'</a>';
+                        }
+                        if ($morepicto)
+                        {
+                            $morepicto=preg_replace('/__FILENAMEURLENCODED__/',urlencode($relativepath),$morepicto);
+                            $out.=$morepicto;
+                        }
+                        $out.='</td>';
+                    }
+
+                    if (is_object($hookmanager))
+                    {
+                        $parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
+                        $res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
+                        if (empty($res))
+                        {
+                            $out.= $hookmanager->resPrint;		// Complete line
+                            $out.= '</tr>';
+                        }
+                        else $out = $hookmanager->resPrint;		// Replace line
+                        }
+                }
+
+                $this->numoffiles++;
+            }
+            // Loop on each link found
+            if (is_array($link_list))
+            {
+                $colspan=2;
+
+                foreach($link_list as $file)
+                {
+                    $out.='<tr class="oddeven">';
+                    $out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
+                    $out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
+                    $out.=$file->label;
+                    $out.='</a>';
+                    $out.='</td>';
+                    $out.='<td align="right">';
+                    $out.=dol_print_date($file->datea,'dayhour');
+                    $out.='</td>';
+                    if ($delallowed || $printer || $morepicto) $out.='<td></td>';
+                    $out.='</tr>'."\n";
+                }
+                $this->numoffiles++;
+            }
+
+                if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
+            {
+                $out.='<tr><td colspan="'.(3+($addcolumforpicto?1:0)).'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
+            }
+        }
+
+        if ($headershown)
+        {
+            // Affiche pied du tableau
+            $out.= "</table>\n";
+            $out.= "</div>\n";
+            if ($genallowed)
+            {
+                if (empty($noform)) $out.= '</form>'."\n";
+            }
+        }
+        $out.= '<!-- End show_document -->'."\n";
+        //return ($i?$i:$headershown);
+        return $out;
+    }
+
+    /**
+     *	Show a Document icon with link(s)
+     *  You may want to call this into a div like this:
+     *  print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
+     *
+     *	@param	string	$modulepart		propal, facture, facture_fourn, ...
+     *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+     *	@param	string	$filedir		Full path to directory to scan
+     *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
+     *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
+     */
+    function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter='')
+    {
+        global $conf, $langs;
+
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        $out='';
+        $this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
+
+        $entity = 1; // Without multicompany
+
+        // Get object entity
+        if (! empty($conf->multicompany->enabled))
+        {
+            preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir,'/').'$/', $filedir, $regs);
+            $entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
+        }
+
+        // Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
+        // @TODO Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
+        if (! empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
+        {
+            $filterforfilesearch = preg_quote(basename($modulesubdir),'/');
+        }
+        else
+        {
+            $filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
+        }
+        $file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// We also discard .meta and .png preview
+
+        //var_dump($file_list);
+        // For ajax treatment
+        $out.= '<!-- html.formfile::getDocumentsLink -->'."\n";
+        if (! empty($file_list))
+        {
+            $out='<dl class="dropdown inline-block">
     			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignmiddle').'</a></dt>
     			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields" style="display: none;">';
-			$tmpout='';
-
-			// Loop on each file found
-			$found=0;
-			foreach($file_list as $file)
-			{
-				$i++;
-				if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
-
-				$found++;
-				// Define relative path for download link (depends on module)
-				$relativepath=$file["name"];								// Cas general
-				if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
-				// Autre cas
-				if ($modulepart == 'donation')            {
-					$relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
-				}
-				if ($modulepart == 'export')              {
-					$relativepath = $file["name"];
-				}
-
-				$this->infofiles['nboffiles']++;
-				$this->infofiles['files'][]=$file['fullname'];
-				$ext=pathinfo($file["name"], PATHINFO_EXTENSION);
-				if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
-				else $this->infofiles['extensions'][$ext]++;
-
-				// Preview
-				if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
-				{
-					$tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
-					if ($tmparray && $tmparray['url'])
-					{
-						$tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>';
-						//$tmpout.= img_picto('','detail');
-						$tmpout.= '<i class="fa fa-search-plus paddingright" style="color: gray"></i>';
-						$tmpout.= $langs->trans("Preview").' '.$ext.'</a></li>';
-					}
-				}
-
-				// Download
-				$tmpout.= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
-				$mime=dol_mimetype($relativepath,'',0);
-				if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
-				$tmpout.= '>';
-				$tmpout.= img_mime($relativepath, $file["name"]);
-				$tmpout.= $langs->trans("Download").' '.$ext;
-				$tmpout.= '</a></li>'."\n";
-			}
-			$out.=$tmpout;
-			$out.='</ul></div></dd>
+            $tmpout='';
+
+            // Loop on each file found
+            $found=0;
+            foreach($file_list as $file)
+            {
+                $i++;
+                if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
+
+                $found++;
+                // Define relative path for download link (depends on module)
+                $relativepath=$file["name"];								// Cas general
+                if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+                // Autre cas
+                if ($modulepart == 'donation')            {
+                    $relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
+                }
+                if ($modulepart == 'export')              {
+                    $relativepath = $file["name"];
+                }
+
+                $this->infofiles['nboffiles']++;
+                $this->infofiles['files'][]=$file['fullname'];
+                $ext=pathinfo($file["name"], PATHINFO_EXTENSION);
+                if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
+                else $this->infofiles['extensions'][$ext]++;
+
+                // Preview
+                if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
+                {
+                    $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
+                    if ($tmparray && $tmparray['url'])
+                    {
+                        $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>';
+                        //$tmpout.= img_picto('','detail');
+                        $tmpout.= '<i class="fa fa-search-plus paddingright" style="color: gray"></i>';
+                        $tmpout.= $langs->trans("Preview").' '.$ext.'</a></li>';
+                    }
+                }
+
+                // Download
+                $tmpout.= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
+                $mime=dol_mimetype($relativepath,'',0);
+                if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
+                $tmpout.= '>';
+                $tmpout.= img_mime($relativepath, $file["name"]);
+                $tmpout.= $langs->trans("Download").' '.$ext;
+                $tmpout.= '</a></li>'."\n";
+            }
+            $out.=$tmpout;
+            $out.='</ul></div></dd>
     			</dl>';
 
-			if (! $found) $out='';
-		}
-		else
-		{
-			// TODO Add link to regenerate doc ?
-			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
-		}
+            if (! $found) $out='';
+        }
+        else
+        {
+            // TODO Add link to regenerate doc ?
+            //$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
+        }
 
-		return $out;
-	}
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Show list of documents in $filearray (may be they are all in same directory but may not)
-	 *  This also sync database if $upload_dir is defined.
-	 *
-	 *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this.
-	 * 	@param	 Object	$object				Object on which document is linked to.
-	 * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper.
-	 * 	@param	 string	$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)
-	 * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file.
-	 * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.
-	 * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)
-	 * 	@param	 int	$useinecm			Change output for use in ecm module:
-	 * 										0: Add a previw link. Show also rename and crop file
-	 * 										1: Add link to edit ECM entry
-	 * 										2: Add rename and crop file
-	 * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
-	 *  @param   int	$maxlength          Maximum length of file name shown.
-	 *  @param	 string	$title				Title before list. Use 'none' to disable title.
-	 *  @param	 string $url				Full url to use for click links ('' = autodetect)
-	 *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
-	 *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
-	 *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes.
-	 *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
-	 *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
-	 *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
-	 *  @param	 int	$addfilterfields	Add line with filters
-	 * 	@return	 int						<0 if KO, nb of files shown if OK
-	 *  @see list_of_autoecmfiles
-	 */
-	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0)
-	{
+    /**
+     *  Show list of documents in $filearray (may be they are all in same directory but may not)
+     *  This also sync database if $upload_dir is defined.
+     *
+     *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this.
+     * 	@param	 Object	$object				Object on which document is linked to.
+     * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper.
+     * 	@param	 string	$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)
+     * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file.
+     * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.
+     * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)
+     * 	@param	 int	$useinecm			Change output for use in ecm module:
+     * 										0: Add a previw link. Show also rename and crop file
+     * 										1: Add link to edit ECM entry
+     * 										2: Add rename and crop file
+     * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
+     *  @param   int	$maxlength          Maximum length of file name shown.
+     *  @param	 string	$title				Title before list. Use 'none' to disable title.
+     *  @param	 string $url				Full url to use for click links ('' = autodetect)
+     *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
+     *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
+     *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes.
+     *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
+     *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
+     *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
+     *  @param	 int	$addfilterfields	Add line with filters
+     * 	@return	 int						<0 if KO, nb of files shown if OK
+     *  @see list_of_autoecmfiles
+     */
+    function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0)
+    {
         // phpcs:enable
-		global $user, $conf, $langs, $hookmanager;
-		global $sortfield, $sortorder, $maxheightmini;
-		global $dolibarr_main_url_root;
-		global $form;
-
-		$disablecrop=1;
-		if (in_array($modulepart, array('expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) $disablecrop=0;
-
-		// Define relative path used to store the file
-		if (empty($relativepath))
-		{
-			$relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
-			if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
-			if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
-		}
-		// For backward compatiblity, we detect file stored into an old path
-		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
-		{
-		    $relativepath=preg_replace('/^.*\/produit\//','',$filearray[0]['path']).'/';
-		}
-		// Defined relative dir to DOL_DATA_ROOT
-		$relativedir = '';
-		if ($upload_dir)
-		{
-			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-			$relativedir = preg_replace('/^[\\/]/','',$relativedir);
-		}
-
-		$hookmanager->initHooks(array('formfile'));
-		$parameters=array(
-				'filearray' => $filearray,
-				'modulepart'=> $modulepart,
-				'param' => $param,
-				'forcedownload' => $forcedownload,
-				'relativepath' => $relativepath,    // relative filename to module dir
-				'relativedir' => $relativedir,      // relative dirname to DOL_DATA_ROOT
-				'permtodelete' => $permonobject,
-				'useinecm' => $useinecm,
-				'textifempty' => $textifempty,
-				'maxlength' => $maxlength,
-				'title' => $title,
-				'url' => $url
-		);
-		$reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
-
-		if (isset($reshook) && $reshook != '') // null or '' for bypass
-		{
-			return $reshook;
-		}
-		else
-		{
-			if (! is_object($form))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';		// The compoent may be included into ajax page that does not include the Form class
-				$form=new Form($this->db);
-			}
-
-			if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
-			$relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
-			if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
-
-			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
-			{
-				$permtoeditline=0;
-				if (in_array($modulepart, array('product','produit','service')))
-				{
-					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
-					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
-				}
-			}
-			if (empty($conf->global->MAIN_UPLOAD_DOC))
-			{
-				$permtoeditline=0;
-				$permonobject=0;
-			}
-
-			// Show list of existing files
-			if (empty($useinecm) && $title != 'none') print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
-			if (empty($url)) $url=$_SERVER["PHP_SELF"];
-
-			print '<!-- html.formfile::list_of_documents -->'."\n";
-			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
-			{
-				print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
-				print '<input type="hidden" name="action" value="renamefile">';
-				print '<input type="hidden" name="id" value="'.$object->id.'">';
-				print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
-			}
-
-			print '<div class="div-table-responsive-no-min">';
-			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
-
-			if (! empty($addfilterfields))
-			{
-				print '<tr class="liste_titre nodrag nodrop">';
-				print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref','alpha')).'"></td>';
-				print '<td></td>';
-				print '<td></td>';
-				if (empty($useinecm)) print '<td></td>';
-				print '<td></td>';
-				print '<td></td>';
-				if (! $disablemove) print '<td></td>';
-				print "</tr>\n";
-			}
-
-			print '<tr class="liste_titre nodrag nodrop">';
-			//print $url.' sortfield='.$sortfield.' sortorder='.$sortorder;
-			print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
-			print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');					// Preview
-			print_liste_field_titre('');
-			print_liste_field_titre('');
-			if (! $disablemove) print_liste_field_titre('');
-			print "</tr>\n";
-
-			// Get list of files stored into database for same relative directory
-			if ($relativedir)
-			{
-				completeFileArrayWithDatabaseInfo($filearray, $relativedir);
-
-				//var_dump($sortfield.' - '.$sortorder);
-				if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
-				{
-					$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
-				}
-			}
-
-			$nboffiles=count($filearray);
-			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-			$i=0; $nboflines = 0; $lastrowid=0;
-			foreach($filearray as $key => $file)      // filearray must be only files here
-			{
-				if ($file['name'] != '.'
-						&& $file['name'] != '..'
-						&& ! preg_match('/\.meta$/i',$file['name']))
-				{
-					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
-					$filepath=$relativepath.$file['name'];
-
-					$editline=0;
-					$nboflines++;
-					print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
-					// Do we have entry into database ?
-					print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
-					print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'AFTER'.$lastrowid.'POS'.($i+1)).'">';
-
-					// File name
-					print '<td class="minwith200">';
-
-					// Show file name with link to download
-					//print "XX".$file['name'];	//$file['name'] must be utf8
-					print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-					if ($forcedownload) print '&attachment=1';
-					if (! empty($object->entity)) print '&entity='.$object->entity;
-					print '&file='.urlencode($filepath);
-					print '">';
-					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'],0,0).')', 'inline-block valignbottom paddingright');
-					if ($showrelpart == 1) print $relativepath;
-					//print dol_trunc($file['name'],$maxlength,'middle');
-					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile','alpha')))
-					{
-						print '</a>';
-						$section_dir=dirname(GETPOST('urlfile','alpha'));
-						print '<input type="hidden" name="section_dir" value="'.$section_dir.'">';
-						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
-						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
-						$editline=1;
-					}
-					else
-					{
-						print dol_trunc($file['name'], 200);
-						print '</a>';
-					}
-					// Preview link
-					if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
-					// Public share link
-					//if (! $editline && ! empty($filearray[$key]['hashp'])) print pictowithlinktodirectdownload;
-
-					print "</td>\n";
-
-					// Size
-					$sizetoshow = dol_print_size($file['size'],1,1);
-					$sizetoshowbytes = dol_print_size($file['size'],0,1);
-
-					print '<td align="right" width="80px">';
-					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
-					else {
-						print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
-					}
-					print '</td>';
-
-					// Date
-					print '<td align="center" width="140px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';	// 140px = width for date with PM format
-
-					// Preview
-					if (empty($useinecm))
-					{
-						$fileinfo = pathinfo($file['name']);
-						print '<td align="center">';
-						if (image_format_supported($file['name']) > 0)
-						{
-							$minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-							if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
-							//print $file['path'].'/'.$minifile.'<br>';
-
-							$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
-							if (empty($urlforhref)) {
-								$urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
-								print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
-							} else {
-								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
-							}
-							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
-							print '</a>';
-						}
-						else print '&nbsp;';
-						print '</td>';
-					}
-
-					// Hash of file (only if we are in a mode where a scan of dir were done and we have id of file in ECM table)
-					print '<td align="center">';
-					if ($relativedir && $filearray[$key]['rowid'] > 0)
-					{
-						if ($editline)
-						{
-							print $langs->trans("FileSharedViaALink").' ';
-							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
-						}
-						else
-						{
-							if ($file['share'])
-							{
-								// Define $urlwithroot
-								$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-								$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-								//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-								//print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';
-								$forcedownload=0;
-								$paramlink='';
-								if (! empty($file['share'])) $paramlink.=($paramlink?'&':'').'hashp='.$file['share'];			// Hash for public share
-								if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
-
-								$fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
-
-								print img_picto($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
-								print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-							}
-							else
-							{
-								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
-							}
-						}
-					}
-					print '</td>';
-
-					// Actions buttons
-					if (! $editline)
-					{
-						// Delete or view link
-						// ($param must start with &)
-						print '<td class="valignmiddle right actionbuttons"><!-- action on files -->';
-						if ($useinecm == 1)
-						{
-							print '<a href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
-						}
-						if (! $useinecm || $useinecm == 2)
-						{
-							$newmodulepart=$modulepart;
-							if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
-
-							if (! $disablecrop && image_format_supported($file['name']) > 0)
-							{
-								if ($permtoeditline)
-								{
-	   								// Link to resize
-	   						   		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("ResizeOrCrop")).'">'.img_picto($langs->trans("ResizeOrCrop"),'resize','class="paddingrightonly"').'</a>';
-								}
-							}
-
-							if ($permtoeditline)
-							{
-								$paramsectiondir=(in_array($modulepart, array('medias','ecm'))?'&section_dir='.urlencode($relativepath):'');
-								print '<a href="'.(($useinecm == 1)?'#':($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
-							}
-						}
-						if ($permonobject)
-						{
-							$useajax=1;
-							if (! empty($conf->dol_use_jmobile)) $useajax=0;
-							if (empty($conf->use_javascript_ajax)) $useajax=0;
-							if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
-							print '<a href="'.(($useinecm && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
-						}
-						print "</td>";
+        global $user, $conf, $langs, $hookmanager;
+        global $sortfield, $sortorder, $maxheightmini;
+        global $dolibarr_main_url_root;
+        global $form;
+
+        $disablecrop=1;
+        if (in_array($modulepart, array('expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) $disablecrop=0;
+
+        // Define relative path used to store the file
+        if (empty($relativepath))
+        {
+            $relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
+            if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
+            if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+        }
+        // For backward compatiblity, we detect file stored into an old path
+        if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
+        {
+            $relativepath=preg_replace('/^.*\/produit\//','',$filearray[0]['path']).'/';
+        }
+        // Defined relative dir to DOL_DATA_ROOT
+        $relativedir = '';
+        if ($upload_dir)
+        {
+            $relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+            $relativedir = preg_replace('/^[\\/]/','',$relativedir);
+        }
+
+        $hookmanager->initHooks(array('formfile'));
+        $parameters=array(
+                'filearray' => $filearray,
+                'modulepart'=> $modulepart,
+                'param' => $param,
+                'forcedownload' => $forcedownload,
+                'relativepath' => $relativepath,    // relative filename to module dir
+                'relativedir' => $relativedir,      // relative dirname to DOL_DATA_ROOT
+                'permtodelete' => $permonobject,
+                'useinecm' => $useinecm,
+                'textifempty' => $textifempty,
+                'maxlength' => $maxlength,
+                'title' => $title,
+                'url' => $url
+        );
+        $reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
+
+        if (isset($reshook) && $reshook != '') // null or '' for bypass
+        {
+            return $reshook;
+        }
+        else
+        {
+            if (! is_object($form))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';		// The compoent may be included into ajax page that does not include the Form class
+                $form=new Form($this->db);
+            }
 
-						if (empty($disablemove))
-						{
-							if ($nboffiles > 1 && $conf->browser->layout != 'phone') {
-								print '<td align="center" class="linecolmove tdlineupdown">';
-								if ($i > 0) {
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
-								}
-								if ($i < $nboffiles-1) {
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
-								}
-								print '</td>';
-							}
-							else {
-							   	print '<td align="center"'.(($conf->browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
-							   	print '</td>';
-							}
-					   }
-					}
-					else
-					{
-						print '<td class="right">';
-						print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
-						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-						print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-						print '</td>';
-						if (empty($disablemove)) print '<td class="right"></td>';
-					}
-					print "</tr>\n";
-
-					$i++;
-				}
-			}
-			if ($nboffiles == 0)
-			{
-				$colspan=(empty($useinecm)?'6':'6');
-				if (empty($disablemove)) $colspan++;		// 6 columns or 7
-				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
-				if (empty($textifempty)) print $langs->trans("NoFileFound");
-				else print $textifempty;
-				print '</td></tr>';
-			}
-			print "</table>";
-			print '</div>';
-
-			if ($nboflines > 1 && is_object($object)) {
-				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
-					$table_element_line = 'ecm_files';
-					include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-				}
-			}
-
-			print ajax_autoselect('downloadlink');
-
-			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
-			{
-				print '</form>';
-			}
-
-			return $nboffiles;
-		}
-	}
+            if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
+            $relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
+            if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
+
+            if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
+            {
+                $permtoeditline=0;
+                if (in_array($modulepart, array('product','produit','service')))
+                {
+                    if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
+                    if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
+                }
+            }
+            if (empty($conf->global->MAIN_UPLOAD_DOC))
+            {
+                $permtoeditline=0;
+                $permonobject=0;
+            }
+
+            // Show list of existing files
+            if (empty($useinecm) && $title != 'none') print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
+            if (empty($url)) $url=$_SERVER["PHP_SELF"];
+
+            print '<!-- html.formfile::list_of_documents -->'."\n";
+            if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
+            {
+                print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
+                print '<input type="hidden" name="action" value="renamefile">';
+                print '<input type="hidden" name="id" value="'.$object->id.'">';
+                print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
+            }
+
+            print '<div class="div-table-responsive-no-min">';
+            print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
+
+            if (! empty($addfilterfields))
+            {
+                print '<tr class="liste_titre nodrag nodrop">';
+                print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref','alpha')).'"></td>';
+                print '<td></td>';
+                print '<td></td>';
+                if (empty($useinecm)) print '<td></td>';
+                print '<td></td>';
+                print '<td></td>';
+                if (! $disablemove) print '<td></td>';
+                print "</tr>\n";
+            }
+
+            print '<tr class="liste_titre nodrag nodrop">';
+            //print $url.' sortfield='.$sortfield.' sortorder='.$sortorder;
+            print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
+            print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
+            print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
+            if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');					// Preview
+            print_liste_field_titre('');
+            print_liste_field_titre('');
+            if (! $disablemove) print_liste_field_titre('');
+            print "</tr>\n";
+
+            // Get list of files stored into database for same relative directory
+            if ($relativedir)
+            {
+                completeFileArrayWithDatabaseInfo($filearray, $relativedir);
+
+                //var_dump($sortfield.' - '.$sortorder);
+                if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+                {
+                    $filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+                }
+            }
+
+            $nboffiles=count($filearray);
+            if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+            $i=0; $nboflines = 0; $lastrowid=0;
+            foreach($filearray as $key => $file)      // filearray must be only files here
+            {
+                if ($file['name'] != '.'
+                        && $file['name'] != '..'
+                        && ! preg_match('/\.meta$/i',$file['name']))
+                {
+                    if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
+                    $filepath=$relativepath.$file['name'];
+
+                    $editline=0;
+                    $nboflines++;
+                    print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
+                    // Do we have entry into database ?
+                    print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
+                    print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'AFTER'.$lastrowid.'POS'.($i+1)).'">';
+
+                    // File name
+                    print '<td class="minwith200">';
+
+                    // Show file name with link to download
+                    //print "XX".$file['name'];	//$file['name'] must be utf8
+                    print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+                    if ($forcedownload) print '&attachment=1';
+                    if (! empty($object->entity)) print '&entity='.$object->entity;
+                    print '&file='.urlencode($filepath);
+                    print '">';
+                    print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'],0,0).')', 'inline-block valignbottom paddingright');
+                    if ($showrelpart == 1) print $relativepath;
+                    //print dol_trunc($file['name'],$maxlength,'middle');
+                    if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile','alpha')))
+                    {
+                        print '</a>';
+                        $section_dir=dirname(GETPOST('urlfile','alpha'));
+                        print '<input type="hidden" name="section_dir" value="'.$section_dir.'">';
+                        print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
+                        print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
+                        $editline=1;
+                    }
+                    else
+                    {
+                        print dol_trunc($file['name'], 200);
+                        print '</a>';
+                    }
+                    // Preview link
+                    if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
+                    // Public share link
+                    //if (! $editline && ! empty($filearray[$key]['hashp'])) print pictowithlinktodirectdownload;
+
+                    print "</td>\n";
+
+                    // Size
+                    $sizetoshow = dol_print_size($file['size'],1,1);
+                    $sizetoshowbytes = dol_print_size($file['size'],0,1);
+
+                    print '<td align="right" width="80px">';
+                    if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
+                    else {
+                        print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
+                    }
+                    print '</td>';
+
+                    // Date
+                    print '<td align="center" width="140px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';	// 140px = width for date with PM format
+
+                    // Preview
+                    if (empty($useinecm))
+                    {
+                        $fileinfo = pathinfo($file['name']);
+                        print '<td align="center">';
+                        if (image_format_supported($file['name']) > 0)
+                        {
+                            $minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+                            if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+                            //print $file['path'].'/'.$minifile.'<br>';
+
+                            $urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
+                            if (empty($urlforhref)) {
+                                $urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+                                print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
+                            } else {
+                                print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
+                            }
+                            print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
+                            print '</a>';
+                        }
+                        else print '&nbsp;';
+                        print '</td>';
+                    }
+
+                    // Hash of file (only if we are in a mode where a scan of dir were done and we have id of file in ECM table)
+                    print '<td align="center">';
+                    if ($relativedir && $filearray[$key]['rowid'] > 0)
+                    {
+                        if ($editline)
+                        {
+                            print $langs->trans("FileSharedViaALink").' ';
+                            print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
+                        }
+                        else
+                        {
+                            if ($file['share'])
+                            {
+                                // Define $urlwithroot
+                                $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+                                $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+                                //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+                                //print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';
+                                $forcedownload=0;
+                                $paramlink='';
+                                if (! empty($file['share'])) $paramlink.=($paramlink?'&':'').'hashp='.$file['share'];			// Hash for public share
+                                if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+
+                                $fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+
+                                print img_picto($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
+                                print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+                            }
+                            else
+                            {
+                                //print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
+                            }
+                        }
+                    }
+                    print '</td>';
+
+                    // Actions buttons
+                    if (! $editline)
+                    {
+                        // Delete or view link
+                        // ($param must start with &)
+                        print '<td class="valignmiddle right actionbuttons"><!-- action on files -->';
+                        if ($useinecm == 1)
+                        {
+                            print '<a href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
+                        }
+                        if (! $useinecm || $useinecm == 2)
+                        {
+                            $newmodulepart=$modulepart;
+                            if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
+
+                            if (! $disablecrop && image_format_supported($file['name']) > 0)
+                            {
+                                if ($permtoeditline)
+                                {
+                                        // Link to resize
+                                            print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("ResizeOrCrop")).'">'.img_picto($langs->trans("ResizeOrCrop"),'resize','class="paddingrightonly"').'</a>';
+                                }
+                            }
+
+                            if ($permtoeditline)
+                            {
+                                $paramsectiondir=(in_array($modulepart, array('medias','ecm'))?'&section_dir='.urlencode($relativepath):'');
+                                print '<a href="'.(($useinecm == 1)?'#':($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
+                            }
+                        }
+                        if ($permonobject)
+                        {
+                            $useajax=1;
+                            if (! empty($conf->dol_use_jmobile)) $useajax=0;
+                            if (empty($conf->use_javascript_ajax)) $useajax=0;
+                            if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
+                            print '<a href="'.(($useinecm && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
+                        }
+                        print "</td>";
+
+                        if (empty($disablemove))
+                        {
+                            if ($nboffiles > 1 && $conf->browser->layout != 'phone') {
+                                print '<td align="center" class="linecolmove tdlineupdown">';
+                                if ($i > 0) {
+                                    print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
+                                }
+                                if ($i < $nboffiles-1) {
+                                    print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
+                                }
+                                print '</td>';
+                            }
+                            else {
+                                    print '<td align="center"'.(($conf->browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
+                                    print '</td>';
+                            }
+                        }
+                    }
+                    else
+                    {
+                        print '<td class="right">';
+                        print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
+                        print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+                        print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+                        print '</td>';
+                        if (empty($disablemove)) print '<td class="right"></td>';
+                    }
+                    print "</tr>\n";
+
+                    $i++;
+                }
+            }
+            if ($nboffiles == 0)
+            {
+                $colspan=(empty($useinecm)?'6':'6');
+                if (empty($disablemove)) $colspan++;		// 6 columns or 7
+                print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
+                if (empty($textifempty)) print $langs->trans("NoFileFound");
+                else print $textifempty;
+                print '</td></tr>';
+            }
+            print "</table>";
+            print '</div>';
+
+            if ($nboflines > 1 && is_object($object)) {
+                if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
+                    $table_element_line = 'ecm_files';
+                    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+                }
+            }
+
+            print ajax_autoselect('downloadlink');
+
+            if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
+            {
+                print '</form>';
+            }
+
+            return $nboffiles;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show list of documents in a directory
-	 *
-	 *  @param	string	$upload_dir         Directory that was scanned
-	 *  @param  array	$filearray          Array of files loaded by dol_dir_list function before calling this function
-	 *  @param  string	$modulepart         Value for modulepart used by download wrapper
-	 *  @param  string	$param              Parameters on sort links
-	 *  @param  int		$forcedownload      Force to open dialog box "Save As" when clicking on file
-	 *  @param  string	$relativepath       Relative path of docs (autodefined if not provided)
-	 *  @param  int		$permtodelete       Permission to delete
-	 *  @param  int		$useinecm           Change output for use in ecm module
-	 *  @param  int		$textifempty        Text to show if filearray is empty
-	 *  @param  int		$maxlength          Maximum length of file name shown
-	 *  @param	string 	$url				Full url to use for click links ('' = autodetect)
-	 *  @param	int		$addfilterfields	Add line with filters
-	 *  @return int                 		<0 if KO, nb of files shown if OK
-	 *  @see list_of_documents
-	 */
-	function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload=0, $relativepath='', $permtodelete=1, $useinecm=0, $textifempty='', $maxlength=0, $url='', $addfilterfields=0)
-	{
+    /**
+     *	Show list of documents in a directory
+     *
+     *  @param	string	$upload_dir         Directory that was scanned
+     *  @param  array	$filearray          Array of files loaded by dol_dir_list function before calling this function
+     *  @param  string	$modulepart         Value for modulepart used by download wrapper
+     *  @param  string	$param              Parameters on sort links
+     *  @param  int		$forcedownload      Force to open dialog box "Save As" when clicking on file
+     *  @param  string	$relativepath       Relative path of docs (autodefined if not provided)
+     *  @param  int		$permtodelete       Permission to delete
+     *  @param  int		$useinecm           Change output for use in ecm module
+     *  @param  int		$textifempty        Text to show if filearray is empty
+     *  @param  int		$maxlength          Maximum length of file name shown
+     *  @param	string 	$url				Full url to use for click links ('' = autodetect)
+     *  @param	int		$addfilterfields	Add line with filters
+     *  @return int                 		<0 if KO, nb of files shown if OK
+     *  @see list_of_documents
+     */
+    function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload=0, $relativepath='', $permtodelete=1, $useinecm=0, $textifempty='', $maxlength=0, $url='', $addfilterfields=0)
+    {
         // phpcs:enable
-		global $user, $conf, $langs, $form;
-		global $sortfield, $sortorder;
-		global $search_doc_ref;
-
-		dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
-
-		// Show list of documents
-		if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
-		if (empty($url)) $url=$_SERVER["PHP_SELF"];
-
-		if (! empty($addfilterfields))
-		{
-			print '<form action="'.$_SERVER['PHP_SELF'].'">';
-			print '<input type="hidden" name="module" value="'.$modulepart.'">';
-		}
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table width="100%" class="noborder">'."\n";
-
-		if (! empty($addfilterfields))
-		{
-			print '<tr class="liste_titre nodrag nodrop">';
-			print '<td></td>';
-			print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
-			print '<td></td>';
-			print '<td></td>';
-			// Action column
-			print '<td class="liste_titre" align="middle">';
-			$searchpicto=$form->showFilterButtons();
-			print $searchpicto;
-			print '</td>';
-			print "</tr>\n";
-		}
-
-		print '<tr class="liste_titre">';
-		$sortref="fullname";
-		if ($modulepart == 'invoice_supplier') $sortref='level1name';
-		print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
-		print_liste_field_titre("Date",$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre('','','');
-		print '</tr>'."\n";
-
-		// To show ref or specific information according to view to show (defined by $module)
-		if ($modulepart == 'company')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-			$object_instance=new Societe($this->db);
-		}
-		else if ($modulepart == 'invoice')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$object_instance=new Facture($this->db);
-		}
-		else if ($modulepart == 'invoice_supplier')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-			$object_instance=new FactureFournisseur($this->db);
-		}
-		else if ($modulepart == 'propal')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-			$object_instance=new Propal($this->db);
-		}
-		else if ($modulepart == 'supplier_proposal')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-			$object_instance=new SupplierProposal($this->db);
-		}
-		else if ($modulepart == 'order')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-			$object_instance=new Commande($this->db);
-		}
-		else if ($modulepart == 'order_supplier')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-			$object_instance=new CommandeFournisseur($this->db);
-		}
-		else if ($modulepart == 'contract')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-			$object_instance=new Contrat($this->db);
-		}
-		else if ($modulepart == 'product')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-			$object_instance=new Product($this->db);
-		}
-		else if ($modulepart == 'tax')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-			$object_instance=new ChargeSociales($this->db);
-		}
-		else if ($modulepart == 'project')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-			$object_instance=new Project($this->db);
-		}
-		else if ($modulepart == 'fichinter')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-			$object_instance=new Fichinter($this->db);
-		}
-		else if ($modulepart == 'user')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-			$object_instance=new User($this->db);
-		}
-		else if ($modulepart == 'expensereport')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-			$object_instance=new ExpenseReport($this->db);
-		}
-		else if ($modulepart == 'holiday')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
-			$object_instance=new Holiday($this->db);
-		}
-
-		foreach($filearray as $key => $file)
-		{
-			if (!is_dir($file['name'])
-			&& $file['name'] != '.'
-			&& $file['name'] != '..'
-			&& $file['name'] != 'CVS'
-			&& ! preg_match('/\.meta$/i',$file['name']))
-			{
-				// Define relative path used to store the file
-				$relativefile=preg_replace('/'.preg_quote($upload_dir.'/','/').'/','',$file['fullname']);
-
-				//var_dump($file);
-				$id=0; $ref=''; $label='';
-
-				// To show ref or specific information according to view to show (defined by $module)
-				if ($modulepart == 'company')           { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'invoice')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'invoice_supplier')  { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } }	// $ref may be also id with old supplier invoices
-				if ($modulepart == 'propal')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'order')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'order_supplier')    { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'contract')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'product')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'tax')               { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'holiday')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-
-				if (! $id && ! $ref) continue;
-				$found=0;
-				if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
-				{
-					$found=1;
-				}
-				else
-				{
-					//print 'Fetch '.$id." - ".$ref.'<br>';
-
-					if ($id) {
-						$result = $object_instance->fetch($id);
-					} else {
-						//fetchOneLike looks for objects with wildcards in its reference.
-						//It is useful for those masks who get underscores instead of their actual symbols
-						//fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
-						//that's why we look only look fetchOneLike when fetch returns 0
-						if (!$result = $object_instance->fetch('', $ref)) {
-							$result = $object_instance->fetchOneLike($ref);
-						}
-					}
-
-					if ($result > 0) {  // Save object into a cache
-						$found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
-					}
-					if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
-				}
-
-				if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
-
-				print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
-				print '<tr class="oddeven">';
-				print '<td>';
-				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
-				else print $langs->trans("ObjectDeleted",($id?$id:$ref));
-
-				//$modulesubdir=dol_sanitizeFileName($ref);
-				$modulesubdir=dirname($relativefile);
-
-				//$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-				$filedir=$file['path'];
-				//$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-				//print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
-
-				print '</td>';
-
-				// File
-				print '<td>';
-				//print "XX".$file['name']; //$file['name'] must be utf8
-				print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-				if ($forcedownload) print '&attachment=1';
-				print '&file='.urlencode($relativefile).'">';
-				print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')');
-				print dol_trunc($file['name'],$maxlength,'middle');
-				print '</a>';
-
-				//print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$');
-				print $this->showPreview($file, $modulepart, $file['relativename']);
-
-				print "</td>\n";
-				print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
-				print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
-				print '<td align="right">';
-				//if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-				//if ($forcedownload) print '&attachment=1';
-				//print '&file='.urlencode($relativefile).'">';
-				//print img_view().'</a> &nbsp; ';
-				//if ($permtodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
-				//else print '&nbsp;';
-				print "</td></tr>\n";
-			}
-		}
-
-		if (count($filearray) == 0)
-		{
-			print '<tr class="oddeven"><td colspan="5">';
-			if (empty($textifempty)) print $langs->trans("NoFileFound");
-			else print $textifempty;
-			print '</td></tr>';
-		}
-		print "</table>";
-		print '</div>';
-
-		if (! empty($addfilterfields)) print '</form>';
-		// Fin de zone
-	}
-
-	/**
-	 *    Show form to upload a new file with jquery fileupload.
-	 *    This form use the fileupload.php file.
-	 *
-	 *    @param	Object	$object		Object to use
-	 *    @return	void
-	 */
-	private function _formAjaxFileUpload($object)
-	{
-		global $langs, $conf;
-
-		// PHP post_max_size
-		$post_max_size				= ini_get('post_max_size');
-		$mul_post_max_size			= substr($post_max_size, -1);
-		$mul_post_max_size			= ($mul_post_max_size == 'M' ? 1048576 : ($mul_post_max_size == 'K' ? 1024 : ($mul_post_max_size == 'G' ? 1073741824 : 1)));
-		$post_max_size				= $mul_post_max_size * (int) $post_max_size;
-		// PHP upload_max_filesize
-		$upload_max_filesize		= ini_get('upload_max_filesize');
-		$mul_upload_max_filesize	= substr($upload_max_filesize, -1);
-		$mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));
-		$upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;
-		// Max file size
-		$max_file_size 				= (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
-
-		// Include main
-		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';
-
-		// Include template
-		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php';
-	}
-
-	/**
-	 * Show array with linked files
-	 *
-	 * @param 	Object		$object			Object
-	 * @param 	int			$permtodelete	Deletion is allowed
-	 * @param 	string		$action			Action
-	 * @param 	string		$selected		???
-	 * @param	string		$param			More param to add into URL
-	 * @return 	int							Number of links
-	 */
-	public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
-	{
-		global $user, $conf, $langs, $user;
-		global $sortfield, $sortorder;
-
-		$langs->load("link");
-
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-		$link = new Link($this->db);
-		$links = array();
-		if ($sortfield == "name") {
-			$sortfield = "label";
-		} elseif ($sortfield == "date") {
-			$sortfield = "datea";
-		} else {
-			$sortfield = null;
-		}
-		$res = $link->fetchAll($links, $object->element, $object->id, $sortfield, $sortorder);
-		$param .= (isset($object->id)?'&id=' . $object->id : '');
-
-		// Show list of associated links
-		print load_fiche_titre($langs->trans("LinkedFiles"));
-
-		print '<form action="' . $_SERVER['PHP_SELF'] . ($param?'?'.$param:'') . '" method="POST">';
-
-		print '<table width="100%" class="liste">';
-		print '<tr class="liste_titre">';
-		print_liste_field_titre(
-			$langs->trans("Links"),
-			$_SERVER['PHP_SELF'],
-			"name",
-			"",
-			$param,
-			'align="left"',
-			$sortfield,
-			$sortorder
-		);
-		print_liste_field_titre(
-			"",
-			"",
-			"",
-			"",
-			"",
-			'align="right"'
-		);
-		print_liste_field_titre(
-			$langs->trans("Date"),
-			$_SERVER['PHP_SELF'],
-			"date",
-			"",
-			$param,
-			'align="center"',
-			$sortfield,
-			$sortorder
-		);
-		print_liste_field_titre(
-			'',
-			$_SERVER['PHP_SELF'],
-			"",
-			"",
-			$param,
-			'align="center"'
-		);
-		print_liste_field_titre('','','');
-		print '</tr>';
-		$nboflinks = count($links);
-		if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-		foreach ($links as $link)
-		{
-			print '<tr class="oddeven">';
-			//edit mode
-			if ($action == 'update' && $selected === $link->id)
-			{
-				print '<td>';
-				print '<input type="hidden" name="id" value="' . $object->id . '">';
-				print '<input type="hidden" name="linkid" value="' . $link->id . '">';
-				print '<input type="hidden" name="action" value="confirm_updateline">';
-				print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
-				print '</td>';
-				print '<td>';
-				print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';
-				print '</td>';
-				print '<td align="center">' . dol_print_date(dol_now(), "dayhour", "tzuser") . '</td>';
-				print '<td align="right"></td>';
-				print '<td align="right">';
-				print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
-				print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
-				print '</td>';
-			}
-			else
-			{
-				print '<td>';
-				print img_picto('', 'object_globe').' ';
-				print '<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-				print $link->label;
-				print '</a>';
-				print '</td>'."\n";
-				print '<td align="right"></td>';
-				print '<td align="center">' . dol_print_date($link->datea, "dayhour", "tzuser") . '</td>';
-				print '<td align="center"></td>';
-				print '<td align="right">';
-				print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '" class="editfilelink" >' . img_edit() . '</a>';	// id= is included into $param
-				if ($permtodelete) {
-					print ' &nbsp; <a href="'. $_SERVER['PHP_SELF'] .'?action=delete&linkid=' . $link->id . $param . '" class="deletefilelink">' . img_delete() . '</a>';	// id= is included into $param
-				} else {
-					print '&nbsp;';
-				}
-				print '</td>';
-			}
-			print "</tr>\n";
-		}
-		if ($nboflinks == 0)
-		{
-			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">';
-			print $langs->trans("NoLinkFound");
-			print '</td></tr>';
-		}
-		print "</table>";
-
-		print '</form>';
-
-		return $nboflinks;
-	}
-
-
-	/**
-	 * Show detail icon with link for preview
-	 *
-	 * @param   array     $file           Array with data of file. Example: array('name'=>...)
-	 * @param   string    $modulepart     propal, facture, facture_fourn, ...
-	 * @param   string    $relativepath   Relative path of docs
-	 * @param   string    $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file)
-	 * @param	string	  $param		  More param on http links
-	 * @return  string    $out            Output string with HTML
-	 */
-	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
-	{
-		global $langs, $conf;
-
-		$out='';
-		if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
-		{
-			$urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
-			if (count($urladvancedpreview))
-			{
-				$out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
-				//$out.= '<a class="pictopreview">';
-				if (empty($ruleforpicto))
-				{
-					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
-					$out.='<span class="fa fa-search-plus" style="color: gray"></span>';
-				}
-				else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
-				$out.= '</a>';
-			}
-		}
-		return $out;
-	}
+        global $user, $conf, $langs, $form;
+        global $sortfield, $sortorder;
+        global $search_doc_ref;
+
+        dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
+
+        // Show list of documents
+        if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
+        if (empty($url)) $url=$_SERVER["PHP_SELF"];
+
+        if (! empty($addfilterfields))
+        {
+            print '<form action="'.$_SERVER['PHP_SELF'].'">';
+            print '<input type="hidden" name="module" value="'.$modulepart.'">';
+        }
+
+        print '<div class="div-table-responsive-no-min">';
+        print '<table width="100%" class="noborder">'."\n";
+
+        if (! empty($addfilterfields))
+        {
+            print '<tr class="liste_titre nodrag nodrop">';
+            print '<td></td>';
+            print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
+            print '<td></td>';
+            print '<td></td>';
+            // Action column
+            print '<td class="liste_titre" align="middle">';
+            $searchpicto=$form->showFilterButtons();
+            print $searchpicto;
+            print '</td>';
+            print "</tr>\n";
+        }
+
+        print '<tr class="liste_titre">';
+        $sortref="fullname";
+        if ($modulepart == 'invoice_supplier') $sortref='level1name';
+        print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
+        print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
+        print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
+        print_liste_field_titre("Date",$url,"date","",$param,'align="center"',$sortfield,$sortorder);
+        print_liste_field_titre('','','');
+        print '</tr>'."\n";
+
+        // To show ref or specific information according to view to show (defined by $module)
+        if ($modulepart == 'company')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+            $object_instance=new Societe($this->db);
+        }
+        else if ($modulepart == 'invoice')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+            $object_instance=new Facture($this->db);
+        }
+        else if ($modulepart == 'invoice_supplier')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+            $object_instance=new FactureFournisseur($this->db);
+        }
+        else if ($modulepart == 'propal')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+            $object_instance=new Propal($this->db);
+        }
+        else if ($modulepart == 'supplier_proposal')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+            $object_instance=new SupplierProposal($this->db);
+        }
+        else if ($modulepart == 'order')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+            $object_instance=new Commande($this->db);
+        }
+        else if ($modulepart == 'order_supplier')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+            $object_instance=new CommandeFournisseur($this->db);
+        }
+        else if ($modulepart == 'contract')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+            $object_instance=new Contrat($this->db);
+        }
+        else if ($modulepart == 'product')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+            $object_instance=new Product($this->db);
+        }
+        else if ($modulepart == 'tax')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+            $object_instance=new ChargeSociales($this->db);
+        }
+        else if ($modulepart == 'project')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+            $object_instance=new Project($this->db);
+        }
+        else if ($modulepart == 'fichinter')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+            $object_instance=new Fichinter($this->db);
+        }
+        else if ($modulepart == 'user')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+            $object_instance=new User($this->db);
+        }
+        else if ($modulepart == 'expensereport')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+            $object_instance=new ExpenseReport($this->db);
+        }
+        else if ($modulepart == 'holiday')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+            $object_instance=new Holiday($this->db);
+        }
+
+        foreach($filearray as $key => $file)
+        {
+            if (!is_dir($file['name'])
+            && $file['name'] != '.'
+            && $file['name'] != '..'
+            && $file['name'] != 'CVS'
+            && ! preg_match('/\.meta$/i',$file['name']))
+            {
+                // Define relative path used to store the file
+                $relativefile=preg_replace('/'.preg_quote($upload_dir.'/','/').'/','',$file['fullname']);
+
+                //var_dump($file);
+                $id=0; $ref=''; $label='';
+
+                // To show ref or specific information according to view to show (defined by $module)
+                if ($modulepart == 'company')           { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'invoice')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'invoice_supplier')  { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } }	// $ref may be also id with old supplier invoices
+                if ($modulepart == 'propal')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'order')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'order_supplier')    { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'contract')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'product')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'tax')               { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'holiday')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
+
+                if (! $id && ! $ref) continue;
+                $found=0;
+                if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
+                {
+                    $found=1;
+                }
+                else
+                {
+                    //print 'Fetch '.$id." - ".$ref.'<br>';
+
+                    if ($id) {
+                        $result = $object_instance->fetch($id);
+                    } else {
+                        //fetchOneLike looks for objects with wildcards in its reference.
+                        //It is useful for those masks who get underscores instead of their actual symbols
+                        //fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
+                        //that's why we look only look fetchOneLike when fetch returns 0
+                        if (!$result = $object_instance->fetch('', $ref)) {
+                            $result = $object_instance->fetchOneLike($ref);
+                        }
+                    }
+
+                    if ($result > 0) {  // Save object into a cache
+                        $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
+                    }
+                    if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
+                }
+
+                if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
+
+                print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
+                print '<tr class="oddeven">';
+                print '<td>';
+                if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
+                else print $langs->trans("ObjectDeleted",($id?$id:$ref));
+
+                //$modulesubdir=dol_sanitizeFileName($ref);
+                $modulesubdir=dirname($relativefile);
+
+                //$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+                $filedir=$file['path'];
+                //$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+                //print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
+
+                print '</td>';
+
+                // File
+                print '<td>';
+                //print "XX".$file['name']; //$file['name'] must be utf8
+                print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+                if ($forcedownload) print '&attachment=1';
+                print '&file='.urlencode($relativefile).'">';
+                print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')');
+                print dol_trunc($file['name'],$maxlength,'middle');
+                print '</a>';
+
+                //print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$');
+                print $this->showPreview($file, $modulepart, $file['relativename']);
+
+                print "</td>\n";
+                print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
+                print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
+                print '<td align="right">';
+                //if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+                //if ($forcedownload) print '&attachment=1';
+                //print '&file='.urlencode($relativefile).'">';
+                //print img_view().'</a> &nbsp; ';
+                //if ($permtodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
+                //else print '&nbsp;';
+                print "</td></tr>\n";
+            }
+        }
+
+        if (count($filearray) == 0)
+        {
+            print '<tr class="oddeven"><td colspan="5">';
+            if (empty($textifempty)) print $langs->trans("NoFileFound");
+            else print $textifempty;
+            print '</td></tr>';
+        }
+        print "</table>";
+        print '</div>';
+
+        if (! empty($addfilterfields)) print '</form>';
+        // Fin de zone
+    }
+
+    /**
+     *    Show form to upload a new file with jquery fileupload.
+     *    This form use the fileupload.php file.
+     *
+     *    @param	Object	$object		Object to use
+     *    @return	void
+     */
+    private function _formAjaxFileUpload($object)
+    {
+        global $langs, $conf;
+
+        // PHP post_max_size
+        $post_max_size				= ini_get('post_max_size');
+        $mul_post_max_size			= substr($post_max_size, -1);
+        $mul_post_max_size			= ($mul_post_max_size == 'M' ? 1048576 : ($mul_post_max_size == 'K' ? 1024 : ($mul_post_max_size == 'G' ? 1073741824 : 1)));
+        $post_max_size				= $mul_post_max_size * (int) $post_max_size;
+        // PHP upload_max_filesize
+        $upload_max_filesize		= ini_get('upload_max_filesize');
+        $mul_upload_max_filesize	= substr($upload_max_filesize, -1);
+        $mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));
+        $upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;
+        // Max file size
+        $max_file_size 				= (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
+
+        // Include main
+        include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';
+
+        // Include template
+        include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php';
+    }
+
+    /**
+     * Show array with linked files
+     *
+     * @param 	Object		$object			Object
+     * @param 	int			$permtodelete	Deletion is allowed
+     * @param 	string		$action			Action
+     * @param 	string		$selected		???
+     * @param	string		$param			More param to add into URL
+     * @return 	int							Number of links
+     */
+    public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
+    {
+        global $user, $conf, $langs, $user;
+        global $sortfield, $sortorder;
+
+        $langs->load("link");
+
+        require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+        $link = new Link($this->db);
+        $links = array();
+        if ($sortfield == "name") {
+            $sortfield = "label";
+        } elseif ($sortfield == "date") {
+            $sortfield = "datea";
+        } else {
+            $sortfield = null;
+        }
+        $res = $link->fetchAll($links, $object->element, $object->id, $sortfield, $sortorder);
+        $param .= (isset($object->id)?'&id=' . $object->id : '');
+
+        // Show list of associated links
+        print load_fiche_titre($langs->trans("LinkedFiles"));
+
+        print '<form action="' . $_SERVER['PHP_SELF'] . ($param?'?'.$param:'') . '" method="POST">';
+
+        print '<table width="100%" class="liste">';
+        print '<tr class="liste_titre">';
+        print_liste_field_titre(
+            $langs->trans("Links"),
+            $_SERVER['PHP_SELF'],
+            "name",
+            "",
+            $param,
+            'align="left"',
+            $sortfield,
+            $sortorder
+        );
+        print_liste_field_titre(
+            "",
+            "",
+            "",
+            "",
+            "",
+            'align="right"'
+        );
+        print_liste_field_titre(
+            $langs->trans("Date"),
+            $_SERVER['PHP_SELF'],
+            "date",
+            "",
+            $param,
+            'align="center"',
+            $sortfield,
+            $sortorder
+        );
+        print_liste_field_titre(
+            '',
+            $_SERVER['PHP_SELF'],
+            "",
+            "",
+            $param,
+            'align="center"'
+        );
+        print_liste_field_titre('','','');
+        print '</tr>';
+        $nboflinks = count($links);
+        if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+        foreach ($links as $link)
+        {
+            print '<tr class="oddeven">';
+            //edit mode
+            if ($action == 'update' && $selected === $link->id)
+            {
+                print '<td>';
+                print '<input type="hidden" name="id" value="' . $object->id . '">';
+                print '<input type="hidden" name="linkid" value="' . $link->id . '">';
+                print '<input type="hidden" name="action" value="confirm_updateline">';
+                print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
+                print '</td>';
+                print '<td>';
+                print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';
+                print '</td>';
+                print '<td align="center">' . dol_print_date(dol_now(), "dayhour", "tzuser") . '</td>';
+                print '<td align="right"></td>';
+                print '<td align="right">';
+                print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
+                print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
+                print '</td>';
+            }
+            else
+            {
+                print '<td>';
+                print img_picto('', 'object_globe').' ';
+                print '<a data-ajax="false" href="' . $link->url . '" target="_blank">';
+                print $link->label;
+                print '</a>';
+                print '</td>'."\n";
+                print '<td align="right"></td>';
+                print '<td align="center">' . dol_print_date($link->datea, "dayhour", "tzuser") . '</td>';
+                print '<td align="center"></td>';
+                print '<td align="right">';
+                print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '" class="editfilelink" >' . img_edit() . '</a>';	// id= is included into $param
+                if ($permtodelete) {
+                    print ' &nbsp; <a href="'. $_SERVER['PHP_SELF'] .'?action=delete&linkid=' . $link->id . $param . '" class="deletefilelink">' . img_delete() . '</a>';	// id= is included into $param
+                } else {
+                    print '&nbsp;';
+                }
+                print '</td>';
+            }
+            print "</tr>\n";
+        }
+        if ($nboflinks == 0)
+        {
+            print '<tr class="oddeven"><td colspan="5" class="opacitymedium">';
+            print $langs->trans("NoLinkFound");
+            print '</td></tr>';
+        }
+        print "</table>";
+
+        print '</form>';
+
+        return $nboflinks;
+    }
+
+
+    /**
+     * Show detail icon with link for preview
+     *
+     * @param   array     $file           Array with data of file. Example: array('name'=>...)
+     * @param   string    $modulepart     propal, facture, facture_fourn, ...
+     * @param   string    $relativepath   Relative path of docs
+     * @param   string    $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file)
+     * @param	string	  $param		  More param on http links
+     * @return  string    $out            Output string with HTML
+     */
+    public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
+    {
+        global $langs, $conf;
+
+        $out='';
+        if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
+        {
+            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
+            if (count($urladvancedpreview))
+            {
+                $out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
+                //$out.= '<a class="pictopreview">';
+                if (empty($ruleforpicto))
+                {
+                    //$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
+                    $out.='<span class="fa fa-search-plus" style="color: gray"></span>';
+                }
+                else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+                $out.= '</a>';
+            }
+        }
+        return $out;
+    }
 }

Spacing +444 added lines, -444 removed lines

@@ -42,7 +42,7 @@ 
 	public $error;
 
 	public $numoffiles;
-	public $infofiles;			// Used to return informations by function getDocumentsLink
+	public $infofiles; // Used to return informations by function getDocumentsLink
 
 
 	/**
@@ -53,7 +53,7 @@ 
 	function __construct($db)
 	{
 		$this->db = $db;
-		$this->numoffiles=0;
+		$this->numoffiles = 0;
 	}
 
 
@@ -77,16 +77,16 @@ 
 	 *	@param	string		$sectiondir		If upload must be done inside a particular directory (is sectiondir defined, sectionid must not be)
 	 * 	@return	int							<0 if KO, >0 if OK
 	 */
-	function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='', $sectiondir='')
+	function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '')
 	{
         // phpcs:enable
-		global $conf,$langs, $hookmanager;
+		global $conf, $langs, $hookmanager;
 		$hookmanager->initHooks(array('formfile'));
 
 
-		if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
+		if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax = 0;
 
-		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
+		if ((!empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax == 2))
 		{
 			// TODO: Check this works with 2 forms on same page
 			// TODO: Check this works with GED module, otherwise, force useajax to 0
@@ -101,12 +101,12 @@ 
 				return 1;
 			}
 
-			$maxlength=$size;
+			$maxlength = $size;
 
 			$out = "\n\n<!-- Start form attach new file -->\n";
 
-			if (empty($title)) $title=$langs->trans("AttachANewFile");
-			if ($title != 'none') $out.=load_fiche_titre($title, null, null);
+			if (empty($title)) $title = $langs->trans("AttachANewFile");
+			if ($title != 'none') $out .= load_fiche_titre($title, null, null);
 
 			$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
 			$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
@@ -116,34 +116,34 @@ 
 			$out .= '<table width="100%" class="nobordernopadding">';
 			$out .= '<tr>';
 
-			if (! empty($options)) $out .= '<td>'.$options.'</td>';
+			if (!empty($options)) $out .= '<td>'.$options.'</td>';
 
 			$out .= '<td class="valignmiddle nowrap">';
 
-			$max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
-			$maxphp=@ini_get('upload_max_filesize');	// En inconnu
-			if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
-			if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
-			if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
-			if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
+			$max = $conf->global->MAIN_UPLOAD_DOC; // En Kb
+			$maxphp = @ini_get('upload_max_filesize'); // En inconnu
+			if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;
+			if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;
+			if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;
+			if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;
 			// Now $max and $maxphp are in Kb
 			$maxmin = $max;
-			if ($maxphp > 0) $maxmin=min($max,$maxphp);
+			if ($maxphp > 0) $maxmin = min($max, $maxphp);
 
 			if ($maxmin > 0)
 			{
 				// MAX_FILE_SIZE doit précéder le champ input de type file
-				$out .= '<input type="hidden" name="max_file_size" value="'.($maxmin*1024).'">';
+				$out .= '<input type="hidden" name="max_file_size" value="'.($maxmin * 1024).'">';
 			}
 
 			$out .= '<input class="flat minwidth400" type="file"';
-			$out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
-			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-			$out .= (!empty($accept)?' accept="'.$accept.'"':' accept=""');
+			$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic') ? ' name="userfile"' : ' name="userfile[]" multiple');
+			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
+			$out .= (!empty($accept) ? ' accept="'.$accept.'"' : ' accept=""');
 			$out .= '>';
 			$out .= ' ';
 			$out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';
-			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
 			$out .= '>';
 
 			if ($addcancel)
@@ -152,13 +152,13 @@ 
 				$out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 			}
 
-			if (! empty($conf->global->MAIN_UPLOAD_DOC))
+			if (!empty($conf->global->MAIN_UPLOAD_DOC))
 			{
 				if ($perm)
 				{
 					$langs->load('other');
 					$out .= ' ';
-					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
+					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphp), 1);
 				}
 			}
 			else
@@ -170,9 +170,9 @@ 
 			if ($savingdocmask)
 			{
 				$out .= '<tr>';
-   				if (! empty($options)) $out .= '<td>'.$options.'</td>';
+   				if (!empty($options)) $out .= '<td>'.$options.'</td>';
 				$out .= '<td valign="middle" class="nowrap">';
-				$out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
+				$out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
 				$out .= '</td>';
 				$out .= '</tr>';
 			}
@@ -197,18 +197,18 @@ 
 
 				$out .= '<div class="valignmiddle" >';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
+				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink").':</label> ';
 				$out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
 				$out .= '</div>';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
+				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label").':</label> ';
 				$out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
-				$out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
-				$out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
+				$out .= '<input type="hidden" name="objecttype" value="'.$object->element.'">';
+				$out .= '<input type="hidden" name="objectid" value="'.$object->id.'">';
 				$out .= '</div>';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
 				$out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
-				$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+				$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
 				$out .= '>';
 				$out .= '</div>';
 				$out .= '</div>';
@@ -218,8 +218,8 @@ 
 				$out .= "\n<!-- End form link new url -->\n";
 			}
 
-			$parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''), 'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
-			$res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
+			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm);
+			$res = $hookmanager->executeHooks('formattachOptions', $parameters, $object);
 			if (empty($res))
 			{
 				print '<div class="attacharea attacharea'.$htmlname.'">';
@@ -255,11 +255,11 @@ 
 	 * 		@return		int										<0 if KO, number of shown files if OK
 	 *      @deprecated                                         Use print xxx->showdocuments() instead.
 	 */
-	function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
+	function show_documents($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '')
 	{
         // phpcs:enable
-		$this->numoffiles=0;
-		print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$notused,$noform,$param,$title,$buttonlabel,$codelang);
+		$this->numoffiles = 0;
+		print $this->showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed, $modelselected, $allowgenifempty, $forcenomultilang, $iconPDF, $notused, $noform, $param, $title, $buttonlabel, $codelang);
 		return $this->numoffiles;
 	}
 
@@ -288,58 +288,58 @@ 
 	 *      @param		int					$hideifempty		Hide section of generated files if there is no file
 	 * 		@return		string              					Output string with HTML array of documents (might be empty string)
 	 */
-	function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null,$hideifempty=0)
+	function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null, $hideifempty = 0)
 	{
 		// Deprecation warning
-		if (! empty($iconPDF)) {
-			dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
+		if (!empty($iconPDF)) {
+			dol_syslog(__METHOD__.": passing iconPDF parameter is deprecated", LOG_WARNING);
 		}
 
 		global $langs, $conf, $user, $hookmanager;
 		global $form;
 
-		if (! is_object($form)) $form=new Form($this->db);
+		if (!is_object($form)) $form = new Form($this->db);
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		// For backward compatibility
-		if (! empty($iconPDF)) {
+		if (!empty($iconPDF)) {
 			return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
 		}
 
 		// Add entity in $param
-		$param.= 'entity='.(!empty($object->entity)?$object->entity:$conf->entity);
+		$param .= 'entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
 
-		$printer=0;
-		if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport','livraison')))	// The direct print feature is implemented only for such elements
+		$printer = 0;
+		if (in_array($modulepart, array('facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'livraison')))	// The direct print feature is implemented only for such elements
 		{
-			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
+			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled)) ?true:false;
 		}
 
 		$hookmanager->initHooks(array('formfile'));
 
 		// Get list of files
-		$file_list=null;
-		if (! empty($filedir))
+		$file_list = null;
+		if (!empty($filedir))
 		{
-			$file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
+			$file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
 		}
 		if ($hideifempty && empty($file_list)) return '';
 
-		$out='';
-		$forname='builddoc';
-		$headershown=0;
-		$showempty=0;
-		$i=0;
+		$out = '';
+		$forname = 'builddoc';
+		$headershown = 0;
+		$showempty = 0;
+		$i = 0;
 
-		$out.= "\n".'<!-- Start show_document -->'."\n";
+		$out .= "\n".'<!-- Start show_document -->'."\n";
 		//print 'filedir='.$filedir;
 
 		if (preg_match('/massfilesarea_/', $modulepart))
 		{
-			$out.='<div id="show_files"><br></div>'."\n";
-			$title=$langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
-			$title.='<script type="text/javascript" language="javascript">
+			$out .= '<div id="show_files"><br></div>'."\n";
+			$title = $langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
+			$title .= '<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
 					jQuery(\'#togglemassfilesarea\').click(function() {
 						if (jQuery(\'#togglemassfilesarea\').attr(\'ref\') == "shown")
@@ -360,63 +360,63 @@ 
 				</script>';
 		}
 
-		$titletoshow=$langs->trans("Documents");
-		if (! empty($title)) $titletoshow=$title;
+		$titletoshow = $langs->trans("Documents");
+		if (!empty($title)) $titletoshow = $title;
 
 		// Show table
 		if ($genallowed)
 		{
-			$modellist=array();
+			$modellist = array();
 
 			if ($modulepart == 'company')
 			{
-				$showempty=1;
-				if (is_array($genallowed)) $modellist=$genallowed;
+				$showempty = 1;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
-					$modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
+					$modellist = ModeleThirdPartyDoc::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'propal')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
-					$modellist=ModelePDFPropales::liste_modeles($this->db);
+					$modellist = ModelePDFPropales::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'supplier_proposal')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
-					$modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
+					$modellist = ModelePDFSupplierProposal::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'commande')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
-					$modellist=ModelePDFCommandes::liste_modeles($this->db);
+					$modellist = ModelePDFCommandes::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'expedition')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-					$modellist=ModelePDFExpedition::liste_modeles($this->db);
+					$modellist = ModelePDFExpedition::liste_modeles($this->db);
 				}
 			}
             elseif ($modulepart == 'reception')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
@@ -425,407 +425,407 @@ 
             }
 			elseif ($modulepart == 'livraison')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
-					$modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
+					$modellist = ModelePDFDeliveryOrder::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'ficheinter')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
-					$modellist=ModelePDFFicheinter::liste_modeles($this->db);
+					$modellist = ModelePDFFicheinter::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'facture')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-					$modellist=ModelePDFFactures::liste_modeles($this->db);
+					$modellist = ModelePDFFactures::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'contract')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
-					$modellist=ModelePDFContract::liste_modeles($this->db);
+					$modellist = ModelePDFContract::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'project')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
-					$modellist=ModelePDFProjects::liste_modeles($this->db);
+					$modellist = ModelePDFProjects::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'project_task')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
-					$modellist=ModelePDFTask::liste_modeles($this->db);
+					$modellist = ModelePDFTask::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'product')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
-					$modellist=ModelePDFProduct::liste_modeles($this->db);
+					$modellist = ModelePDFProduct::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'product_batch')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
-					$modellist=ModelePDFProductBatch::liste_modeles($this->db);
+					$modellist = ModelePDFProductBatch::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'stock')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
-					$modellist=ModelePDFStock::liste_modeles($this->db);
+					$modellist = ModelePDFStock::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'movement')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
-					$modellist=ModelePDFMovement::liste_modeles($this->db);
+					$modellist = ModelePDFMovement::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'export')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
-					$modellist=ModeleExports::liste_modeles($this->db);
+					$modellist = ModeleExports::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
-					$modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
+					$modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
-					$modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
+					$modellist = ModelePDFSuppliersInvoices::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'supplier_payment')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
-					$modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
+					$modellist = ModelePDFSuppliersPayments::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'remisecheque')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
-					$modellist=ModeleChequeReceipts::liste_modeles($this->db);
+					$modellist = ModeleChequeReceipts::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'donation')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
-					$modellist=ModeleDon::liste_modeles($this->db);
+					$modellist = ModeleDon::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'member')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
-					$modellist=ModelePDFCards::liste_modeles($this->db);
+					$modellist = ModelePDFCards::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'agenda' || $modulepart == 'actions')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
-					$modellist=ModeleAction::liste_modeles($this->db);
+					$modellist = ModeleAction::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'expensereport')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
-					$modellist=ModeleExpenseReport::liste_modeles($this->db);
+					$modellist = ModeleExpenseReport::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'unpaid')
 			{
-				$modellist='';
+				$modellist = '';
 			}
 			elseif ($modulepart == 'user')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
-					$modellist=ModelePDFUser::liste_modeles($this->db);
+					$modellist = ModelePDFUser::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'usergroup')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
-					$modellist=ModelePDFUserGroup::liste_modeles($this->db);
+					$modellist = ModelePDFUserGroup::liste_modeles($this->db);
 				}
 			}
 			else
 			{
 				// For normalized standard modules
-				$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
+				$file = dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php', 0);
 				if (file_exists($file))
 				{
-					$res=include_once $file;
+					$res = include_once $file;
 				}
 				// For normalized external modules
 				else
 				{
-					$file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
-					$res=include_once $file;
+					$file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php', 0);
+					$res = include_once $file;
 				}
-				$class='ModelePDF'.ucfirst($modulepart);
+				$class = 'ModelePDF'.ucfirst($modulepart);
 				if (class_exists($class))
 				{
-					$modellist=call_user_func($class.'::liste_modeles',$this->db);
+					$modellist = call_user_func($class.'::liste_modeles', $this->db);
 				}
 				else
 				{
-					dol_print_error($this->db,'Bad value for modulepart');
+					dol_print_error($this->db, 'Bad value for modulepart');
 					return -1;
 				}
 			}
 
 			// Set headershown to avoid to have table opened a second time later
-			$headershown=1;
+			$headershown = 1;
 
-			$buttonlabeltoshow=$buttonlabel;
-			if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
+			$buttonlabeltoshow = $buttonlabel;
+			if (empty($buttonlabel)) $buttonlabel = $langs->trans('Generate');
 
-			if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
-			if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
-			$out.= '<input type="hidden" name="action" value="builddoc">';
-			$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			if ($conf->browser->layout == 'phone') $urlsource .= '#'.$forname.'_form'; // So we switch to form after a generation
+			if (empty($noform)) $out .= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" id="'.$forname.'_form" method="post">';
+			$out .= '<input type="hidden" name="action" value="builddoc">';
+			$out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-			$out.= load_fiche_titre($titletoshow, '', '');
-			$out.= '<div class="div-table-responsive-no-min">';
-			$out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
+			$out .= load_fiche_titre($titletoshow, '', '');
+			$out .= '<div class="div-table-responsive-no-min">';
+			$out .= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
 
-			$out.= '<tr class="liste_titre">';
+			$out .= '<tr class="liste_titre">';
 
-			$addcolumforpicto=($delallowed || $printer || $morepicto);
-			$out.= '<th align="center" colspan="'.(3+($addcolumforpicto?1:0)).'" class="formdoc liste_titre maxwidthonsmartphone">';
+			$addcolumforpicto = ($delallowed || $printer || $morepicto);
+			$out .= '<th align="center" colspan="'.(3 + ($addcolumforpicto ? 1 : 0)).'" class="formdoc liste_titre maxwidthonsmartphone">';
 
 			// Model
-			if (! empty($modellist))
+			if (!empty($modellist))
 			{
-				$out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
+				$out .= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
 				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
 				{
-					$arraykeys=array_keys($modellist);
-					$modelselected=$arraykeys[0];
+					$arraykeys = array_keys($modellist);
+					$modelselected = $arraykeys[0];
 				}
-				$out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				$out .= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 				if ($conf->use_javascript_ajax)
 				{
-					$out.= ajax_combobox('model');
+					$out .= ajax_combobox('model');
 				}
 			}
 			else
 			{
-				$out.= '<div class="float">'.$langs->trans("Files").'</div>';
+				$out .= '<div class="float">'.$langs->trans("Files").'</div>';
 			}
 
 			// Language code (if multilang)
-			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
+			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && !$forcenomultilang && (!empty($modellist) || $showempty))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-				$formadmin=new FormAdmin($this->db);
-				$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
-				$morecss='maxwidth150';
-				if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
-				$out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
+				$formadmin = new FormAdmin($this->db);
+				$defaultlang = $codelang ? $codelang : $langs->getDefaultLang();
+				$morecss = 'maxwidth150';
+				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';
+				$out .= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
 			}
 			else
 			{
-				$out.= '&nbsp;';
+				$out .= '&nbsp;';
 			}
 
 			// Button
 			$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-			$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
-			$genbutton.= '>';
-			if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
+			$genbutton .= ' type="submit" value="'.$buttonlabel.'"';
+			if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) $genbutton .= ' disabled';
+			$genbutton .= '>';
+			if ($allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
 			{
 			   	$langs->load("errors");
-			   	$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+			   	$genbutton .= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
 			}
-			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-			if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
-			$out.= $genbutton;
-			$out.= '</th>';
+			if (!$allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton = '';
+			if (empty($modellist) && !$showempty && $modulepart != 'unpaid') $genbutton = '';
+			$out .= $genbutton;
+			$out .= '</th>';
 
 			if (!empty($hookmanager->hooks['formfile']))
 			{
-				foreach($hookmanager->hooks['formfile'] as $module)
+				foreach ($hookmanager->hooks['formfile'] as $module)
 				{
 					if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
 				}
 			}
-			$out.= '</tr>';
+			$out .= '</tr>';
 
 			// Execute hooks
-			$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
+			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart'=>$modulepart);
 			if (is_object($hookmanager))
 			{
-				$reshook = $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']);
-				$out.= $hookmanager->resPrint;
+				$reshook = $hookmanager->executeHooks('formBuilddocOptions', $parameters, $GLOBALS['object']);
+				$out .= $hookmanager->resPrint;
 			}
 		}
 
 		// Get list of files
-		if (! empty($filedir))
+		if (!empty($filedir))
 		{
 			$link_list = array();
 			if (is_object($object))
 			{
-				require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 				$link = new Link($this->db);
 				$sortfield = $sortorder = null;
 				$res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
 			}
 
-			$out.= '<!-- html.formfile::showdocuments -->'."\n";
+			$out .= '<!-- html.formfile::showdocuments -->'."\n";
 
 			// Show title of array if not already shown
-			if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart))
-				&& ! $headershown)
+			if ((!empty($file_list) || !empty($link_list) || preg_match('/^massfilesarea/', $modulepart))
+				&& !$headershown)
 			{
-				$headershown=1;
-				$out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
-				$out.= '<div class="div-table-responsive-no-min">';
-				$out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
+				$headershown = 1;
+				$out .= '<div class="titre">'.$titletoshow.'</div>'."\n";
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
 			}
 
 			// Loop on each file found
 			if (is_array($file_list))
 			{
-				foreach($file_list as $file)
+				foreach ($file_list as $file)
 				{
 					// Define relative path for download link (depends on module)
-					$relativepath=$file["name"];										// Cas general
-					if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
-					if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
+					$relativepath = $file["name"]; // Cas general
+					if ($modulesubdir) $relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...
+					if ($modulepart == 'export') $relativepath = $file["name"]; // Other case
 
-					$out.= '<tr class="oddeven">';
+					$out .= '<tr class="oddeven">';
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper
 
 					// Show file name with link to download
-					$out.= '<td class="minwidth200">';
-					$out.= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
-					$mime=dol_mimetype($relativepath,'',0);
-					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
-					$out.= ' target="_blank">';
-					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]);
-					$out.= dol_trunc($file["name"], 150);
-					$out.= '</a>'."\n";
-					$out.= $this->showPreview($file,$modulepart,$relativepath,0,$param);
-					$out.= '</td>';
+					$out .= '<td class="minwidth200">';
+					$out .= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';
+					$mime = dol_mimetype($relativepath, '', 0);
+					if (preg_match('/text/', $mime)) $out .= ' target="_blank"';
+					$out .= ' target="_blank">';
+					$out .= img_mime($file["name"], $langs->trans("File").': '.$file["name"]);
+					$out .= dol_trunc($file["name"], 150);
+					$out .= '</a>'."\n";
+					$out .= $this->showPreview($file, $modulepart, $relativepath, 0, $param);
+					$out .= '</td>';
 
 					// Show file size
-					$size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"]));
-					$out.= '<td align="right" class="nowrap">'.dol_print_size($size,1,1).'</td>';
+					$size = (!empty($file['size']) ? $file['size'] : dol_filesize($filedir."/".$file["name"]));
+					$out .= '<td align="right" class="nowrap">'.dol_print_size($size, 1, 1).'</td>';
 
 					// Show file date
-					$date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
-					$out.= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
+					$date = (!empty($file['date']) ? $file['date'] : dol_filemtime($filedir."/".$file["name"]));
+					$out .= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
 
 					if ($delallowed || $printer || $morepicto)
 					{
-						$out.= '<td class="right nowraponall">';
+						$out .= '<td class="right nowraponall">';
 						if ($delallowed)
 						{
 							$tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
-							$out.= '<a href="'.$tmpurlsource.(strpos($tmpurlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
-							$out.= ($param?'&amp;'.$param:'');
+							$out .= '<a href="'.$tmpurlsource.(strpos($tmpurlsource, '?') ? '&amp;' : '?').'action=remove_file&amp;file='.urlencode($relativepath);
+							$out .= ($param ? '&amp;'.$param : '');
 							//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
 							//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
-							$out.= '">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+							$out .= '">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						}
 						if ($printer)
 						{
 							//$out.= '<td align="right">';
-							$out.= '<a class="paddingleft" href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
-							$out.= ($param?'&amp;'.$param:'');
-							$out.= '">'.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').'</a>';
+							$out .= '<a class="paddingleft" href="'.$urlsource.(strpos($urlsource, '?') ? '&amp;' : '?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
+							$out .= ($param ? '&amp;'.$param : '');
+							$out .= '">'.img_picto($langs->trans("PrintFile", $relativepath), 'printer.png').'</a>';
 						}
 						if ($morepicto)
 						{
-							$morepicto=preg_replace('/__FILENAMEURLENCODED__/',urlencode($relativepath),$morepicto);
-							$out.=$morepicto;
+							$morepicto = preg_replace('/__FILENAMEURLENCODED__/', urlencode($relativepath), $morepicto);
+							$out .= $morepicto;
 						}
-						$out.='</td>';
+						$out .= '</td>';
 					}
 
 					if (is_object($hookmanager))
 					{
-						$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
-						$res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
+						$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart'=>$modulepart, 'relativepath'=>$relativepath);
+						$res = $hookmanager->executeHooks('formBuilddocLineOptions', $parameters, $file);
 						if (empty($res))
 						{
-							$out.= $hookmanager->resPrint;		// Complete line
-							$out.= '</tr>';
+							$out .= $hookmanager->resPrint; // Complete line
+							$out .= '</tr>';
 						}
-						else $out = $hookmanager->resPrint;		// Replace line
+						else $out = $hookmanager->resPrint; // Replace line
 			  		}
 				}
 
@@ -834,42 +834,42 @@ 
 			// Loop on each link found
 			if (is_array($link_list))
 			{
-				$colspan=2;
+				$colspan = 2;
 
-				foreach($link_list as $file)
+				foreach ($link_list as $file)
 				{
-					$out.='<tr class="oddeven">';
-					$out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
-					$out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-					$out.=$file->label;
-					$out.='</a>';
-					$out.='</td>';
-					$out.='<td align="right">';
-					$out.=dol_print_date($file->datea,'dayhour');
-					$out.='</td>';
-					if ($delallowed || $printer || $morepicto) $out.='<td></td>';
-					$out.='</tr>'."\n";
+					$out .= '<tr class="oddeven">';
+					$out .= '<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
+					$out .= '<a data-ajax="false" href="'.$link->url.'" target="_blank">';
+					$out .= $file->label;
+					$out .= '</a>';
+					$out .= '</td>';
+					$out .= '<td align="right">';
+					$out .= dol_print_date($file->datea, 'dayhour');
+					$out .= '</td>';
+					if ($delallowed || $printer || $morepicto) $out .= '<td></td>';
+					$out .= '</tr>'."\n";
 				}
 				$this->numoffiles++;
 			}
 
 		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
 			{
-				$out.='<tr><td colspan="'.(3+($addcolumforpicto?1:0)).'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
+				$out .= '<tr><td colspan="'.(3 + ($addcolumforpicto ? 1 : 0)).'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
 			}
 		}
 
 		if ($headershown)
 		{
 			// Affiche pied du tableau
-			$out.= "</table>\n";
-			$out.= "</div>\n";
+			$out .= "</table>\n";
+			$out .= "</div>\n";
 			if ($genallowed)
 			{
-				if (empty($noform)) $out.= '</form>'."\n";
+				if (empty($noform)) $out .= '</form>'."\n";
 			}
 		}
-		$out.= '<!-- End show_document -->'."\n";
+		$out .= '<!-- End show_document -->'."\n";
 		//return ($i?$i:$headershown);
 		return $out;
 	}
@@ -885,98 +885,98 @@ 
 	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
 	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
 	 */
-	function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter='')
+	function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '')
 	{
 		global $conf, $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$out='';
-		$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
+		$out = '';
+		$this->infofiles = array('nboffiles'=>0, 'extensions'=>array(), 'files'=>array());
 
 		$entity = 1; // Without multicompany
 
 		// Get object entity
-		if (! empty($conf->multicompany->enabled))
+		if (!empty($conf->multicompany->enabled))
 		{
-			preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir,'/').'$/', $filedir, $regs);
-			$entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
+			preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir, '/').'$/', $filedir, $regs);
+			$entity = ((!empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
 		}
 
 		// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
 		// @TODO Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
-		if (! empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
+		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
 		{
-			$filterforfilesearch = preg_quote(basename($modulesubdir),'/');
+			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
 		}
 		else
 		{
-			$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
+			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
 		}
-		$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// We also discard .meta and .png preview
+		$file_list = dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // We also discard .meta and .png preview
 
 		//var_dump($file_list);
 		// For ajax treatment
-		$out.= '<!-- html.formfile::getDocumentsLink -->'."\n";
-		if (! empty($file_list))
+		$out .= '<!-- html.formfile::getDocumentsLink -->'."\n";
+		if (!empty($file_list))
 		{
-			$out='<dl class="dropdown inline-block">
+			$out = '<dl class="dropdown inline-block">
     			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignmiddle').'</a></dt>
     			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields" style="display: none;">';
-			$tmpout='';
+			$tmpout = '';
 
 			// Loop on each file found
-			$found=0;
-			foreach($file_list as $file)
+			$found = 0;
+			foreach ($file_list as $file)
 			{
 				$i++;
-				if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
+				if ($filter && !preg_match('/'.$filter.'/i', $file["name"])) continue; // Discard this. It does not match provided filter.
 
 				$found++;
 				// Define relative path for download link (depends on module)
-				$relativepath=$file["name"];								// Cas general
-				if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+				$relativepath = $file["name"]; // Cas general
+				if ($modulesubdir) $relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...
 				// Autre cas
-				if ($modulepart == 'donation')            {
-					$relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
+				if ($modulepart == 'donation') {
+					$relativepath = get_exdir($modulesubdir, 2, 0, 0, null, 'donation').$file["name"];
 				}
-				if ($modulepart == 'export')              {
+				if ($modulepart == 'export') {
 					$relativepath = $file["name"];
 				}
 
 				$this->infofiles['nboffiles']++;
-				$this->infofiles['files'][]=$file['fullname'];
-				$ext=pathinfo($file["name"], PATHINFO_EXTENSION);
-				if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
+				$this->infofiles['files'][] = $file['fullname'];
+				$ext = pathinfo($file["name"], PATHINFO_EXTENSION);
+				if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext] = 1;
 				else $this->infofiles['extensions'][$ext]++;
 
 				// Preview
-				if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
+				if (!empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
 				{
 					$tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
 					if ($tmparray && $tmparray['url'])
 					{
-						$tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>';
+						$tmpout .= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css'] ? ' class="'.$tmparray['css'].'"' : '').($tmparray['mime'] ? ' mime="'.$tmparray['mime'].'"' : '').($tmparray['target'] ? ' target="'.$tmparray['target'].'"' : '').'>';
 						//$tmpout.= img_picto('','detail');
-						$tmpout.= '<i class="fa fa-search-plus paddingright" style="color: gray"></i>';
-						$tmpout.= $langs->trans("Preview").' '.$ext.'</a></li>';
+						$tmpout .= '<i class="fa fa-search-plus paddingright" style="color: gray"></i>';
+						$tmpout .= $langs->trans("Preview").' '.$ext.'</a></li>';
 					}
 				}
 
 				// Download
-				$tmpout.= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
-				$mime=dol_mimetype($relativepath,'',0);
-				if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
-				$tmpout.= '>';
-				$tmpout.= img_mime($relativepath, $file["name"]);
-				$tmpout.= $langs->trans("Download").' '.$ext;
-				$tmpout.= '</a></li>'."\n";
-			}
-			$out.=$tmpout;
-			$out.='</ul></div></dd>
+				$tmpout .= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
+				$mime = dol_mimetype($relativepath, '', 0);
+				if (preg_match('/text/', $mime)) $tmpout .= ' target="_blank"';
+				$tmpout .= '>';
+				$tmpout .= img_mime($relativepath, $file["name"]);
+				$tmpout .= $langs->trans("Download").' '.$ext;
+				$tmpout .= '</a></li>'."\n";
+			}
+			$out .= $tmpout;
+			$out .= '</ul></div></dd>
     			</dl>';
 
-			if (! $found) $out='';
+			if (!$found) $out = '';
 		}
 		else
 		{
@@ -1018,7 +1018,7 @@ 
 	 * 	@return	 int						<0 if KO, nb of files shown if OK
 	 *  @see list_of_autoecmfiles
 	 */
-	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0)
+	function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0)
 	{
         // phpcs:enable
 		global $user, $conf, $langs, $hookmanager;
@@ -1026,37 +1026,37 @@ 
 		global $dolibarr_main_url_root;
 		global $form;
 
-		$disablecrop=1;
-		if (in_array($modulepart, array('expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) $disablecrop=0;
+		$disablecrop = 1;
+		if (in_array($modulepart, array('expensereport', 'holiday', 'member', 'project', 'product', 'produit', 'service', 'societe', 'tax', 'ticket', 'user'))) $disablecrop = 0;
 
 		// Define relative path used to store the file
 		if (empty($relativepath))
 		{
-			$relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
-			if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
-			if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+			$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
+			if ($object->element == 'invoice_supplier') $relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath
+			if ($object->element == 'project_task') $relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';
 		}
 		// For backward compatiblity, we detect file stored into an old path
-		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
 		{
-		    $relativepath=preg_replace('/^.*\/produit\//','',$filearray[0]['path']).'/';
+		    $relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
 		}
 		// Defined relative dir to DOL_DATA_ROOT
 		$relativedir = '';
 		if ($upload_dir)
 		{
-			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-			$relativedir = preg_replace('/^[\\/]/','',$relativedir);
+			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
+			$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
 		}
 
 		$hookmanager->initHooks(array('formfile'));
-		$parameters=array(
+		$parameters = array(
 				'filearray' => $filearray,
 				'modulepart'=> $modulepart,
 				'param' => $param,
 				'forcedownload' => $forcedownload,
-				'relativepath' => $relativepath,    // relative filename to module dir
-				'relativedir' => $relativedir,      // relative dirname to DOL_DATA_ROOT
+				'relativepath' => $relativepath, // relative filename to module dir
+				'relativedir' => $relativedir, // relative dirname to DOL_DATA_ROOT
 				'permtodelete' => $permonobject,
 				'useinecm' => $useinecm,
 				'textifempty' => $textifempty,
@@ -1064,7 +1064,7 @@ 
 				'title' => $title,
 				'url' => $url
 		);
-		$reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
+		$reshook = $hookmanager->executeHooks('showFilesList', $parameters, $object);
 
 		if (isset($reshook) && $reshook != '') // null or '' for bypass
 		{
@@ -1072,37 +1072,37 @@ 
 		}
 		else
 		{
-			if (! is_object($form))
+			if (!is_object($form))
 			{
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';		// The compoent may be included into ajax page that does not include the Form class
-				$form=new Form($this->db);
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // The compoent may be included into ajax page that does not include the Form class
+				$form = new Form($this->db);
 			}
 
-			if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
-			$relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
-			if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
+			if (!preg_match('/&id=/', $param) && isset($object->id)) $param .= '&id='.$object->id;
+			$relativepathwihtoutslashend = preg_replace('/\/$/', '', $relativepath);
+			if ($relativepathwihtoutslashend) $param .= '&file='.urlencode($relativepathwihtoutslashend);
 
 			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
 			{
-				$permtoeditline=0;
-				if (in_array($modulepart, array('product','produit','service')))
+				$permtoeditline = 0;
+				if (in_array($modulepart, array('product', 'produit', 'service')))
 				{
-					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
-					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
+					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline = 1;
+					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline = 1;
 				}
 			}
 			if (empty($conf->global->MAIN_UPLOAD_DOC))
 			{
-				$permtoeditline=0;
-				$permonobject=0;
+				$permtoeditline = 0;
+				$permonobject = 0;
 			}
 
 			// Show list of existing files
-			if (empty($useinecm) && $title != 'none') print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
-			if (empty($url)) $url=$_SERVER["PHP_SELF"];
+			if (empty($useinecm) && $title != 'none') print load_fiche_titre($title ? $title : $langs->trans("AttachedFiles"));
+			if (empty($url)) $url = $_SERVER["PHP_SELF"];
 
 			print '<!-- html.formfile::list_of_documents -->'."\n";
-			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)
 			{
 				print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
 				print '<input type="hidden" name="action" value="renamefile">';
@@ -1111,30 +1111,30 @@ 
 			}
 
 			print '<div class="div-table-responsive-no-min">';
-			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
+			print '<table width="100%" id="tablelines" class="'.($useinecm ? 'liste noborder' : 'liste').'">'."\n";
 
-			if (! empty($addfilterfields))
+			if (!empty($addfilterfields))
 			{
 				print '<tr class="liste_titre nodrag nodrop">';
-				print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref','alpha')).'"></td>';
+				print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref', 'alpha')).'"></td>';
 				print '<td></td>';
 				print '<td></td>';
 				if (empty($useinecm)) print '<td></td>';
 				print '<td></td>';
 				print '<td></td>';
-				if (! $disablemove) print '<td></td>';
+				if (!$disablemove) print '<td></td>';
 				print "</tr>\n";
 			}
 
 			print '<tr class="liste_titre nodrag nodrop">';
 			//print $url.' sortfield='.$sortfield.' sortorder='.$sortorder;
-			print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
-			print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');					// Preview
+			print_liste_field_titre('Documents2', $url, "name", "", $param, 'align="left"', $sortfield, $sortorder);
+			print_liste_field_titre('Size', $url, "size", "", $param, 'align="right"', $sortfield, $sortorder);
+			print_liste_field_titre('Date', $url, "date", "", $param, 'align="center"', $sortfield, $sortorder);
+			if (empty($useinecm)) print_liste_field_titre('', $url, "", "", $param, 'align="center"'); // Preview
 			print_liste_field_titre('');
 			print_liste_field_titre('');
-			if (! $disablemove) print_liste_field_titre('');
+			if (!$disablemove) print_liste_field_titre('');
 			print "</tr>\n";
 
 			// Get list of files stored into database for same relative directory
@@ -1145,29 +1145,29 @@ 
 				//var_dump($sortfield.' - '.$sortorder);
 				if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
 				{
-					$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+					$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
 				}
 			}
 
-			$nboffiles=count($filearray);
+			$nboffiles = count($filearray);
 			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-			$i=0; $nboflines = 0; $lastrowid=0;
-			foreach($filearray as $key => $file)      // filearray must be only files here
+			$i = 0; $nboflines = 0; $lastrowid = 0;
+			foreach ($filearray as $key => $file)      // filearray must be only files here
 			{
 				if ($file['name'] != '.'
 						&& $file['name'] != '..'
-						&& ! preg_match('/\.meta$/i',$file['name']))
+						&& !preg_match('/\.meta$/i', $file['name']))
 				{
 					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
-					$filepath=$relativepath.$file['name'];
+					$filepath = $relativepath.$file['name'];
 
-					$editline=0;
+					$editline = 0;
 					$nboflines++;
 					print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
 					// Do we have entry into database ?
 					print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
-					print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'AFTER'.$lastrowid.'POS'.($i+1)).'">';
+					print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid'] > 0 ? $filearray[$key]['rowid'] : 'AFTER'.$lastrowid.'POS'.($i + 1)).'">';
 
 					// File name
 					print '<td class="minwith200">';
@@ -1176,20 +1176,20 @@ 
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) print '&attachment=1';
-					if (! empty($object->entity)) print '&entity='.$object->entity;
+					if (!empty($object->entity)) print '&entity='.$object->entity;
 					print '&file='.urlencode($filepath);
 					print '">';
-					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'],0,0).')', 'inline-block valignbottom paddingright');
+					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')', 'inline-block valignbottom paddingright');
 					if ($showrelpart == 1) print $relativepath;
 					//print dol_trunc($file['name'],$maxlength,'middle');
-					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile','alpha')))
+					if (GETPOST('action', 'aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile', 'alpha')))
 					{
 						print '</a>';
-						$section_dir=dirname(GETPOST('urlfile','alpha'));
+						$section_dir = dirname(GETPOST('urlfile', 'alpha'));
 						print '<input type="hidden" name="section_dir" value="'.$section_dir.'">';
 						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
 						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
-						$editline=1;
+						$editline = 1;
 					}
 					else
 					{
@@ -1197,15 +1197,15 @@ 
 						print '</a>';
 					}
 					// Preview link
-					if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
+					if (!$editline) print $this->showPreview($file, $modulepart, $filepath);
 					// Public share link
 					//if (! $editline && ! empty($filearray[$key]['hashp'])) print pictowithlinktodirectdownload;
 
 					print "</td>\n";
 
 					// Size
-					$sizetoshow = dol_print_size($file['size'],1,1);
-					$sizetoshowbytes = dol_print_size($file['size'],0,1);
+					$sizetoshow = dol_print_size($file['size'], 1, 1);
+					$sizetoshowbytes = dol_print_size($file['size'], 0, 1);
 
 					print '<td align="right" width="80px">';
 					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
@@ -1215,7 +1215,7 @@ 
 					print '</td>';
 
 					// Date
-					print '<td align="center" width="140px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';	// 140px = width for date with PM format
+					print '<td align="center" width="140px">'.dol_print_date($file['date'], "dayhour", "tzuser").'</td>'; // 140px = width for date with PM format
 
 					// Preview
 					if (empty($useinecm))
@@ -1224,18 +1224,18 @@ 
 						print '<td align="center">';
 						if (image_format_supported($file['name']) > 0)
 						{
-							$minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-							if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+							$minifile = getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+							if (!dol_is_file($file['path'].'/'.$minifile)) $minifile = getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
 							//print $file['path'].'/'.$minifile.'<br>';
 
-							$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
+							$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 							if (empty($urlforhref)) {
-								$urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+								$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
 								print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
 							} else {
 								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 							}
-							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
+							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
 							print '</a>';
 						}
 						else print '&nbsp;';
@@ -1249,26 +1249,26 @@ 
 						if ($editline)
 						{
 							print $langs->trans("FileSharedViaALink").' ';
-							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
+							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share'] ? ' checked="checked"' : '').' /> ';
 						}
 						else
 						{
 							if ($file['share'])
 							{
 								// Define $urlwithroot
-								$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-								$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+								$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+								$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 								//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 								//print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';
-								$forcedownload=0;
-								$paramlink='';
-								if (! empty($file['share'])) $paramlink.=($paramlink?'&':'').'hashp='.$file['share'];			// Hash for public share
-								if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+								$forcedownload = 0;
+								$paramlink = '';
+								if (!empty($file['share'])) $paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share
+								if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
 
-								$fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+								$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 
-								print img_picto($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
+								print img_picto($langs->trans("FileSharedViaALink"), 'object_globe.png').' ';
 								print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 							}
 							else
@@ -1280,7 +1280,7 @@ 
 					print '</td>';
 
 					// Actions buttons
-					if (! $editline)
+					if (!$editline)
 					{
 						// Delete or view link
 						// ($param must start with &)
@@ -1289,33 +1289,33 @@ 
 						{
 							print '<a href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 						}
-						if (! $useinecm || $useinecm == 2)
+						if (!$useinecm || $useinecm == 2)
 						{
-							$newmodulepart=$modulepart;
-							if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
+							$newmodulepart = $modulepart;
+							if (in_array($modulepart, array('product', 'produit', 'service'))) $newmodulepart = 'produit|service';
 
-							if (! $disablecrop && image_format_supported($file['name']) > 0)
+							if (!$disablecrop && image_format_supported($file['name']) > 0)
 							{
 								if ($permtoeditline)
 								{
 	   								// Link to resize
-	   						   		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("ResizeOrCrop")).'">'.img_picto($langs->trans("ResizeOrCrop"),'resize','class="paddingrightonly"').'</a>';
+	   						   		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("ResizeOrCrop")).'">'.img_picto($langs->trans("ResizeOrCrop"), 'resize', 'class="paddingrightonly"').'</a>';
 								}
 							}
 
 							if ($permtoeditline)
 							{
-								$paramsectiondir=(in_array($modulepart, array('medias','ecm'))?'&section_dir='.urlencode($relativepath):'');
-								print '<a href="'.(($useinecm == 1)?'#':($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
+								$paramsectiondir = (in_array($modulepart, array('medias', 'ecm')) ? '&section_dir='.urlencode($relativepath) : '');
+								print '<a href="'.(($useinecm == 1) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 							}
 						}
 						if ($permonobject)
 						{
-							$useajax=1;
-							if (! empty($conf->dol_use_jmobile)) $useajax=0;
-							if (empty($conf->use_javascript_ajax)) $useajax=0;
-							if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
-							print '<a href="'.(($useinecm && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
+							$useajax = 1;
+							if (!empty($conf->dol_use_jmobile)) $useajax = 0;
+							if (empty($conf->use_javascript_ajax)) $useajax = 0;
+							if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax = 0;
+							print '<a href="'.(($useinecm && $useajax) ? '#' : ($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
 						}
 						print "</td>";
 
@@ -1324,15 +1324,15 @@ 
 							if ($nboffiles > 1 && $conf->browser->layout != 'phone') {
 								print '<td align="center" class="linecolmove tdlineupdown">';
 								if ($i > 0) {
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
+									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default', 0, 'imgupforline').'</a>';
 								}
-								if ($i < $nboffiles-1) {
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
+								if ($i < $nboffiles - 1) {
+									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
 								}
 								print '</td>';
 							}
 							else {
-							   	print '<td align="center"'.(($conf->browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
+							   	print '<td align="center"'.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown"' : ' class="linecolmove"').'>';
 							   	print '</td>';
 							}
 					   }
@@ -1353,8 +1353,8 @@ 
 			}
 			if ($nboffiles == 0)
 			{
-				$colspan=(empty($useinecm)?'6':'6');
-				if (empty($disablemove)) $colspan++;		// 6 columns or 7
+				$colspan = (empty($useinecm) ? '6' : '6');
+				if (empty($disablemove)) $colspan++; // 6 columns or 7
 				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
 				else print $textifempty;
@@ -1364,15 +1364,15 @@ 
 			print '</div>';
 
 			if ($nboflines > 1 && is_object($object)) {
-				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
+				if (!empty($conf->use_javascript_ajax) && $permtoeditline) {
 					$table_element_line = 'ecm_files';
-					include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+					include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 				}
 			}
 
 			print ajax_autoselect('downloadlink');
 
-			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)
 			{
 				print '</form>';
 			}
@@ -1401,7 +1401,7 @@ 
 	 *  @return int                 		<0 if KO, nb of files shown if OK
 	 *  @see list_of_documents
 	 */
-	function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload=0, $relativepath='', $permtodelete=1, $useinecm=0, $textifempty='', $maxlength=0, $url='', $addfilterfields=0)
+	function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permtodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0)
 	{
         // phpcs:enable
 		global $user, $conf, $langs, $form;
@@ -1412,9 +1412,9 @@ 
 
 		// Show list of documents
 		if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
-		if (empty($url)) $url=$_SERVER["PHP_SELF"];
+		if (empty($url)) $url = $_SERVER["PHP_SELF"];
 
-		if (! empty($addfilterfields))
+		if (!empty($addfilterfields))
 		{
 			print '<form action="'.$_SERVER['PHP_SELF'].'">';
 			print '<input type="hidden" name="module" value="'.$modulepart.'">';
@@ -1423,7 +1423,7 @@ 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table width="100%" class="noborder">'."\n";
 
-		if (! empty($addfilterfields))
+		if (!empty($addfilterfields))
 		{
 			print '<tr class="liste_titre nodrag nodrop">';
 			print '<td></td>';
@@ -1432,135 +1432,135 @@ 
 			print '<td></td>';
 			// Action column
 			print '<td class="liste_titre" align="middle">';
-			$searchpicto=$form->showFilterButtons();
+			$searchpicto = $form->showFilterButtons();
 			print $searchpicto;
 			print '</td>';
 			print "</tr>\n";
 		}
 
 		print '<tr class="liste_titre">';
-		$sortref="fullname";
-		if ($modulepart == 'invoice_supplier') $sortref='level1name';
-		print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
-		print_liste_field_titre("Date",$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre('','','');
+		$sortref = "fullname";
+		if ($modulepart == 'invoice_supplier') $sortref = 'level1name';
+		print_liste_field_titre("Ref", $url, $sortref, "", $param, 'align="left"', $sortfield, $sortorder);
+		print_liste_field_titre("Documents2", $url, "name", "", $param, 'align="left"', $sortfield, $sortorder);
+		print_liste_field_titre("Size", $url, "size", "", $param, 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre("Date", $url, "date", "", $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre('', '', '');
 		print '</tr>'."\n";
 
 		// To show ref or specific information according to view to show (defined by $module)
 		if ($modulepart == 'company')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-			$object_instance=new Societe($this->db);
+			$object_instance = new Societe($this->db);
 		}
 		else if ($modulepart == 'invoice')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$object_instance=new Facture($this->db);
+			$object_instance = new Facture($this->db);
 		}
 		else if ($modulepart == 'invoice_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-			$object_instance=new FactureFournisseur($this->db);
+			$object_instance = new FactureFournisseur($this->db);
 		}
 		else if ($modulepart == 'propal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-			$object_instance=new Propal($this->db);
+			$object_instance = new Propal($this->db);
 		}
 		else if ($modulepart == 'supplier_proposal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-			$object_instance=new SupplierProposal($this->db);
+			$object_instance = new SupplierProposal($this->db);
 		}
 		else if ($modulepart == 'order')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-			$object_instance=new Commande($this->db);
+			$object_instance = new Commande($this->db);
 		}
 		else if ($modulepart == 'order_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-			$object_instance=new CommandeFournisseur($this->db);
+			$object_instance = new CommandeFournisseur($this->db);
 		}
 		else if ($modulepart == 'contract')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-			$object_instance=new Contrat($this->db);
+			$object_instance = new Contrat($this->db);
 		}
 		else if ($modulepart == 'product')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-			$object_instance=new Product($this->db);
+			$object_instance = new Product($this->db);
 		}
 		else if ($modulepart == 'tax')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-			$object_instance=new ChargeSociales($this->db);
+			$object_instance = new ChargeSociales($this->db);
 		}
 		else if ($modulepart == 'project')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-			$object_instance=new Project($this->db);
+			$object_instance = new Project($this->db);
 		}
 		else if ($modulepart == 'fichinter')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-			$object_instance=new Fichinter($this->db);
+			$object_instance = new Fichinter($this->db);
 		}
 		else if ($modulepart == 'user')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-			$object_instance=new User($this->db);
+			$object_instance = new User($this->db);
 		}
 		else if ($modulepart == 'expensereport')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-			$object_instance=new ExpenseReport($this->db);
+			$object_instance = new ExpenseReport($this->db);
 		}
 		else if ($modulepart == 'holiday')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
-			$object_instance=new Holiday($this->db);
+			$object_instance = new Holiday($this->db);
 		}
 
-		foreach($filearray as $key => $file)
+		foreach ($filearray as $key => $file)
 		{
 			if (!is_dir($file['name'])
 			&& $file['name'] != '.'
 			&& $file['name'] != '..'
 			&& $file['name'] != 'CVS'
-			&& ! preg_match('/\.meta$/i',$file['name']))
+			&& !preg_match('/\.meta$/i', $file['name']))
 			{
 				// Define relative path used to store the file
-				$relativefile=preg_replace('/'.preg_quote($upload_dir.'/','/').'/','',$file['fullname']);
+				$relativefile = preg_replace('/'.preg_quote($upload_dir.'/', '/').'/', '', $file['fullname']);
 
 				//var_dump($file);
-				$id=0; $ref=''; $label='';
+				$id = 0; $ref = ''; $label = '';
 
 				// To show ref or specific information according to view to show (defined by $module)
-				if ($modulepart == 'company')           { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'invoice')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'invoice_supplier')  { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } }	// $ref may be also id with old supplier invoices
-				if ($modulepart == 'propal')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'order')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'order_supplier')    { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'contract')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'product')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'tax')               { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'holiday')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-
-				if (! $id && ! $ref) continue;
-				$found=0;
-				if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
+				if ($modulepart == 'company') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'invoice') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) { $id = $ref; $ref = ''; } }	// $ref may be also id with old supplier invoices
+				if ($modulepart == 'propal') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'order') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'order_supplier') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'contract') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'product') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'project') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'fichinter') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'user') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'expensereport') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
+
+				if (!$id && !$ref) continue;
+				$found = 0;
+				if (!empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
 				{
-					$found=1;
+					$found = 1;
 				}
 				else
 				{
@@ -1579,24 +1579,24 @@ 
 					}
 
 					if ($result > 0) {  // Save object into a cache
-						$found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
+						$found = 1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
 					}
-					if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
+					if ($result == 0) { $found = 1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = 'notfound'; unset($filearray[$key]); }
 				}
 
-				if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
+				if (!$found > 0 || !is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue; // We do not show orphelins files
 
 				print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
 				print '<tr class="oddeven">';
 				print '<td>';
-				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
-				else print $langs->trans("ObjectDeleted",($id?$id:$ref));
+				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1, 'document');
+				else print $langs->trans("ObjectDeleted", ($id ? $id : $ref));
 
 				//$modulesubdir=dol_sanitizeFileName($ref);
-				$modulesubdir=dirname($relativefile);
+				$modulesubdir = dirname($relativefile);
 
 				//$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-				$filedir=$file['path'];
+				$filedir = $file['path'];
 				//$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 				//print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
 
@@ -1608,16 +1608,16 @@ 
 				print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 				if ($forcedownload) print '&attachment=1';
 				print '&file='.urlencode($relativefile).'">';
-				print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')');
-				print dol_trunc($file['name'],$maxlength,'middle');
+				print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')');
+				print dol_trunc($file['name'], $maxlength, 'middle');
 				print '</a>';
 
 				//print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$');
 				print $this->showPreview($file, $modulepart, $file['relativename']);
 
 				print "</td>\n";
-				print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
-				print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
+				print '<td align="right">'.dol_print_size($file['size'], 1, 1).'</td>';
+				print '<td align="center">'.dol_print_date($file['date'], "dayhour").'</td>';
 				print '<td align="right">';
 				//if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 				//if ($forcedownload) print '&attachment=1';
@@ -1639,7 +1639,7 @@ 
 		print "</table>";
 		print '</div>';
 
-		if (! empty($addfilterfields)) print '</form>';
+		if (!empty($addfilterfields)) print '</form>';
 		// Fin de zone
 	}
 
@@ -1665,7 +1665,7 @@ 
 		$mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));
 		$upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;
 		// Max file size
-		$max_file_size 				= (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
+		$max_file_size = (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
 
 		// Include main
 		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';
@@ -1684,14 +1684,14 @@ 
 	 * @param	string		$param			More param to add into URL
 	 * @return 	int							Number of links
 	 */
-	public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
+	public function listOfLinks($object, $permtodelete = 1, $action = null, $selected = null, $param = '')
 	{
 		global $user, $conf, $langs, $user;
 		global $sortfield, $sortorder;
 
 		$langs->load("link");
 
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 		$link = new Link($this->db);
 		$links = array();
 		if ($sortfield == "name") {
@@ -1702,12 +1702,12 @@ 
 			$sortfield = null;
 		}
 		$res = $link->fetchAll($links, $object->element, $object->id, $sortfield, $sortorder);
-		$param .= (isset($object->id)?'&id=' . $object->id : '');
+		$param .= (isset($object->id) ? '&id='.$object->id : '');
 
 		// Show list of associated links
 		print load_fiche_titre($langs->trans("LinkedFiles"));
 
-		print '<form action="' . $_SERVER['PHP_SELF'] . ($param?'?'.$param:'') . '" method="POST">';
+		print '<form action="'.$_SERVER['PHP_SELF'].($param ? '?'.$param : '').'" method="POST">';
 
 		print '<table width="100%" class="liste">';
 		print '<tr class="liste_titre">';
@@ -1747,7 +1747,7 @@ 
 			$param,
 			'align="center"'
 		);
-		print_liste_field_titre('','','');
+		print_liste_field_titre('', '', '');
 		print '</tr>';
 		$nboflinks = count($links);
 		if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -1759,36 +1759,36 @@ 
 			if ($action == 'update' && $selected === $link->id)
 			{
 				print '<td>';
-				print '<input type="hidden" name="id" value="' . $object->id . '">';
-				print '<input type="hidden" name="linkid" value="' . $link->id . '">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="linkid" value="'.$link->id.'">';
 				print '<input type="hidden" name="action" value="confirm_updateline">';
-				print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
+				print $langs->trans('Link').': <input type="text" name="link" value="'.$link->url.'">';
 				print '</td>';
 				print '<td>';
-				print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';
+				print $langs->trans('Label').': <input type="text" name="label" value="'.$link->label.'">';
 				print '</td>';
-				print '<td align="center">' . dol_print_date(dol_now(), "dayhour", "tzuser") . '</td>';
+				print '<td align="center">'.dol_print_date(dol_now(), "dayhour", "tzuser").'</td>';
 				print '<td align="right"></td>';
 				print '<td align="right">';
-				print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
-				print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
+				print '<input type="submit" name="save" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
+				print '<input type="submit" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'">';
 				print '</td>';
 			}
 			else
 			{
 				print '<td>';
 				print img_picto('', 'object_globe').' ';
-				print '<a data-ajax="false" href="' . $link->url . '" target="_blank">';
+				print '<a data-ajax="false" href="'.$link->url.'" target="_blank">';
 				print $link->label;
 				print '</a>';
 				print '</td>'."\n";
 				print '<td align="right"></td>';
-				print '<td align="center">' . dol_print_date($link->datea, "dayhour", "tzuser") . '</td>';
+				print '<td align="center">'.dol_print_date($link->datea, "dayhour", "tzuser").'</td>';
 				print '<td align="center"></td>';
 				print '<td align="right">';
-				print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '" class="editfilelink" >' . img_edit() . '</a>';	// id= is included into $param
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'" class="editfilelink" >'.img_edit().'</a>'; // id= is included into $param
 				if ($permtodelete) {
-					print ' &nbsp; <a href="'. $_SERVER['PHP_SELF'] .'?action=delete&linkid=' . $link->id . $param . '" class="deletefilelink">' . img_delete() . '</a>';	// id= is included into $param
+					print ' &nbsp; <a href="'.$_SERVER['PHP_SELF'].'?action=delete&linkid='.$link->id.$param.'" class="deletefilelink">'.img_delete().'</a>'; // id= is included into $param
 				} else {
 					print '&nbsp;';
 				}
@@ -1820,25 +1820,25 @@ 
 	 * @param	string	  $param		  More param on http links
 	 * @return  string    $out            Output string with HTML
 	 */
-	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
+	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto = 0, $param = '')
 	{
 		global $langs, $conf;
 
-		$out='';
-		if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
+		$out = '';
+		if ($conf->browser->layout != 'phone' && !empty($conf->use_javascript_ajax))
 		{
-			$urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
+			$urladvancedpreview = getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param); // Return if a file is qualified for preview.
 			if (count($urladvancedpreview))
 			{
-				$out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
+				$out .= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime']) ? '' : ' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target']) ? '' : ' target="'.$urladvancedpreview['target'].'"').'>';
 				//$out.= '<a class="pictopreview">';
 				if (empty($ruleforpicto))
 				{
 					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
-					$out.='<span class="fa fa-search-plus" style="color: gray"></span>';
+					$out .= '<span class="fa fa-search-plus" style="color: gray"></span>';
 				}
-				else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
-				$out.= '</a>';
+				else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+				$out .= '</a>';
 			}
 		}
 		return $out;

Braces +404 added lines, -255 removed lines

@@ -84,7 +84,9 @@ 
 		$hookmanager->initHooks(array('formfile'));
 
 
-		if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
+		if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
+		    $useajax=0;
+		}
 
 		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
 		{
@@ -93,8 +95,7 @@ 
 			// TODO: This does not support option savingdocmask
 			// TODO: This break feature to upload links too
 			return $this->_formAjaxFileUpload($object);
-		}
-		else
+		} else
 	   	{
 			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
 			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
@@ -105,8 +106,12 @@ 
 
 			$out = "\n\n<!-- Start form attach new file -->\n";
 
-			if (empty($title)) $title=$langs->trans("AttachANewFile");
-			if ($title != 'none') $out.=load_fiche_titre($title, null, null);
+			if (empty($title)) {
+			    $title=$langs->trans("AttachANewFile");
+			}
+			if ($title != 'none') {
+			    $out.=load_fiche_titre($title, null, null);
+			}
 
 			$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
 			$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
@@ -116,19 +121,31 @@ 
 			$out .= '<table width="100%" class="nobordernopadding">';
 			$out .= '<tr>';
 
-			if (! empty($options)) $out .= '<td>'.$options.'</td>';
+			if (! empty($options)) {
+			    $out .= '<td>'.$options.'</td>';
+			}
 
 			$out .= '<td class="valignmiddle nowrap">';
 
 			$max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
 			$maxphp=@ini_get('upload_max_filesize');	// En inconnu
-			if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
-			if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
-			if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
-			if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
+			if (preg_match('/k$/i',$maxphp)) {
+			    $maxphp=$maxphp*1;
+			}
+			if (preg_match('/m$/i',$maxphp)) {
+			    $maxphp=$maxphp*1024;
+			}
+			if (preg_match('/g$/i',$maxphp)) {
+			    $maxphp=$maxphp*1024*1024;
+			}
+			if (preg_match('/t$/i',$maxphp)) {
+			    $maxphp=$maxphp*1024*1024*1024;
+			}
 			// Now $max and $maxphp are in Kb
 			$maxmin = $max;
-			if ($maxphp > 0) $maxmin=min($max,$maxphp);
+			if ($maxphp > 0) {
+			    $maxmin=min($max,$maxphp);
+			}
 
 			if ($maxmin > 0)
 			{
@@ -160,8 +177,7 @@ 
 					$out .= ' ';
 					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
 				}
-			}
-			else
+			} else
 			{
 				$out .= ' ('.$langs->trans("UploadDisabled").')';
 			}
@@ -170,7 +186,9 @@ 
 			if ($savingdocmask)
 			{
 				$out .= '<tr>';
-   				if (! empty($options)) $out .= '<td>'.$options.'</td>';
+   				if (! empty($options)) {
+   				    $out .= '<td>'.$options.'</td>';
+   				}
 				$out .= '<td valign="middle" class="nowrap">';
 				$out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
 				$out .= '</td>';
@@ -180,7 +198,9 @@ 
 			$out .= "</table>";
 
 			$out .= '</form>';
-			if (empty($sectionid)) $out .= '<br>';
+			if (empty($sectionid)) {
+			    $out .= '<br>';
+			}
 
 			$out .= "\n<!-- End form attach new file -->\n";
 
@@ -197,11 +217,15 @@ 
 
 				$out .= '<div class="valignmiddle" >';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
+				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) {
+				    $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
+				}
 				$out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
 				$out .= '</div>';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
+				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) {
+				    $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
+				}
 				$out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
 				$out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
 				$out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
@@ -298,7 +322,9 @@ 
 		global $langs, $conf, $user, $hookmanager;
 		global $form;
 
-		if (! is_object($form)) $form=new Form($this->db);
+		if (! is_object($form)) {
+		    $form=new Form($this->db);
+		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -311,10 +337,12 @@ 
 		$param.= 'entity='.(!empty($object->entity)?$object->entity:$conf->entity);
 
 		$printer=0;
-		if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport','livraison')))	// The direct print feature is implemented only for such elements
+		if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport','livraison'))) {
+		    // The direct print feature is implemented only for such elements
 		{
 			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
 		}
+		}
 
 		$hookmanager->initHooks(array('formfile'));
 
@@ -324,7 +352,9 @@ 
 		{
 			$file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
 		}
-		if ($hideifempty && empty($file_list)) return '';
+		if ($hideifempty && empty($file_list)) {
+		    return '';
+		}
 
 		$out='';
 		$forname='builddoc';
@@ -361,7 +391,9 @@ 
 		}
 
 		$titletoshow=$langs->trans("Documents");
-		if (! empty($title)) $titletoshow=$title;
+		if (! empty($title)) {
+		    $titletoshow=$title;
+		}
 
 		// Show table
 		if ($genallowed)
@@ -371,252 +403,251 @@ 
 			if ($modulepart == 'company')
 			{
 				$showempty=1;
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
 					$modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'propal')
+			} else if ($modulepart == 'propal')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 					$modellist=ModelePDFPropales::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'supplier_proposal')
+			} else if ($modulepart == 'supplier_proposal')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
 					$modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'commande')
+			} else if ($modulepart == 'commande')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 					$modellist=ModelePDFCommandes::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'expedition')
+			} elseif ($modulepart == 'expedition')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 					$modellist=ModelePDFExpedition::liste_modeles($this->db);
 				}
-			}
-            elseif ($modulepart == 'reception')
+			} elseif ($modulepart == 'reception')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                    $modellist=$genallowed;
+                } else
                 {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 					$modellist = ModelePdfReception::liste_modeles($this->db);
 				}
-            }
-			elseif ($modulepart == 'livraison')
+            } elseif ($modulepart == 'livraison')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
 					$modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'ficheinter')
+			} else if ($modulepart == 'ficheinter')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 					$modellist=ModelePDFFicheinter::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'facture')
+			} elseif ($modulepart == 'facture')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 					$modellist=ModelePDFFactures::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'contract')
+			} elseif ($modulepart == 'contract')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 					$modellist=ModelePDFContract::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'project')
+			} elseif ($modulepart == 'project')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 					$modellist=ModelePDFProjects::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'project_task')
+			} elseif ($modulepart == 'project_task')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 					$modellist=ModelePDFTask::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'product')
+			} elseif ($modulepart == 'product')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
 					$modellist=ModelePDFProduct::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'product_batch')
+			} elseif ($modulepart == 'product_batch')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
 					$modellist=ModelePDFProductBatch::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'stock')
+			} elseif ($modulepart == 'stock')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
 					$modellist=ModelePDFStock::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'movement')
+			} elseif ($modulepart == 'movement')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
 					$modellist=ModelePDFMovement::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'export')
+			} elseif ($modulepart == 'export')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 					$modellist=ModeleExports::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
+			} else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 					$modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+			} else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 					$modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'supplier_payment')
+			} else if ($modulepart == 'supplier_payment')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 					$modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'remisecheque')
+			} else if ($modulepart == 'remisecheque')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 					$modellist=ModeleChequeReceipts::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'donation')
+			} elseif ($modulepart == 'donation')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
 					$modellist=ModeleDon::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'member')
+			} elseif ($modulepart == 'member')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
 					$modellist=ModelePDFCards::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'agenda' || $modulepart == 'actions')
+			} elseif ($modulepart == 'agenda' || $modulepart == 'actions')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
 					$modellist=ModeleAction::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'expensereport')
+			} else if ($modulepart == 'expensereport')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
 					$modellist=ModeleExpenseReport::liste_modeles($this->db);
 				}
-			}
-			else if ($modulepart == 'unpaid')
+			} else if ($modulepart == 'unpaid')
 			{
 				$modellist='';
-			}
-			elseif ($modulepart == 'user')
+			} elseif ($modulepart == 'user')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
 					$modellist=ModelePDFUser::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'usergroup')
+			} elseif ($modulepart == 'usergroup')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				if (is_array($genallowed)) {
+				    $modellist=$genallowed;
+				} else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
 					$modellist=ModelePDFUserGroup::liste_modeles($this->db);
 				}
-			}
-			else
+			} else
 			{
 				// For normalized standard modules
 				$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
@@ -634,8 +665,7 @@ 
 				if (class_exists($class))
 				{
 					$modellist=call_user_func($class.'::liste_modeles',$this->db);
-				}
-				else
+				} else
 				{
 					dol_print_error($this->db,'Bad value for modulepart');
 					return -1;
@@ -646,10 +676,17 @@ 
 			$headershown=1;
 
 			$buttonlabeltoshow=$buttonlabel;
-			if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
+			if (empty($buttonlabel)) {
+			    $buttonlabel=$langs->trans('Generate');
+			}
 
-			if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
-			if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
+			if ($conf->browser->layout == 'phone') {
+			    $urlsource.='#'.$forname.'_form';
+			}
+			// So we switch to form after a generation
+			if (empty($noform)) {
+			    $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
+			}
 			$out.= '<input type="hidden" name="action" value="builddoc">';
 			$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
@@ -666,9 +703,11 @@ 
 			if (! empty($modellist))
 			{
 				$out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+				if (is_array($modellist) && count($modellist) == 1) {
+				    // If there is only one element
 				{
 					$arraykeys=array_keys($modellist);
+				}
 					$modelselected=$arraykeys[0];
 				}
 				$out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
@@ -676,8 +715,7 @@ 
 				{
 					$out.= ajax_combobox('model');
 				}
-			}
-			else
+			} else
 			{
 				$out.= '<div class="float">'.$langs->trans("Files").'</div>';
 			}
@@ -689,10 +727,11 @@ 
 				$formadmin=new FormAdmin($this->db);
 				$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
 				$morecss='maxwidth150';
-				if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
+				if ($conf->browser->layout == 'phone') {
+				    $morecss='maxwidth100';
+				}
 				$out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
-			}
-			else
+			} else
 			{
 				$out.= '&nbsp;';
 			}
@@ -700,15 +739,21 @@ 
 			// Button
 			$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
 			$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
+			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) {
+			    $genbutton.= ' disabled';
+			}
 			$genbutton.= '>';
 			if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
 			{
 			   	$langs->load("errors");
 			   	$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
 			}
-			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-			if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
+			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {
+			    $genbutton='';
+			}
+			if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') {
+			    $genbutton='';
+			}
 			$out.= $genbutton;
 			$out.= '</th>';
 
@@ -716,7 +761,9 @@ 
 			{
 				foreach($hookmanager->hooks['formfile'] as $module)
 				{
-					if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
+					if (method_exists($module, 'formBuilddocLineOptions')) {
+					    $out .= '<th></th>';
+					}
 				}
 			}
 			$out.= '</tr>';
@@ -761,19 +808,30 @@ 
 				{
 					// Define relative path for download link (depends on module)
 					$relativepath=$file["name"];										// Cas general
-					if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
-					if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
+					if ($modulesubdir) {
+					    $relativepath=$modulesubdir."/".$file["name"];
+					}
+					// Cas propal, facture...
+					if ($modulepart == 'export') {
+					    $relativepath = $file["name"];
+					}
+					// Other case
 
 					$out.= '<tr class="oddeven">';
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) {
+					    $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;
+					}
+					// To use another wrapper
 
 					// Show file name with link to download
 					$out.= '<td class="minwidth200">';
 					$out.= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
 					$mime=dol_mimetype($relativepath,'',0);
-					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
+					if (preg_match('/text/',$mime)) {
+					    $out.= ' target="_blank"';
+					}
 					$out.= ' target="_blank">';
 					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]);
 					$out.= dol_trunc($file["name"], 150);
@@ -824,8 +882,10 @@ 
 						{
 							$out.= $hookmanager->resPrint;		// Complete line
 							$out.= '</tr>';
+						} else {
+						    $out = $hookmanager->resPrint;
 						}
-						else $out = $hookmanager->resPrint;		// Replace line
+						// Replace line
 			  		}
 				}
 
@@ -847,7 +907,9 @@ 
 					$out.='<td align="right">';
 					$out.=dol_print_date($file->datea,'dayhour');
 					$out.='</td>';
-					if ($delallowed || $printer || $morepicto) $out.='<td></td>';
+					if ($delallowed || $printer || $morepicto) {
+					    $out.='<td></td>';
+					}
 					$out.='</tr>'."\n";
 				}
 				$this->numoffiles++;
@@ -866,7 +928,9 @@ 
 			$out.= "</div>\n";
 			if ($genallowed)
 			{
-				if (empty($noform)) $out.= '</form>'."\n";
+				if (empty($noform)) {
+				    $out.= '</form>'."\n";
+				}
 			}
 		}
 		$out.= '<!-- End show_document -->'."\n";
@@ -908,8 +972,7 @@ 
 		if (! empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
 		{
 			$filterforfilesearch = preg_quote(basename($modulesubdir),'/');
-		}
-		else
+		} else
 		{
 			$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
 		}
@@ -930,12 +993,18 @@ 
 			foreach($file_list as $file)
 			{
 				$i++;
-				if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
+				if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) {
+				    continue;
+				}
+				// Discard this. It does not match provided filter.
 
 				$found++;
 				// Define relative path for download link (depends on module)
 				$relativepath=$file["name"];								// Cas general
-				if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+				if ($modulesubdir) {
+				    $relativepath=$modulesubdir."/".$file["name"];
+				}
+				// Cas propal, facture...
 				// Autre cas
 				if ($modulepart == 'donation')            {
 					$relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
@@ -947,8 +1016,11 @@ 
 				$this->infofiles['nboffiles']++;
 				$this->infofiles['files'][]=$file['fullname'];
 				$ext=pathinfo($file["name"], PATHINFO_EXTENSION);
-				if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
-				else $this->infofiles['extensions'][$ext]++;
+				if (empty($this->infofiles[$ext])) {
+				    $this->infofiles['extensions'][$ext]=1;
+				} else {
+				    $this->infofiles['extensions'][$ext]++;
+				}
 
 				// Preview
 				if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
@@ -966,7 +1038,9 @@ 
 				// Download
 				$tmpout.= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
 				$mime=dol_mimetype($relativepath,'',0);
-				if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
+				if (preg_match('/text/',$mime)) {
+				    $tmpout.= ' target="_blank"';
+				}
 				$tmpout.= '>';
 				$tmpout.= img_mime($relativepath, $file["name"]);
 				$tmpout.= $langs->trans("Download").' '.$ext;
@@ -976,9 +1050,10 @@ 
 			$out.='</ul></div></dd>
     			</dl>';
 
-			if (! $found) $out='';
-		}
-		else
+			if (! $found) {
+			    $out='';
+			}
+		} else
 		{
 			// TODO Add link to regenerate doc ?
 			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
@@ -1027,14 +1102,21 @@ 
 		global $form;
 
 		$disablecrop=1;
-		if (in_array($modulepart, array('expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) $disablecrop=0;
+		if (in_array($modulepart, array('expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) {
+		    $disablecrop=0;
+		}
 
 		// Define relative path used to store the file
 		if (empty($relativepath))
 		{
 			$relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
-			if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
-			if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+			if ($object->element == 'invoice_supplier') {
+			    $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;
+			}
+			// TODO Call using a defined value for $relativepath
+			if ($object->element == 'project_task') {
+			    $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+			}
 		}
 		// For backward compatiblity, we detect file stored into an old path
 		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
@@ -1066,11 +1148,12 @@ 
 		);
 		$reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
 
-		if (isset($reshook) && $reshook != '') // null or '' for bypass
+		if (isset($reshook) && $reshook != '') {
+		    // null or '' for bypass
 		{
 			return $reshook;
 		}
-		else
+		} else
 		{
 			if (! is_object($form))
 			{
@@ -1078,17 +1161,27 @@ 
 				$form=new Form($this->db);
 			}
 
-			if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
+			if (! preg_match('/&id=/', $param) && isset($object->id)) {
+			    $param.='&id='.$object->id;
+			}
 			$relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
-			if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
+			if ($relativepathwihtoutslashend) {
+			    $param.= '&file='.urlencode($relativepathwihtoutslashend);
+			}
 
-			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
+			if ($permtoeditline < 0) {
+			    // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
 			{
 				$permtoeditline=0;
+			}
 				if (in_array($modulepart, array('product','produit','service')))
 				{
-					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
-					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
+					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) {
+					    $permtoeditline=1;
+					}
+					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) {
+					    $permtoeditline=1;
+					}
 				}
 			}
 			if (empty($conf->global->MAIN_UPLOAD_DOC))
@@ -1098,8 +1191,12 @@ 
 			}
 
 			// Show list of existing files
-			if (empty($useinecm) && $title != 'none') print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
-			if (empty($url)) $url=$_SERVER["PHP_SELF"];
+			if (empty($useinecm) && $title != 'none') {
+			    print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
+			}
+			if (empty($url)) {
+			    $url=$_SERVER["PHP_SELF"];
+			}
 
 			print '<!-- html.formfile::list_of_documents -->'."\n";
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
@@ -1119,10 +1216,14 @@ 
 				print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref','alpha')).'"></td>';
 				print '<td></td>';
 				print '<td></td>';
-				if (empty($useinecm)) print '<td></td>';
+				if (empty($useinecm)) {
+				    print '<td></td>';
+				}
 				print '<td></td>';
 				print '<td></td>';
-				if (! $disablemove) print '<td></td>';
+				if (! $disablemove) {
+				    print '<td></td>';
+				}
 				print "</tr>\n";
 			}
 
@@ -1131,10 +1232,15 @@ 
 			print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 			print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');					// Preview
+			if (empty($useinecm)) {
+			    print_liste_field_titre('',$url,"","",$param,'align="center"');
+			}
+			// Preview
 			print_liste_field_titre('');
 			print_liste_field_titre('');
-			if (! $disablemove) print_liste_field_titre('');
+			if (! $disablemove) {
+			    print_liste_field_titre('');
+			}
 			print "</tr>\n";
 
 			// Get list of files stored into database for same relative directory
@@ -1143,23 +1249,29 @@ 
 				completeFileArrayWithDatabaseInfo($filearray, $relativedir);
 
 				//var_dump($sortfield.' - '.$sortorder);
-				if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+				if ($sortfield && $sortorder) {
+				    // If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
 				{
 					$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
 				}
+				}
 			}
 
 			$nboffiles=count($filearray);
-			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+			if ($nboffiles > 0) {
+			    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+			}
 
 			$i=0; $nboflines = 0; $lastrowid=0;
-			foreach($filearray as $key => $file)      // filearray must be only files here
+			foreach($filearray as $key => $file) {
+			    // filearray must be only files here
 			{
 				if ($file['name'] != '.'
 						&& $file['name'] != '..'
 						&& ! preg_match('/\.meta$/i',$file['name']))
 				{
 					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
+			}
 					$filepath=$relativepath.$file['name'];
 
 					$editline=0;
@@ -1175,12 +1287,18 @@ 
 					// Show file name with link to download
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-					if ($forcedownload) print '&attachment=1';
-					if (! empty($object->entity)) print '&entity='.$object->entity;
+					if ($forcedownload) {
+					    print '&attachment=1';
+					}
+					if (! empty($object->entity)) {
+					    print '&entity='.$object->entity;
+					}
 					print '&file='.urlencode($filepath);
 					print '">';
 					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'],0,0).')', 'inline-block valignbottom paddingright');
-					if ($showrelpart == 1) print $relativepath;
+					if ($showrelpart == 1) {
+					    print $relativepath;
+					}
 					//print dol_trunc($file['name'],$maxlength,'middle');
 					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile','alpha')))
 					{
@@ -1190,14 +1308,15 @@ 
 						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
 						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
 						$editline=1;
-					}
-					else
+					} else
 					{
 						print dol_trunc($file['name'], 200);
 						print '</a>';
 					}
 					// Preview link
-					if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
+					if (! $editline) {
+					    print $this->showPreview($file, $modulepart, $filepath);
+					}
 					// Public share link
 					//if (! $editline && ! empty($filearray[$key]['hashp'])) print pictowithlinktodirectdownload;
 
@@ -1208,8 +1327,9 @@ 
 					$sizetoshowbytes = dol_print_size($file['size'],0,1);
 
 					print '<td align="right" width="80px">';
-					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
-					else {
+					if ($sizetoshow == $sizetoshowbytes) {
+					    print $sizetoshow;
+					} else {
 						print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
 					}
 					print '</td>';
@@ -1225,7 +1345,10 @@ 
 						if (image_format_supported($file['name']) > 0)
 						{
 							$minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-							if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+							if (! dol_is_file($file['path'].'/'.$minifile)) {
+							    $minifile=getImageFileNameForSize($file['name'], '_mini', '.png');
+							}
+							// For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
 							//print $file['path'].'/'.$minifile.'<br>';
 
 							$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
@@ -1237,8 +1360,9 @@ 
 							}
 							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
 							print '</a>';
+						} else {
+						    print '&nbsp;';
 						}
-						else print '&nbsp;';
 						print '</td>';
 					}
 
@@ -1250,8 +1374,7 @@ 
 						{
 							print $langs->trans("FileSharedViaALink").' ';
 							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
-						}
-						else
+						} else
 						{
 							if ($file['share'])
 							{
@@ -1263,15 +1386,19 @@ 
 								//print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';
 								$forcedownload=0;
 								$paramlink='';
-								if (! empty($file['share'])) $paramlink.=($paramlink?'&':'').'hashp='.$file['share'];			// Hash for public share
-								if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+								if (! empty($file['share'])) {
+								    $paramlink.=($paramlink?'&':'').'hashp='.$file['share'];
+								}
+								// Hash for public share
+								if ($forcedownload) {
+								    $paramlink.=($paramlink?'&':'').'attachment=1';
+								}
 
 								$fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
 
 								print img_picto($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
 								print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-							}
-							else
+							} else
 							{
 								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 							}
@@ -1292,7 +1419,9 @@ 
 						if (! $useinecm || $useinecm == 2)
 						{
 							$newmodulepart=$modulepart;
-							if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
+							if (in_array($modulepart, array('product','produit','service'))) {
+							    $newmodulepart='produit|service';
+							}
 
 							if (! $disablecrop && image_format_supported($file['name']) > 0)
 							{
@@ -1312,9 +1441,15 @@ 
 						if ($permonobject)
 						{
 							$useajax=1;
-							if (! empty($conf->dol_use_jmobile)) $useajax=0;
-							if (empty($conf->use_javascript_ajax)) $useajax=0;
-							if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
+							if (! empty($conf->dol_use_jmobile)) {
+							    $useajax=0;
+							}
+							if (empty($conf->use_javascript_ajax)) {
+							    $useajax=0;
+							}
+							if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+							    $useajax=0;
+							}
 							print '<a href="'.(($useinecm && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
 						}
 						print "</td>";
@@ -1330,21 +1465,21 @@ 
 									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
 								}
 								print '</td>';
-							}
-							else {
+							} else {
 							   	print '<td align="center"'.(($conf->browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
 							   	print '</td>';
 							}
 					   }
-					}
-					else
+					} else
 					{
 						print '<td class="right">';
 						print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
 						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 						print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 						print '</td>';
-						if (empty($disablemove)) print '<td class="right"></td>';
+						if (empty($disablemove)) {
+						    print '<td class="right"></td>';
+						}
 					}
 					print "</tr>\n";
 
@@ -1354,10 +1489,16 @@ 
 			if ($nboffiles == 0)
 			{
 				$colspan=(empty($useinecm)?'6':'6');
-				if (empty($disablemove)) $colspan++;		// 6 columns or 7
+				if (empty($disablemove)) {
+				    $colspan++;
+				}
+				// 6 columns or 7
 				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
-				if (empty($textifempty)) print $langs->trans("NoFileFound");
-				else print $textifempty;
+				if (empty($textifempty)) {
+				    print $langs->trans("NoFileFound");
+				} else {
+				    print $textifempty;
+				}
 				print '</td></tr>';
 			}
 			print "</table>";
@@ -1411,8 +1552,12 @@ 
 		dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
 
 		// Show list of documents
-		if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
-		if (empty($url)) $url=$_SERVER["PHP_SELF"];
+		if (empty($useinecm)) {
+		    print load_fiche_titre($langs->trans("AttachedFiles"));
+		}
+		if (empty($url)) {
+		    $url=$_SERVER["PHP_SELF"];
+		}
 
 		if (! empty($addfilterfields))
 		{
@@ -1440,7 +1585,9 @@ 
 
 		print '<tr class="liste_titre">';
 		$sortref="fullname";
-		if ($modulepart == 'invoice_supplier') $sortref='level1name';
+		if ($modulepart == 'invoice_supplier') {
+		    $sortref='level1name';
+		}
 		print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
 		print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 		print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
@@ -1453,73 +1600,59 @@ 
 		{
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 			$object_instance=new Societe($this->db);
-		}
-		else if ($modulepart == 'invoice')
+		} else if ($modulepart == 'invoice')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$object_instance=new Facture($this->db);
-		}
-		else if ($modulepart == 'invoice_supplier')
+		} else if ($modulepart == 'invoice_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 			$object_instance=new FactureFournisseur($this->db);
-		}
-		else if ($modulepart == 'propal')
+		} else if ($modulepart == 'propal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$object_instance=new Propal($this->db);
-		}
-		else if ($modulepart == 'supplier_proposal')
+		} else if ($modulepart == 'supplier_proposal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 			$object_instance=new SupplierProposal($this->db);
-		}
-		else if ($modulepart == 'order')
+		} else if ($modulepart == 'order')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$object_instance=new Commande($this->db);
-		}
-		else if ($modulepart == 'order_supplier')
+		} else if ($modulepart == 'order_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 			$object_instance=new CommandeFournisseur($this->db);
-		}
-		else if ($modulepart == 'contract')
+		} else if ($modulepart == 'contract')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 			$object_instance=new Contrat($this->db);
-		}
-		else if ($modulepart == 'product')
+		} else if ($modulepart == 'product')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$object_instance=new Product($this->db);
-		}
-		else if ($modulepart == 'tax')
+		} else if ($modulepart == 'tax')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 			$object_instance=new ChargeSociales($this->db);
-		}
-		else if ($modulepart == 'project')
+		} else if ($modulepart == 'project')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 			$object_instance=new Project($this->db);
-		}
-		else if ($modulepart == 'fichinter')
+		} else if ($modulepart == 'fichinter')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 			$object_instance=new Fichinter($this->db);
-		}
-		else if ($modulepart == 'user')
+		} else if ($modulepart == 'user')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 			$object_instance=new User($this->db);
-		}
-		else if ($modulepart == 'expensereport')
+		} else if ($modulepart == 'expensereport')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 			$object_instance=new ExpenseReport($this->db);
-		}
-		else if ($modulepart == 'holiday')
+		} else if ($modulepart == 'holiday')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 			$object_instance=new Holiday($this->db);
@@ -1556,13 +1689,14 @@ 
 				if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
 				if ($modulepart == 'holiday')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
 
-				if (! $id && ! $ref) continue;
+				if (! $id && ! $ref) {
+				    continue;
+				}
 				$found=0;
 				if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
 				{
 					$found=1;
-				}
-				else
+				} else
 				{
 					//print 'Fetch '.$id." - ".$ref.'<br>';
 
@@ -1584,13 +1718,19 @@ 
 					if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
 				}
 
-				if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
+				if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
+				    continue;
+				}
+				// We do not show orphelins files
 
 				print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
 				print '<tr class="oddeven">';
 				print '<td>';
-				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
-				else print $langs->trans("ObjectDeleted",($id?$id:$ref));
+				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
+				    print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
+				} else {
+				    print $langs->trans("ObjectDeleted",($id?$id:$ref));
+				}
 
 				//$modulesubdir=dol_sanitizeFileName($ref);
 				$modulesubdir=dirname($relativefile);
@@ -1606,7 +1746,9 @@ 
 				print '<td>';
 				//print "XX".$file['name']; //$file['name'] must be utf8
 				print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-				if ($forcedownload) print '&attachment=1';
+				if ($forcedownload) {
+				    print '&attachment=1';
+				}
 				print '&file='.urlencode($relativefile).'">';
 				print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')');
 				print dol_trunc($file['name'],$maxlength,'middle');
@@ -1632,14 +1774,19 @@ 
 		if (count($filearray) == 0)
 		{
 			print '<tr class="oddeven"><td colspan="5">';
-			if (empty($textifempty)) print $langs->trans("NoFileFound");
-			else print $textifempty;
+			if (empty($textifempty)) {
+			    print $langs->trans("NoFileFound");
+			} else {
+			    print $textifempty;
+			}
 			print '</td></tr>';
 		}
 		print "</table>";
 		print '</div>';
 
-		if (! empty($addfilterfields)) print '</form>';
+		if (! empty($addfilterfields)) {
+		    print '</form>';
+		}
 		// Fin de zone
 	}
 
@@ -1750,7 +1897,9 @@ 
 		print_liste_field_titre('','','');
 		print '</tr>';
 		$nboflinks = count($links);
-		if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+		if ($nboflinks > 0) {
+		    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+		}
 
 		foreach ($links as $link)
 		{
@@ -1773,8 +1922,7 @@ 
 				print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
 				print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
 				print '</td>';
-			}
-			else
+			} else
 			{
 				print '<td>';
 				print img_picto('', 'object_globe').' ';
@@ -1836,8 +1984,9 @@ 
 				{
 					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
 					$out.='<span class="fa fa-search-plus" style="color: gray"></span>';
+				} else {
+				    $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
 				}
-				else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
 				$out.= '</a>';
 			}
 		}

dolibarr/htdocs/core/class/html.formaccounting.class.php

Indentation +303 added lines, -303 removed lines

@@ -33,110 +33,110 @@ 
 class FormAccounting extends Form
 {
 
-	private $options_cache = array();
+    private $options_cache = array();
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-   /**
-	* Constructor
-	*
-	* @param		DoliDB		$db      Database handler
-	*/
-	public function __construct($db)
-	{
-	    $this->db = $db;
-	}
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    /**
+     * Constructor
+     *
+     * @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return list of journals with label by nature
-	 *
-	 * @param	string	$selectid	Preselected pcg_type
-	 * @param	string	$htmlname	Name of field in html form
-	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
-	 * @param	int		$showempty	Add an empty field
-	 * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
-	 * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
-	 * @param	string	$morecss	More css non HTML object
-	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
-	 * @param   int     $disabledajaxcombo Disable ajax combo box.
-	 * @return	string				String with HTML select
-	 */
-	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0)
-	{
+    /**
+     * Return list of journals with label by nature
+     *
+     * @param	string	$selectid	Preselected pcg_type
+     * @param	string	$htmlname	Name of field in html form
+     * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+     * @param	int		$showempty	Add an empty field
+     * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
+     * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
+     * @param	string	$morecss	More css non HTML object
+     * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
+     * @param   int     $disabledajaxcombo Disable ajax combo box.
+     * @return	string				String with HTML select
+     */
+    function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0)
+    {
         // phpcs:enable
-		global $conf,$langs;
-
-		$out = '';
-
-    	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
-		{
-		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
-		}
-		else
-		{
-			$sql = "SELECT rowid, code, label, nature, entity, active";
-			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
-			$sql.= " WHERE active = 1";
-			$sql.= " AND entity = ".$conf->entity;
-			//if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
-			$sql.= " ORDER BY code";
-
-			dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-
-			if (!$resql) {
-				$this->error = "Error ".$this->db->lasterror();
-				dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
-				return -1;
-			}
-
-    		$selected = 0;
-			$langs->load('accountancy');
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				$label = $obj->code . ' - ' . $langs->trans($obj->label);
-
-    			$select_value_in = $obj->rowid;
-				$select_value_out = $obj->rowid;
-
-				// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->code;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->code;
-    			}
-    			// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
-
-				$options[$select_value_out] = $label;
-			}
-			$this->db->free($resql);
-
-			if ($usecache)
-			{
-				$this->options_cache[$usecache] = $options;
-			}
-		}
-
-		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo?0:1));
-
-		return $out;
-	}
+        global $conf,$langs;
+
+        $out = '';
+
+        $options = array();
+        if ($usecache && ! empty($this->options_cache[$usecache]))
+        {
+            $options = $this->options_cache[$usecache];
+            $selected=$selectid;
+        }
+        else
+        {
+            $sql = "SELECT rowid, code, label, nature, entity, active";
+            $sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
+            $sql.= " WHERE active = 1";
+            $sql.= " AND entity = ".$conf->entity;
+            //if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
+            $sql.= " ORDER BY code";
+
+            dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+
+            if (!$resql) {
+                $this->error = "Error ".$this->db->lasterror();
+                dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
+                return -1;
+            }
+
+            $selected = 0;
+            $langs->load('accountancy');
+            while ($obj = $this->db->fetch_object($resql))
+            {
+                $label = $obj->code . ' - ' . $langs->trans($obj->label);
+
+                $select_value_in = $obj->rowid;
+                $select_value_out = $obj->rowid;
+
+                // Try to guess if we have found default value
+                if ($select_in == 1) {
+                    $select_value_in = $obj->code;
+                }
+                if ($select_out == 1) {
+                    $select_value_out = $obj->code;
+                }
+                // Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
+                if ($selectid != '' && $selectid == $select_value_in) {
+                    //var_dump("Found ".$selectid." ".$select_value_in);
+                    $selected = $select_value_out;
+                }
+
+                $options[$select_value_out] = $label;
+            }
+            $this->db->free($resql);
+
+            if ($usecache)
+            {
+                $this->options_cache[$usecache] = $options;
+            }
+        }
+
+        $out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo?0:1));
+
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -167,7 +167,7 @@ 
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
             $sql.= " WHERE c.active = 1";
-			$sql.= " AND c.category_type = 0";
+            $sql.= " AND c.category_type = 0";
             if (empty($allcountries)) $sql.= " AND c.fk_country = ".$mysoc->country_id;
             $sql.= " ORDER BY c.label ASC";
         }
@@ -176,8 +176,8 @@ 
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql.= " WHERE c.active = 1";
-			$sql.= " AND c.category_type = 0";
-			$sql.= " AND c.fk_country = co.rowid";
+            $sql.= " AND c.category_type = 0";
+            $sql.= " AND c.fk_country = co.rowid";
             if (empty($allcountries)) $sql.= " AND co.code = '".$mysoc->country_code."'";
             $sql.= " ORDER BY c.label ASC";
         }
@@ -199,7 +199,7 @@ 
                     $out .= '<option value="'.$obj->rowid.'"';
                     if ($obj->rowid == $selected) $out .= ' selected';
                     $out .= '>'.($maxlen ? dol_trunc($obj->type,$maxlen) : $obj->type);
-					$out .= ' ('.$obj->range_account.')';
+                    $out .= ' ('.$obj->range_account.')';
                     $i++;
                 }
                 $out .=  '</select>';
@@ -221,231 +221,231 @@ 
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return select filter with date of transaction
-	 *
-	 * @param string $htmlname Name of select field
-	 * @param string $selectedkey Value
-	 * @return string HTML edit field
-	 */
+    /**
+     * Return select filter with date of transaction
+     *
+     * @param string $htmlname Name of select field
+     * @param string $selectedkey Value
+     * @return string HTML edit field
+     */
     function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')
     {
         // phpcs:enable
-		$options = array();
+        $options = array();
 
-		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
-	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";
-		$sql .= ' ORDER BY import_key DESC';
+        $sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+        $sql .= " WHERE entity IN (".getEntity('accountancy').")";
+        $sql .= ' ORDER BY import_key DESC';
 
-		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
-		$resql = $this->db->query($sql);
+        dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
+        $resql = $this->db->query($sql);
 
-		if (!$resql) {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
-			return - 1;
-		}
+        if (!$resql) {
+            $this->error = "Error " . $this->db->lasterror();
+            dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
+            return - 1;
+        }
 
-		while ($obj = $this->db->fetch_object($resql)) {
-			$options[$obj->import_key] = dol_print_date($obj->import_key, 'dayhourtext');
-		}
+        while ($obj = $this->db->fetch_object($resql)) {
+            $options[$obj->import_key] = dol_print_date($obj->import_key, 'dayhourtext');
+        }
 
-		return Form::selectarray($htmlname, $options, $selectedkey);
-	}
+        return Form::selectarray($htmlname, $options, $selectedkey);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return list of accounts with label by chart of accounts
-	 *
-	 * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
-	 * @param string   $htmlname           Name of HTML field id. If name start with '.', it is name of HTML css class, so several component with same name in different forms can be used.
-	 * @param int      $showempty          1=Add an empty field, 2=Add an empty field+'None' field
-	 * @param array    $event              Event options
-	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
-	 * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number
-	 * @param string   $morecss            More css non HTML object
-	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
-	 * @return string                      String with HTML select
-	 */
-	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
-	{
+    /**
+     * Return list of accounts with label by chart of accounts
+     *
+     * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
+     * @param string   $htmlname           Name of HTML field id. If name start with '.', it is name of HTML css class, so several component with same name in different forms can be used.
+     * @param int      $showempty          1=Add an empty field, 2=Add an empty field+'None' field
+     * @param array    $event              Event options
+     * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
+     * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number
+     * @param string   $morecss            More css non HTML object
+     * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
+     * @return string                      String with HTML select
+     */
+    function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-
-		$out = '';
-
-    	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
-		{
-		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
-		}
-		else
-		{
-    		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
-
-    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
-    		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-    		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-    		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
-    		$sql .= " AND aa.active = 1";
-    		$sql .= " AND aa.entity=".$conf->entity;
-    		$sql .= " ORDER BY aa.account_number";
-
-    		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-
-    		if (!$resql) {
-    			$this->error = "Error " . $this->db->lasterror();
-    			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
-    			return -1;
-    		}
-
-    		$selected = 0;
-    		while ($obj = $this->db->fetch_object($resql))
-    		{
-    			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
-    			$label = dol_trunc($label, $trunclength);
-
-    			$select_value_in = $obj->rowid;
-    			$select_value_out = $obj->rowid;
-
-    			// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->account_number;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->account_number;
-    			}
-    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
-    			// Because same account_number can be share between different accounting_system and do have the same meaning
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
-
-    			$options[$select_value_out] = $label;
-    		}
-    		$this->db->free($resql);
-
-    		if ($usecache)
-    		{
+        global $conf, $langs;
+
+        require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+
+        $out = '';
+
+        $options = array();
+        if ($usecache && ! empty($this->options_cache[$usecache]))
+        {
+            $options = $this->options_cache[$usecache];
+            $selected=$selectid;
+        }
+        else
+        {
+            $trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
+
+            $sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
+            $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+            $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+            $sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+            $sql .= " AND aa.active = 1";
+            $sql .= " AND aa.entity=".$conf->entity;
+            $sql .= " ORDER BY aa.account_number";
+
+            dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+
+            if (!$resql) {
+                $this->error = "Error " . $this->db->lasterror();
+                dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
+                return -1;
+            }
+
+            $selected = 0;
+            while ($obj = $this->db->fetch_object($resql))
+            {
+                $label = length_accountg($obj->account_number) . ' - ' . $obj->label;
+                $label = dol_trunc($label, $trunclength);
+
+                $select_value_in = $obj->rowid;
+                $select_value_out = $obj->rowid;
+
+                // Try to guess if we have found default value
+                if ($select_in == 1) {
+                    $select_value_in = $obj->account_number;
+                }
+                if ($select_out == 1) {
+                    $select_value_out = $obj->account_number;
+                }
+                // Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+                // Because same account_number can be share between different accounting_system and do have the same meaning
+                if ($selectid != '' && $selectid == $select_value_in) {
+                    //var_dump("Found ".$selectid." ".$select_value_in);
+                    $selected = $select_value_out;
+                }
+
+                $options[$select_value_out] = $label;
+            }
+            $this->db->free($resql);
+
+            if ($usecache)
+            {
                 $this->options_cache[$usecache] = $options;
-    		}
-		}
+            }
+        }
 
-		if ($showempty == 2)
-		{
-			$options['0'] = $langs->trans("None");
-		}
+        if ($showempty == 2)
+        {
+            $options['0'] = $langs->trans("None");
+        }
 
-		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty > 0 ? 1 : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
+        $out .= Form::selectarray($htmlname, $options, $selected, ($showempty > 0 ? 1 : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
-		return $out;
-	}
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return list of auxilary thirdparty accounts
-	 *
-	 * @param string   $selectid       Preselected pcg_type
-	 * @param string   $htmlname       Name of field in html form
-	 * @param int      $showempty      Add an empty field
-	 * @param string   $morecss        More css
-	 * @return string                  String with HTML select
-	 */
+    /**
+     * Return list of auxilary thirdparty accounts
+     *
+     * @param string   $selectid       Preselected pcg_type
+     * @param string   $htmlname       Name of field in html form
+     * @param int      $showempty      Add an empty field
+     * @param string   $morecss        More css
+     * @return string                  String with HTML select
+     */
     function select_auxaccount($selectid, $htmlname='account_num_aux', $showempty=0, $morecss='maxwidth200')
     {
         // phpcs:enable
 
-		$aux_account = array();
-
-		// Auxiliary customer account
-		$sql = "SELECT DISTINCT code_compta, nom ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
-		$sql .= " ORDER BY code_compta";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta)) {
-					$aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
-				}
-			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-		$this->db->free($resql);
-
-		// Auxiliary supplier account
-		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE entity IN (" . getEntity('societe') . ")";
-		$sql .= " ORDER BY code_compta_fournisseur";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta_fournisseur)) {
-					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
-				}
-			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-		$this->db->free($resql);
-
-		// Build select
-		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
-
-		return $out;
-	}
+        $aux_account = array();
+
+        // Auxiliary customer account
+        $sql = "SELECT DISTINCT code_compta, nom ";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe";
+        $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
+        $sql .= " ORDER BY code_compta";
+        dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            while ($obj = $this->db->fetch_object($resql)) {
+                if (!empty($obj->code_compta)) {
+                    $aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
+                }
+            }
+        } else {
+            $this->error = "Error ".$this->db->lasterror();
+            dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+            return -1;
+        }
+        $this->db->free($resql);
+
+        // Auxiliary supplier account
+        $sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe";
+        $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
+        $sql .= " ORDER BY code_compta_fournisseur";
+        dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            while ($obj = $this->db->fetch_object($resql)) {
+                if (!empty($obj->code_compta_fournisseur)) {
+                    $aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
+                }
+            }
+        } else {
+            $this->error = "Error ".$this->db->lasterror();
+            dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+            return -1;
+        }
+        $this->db->free($resql);
+
+        // Build select
+        $out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return HTML combo list of years existing into book keepping
-	 *
-	 * @param string $selected Preselected value
-	 * @param string $htmlname Name of HTML select object
-	 * @param int $useempty Affiche valeur vide dans liste
-	 * @param string $output_format (html/opton (for option html only)/array (to return options arrays
-	 * @return string/array
-	 */
-	function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
-	{
+    /**
+     * Return HTML combo list of years existing into book keepping
+     *
+     * @param string $selected Preselected value
+     * @param string $htmlname Name of HTML select object
+     * @param int $useempty Affiche valeur vide dans liste
+     * @param string $output_format (html/opton (for option html only)/array (to return options arrays
+     * @return string/array
+     */
+    function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
+    {
         // phpcs:enable
-	    global $conf;
-
-		$out_array = array();
-
-		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
-		$sql .= " ORDER BY date_format(doc_date,'%Y')";
-		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
-			return -1;
-		}
-		while ($obj = $this->db->fetch_object($resql)) {
-			$out_array[$obj->dtyear] = $obj->dtyear;
-		}
-		$this->db->free($resql);
-
-		if ($output_format == 'html') {
-			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
-		} else {
-			return $out_array;
-		}
-	}
+        global $conf;
+
+        $out_array = array();
+
+        $sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
+        $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+        $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+        $sql .= " ORDER BY date_format(doc_date,'%Y')";
+        dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+        $resql = $this->db->query($sql);
+
+        if (!$resql) {
+            $this->error = "Error ".$this->db->lasterror();
+            dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+            return -1;
+        }
+        while ($obj = $this->db->fetch_object($resql)) {
+            $out_array[$obj->dtyear] = $obj->dtyear;
+        }
+        $this->db->free($resql);
+
+        if ($output_format == 'html') {
+            return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
+        } else {
+            return $out_array;
+        }
+    }
 }

Spacing +54 added lines, -54 removed lines

@@ -24,7 +24,7 @@ 
  *  \ingroup    Advanced accountancy
  *	\brief      File of class with all html predefined components
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -43,7 +43,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
    /**
 	* Constructor
@@ -70,29 +70,29 @@ 
 	 * @param   int     $disabledajaxcombo Disable ajax combo box.
 	 * @return	string				String with HTML select
 	 */
-	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0)
+	function select_journal($selectid, $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '', $disabledajaxcombo = 0)
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$out = '';
 
     	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
+		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
 		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
+		    $selected = $selectid;
 		}
 		else
 		{
 			$sql = "SELECT rowid, code, label, nature, entity, active";
-			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
-			$sql.= " WHERE active = 1";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+			$sql .= " WHERE active = 1";
+			$sql .= " AND entity = ".$conf->entity;
 			//if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
-			$sql.= " ORDER BY code";
+			$sql .= " ORDER BY code";
 
-			dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
+			dol_syslog(get_class($this)."::select_journal", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 
 			if (!$resql) {
@@ -105,7 +105,7 @@ 
 			$langs->load('accountancy');
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$label = $obj->code . ' - ' . $langs->trans($obj->label);
+				$label = $obj->code.' - '.$langs->trans($obj->label);
 
     			$select_value_in = $obj->rowid;
 				$select_value_out = $obj->rowid;
@@ -133,7 +133,7 @@ 
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo?0:1));
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo ? 0 : 1));
 
 		return $out;
 	}
@@ -151,39 +151,39 @@ 
      *  @param  int     $allcountries   All countries
      * 	@return	void
      */
-    function select_accounting_category($selected='',$htmlname='account_category', $useempty=0, $maxlen=0, $help=1, $allcountries=0)
+    function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
     {
         // phpcs:enable
-        global $db,$langs,$user,$mysoc;
+        global $db, $langs, $user, $mysoc;
 
         if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))
         {
-            dol_print_error('','Call to select_accounting_account with mysoc country not yet defined');
+            dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
             exit;
         }
 
-        if (! empty($mysoc->country_id))
+        if (!empty($mysoc->country_id))
         {
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
-            $sql.= " WHERE c.active = 1";
-			$sql.= " AND c.category_type = 0";
-            if (empty($allcountries)) $sql.= " AND c.fk_country = ".$mysoc->country_id;
-            $sql.= " ORDER BY c.label ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
+            $sql .= " WHERE c.active = 1";
+			$sql .= " AND c.category_type = 0";
+            if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
+            $sql .= " ORDER BY c.label ASC";
         }
         else
         {
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql.= " WHERE c.active = 1";
-			$sql.= " AND c.category_type = 0";
-			$sql.= " AND c.fk_country = co.rowid";
-            if (empty($allcountries)) $sql.= " AND co.code = '".$mysoc->country_code."'";
-            $sql.= " ORDER BY c.label ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
+            $sql .= " WHERE c.active = 1";
+			$sql .= " AND c.category_type = 0";
+			$sql .= " AND c.fk_country = co.rowid";
+            if (empty($allcountries)) $sql .= " AND co.code = '".$mysoc->country_code."'";
+            $sql .= " ORDER BY c.label ASC";
         }
 
         dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $num = $db->num_rows($resql);
@@ -192,27 +192,27 @@ 
                 $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) $out.= '<option value="0">&nbsp;</option>';
+                if ($useempty) $out .= '<option value="0">&nbsp;</option>';
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     $out .= '<option value="'.$obj->rowid.'"';
                     if ($obj->rowid == $selected) $out .= ' selected';
-                    $out .= '>'.($maxlen ? dol_trunc($obj->type,$maxlen) : $obj->type);
+                    $out .= '>'.($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type);
 					$out .= ' ('.$obj->range_account.')';
                     $i++;
                 }
-                $out .=  '</select>';
+                $out .= '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
             }
             else
             {
-                $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry",$mysoc->country_code);
+                $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
             }
         }
         else
         {
-            dol_print_error($db,$db->lasterror());
+            dol_print_error($db, $db->lasterror());
         }
 
         $out .= ajax_combobox($htmlname, array());
@@ -233,17 +233,17 @@ 
         // phpcs:enable
 		$options = array();
 
-		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+		$sql = 'SELECT DISTINCT import_key from '.MAIN_DB_PREFIX.'accounting_bookkeeping';
 	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";
 		$sql .= ' ORDER BY import_key DESC';
 
-		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_bookkeeping_importkey", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if (!$resql) {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_bookkeeping_importkey ".$this->error, LOG_ERR);
+			return -1;
 		}
 
 		while ($obj = $this->db->fetch_object($resql)) {
@@ -267,46 +267,46 @@ 
 	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
 	 * @return string                      String with HTML select
 	 */
-	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '')
 	{
         // phpcs:enable
 		global $conf, $langs;
 
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		$out = '';
 
     	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
+		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
 		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
+		    $selected = $selectid;
 		}
 		else
 		{
     		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
     		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
-    		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-    		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-    		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+    		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+    		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+    		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
     		$sql .= " AND aa.active = 1";
     		$sql .= " AND aa.entity=".$conf->entity;
     		$sql .= " ORDER BY aa.account_number";
 
-    		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
+    		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
     		$resql = $this->db->query($sql);
 
     		if (!$resql) {
-    			$this->error = "Error " . $this->db->lasterror();
-    			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
+    			$this->error = "Error ".$this->db->lasterror();
+    			dol_syslog(get_class($this)."::select_account ".$this->error, LOG_ERR);
     			return -1;
     		}
 
     		$selected = 0;
     		while ($obj = $this->db->fetch_object($resql))
     		{
-    			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
+    			$label = length_accountg($obj->account_number).' - '.$obj->label;
     			$label = dol_trunc($label, $trunclength);
 
     			$select_value_in = $obj->rowid;
@@ -356,7 +356,7 @@ 
 	 * @param string   $morecss        More css
 	 * @return string                  String with HTML select
 	 */
-    function select_auxaccount($selectid, $htmlname='account_num_aux', $showempty=0, $morecss='maxwidth200')
+    function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200')
     {
         // phpcs:enable
 
@@ -365,7 +365,7 @@ 
 		// Auxiliary customer account
 		$sql = "SELECT DISTINCT code_compta, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
+	    $sql .= " WHERE entity IN (".getEntity('societe').")";
 		$sql .= " ORDER BY code_compta";
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -385,7 +385,7 @@ 
 		// Auxiliary supplier account
 		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE entity IN (" . getEntity('societe') . ")";
+		$sql .= " WHERE entity IN (".getEntity('societe').")";
 		$sql .= " ORDER BY code_compta_fournisseur";
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -427,7 +427,7 @@ 
 
 		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";
 		$sql .= " ORDER BY date_format(doc_date,'%Y')";
 		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);

Braces +17 added lines, -14 removed lines

@@ -82,8 +82,7 @@ 
 		{
 		    $options = $this->options_cache[$usecache];
 		    $selected=$selectid;
-		}
-		else
+		} else
 		{
 			$sql = "SELECT rowid, code, label, nature, entity, active";
 			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
@@ -168,17 +167,20 @@ 
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
             $sql.= " WHERE c.active = 1";
 			$sql.= " AND c.category_type = 0";
-            if (empty($allcountries)) $sql.= " AND c.fk_country = ".$mysoc->country_id;
+            if (empty($allcountries)) {
+                $sql.= " AND c.fk_country = ".$mysoc->country_id;
+            }
             $sql.= " ORDER BY c.label ASC";
-        }
-        else
+        } else
         {
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql.= " WHERE c.active = 1";
 			$sql.= " AND c.category_type = 0";
 			$sql.= " AND c.fk_country = co.rowid";
-            if (empty($allcountries)) $sql.= " AND co.code = '".$mysoc->country_code."'";
+            if (empty($allcountries)) {
+                $sql.= " AND co.code = '".$mysoc->country_code."'";
+            }
             $sql.= " ORDER BY c.label ASC";
         }
 
@@ -192,25 +194,27 @@ 
                 $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) $out.= '<option value="0">&nbsp;</option>';
+                if ($useempty) {
+                    $out.= '<option value="0">&nbsp;</option>';
+                }
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     $out .= '<option value="'.$obj->rowid.'"';
-                    if ($obj->rowid == $selected) $out .= ' selected';
+                    if ($obj->rowid == $selected) {
+                        $out .= ' selected';
+                    }
                     $out .= '>'.($maxlen ? dol_trunc($obj->type,$maxlen) : $obj->type);
 					$out .= ' ('.$obj->range_account.')';
                     $i++;
                 }
                 $out .=  '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            }
-            else
+            } else
             {
                 $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry",$mysoc->country_code);
             }
-        }
-        else
+        } else
         {
             dol_print_error($db,$db->lasterror());
         }
@@ -281,8 +285,7 @@ 
 		{
 		    $options = $this->options_cache[$usecache];
 		    $selected=$selectid;
-		}
-		else
+		} else
 		{
     		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 

dolibarr/htdocs/core/class/vcard.class.php

Spacing +34 added lines, -34 removed lines

@@ -30,7 +30,7 @@ 
  */
 function encode($string)
 {
-    return str_replace(";","\;",(dol_quoted_printable_encode(utf8_decode($string))));
+    return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
 }
 
 
@@ -42,9 +42,9 @@ 
  * @param	int		$line_max	Max length of lines
  * @return	string				Encoded string
  */
-function dol_quoted_printable_encode($input, $line_max=76)
+function dol_quoted_printable_encode($input, $line_max = 76)
 {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     $lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
     $eol = "\r\n";
     $linebreak = "=0D=0A";
@@ -57,23 +57,23 @@ 
         $line = $lines[$j];
         $linlen = strlen($line);
         $newline = "";
-        for($i = 0; $i < $linlen; $i++) {
+        for ($i = 0; $i < $linlen; $i++) {
             $c = substr($line, $i, 1);
             $dec = ord($c);
-            if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
+            if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
                 $c = "=20";
-            } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-                $h2 = floor($dec/16); $h1 = floor($dec%16);
+            } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+                $h2 = floor($dec / 16); $h1 = floor($dec % 16);
                 $c = $escape.$hex["$h2"].$hex["$h1"];
             }
-            if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+            if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
                 $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
                 $newline = "    ";
             }
             $newline .= $c;
         } // end of for
         $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
+        if ($j < count($lines) - 1) $output .= $linebreak;
     }
     return trim($output);
 }
@@ -88,7 +88,7 @@ 
     var $filename;
 
     //var $encoding="UTF-8";
-    var $encoding="ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
+    var $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
 
 
     /**
@@ -98,12 +98,12 @@ 
      *	@param	string	$type		Type
      *	@return	void
      */
-    function setPhoneNumber($number, $type="")
+    function setPhoneNumber($number, $type = "")
     {
         // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
         $key = "TEL";
-        if ($type!="") $key .= ";".$type;
-        $key.= ";CHARSET=".$this->encoding;
+        if ($type != "") $key .= ";".$type;
+        $key .= ";CHARSET=".$this->encoding;
         $this->properties[$key] = encode($number);
     }
 
@@ -142,7 +142,7 @@ 
      *	@param	string	$suffix			Suffix
      *	@return	void
      */
-    function setName($family="", $first="", $additional="", $prefix="", $suffix="")
+    function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
     {
         $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
         $this->filename = "$first%20$family.vcf";
@@ -174,12 +174,12 @@ 
      *	@param	string	$type			Type
      *	@return	void
      */
-    function setAddress($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
+    function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
     {
         // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
         $key = "ADR";
-        if ($type!="") $key.= ";$type";
-        $key.= ";CHARSET=".$this->encoding;
+        if ($type != "") $key .= ";$type";
+        $key .= ";CHARSET=".$this->encoding;
         $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
         if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
@@ -201,16 +201,16 @@ 
      *	@param	string	$type			Type
      *	@return	void
      */
-    function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
+    function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
     {
         $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
+        if ($postoffice != "") $label .= "$postoffice\r\n";
+        if ($extended != "") $label .= "$extended\r\n";
+        if ($street != "") $label .= "$street\r\n";
+        if ($zip != "") $label .= "$zip ";
+        if ($city != "") $label .= "$city\r\n";
+        if ($region != "") $label .= "$region\r\n";
+        if ($country != "") $country .= "$country\r\n";
 
         $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
     }
@@ -222,7 +222,7 @@ 
      *	@param	string	$type			Vcard type
      *	@return	void
      */
-    function setEmail($address,$type="internet,pref")
+    function setEmail($address, $type = "internet,pref")
     {
         $this->properties["EMAIL;TYPE=".$type] = $address;
     }
@@ -293,11 +293,11 @@ 
      *  @param	string	$type		Type
      *	@return	void
      */
-    function setURL($url, $type="")
+    function setURL($url, $type = "")
     {
         // $type may be WORK | HOME
         $key = "URL";
-        if ($type!="") $key.= ";$type";
+        if ($type != "") $key .= ";$type";
         $this->properties[$key] = $url;
     }
 
@@ -309,15 +309,15 @@ 
     function getVCard()
     {
         $text = "BEGIN:VCARD\r\n";
-        $text.= "VERSION:3.0\r\n";
+        $text .= "VERSION:3.0\r\n";
         //$text.= "VERSION:2.1\r\n";
-        foreach($this->properties as $key => $value)
+        foreach ($this->properties as $key => $value)
         {
-            $text.= "$key:$value\r\n";
+            $text .= "$key:$value\r\n";
         }
-        $text.= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
-        $text.= "MAILER: Dolibarr\r\n";
-        $text.= "END:VCARD\r\n";
+        $text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+        $text .= "MAILER: Dolibarr\r\n";
+        $text .= "END:VCARD\r\n";
         return $text;
     }
 

Braces +36 added lines, -12 removed lines

@@ -73,7 +73,9 @@ 
             $newline .= $c;
         } // end of for
         $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
+        if ($j<count($lines)-1) {
+            $output .= $linebreak;
+        }
     }
     return trim($output);
 }
@@ -102,7 +104,9 @@ 
     {
         // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
         $key = "TEL";
-        if ($type!="") $key .= ";".$type;
+        if ($type!="") {
+            $key .= ";".$type;
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = encode($number);
     }
@@ -146,7 +150,9 @@ 
     {
         $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
         $this->filename = "$first%20$family.vcf";
-        if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        if (empty($this->properties["FN"])) {
+            $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        }
     }
 
     /**
@@ -178,7 +184,9 @@ 
     {
         // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
         $key = "ADR";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+            $key.= ";$type";
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
@@ -204,13 +212,27 @@ 
     function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
     {
         $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
+        if ($postoffice!="") {
+            $label.= "$postoffice\r\n";
+        }
+        if ($extended!="") {
+            $label.= "$extended\r\n";
+        }
+        if ($street!="") {
+            $label.= "$street\r\n";
+        }
+        if ($zip!="") {
+            $label.= "$zip ";
+        }
+        if ($city!="") {
+            $label.= "$city\r\n";
+        }
+        if ($region!="") {
+            $label.= "$region\r\n";
+        }
+        if ($country!="") {
+            $country.= "$country\r\n";
+        }
 
         $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
     }
@@ -297,7 +319,9 @@ 
     {
         // $type may be WORK | HOME
         $key = "URL";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+            $key.= ";$type";
+        }
         $this->properties[$key] = $url;
     }
 

dolibarr/htdocs/core/class/commonstickergenerator.class.php

Indentation +192 added lines, -192 removed lines

@@ -61,226 +61,226 @@
  */
 abstract class CommonStickerGenerator
 {
-	public $code;   // Code of format
+    public $code;   // Code of format
 
-	/**
+    /**
      * @var array format Array with informations
      */
     public $format;
 
-	// protected
-	var $_Avery_Name	= '';	// Nom du format de l'etiquette
-	var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
-	var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
-	var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
-	var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
-	var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
-	var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
-	var $_Width 		= 0;	// Largeur de chaque etiquette
-	var $_Height 		= 0;	// Hauteur de chaque etiquette
-	var $_Char_Size	= 10;	// Hauteur des caracteres
-	var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
-	var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
-	var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
-	var $_COUNTX = 1;
-	var $_COUNTY = 1;
-	var $_First = 1;
-	var $Tformat;
+    // protected
+    var $_Avery_Name	= '';	// Nom du format de l'etiquette
+    var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
+    var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
+    var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
+    var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
+    var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
+    var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
+    var $_Width 		= 0;	// Largeur de chaque etiquette
+    var $_Height 		= 0;	// Hauteur de chaque etiquette
+    var $_Char_Size	= 10;	// Hauteur des caracteres
+    var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
+    var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
+    var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
+    var $_COUNTX = 1;
+    var $_COUNTY = 1;
+    var $_First = 1;
+    var $Tformat;
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Function to build PDF on disk, then output on HTTP strem.
-	 *
-	 *  @param	array		$arrayofrecords  	Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
-	 *  @param  Translate	$outputlangs     	Lang object for output language
-	 *  @param	string		$srctemplatepath	Full path of source filename for generator using a template file
-	 *	@param	string		$outputdir			Output directory for pdf file
-	 *  @return int             				1=OK, 0=KO
-	 */
-	abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
+    /**
+     *  Function to build PDF on disk, then output on HTTP strem.
+     *
+     *  @param	array		$arrayofrecords  	Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
+     *  @param  Translate	$outputlangs     	Lang object for output language
+     *  @param	string		$srctemplatepath	Full path of source filename for generator using a template file
+     *	@param	string		$outputdir			Output directory for pdf file
+     *  @return int             				1=OK, 0=KO
+     */
+    abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
     // phpcs:enable
 
-	/**
-	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
-	 *
-	 * @param   PDF         $pdf            PDF reference
-	 * @param   Translate  	$outputlangs    Output langs
-	 * @param   array     	$param          Associative array containing label content and optional parameters
-	 * @return  void
-	 */
-	abstract function addSticker(&$pdf,$outputlangs,$param);
+    /**
+     * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
+     *
+     * @param   PDF         $pdf            PDF reference
+     * @param   Translate  	$outputlangs    Output langs
+     * @param   array     	$param          Associative array containing label content and optional parameters
+     * @return  void
+     */
+    abstract function addSticker(&$pdf,$outputlangs,$param);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Methode qui permet de modifier la taille des caracteres
-	 * Cela modiera aussi l'espace entre chaque ligne
-	 *
-	 * @param    PDF        $pdf   PDF reference
-	 * @param    int        $pt    point
-	 * @return   void
-	 */
-	function Set_Char_Size(&$pdf,$pt)
-	{
+    /**
+     * Methode qui permet de modifier la taille des caracteres
+     * Cela modiera aussi l'espace entre chaque ligne
+     *
+     * @param    PDF        $pdf   PDF reference
+     * @param    int        $pt    point
+     * @return   void
+     */
+    function Set_Char_Size(&$pdf,$pt)
+    {
         // phpcs:enable
-		if ($pt > 3) {
-			$this->_Char_Size = $pt;
-			$this->_Line_Height = $this->_Get_Height_Chars($pt);
-			$pdf->SetFont('','',$pt);
-		}
-	}
+        if ($pt > 3) {
+            $this->_Char_Size = $pt;
+            $this->_Line_Height = $this->_Get_Height_Chars($pt);
+            $pdf->SetFont('','',$pt);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Print dot line
-	 *
-	 * @param	PDF     $pdf                PDF reference
-	 * @param 	int		$x1					X1
-	 * @param 	int		$y1					Y1
-	 * @param 	int		$x2					X2
-	 * @param 	int		$y2					Y2
-	 * @param 	int		$epaisseur			Epaisseur
-	 * @param 	int		$nbPointilles		Nb pointilles
-	 * @return	void
-	 */
+    /**
+     * protected Print dot line
+     *
+     * @param	PDF     $pdf                PDF reference
+     * @param 	int		$x1					X1
+     * @param 	int		$y1					Y1
+     * @param 	int		$x2					X2
+     * @param 	int		$y2					Y2
+     * @param 	int		$epaisseur			Epaisseur
+     * @param 	int		$nbPointilles		Nb pointilles
+     * @return	void
+     */
     function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15)
-	{
+    {
         // phpcs:enable
-		$pdf->SetLineWidth($epaisseur);
-		$length=abs($x1-$x2);
-		$hauteur=abs($y1-$y2);
-		if($length>$hauteur) {
-			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
-		}
-		else {
-			$Pointilles=($hauteur/$nbPointilles)/2;
-		}
-		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($x2-1)) {
-		$pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
-		$pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
-				}
-			}
-		}
-		for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($y2-1)) {
-		$pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
-		$pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
-				}
-			}
-		}
-	}
+        $pdf->SetLineWidth($epaisseur);
+        $length=abs($x1-$x2);
+        $hauteur=abs($y1-$y2);
+        if($length>$hauteur) {
+            $Pointilles=($length/$nbPointilles)/2; // taille des pointilles
+        }
+        else {
+            $Pointilles=($hauteur/$nbPointilles)/2;
+        }
+        for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
+            for($j=$i;$j<=($i+$Pointilles);$j++) {
+                if($j<=($x2-1)) {
+        $pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
+        $pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
+                }
+            }
+        }
+        for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
+            for($j=$i;$j<=($i+$Pointilles);$j++) {
+                if($j<=($y2-1)) {
+        $pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
+        $pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
+                }
+            }
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Function realisant une croix aux 4 coins des cartes
-	 *
-	 * @param PDF   $pdf                PDF reference
-	 * @param int   $x1					X1
-	 * @param int	$y1					Y1
-	 * @param int	$x2					X2
-	 * @param int	$y2					Y2
-	 * @param int	$epaisseur			Epaisseur
-	 * @param int	$taille             Size
-	 * @return void
-	 */
-	function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
-	{
+    /**
+     * protected Function realisant une croix aux 4 coins des cartes
+     *
+     * @param PDF   $pdf                PDF reference
+     * @param int   $x1					X1
+     * @param int	$y1					Y1
+     * @param int	$x2					X2
+     * @param int	$y2					Y2
+     * @param int	$epaisseur			Epaisseur
+     * @param int	$taille             Size
+     * @return void
+     */
+    function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
+    {
         // phpcs:enable
-		$pdf->SetDrawColor(192,192,192);
+        $pdf->SetDrawColor(192,192,192);
 
-		$pdf->SetLineWidth($epaisseur);
-		$lg=$taille/2;
-		// croix haut gauche
-		$pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
-		$pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
-		// croix bas gauche
-		$pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
-		$pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
-		// croix haut droit
-		$pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
-		$pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
-		// croix bas droit
-		$pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
-		$pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
+        $pdf->SetLineWidth($epaisseur);
+        $lg=$taille/2;
+        // croix haut gauche
+        $pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
+        $pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
+        // croix bas gauche
+        $pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
+        $pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
+        // croix haut droit
+        $pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
+        $pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
+        // croix bas droit
+        $pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
+        $pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
 
-		$pdf->SetDrawColor(0,0,0);
-	}
+        $pdf->SetDrawColor(0,0,0);
+    }
 
-	/**
-	 * Convert units (in to mm, mm to in)
-	 * $src and $dest must be 'in' or 'mm'
-	 *
-	 * @param int       $value  value
-	 * @param string    $src    from ('in' or 'mm')
-	 * @param string    $dest   to ('in' or 'mm')
-	 * @return float    value   value after conversion
-	 */
-	private function convertMetric($value, $src, $dest)
-	{
-		if ($src != $dest) {
-			$tab = array(
-				'in'=>39.37008,
-				'mm'=>1000
-			);
-			return $value * $tab[$dest] / $tab[$src];
-		}
+    /**
+     * Convert units (in to mm, mm to in)
+     * $src and $dest must be 'in' or 'mm'
+     *
+     * @param int       $value  value
+     * @param string    $src    from ('in' or 'mm')
+     * @param string    $dest   to ('in' or 'mm')
+     * @return float    value   value after conversion
+     */
+    private function convertMetric($value, $src, $dest)
+    {
+        if ($src != $dest) {
+            $tab = array(
+                'in'=>39.37008,
+                'mm'=>1000
+            );
+            return $value * $tab[$dest] / $tab[$src];
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Give the height for a char size given.
-	 *
-	 * @param  int    $pt    Point
-	 * @return int           Height chars
-	 */
-	function _Get_Height_Chars($pt)
-	{
+    /**
+     * protected Give the height for a char size given.
+     *
+     * @param  int    $pt    Point
+     * @return int           Height chars
+     */
+    function _Get_Height_Chars($pt)
+    {
         // phpcs:enable
-		// Tableau de concordance entre la hauteur des caracteres et de l'espacement entre les lignes
-		$_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10);
-		if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
-			return $_Table_Hauteur_Chars[$pt];
-		} else {
-			return 100; // There is a prob..
-		}
-	}
+        // Tableau de concordance entre la hauteur des caracteres et de l'espacement entre les lignes
+        $_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10);
+        if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
+            return $_Table_Hauteur_Chars[$pt];
+        } else {
+            return 100; // There is a prob..
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Set format
-	 *
-	 * @param    PDF       $pdf     PDF reference
-	 * @param    string    $format  Format
-	 * @return   void
-	 */
-	function _Set_Format(&$pdf, $format)
-	{
+    /**
+     * protected Set format
+     *
+     * @param    PDF       $pdf     PDF reference
+     * @param    string    $format  Format
+     * @return   void
+     */
+    function _Set_Format(&$pdf, $format)
+    {
         // phpcs:enable
-		$this->_Metric = $format['metric'];
-		$this->_Avery_Name = $format['name'];
-		$this->_Avery_Code = $format['code'];
-		$this->_Margin_Left	= $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
-		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
-		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
-		$this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);
-		$this->_X_Number = $format['NX'];
-		$this->_Y_Number = $format['NY'];
-		$this->_Width = $this->convertMetric($format['width'], $this->_Metric, $this->_Metric_Doc);
-		$this->_Height = $this->convertMetric($format['height'], $this->_Metric, $this->_Metric_Doc);
-		$this->Set_Char_Size($pdf, $format['font-size']);
-	}
+        $this->_Metric = $format['metric'];
+        $this->_Avery_Name = $format['name'];
+        $this->_Avery_Code = $format['code'];
+        $this->_Margin_Left	= $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
+        $this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
+        $this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
+        $this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);
+        $this->_X_Number = $format['NX'];
+        $this->_Y_Number = $format['NY'];
+        $this->_Width = $this->convertMetric($format['width'], $this->_Metric, $this->_Metric_Doc);
+        $this->_Height = $this->convertMetric($format['height'], $this->_Metric, $this->_Metric_Doc);
+        $this->Set_Char_Size($pdf, $format['font-size']);
+    }
 }

Spacing +47 added lines, -47 removed lines

@@ -61,7 +61,7 @@ 
  */
 abstract class CommonStickerGenerator
 {
-	public $code;   // Code of format
+	public $code; // Code of format
 
 	/**
      * @var array format Array with informations
@@ -69,19 +69,19 @@ 
     public $format;
 
 	// protected
-	var $_Avery_Name	= '';	// Nom du format de l'etiquette
-	var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
-	var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
-	var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
-	var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
-	var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
-	var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
-	var $_Width 		= 0;	// Largeur de chaque etiquette
-	var $_Height 		= 0;	// Hauteur de chaque etiquette
-	var $_Char_Size	= 10;	// Hauteur des caracteres
-	var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
-	var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
-	var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
+	var $_Avery_Name	= ''; // Nom du format de l'etiquette
+	var $_Margin_Left = 0; // Marge de gauche de l'etiquette
+	var $_Margin_Top	= 0; // marge en haut de la page avant la premiere etiquette
+	var $_X_Space 	= 0; // Espace horizontal entre 2 bandes d'etiquettes
+	var $_Y_Space 	= 0; // Espace vertical entre 2 bandes d'etiquettes
+	var $_X_Number 	= 0; // NX Nombre d'etiquettes sur la largeur de la page
+	var $_Y_Number 	= 0; // NY Nombre d'etiquettes sur la hauteur de la page
+	var $_Width = 0; // Largeur de chaque etiquette
+	var $_Height 		= 0; // Hauteur de chaque etiquette
+	var $_Char_Size	= 10; // Hauteur des caracteres
+	var $_Line_Height	= 10; // Hauteur par defaut d'une ligne
+	var $_Metric 		= 'mm'; // Type of metric.. Will help to calculate good values
+	var $_Metric_Doc 	= 'mm'; // Type of metric for the doc..
 	var $_COUNTX = 1;
 	var $_COUNTY = 1;
 	var $_First = 1;
@@ -107,7 +107,7 @@ 
 	 *	@param	string		$outputdir			Output directory for pdf file
 	 *  @return int             				1=OK, 0=KO
 	 */
-	abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
+	abstract function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');
     // phpcs:enable
 
 	/**
@@ -118,7 +118,7 @@ 
 	 * @param   array     	$param          Associative array containing label content and optional parameters
 	 * @return  void
 	 */
-	abstract function addSticker(&$pdf,$outputlangs,$param);
+	abstract function addSticker(&$pdf, $outputlangs, $param);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	/**
@@ -129,13 +129,13 @@ 
 	 * @param    int        $pt    point
 	 * @return   void
 	 */
-	function Set_Char_Size(&$pdf,$pt)
+	function Set_Char_Size(&$pdf, $pt)
 	{
         // phpcs:enable
 		if ($pt > 3) {
 			$this->_Char_Size = $pt;
 			$this->_Line_Height = $this->_Get_Height_Chars($pt);
-			$pdf->SetFont('','',$pt);
+			$pdf->SetFont('', '', $pt);
 		}
 	}
 
@@ -152,31 +152,31 @@ 
 	 * @param 	int		$nbPointilles		Nb pointilles
 	 * @return	void
 	 */
-    function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15)
+    function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)
 	{
         // phpcs:enable
 		$pdf->SetLineWidth($epaisseur);
-		$length=abs($x1-$x2);
-		$hauteur=abs($y1-$y2);
-		if($length>$hauteur) {
-			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
+		$length = abs($x1 - $x2);
+		$hauteur = abs($y1 - $y2);
+		if ($length > $hauteur) {
+			$Pointilles = ($length / $nbPointilles) / 2; // taille des pointilles
 		}
 		else {
-			$Pointilles=($hauteur/$nbPointilles)/2;
+			$Pointilles = ($hauteur / $nbPointilles) / 2;
 		}
-		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($x2-1)) {
-		$pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
-		$pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
+		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
+			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
+				if ($j <= ($x2 - 1)) {
+		$pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point
+		$pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
-		for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($y2-1)) {
-		$pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
-		$pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
+		for ($i = $y1; $i <= $y2; $i += $Pointilles + $Pointilles) {
+			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
+				if ($j <= ($y2 - 1)) {
+		$pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point
+		$pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
@@ -195,27 +195,27 @@ 
 	 * @param int	$taille             Size
 	 * @return void
 	 */
-	function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
+	function _Croix(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $taille = 4)
 	{
         // phpcs:enable
-		$pdf->SetDrawColor(192,192,192);
+		$pdf->SetDrawColor(192, 192, 192);
 
 		$pdf->SetLineWidth($epaisseur);
-		$lg=$taille/2;
+		$lg = $taille / 2;
 		// croix haut gauche
-		$pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
-		$pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
+		$pdf->Line($x1, $y1 - $lg, $x1, $y1 + $lg);
+		$pdf->Line($x1 - $lg, $y1, $x1 + $lg, $y1);
 		// croix bas gauche
-		$pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
-		$pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
+		$pdf->Line($x1, $y2 - $lg, $x1, $y2 + $lg);
+		$pdf->Line($x1 - $lg, $y2, $x1 + $lg, $y2);
 		// croix haut droit
-		$pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
-		$pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
+		$pdf->Line($x2, $y1 - $lg, $x2, $y1 + $lg);
+		$pdf->Line($x2 - $lg, $y1, $x2 + $lg, $y1);
 		// croix bas droit
-		$pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
-		$pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
+		$pdf->Line($x2, $y2 - $lg, $x2, $y2 + $lg);
+		$pdf->Line($x2 - $lg, $y2, $x2 + $lg, $y2);
 
-		$pdf->SetDrawColor(0,0,0);
+		$pdf->SetDrawColor(0, 0, 0);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 		$this->_Metric = $format['metric'];
 		$this->_Avery_Name = $format['name'];
 		$this->_Avery_Code = $format['code'];
-		$this->_Margin_Left	= $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
+		$this->_Margin_Left = $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
 		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
 		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
 		$this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);

Braces +1 added lines, -2 removed lines

@@ -160,8 +160,7 @@
 		$hauteur=abs($y1-$y2);
 		if($length>$hauteur) {
 			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
-		}
-		else {
+		} else {
 			$Pointilles=($hauteur/$nbPointilles)/2;
 		}
 		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {

dolibarr/htdocs/core/class/html.formsocialcontrib.class.php

Indentation +15 added lines, -15 removed lines

@@ -27,26 +27,26 @@ 
  */
 class FormSocialContrib
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
-	/**
-	* Constructor
-	*
-	* @param		DoliDB		$db      Database handler
-	*/
-	public function __construct($db)
-	{
-	    $this->db = $db;
-	}
+    /**
+     * Constructor
+     *
+     * @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -96,7 +96,7 @@ 
             $num = $db->num_rows($resql);
             if ($num)
             {
-            	print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+                print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
                 if ($useempty) print '<option value="0">&nbsp;</option>';

Spacing +20 added lines, -20 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -61,42 +61,42 @@ 
      *  @param	string	$morecss		Add more CSS on select
      * 	@return	void
      */
-    function select_type_socialcontrib($selected='',$htmlname='actioncode', $useempty=0, $maxlen=40, $help=1, $morecss='minwidth300')
+    function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300')
     {
         // phpcs:enable
-        global $conf,$db,$langs,$user,$mysoc;
+        global $conf, $db, $langs, $user, $mysoc;
 
         if (empty($mysoc->country_id) && empty($mysoc->country_code))
         {
-            dol_print_error('','Call to select_type_socialcontrib with mysoc country not yet defined');
+            dol_print_error('', 'Call to select_type_socialcontrib with mysoc country not yet defined');
             exit;
         }
 
-        if (! empty($mysoc->country_id))
+        if (!empty($mysoc->country_id))
         {
             $sql = "SELECT c.id, c.libelle as type";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-            $sql.= " WHERE c.active = 1";
-            $sql.= " AND c.fk_pays = ".$mysoc->country_id;
-            $sql.= " ORDER BY c.libelle ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+            $sql .= " WHERE c.active = 1";
+            $sql .= " AND c.fk_pays = ".$mysoc->country_id;
+            $sql .= " ORDER BY c.libelle ASC";
         }
         else
         {
             $sql = "SELECT c.id, c.libelle as type";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql.= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
-            $sql.= " AND co.code = '".$mysoc->country_code."'";
-            $sql.= " ORDER BY c.libelle ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
+            $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
+            $sql .= " AND co.code = '".$mysoc->country_code."'";
+            $sql .= " ORDER BY c.libelle ASC";
         }
 
         dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $num = $db->num_rows($resql);
             if ($num)
             {
-            	print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+            	print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
                 if ($useempty) print '<option value="0">&nbsp;</option>';
@@ -105,21 +105,21 @@ 
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
                     if ($obj->id == $selected) print ' selected';
-                    print '>'.dol_trunc($obj->type,$maxlen);
+                    print '>'.dol_trunc($obj->type, $maxlen);
                     $i++;
                 }
                 print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-                if (! empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
+                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+                if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
             }
             else
             {
-                print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
+                print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
             }
         }
         else
         {
-            dol_print_error($db,$db->lasterror());
+            dol_print_error($db, $db->lasterror());
         }
     }
 }

Braces +15 added lines, -10 removed lines

@@ -79,8 +79,7 @@ 
             $sql.= " WHERE c.active = 1";
             $sql.= " AND c.fk_pays = ".$mysoc->country_id;
             $sql.= " ORDER BY c.libelle ASC";
-        }
-        else
+        } else
         {
             $sql = "SELECT c.id, c.libelle as type";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
@@ -99,25 +98,31 @@ 
             	print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) print '<option value="0">&nbsp;</option>';
+                if ($useempty) {
+                    print '<option value="0">&nbsp;</option>';
+                }
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
-                    if ($obj->id == $selected) print ' selected';
+                    if ($obj->id == $selected) {
+                        print ' selected';
+                    }
                     print '>'.dol_trunc($obj->type,$maxlen);
                     $i++;
                 }
                 print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-                if (! empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
-            }
-            else
+                if ($user->admin && $help) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+                }
+                if (! empty($conf->use_javascript_ajax)) {
+                    print ajax_combobox($htmlname);
+                }
+            } else
             {
                 print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
             }
-        }
-        else
+        } else
         {
             dol_print_error($db,$db->lasterror());
         }

dolibarr/htdocs/core/class/ccountry.class.php

Indentation +179 added lines, -179 removed lines

@@ -32,38 +32,38 @@ 
  */
 class Ccountry // extends CommonObject
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
-	//var $element='ccountry';			//!< Id that identify managed objects
-	//var $table_element='ccountry';	//!< Name of table without prefix where object is stored
+    //var $element='ccountry';			//!< Id that identify managed objects
+    //var $table_element='ccountry';	//!< Name of table without prefix where object is stored
 
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
-	public $code;
-	public $code_iso;
+    public $code;
+    public $code_iso;
 
-	/**
+    /**
      * @var string Countries label
      */
     public $label;
 
-	public $active;
+    public $active;
 
 
 
@@ -88,73 +88,73 @@ 
      */
     function create($user, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+        // Clean parameters
+        if (isset($this->code)) $this->code=trim($this->code);
+        if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
+        if (isset($this->label)) $this->label=trim($this->label);
+        if (isset($this->active)) $this->active=trim($this->active);
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
-		$sql.= "rowid,";
-		$sql.= "code,";
-		$sql.= "code_iso,";
-		$sql.= "label,";
-		$sql.= "active";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
+        $sql.= "rowid,";
+        $sql.= "code,";
+        $sql.= "code_iso,";
+        $sql.= "label,";
+        $sql.= "active";
         $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
-		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+        $sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
+        $sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
+        $sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
+        $sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
+        $sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
+        $sql.= ")";
 
-		$this->db->begin();
+        $this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
-		if (! $error)
+        if (! $error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
 
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-			}
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
         }
 
         // Commit or rollback
         if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
             return $this->id;
-		}
+        }
     }
 
 
@@ -167,18 +167,18 @@ 
      */
     function fetch($id,$code='')
     {
-    	global $langs;
+        global $langs;
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code,";
-		$sql.= " t.code_iso,";
-		$sql.= " t.label,";
-		$sql.= " t.active";
+        $sql.= " t.rowid,";
+        $sql.= " t.code,";
+        $sql.= " t.code_iso,";
+        $sql.= " t.label,";
+        $sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
         if ($id)   $sql.= " WHERE t.rowid = ".$id;
         elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -187,10 +187,10 @@ 
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id    = $obj->rowid;
-				$this->code = $obj->code;
-				$this->code_iso = $obj->code_iso;
-				$this->label = $obj->label;
-				$this->active = $obj->active;
+                $this->code = $obj->code;
+                $this->code_iso = $obj->code_iso;
+                $this->label = $obj->label;
+                $this->active = $obj->active;
 
                 $this->db->free($resql);
                 return 1;
@@ -201,7 +201,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+                $this->error="Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -216,120 +216,120 @@ 
      */
     function update($user=null, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+        // Clean parameters
+        if (isset($this->code)) $this->code=trim($this->code);
+        if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
+        if (isset($this->label)) $this->label=trim($this->label);
+        if (isset($this->active)) $this->active=trim($this->active);
 
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").",";
-		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
+        $sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
+        $sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").",";
+        $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
+        $sql.= " active=".(isset($this->active)?$this->active:"null")."";
         $sql.= " WHERE rowid=".$this->id;
 
-		$this->db->begin();
+        $this->db->begin();
 
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
-		}
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
     }
 
 
- 	/**
- 	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
-		$sql.= " WHERE rowid=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action call a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
-			}
-		}
+        /**
+         *  Delete object in database
+         *
+         *	@param  User	$user        User that delete
+         *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+         *  @return	int					 <0 if KO, >0 if OK
+         */
+    function delete($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
+        $sql.= " WHERE rowid=".$this->id;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
 }

Spacing +64 added lines, -64 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -86,46 +86,46 @@ 
      *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return     int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
-		$sql.= "rowid,";
-		$sql.= "code,";
-		$sql.= "code_iso,";
-		$sql.= "label,";
-		$sql.= "active";
-        $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
-		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+		$sql .= "rowid,";
+		$sql .= "code,";
+		$sql .= "code_iso,";
+		$sql .= "label,";
+		$sql .= "active";
+        $sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->code_iso) ? 'NULL' : "'".$this->db->escape($this->code_iso)."'").",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -142,13 +142,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -165,28 +165,28 @@ 
      *  @param		string	$code	Code
      *  @return     int          	>0 if OK, 0 if not found, <0 if KO
      */
-    function fetch($id,$code='')
+    function fetch($id, $code = '')
     {
     	global $langs;
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code,";
-		$sql.= " t.code_iso,";
-		$sql.= " t.label,";
-		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.code_iso,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
+        if ($id)   $sql .= " WHERE t.rowid = ".$id;
+        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
+                $this->id = $obj->rowid;
 				$this->code = $obj->code;
 				$this->code_iso = $obj->code_iso;
 				$this->label = $obj->label;
@@ -201,7 +201,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -214,16 +214,16 @@ 
      *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return     int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 
 		// Check parameters
@@ -231,21 +231,21 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").",";
-		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " code_iso=".(isset($this->code_iso) ? "'".$this->db->escape($this->code_iso)."'" : "null").",";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -262,13 +262,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -285,23 +285,23 @@ 
      *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -318,13 +318,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{

Braces +34 added lines, -20 removed lines

@@ -92,10 +92,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+		    $this->code_iso=trim($this->code_iso);
+		}
+		if (isset($this->label)) {
+		    $this->label=trim($this->label);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -149,8 +157,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -175,8 +182,11 @@ 
 		$sql.= " t.label,";
 		$sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        if ($id) {
+            $sql.= " WHERE t.rowid = ".$id;
+        } elseif ($code) {
+            $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        }
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -194,12 +204,10 @@ 
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -220,10 +228,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+		    $this->code_iso=trim($this->code_iso);
+		}
+		if (isset($this->label)) {
+		    $this->label=trim($this->label);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
 
 
 		// Check parameters
@@ -269,8 +285,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -325,8 +340,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

dolibarr/htdocs/core/class/commondocgenerator.class.php

Indentation +490 added lines, -490 removed lines

@@ -34,27 +34,27 @@ 
  */
 abstract class CommonDocGenerator
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     /**
      * @var string[]    Array of error strings
      */
     public $errors = array();
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
-	protected $db;
+    protected $db;
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	*/
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
     public function __construct($db)
     {
         $this->db = $db;
@@ -82,18 +82,18 @@ 
             'myuser_fullname'=>$user->getFullName($outputlangs,1),
             'myuser_login'=>$user->login,
             'myuser_phone'=>$user->office_phone,
-       		'myuser_address'=>$user->address,
-       		'myuser_zip'=>$user->zip,
-       		'myuser_town'=>$user->town,
-       		'myuser_country'=>$user->country,
-        	'myuser_country_code'=>$user->country_code,
-       		'myuser_state'=>$user->state,
-        	'myuser_state_code'=>$user->state_code,
-        	'myuser_fax'=>$user->office_fax,
+                'myuser_address'=>$user->address,
+                'myuser_zip'=>$user->zip,
+                'myuser_town'=>$user->town,
+                'myuser_country'=>$user->country,
+            'myuser_country_code'=>$user->country_code,
+                'myuser_state'=>$user->state,
+            'myuser_state_code'=>$user->state_code,
+            'myuser_fax'=>$user->office_fax,
             'myuser_mobile'=>$user->user_mobile,
             'myuser_email'=>$user->email,
-        	'myuser_logo'=>$logotouse,
-        	'myuser_job'=>$user->job,
+            'myuser_logo'=>$logotouse,
+            'myuser_job'=>$user->job,
             'myuser_web'=>''	// url not exist in $user object
         );
     }
@@ -118,11 +118,11 @@ 
         }
         if (empty($mysoc->country) && ! empty($mysoc->country_code))
         {
-        	$mysoc->country=$outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
+            $mysoc->country=$outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
         }
         if (empty($mysoc->state) && ! empty($mysoc->state_code))
         {
-        	$mysoc->state=getState($mysoc->state_code,0);
+            $mysoc->state=getState($mysoc->state_code,0);
         }
 
         $logotouse=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
@@ -140,7 +140,7 @@ 
             'mycompany_country_code'=>$mysoc->country_code,
             'mycompany_state'=>$mysoc->state,
             'mycompany_state_code'=>$mysoc->state_code,
-        	'mycompany_web'=>$mysoc->url,
+            'mycompany_web'=>$mysoc->url,
             'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
             'mycompany_managers'=>$mysoc->managers,
             'mycompany_capital'=>$mysoc->capital,
@@ -151,8 +151,8 @@ 
             'mycompany_idprof4'=>$mysoc->idprof4,
             'mycompany_idprof5'=>$mysoc->idprof5,
             'mycompany_idprof6'=>$mysoc->idprof6,
-        	'mycompany_vatnumber'=>$mysoc->tva_intra,
-			'mycompany_object'=>$mysoc->object,
+            'mycompany_vatnumber'=>$mysoc->tva_intra,
+            'mycompany_object'=>$mysoc->object,
             'mycompany_note_private'=>$mysoc->note_private,
             //'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
         );
@@ -174,16 +174,16 @@ 
 
         if (empty($object->country) && ! empty($object->country_code))
         {
-        	$object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code);
+            $object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code);
         }
         if (empty($object->state) && ! empty($object->state_code))
         {
-        	$object->state=getState($object->state_code,0);
+            $object->state=getState($object->state_code,0);
         }
 
         $array_thirdparty = array(
             'company_name'=>$object->name,
-	        'company_name_alias' => $object->name_alias,
+            'company_name_alias' => $object->name_alias,
             'company_email'=>$object->email,
             'company_phone'=>$object->phone,
             'company_fax'=>$object->fax,
@@ -191,10 +191,10 @@ 
             'company_zip'=>$object->zip,
             'company_town'=>$object->town,
             'company_country'=>$object->country,
-        	'company_country_code'=>$object->country_code,
+            'company_country_code'=>$object->country_code,
             'company_state'=>$object->state,
-        	'company_state_code'=>$object->state_code,
-        	'company_web'=>$object->url,
+            'company_state_code'=>$object->state_code,
+            'company_web'=>$object->url,
             'company_barcode'=>$object->barcode,
             'company_vatnumber'=>$object->tva_intra,
             'company_customercode'=>$object->code_client,
@@ -219,52 +219,52 @@ 
         // Retrieve extrafields
         if(is_array($object->array_options) && count($object->array_options))
         {
-        	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        	$extrafields = new ExtraFields($this->db);
-        	$extralabels = $extrafields->fetch_name_optionals_label('societe',true);
-        	$object->fetch_optionals();
-
-        	foreach($extrafields->attribute_label as $key=>$label)
-        	{
-        		if($extrafields->attribute_type[$key] == 'price')
-        		{
-        			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
-        		}
-        		else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
-        		{
-        			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
-        		}
-        		$array_thirdparty = array_merge($array_thirdparty, array ('company_options_'.$key => $object->array_options ['options_' . $key]));
-			}
-		}
-		return $array_thirdparty;
-	}
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $extralabels = $extrafields->fetch_name_optionals_label('societe',true);
+            $object->fetch_optionals();
+
+            foreach($extrafields->attribute_label as $key=>$label)
+            {
+                if($extrafields->attribute_type[$key] == 'price')
+                {
+                    $object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
+                }
+                else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+                {
+                    $object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
+                }
+                $array_thirdparty = array_merge($array_thirdparty, array ('company_options_'.$key => $object->array_options ['options_' . $key]));
+            }
+        }
+        return $array_thirdparty;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define array with couple subtitution key => subtitution value
-	 *
-	 * @param	Contact 	$object        	contact
-	 * @param	Translate 	$outputlangs   	object for output
-	 * @param   array		$array_key	    Name of the key for return array
-	 * @return	array 						Array of substitution key->code
-	 */
+    /**
+     * Define array with couple subtitution key => subtitution value
+     *
+     * @param	Contact 	$object        	contact
+     * @param	Translate 	$outputlangs   	object for output
+     * @param   array		$array_key	    Name of the key for return array
+     * @return	array 						Array of substitution key->code
+     */
     function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')
     {
         // phpcs:enable
-		global $conf;
-
-		if(empty($object->country) && ! empty($object->country_code))
-		{
-			$object->country = $outputlangs->transnoentitiesnoconv("Country" . $object->country_code);
-		}
-		if(empty($object->state) && ! empty($object->state_code))
-		{
-			$object->state = getState($object->state_code, 0);
-		}
-
-		$array_contact = array (
-		    $array_key . '_fullname' => $object->getFullName($outputlangs, 1),
+        global $conf;
+
+        if(empty($object->country) && ! empty($object->country_code))
+        {
+            $object->country = $outputlangs->transnoentitiesnoconv("Country" . $object->country_code);
+        }
+        if(empty($object->state) && ! empty($object->state_code))
+        {
+            $object->state = getState($object->state_code, 0);
+        }
+
+        $array_contact = array (
+            $array_key . '_fullname' => $object->getFullName($outputlangs, 1),
             $array_key . '_lastname' => $object->lastname,
             $array_key . '_firstname' => $object->firstname,
             $array_key . '_address' => $object->address,
@@ -290,28 +290,28 @@ 
             $array_key . '_default_lang' => $object->default_lang,
             $array_key . '_note_public' => $object->note_public,
             $array_key . '_note_private' => $object->note_private
-		);
-
-		// Retrieve extrafields
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
-		$object->fetch_optionals();
-
-		foreach($extrafields->attribute_label as $key => $label)
-		{
-			if ($extrafields->attribute_type[$key] == 'price')
-			{
-				$object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
-			}
-			elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
-			{
-				$object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
-			}
-			$array_contact = array_merge($array_contact, array($array_key.'_options_' . $key => $object->array_options['options_'. $key]));
-		}
-		return $array_contact;
-	}
+        );
+
+        // Retrieve extrafields
+        require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+        $extrafields = new ExtraFields($this->db);
+        $extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
+        $object->fetch_optionals();
+
+        foreach($extrafields->attribute_label as $key => $label)
+        {
+            if ($extrafields->attribute_type[$key] == 'price')
+            {
+                $object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
+            }
+            elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+            {
+                $object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
+            }
+            $array_contact = array_merge($array_contact, array($array_key.'_options_' . $key => $object->array_options['options_'. $key]));
+        }
+        return $array_contact;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -324,260 +324,260 @@ 
     function get_substitutionarray_other($outputlangs)
     {
         // phpcs:enable
-    	global $conf;
-
-    	$now=dol_now('gmt');	// gmt
-    	$array_other = array(
-    	    // Date in default language
-    	    'current_date'=>dol_print_date($now,'day','tzuser'),
-    	    'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
-   			'current_server_date'=>dol_print_date($now,'day','tzserver'),
-   			'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'),
-    	    // Date in requested output language
-    	    'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs),
-   			'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs),
-   			'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs),
-   			'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
-    	);
-
-
-    	foreach($conf->global as $key => $val)
-    	{
-    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
-    		else $newval = $val;
-    		$array_other['__['.$key.']__'] = $newval;
-    	}
-
-    	return $array_other;
+        global $conf;
+
+        $now=dol_now('gmt');	// gmt
+        $array_other = array(
+            // Date in default language
+            'current_date'=>dol_print_date($now,'day','tzuser'),
+            'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
+                'current_server_date'=>dol_print_date($now,'day','tzserver'),
+                'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'),
+            // Date in requested output language
+            'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs),
+                'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs),
+                'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs),
+                'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
+        );
+
+
+        foreach($conf->global as $key => $val)
+        {
+            if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
+            else $newval = $val;
+            $array_other['__['.$key.']__'] = $newval;
+        }
+
+        return $array_other;
     }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define array with couple substitution key => substitution value
-	 *
-	 * @param   Object			$object             Main object to use as data source
-	 * @param   Translate		$outputlangs        Lang object to use for output
+    /**
+     * Define array with couple substitution key => substitution value
+     *
+     * @param   Object			$object             Main object to use as data source
+     * @param   Translate		$outputlangs        Lang object to use for output
      * @param   string		    $array_key	        Name of the key for return array
-	 * @return	array								Array of substitution
-	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
-	{
+     * @return	array								Array of substitution
+     */
+    function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+    {
         // phpcs:enable
-		global $conf;
-
-		$sumpayed=$sumdeposit=$sumcreditnote='';
-		if ($object->element == 'facture')
-		{
-			$invoice_source=new Facture($this->db);
-			if ($object->fk_facture_source > 0)
-			{
-				$invoice_source->fetch($object->fk_facture_source);
-			}
-			$sumpayed = $object->getSommePaiement();
-			$sumdeposit = $object->getSumDepositsUsed();
-			$sumcreditnote = $object->getSumCreditNotesUsed();
-		}
-
-		$date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
-
-		$resarray=array(
-		$array_key.'_id'=>$object->id,
-		$array_key.'_ref'=>$object->ref,
-		$array_key.'_ref_ext'=>$object->ref_ext,
-		$array_key.'_ref_customer'=>(! empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
-		$array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
-		$array_key.'_source_invoice_ref'=>$invoice_source->ref,
-		// Dates
+        global $conf;
+
+        $sumpayed=$sumdeposit=$sumcreditnote='';
+        if ($object->element == 'facture')
+        {
+            $invoice_source=new Facture($this->db);
+            if ($object->fk_facture_source > 0)
+            {
+                $invoice_source->fetch($object->fk_facture_source);
+            }
+            $sumpayed = $object->getSommePaiement();
+            $sumdeposit = $object->getSumDepositsUsed();
+            $sumcreditnote = $object->getSumCreditNotesUsed();
+        }
+
+        $date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
+
+        $resarray=array(
+        $array_key.'_id'=>$object->id,
+        $array_key.'_ref'=>$object->ref,
+        $array_key.'_ref_ext'=>$object->ref_ext,
+        $array_key.'_ref_customer'=>(! empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
+        $array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
+        $array_key.'_source_invoice_ref'=>$invoice_source->ref,
+        // Dates
         $array_key.'_hour'=>dol_print_date($date,'hour'),
-		$array_key.'_date'=>dol_print_date($date,'day'),
-		$array_key.'_date_rfc'=>dol_print_date($date,'dayrfc'),
-		$array_key.'_date_limit'=>(! empty($object->date_lim_reglement)?dol_print_date($object->date_lim_reglement,'day'):''),
-	    $array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''),
-		$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
-		$array_key.'_date_modification'=>(! empty($object->date_modification)?dol_print_date($object->date_modification,'day'):''),
-		$array_key.'_date_validation'=>(! empty($object->date_validation)?dol_print_date($object->date_validation,'dayhour'):''),
-		$array_key.'_date_delivery_planed'=>(! empty($object->date_livraison)?dol_print_date($object->date_livraison,'day'):''),
-		$array_key.'_date_close'=>(! empty($object->date_cloture)?dol_print_date($object->date_cloture,'dayhour'):''),
-
-		$array_key.'_payment_mode_code'=>$object->mode_reglement_code,
-		$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
-		$array_key.'_payment_term_code'=>$object->cond_reglement_code,
-		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):($object->cond_reglement_doc?$object->cond_reglement_doc:$object->cond_reglement)),
-
-		$array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
-		$array_key.'_total_vat_locale'=>(! empty($object->total_vat)?price($object->total_vat, 0, $outputlangs):price($object->total_tva, 0, $outputlangs)),
-		$array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
-		$array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
-		$array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
-
-		$array_key.'_total_ht'=>price2num($object->total_ht),
-		$array_key.'_total_vat'=>(! empty($object->total_vat)?price2num($object->total_vat):price2num($object->total_tva)),
-		$array_key.'_total_localtax1'=>price2num($object->total_localtax1),
-		$array_key.'_total_localtax2'=>price2num($object->total_localtax2),
-		$array_key.'_total_ttc'=>price2num($object->total_ttc),
-
-		$array_key.'_multicurrency_code' => price2num($object->multicurrency_code),
-		$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
-	    $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
-	    $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
-		$array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),
-		$array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),
-		$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
-		$array_key.'_multicurrency_total_ttc_locale' => price($object->multicurrency_total_ttc, 0, $outputlangs),
-
-		$array_key.'_note_private'=>$object->note,
-		$array_key.'_note_public'=>$object->note_public,
-		$array_key.'_note'=>$object->note_public,			// For backward compatibility
-
-		// Payments
-		$array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
-		$array_key.'_already_payed'=>price2num($sumpayed),
-		$array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),
-		$array_key.'_already_deposit'=>price2num($sumdeposit),
-		$array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
-		$array_key.'_already_creditnote'=>price2num($sumcreditnote),
-
-		$array_key.'_already_payed_all_locale'=>price(price2num($sumpayed + $sumdeposit + $sumcreditnote, 'MT'), 0, $outputlangs),
-		$array_key.'_already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'),
-
-		// Remain to pay with all know infrmation (except open direct debit requests)
-		$array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT'), 0, $outputlangs),
-		$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT')
-		);
-
-		if (method_exists($object, 'getTotalDiscount')) {
-			$resarray[$array_key.'_total_discount_ht_locale'] = price($object->getTotalDiscount(), 0, $outputlangs);
-			$resarray[$array_key.'_total_discount_ht'] = price2num($object->getTotalDiscount());
-		} else {
-			$resarray[$array_key.'_total_discount_ht_locale'] = '';
-			$resarray[$array_key.'_total_discount_ht'] = '';
-		}
-
-		// Fetch project information if there is a project assigned to this object
-		if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0)
-		{
-			if (! is_object($object->project))
-			{
-				$object->fetch_projet();
-			}
-
-			$resarray[$array_key.'_project_ref'] = $object->project->ref;
-			$resarray[$array_key.'_project_title'] = $object->project->title;
-			$resarray[$array_key.'_project_description'] = $object->project->description;
-			$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
-			$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
-		}
-
-		// Add vat by rates
-		if (is_array($object->lines) && count($object->lines)>0)
-		{
-			foreach ($object->lines as $line)
-			{
-			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
-				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
-				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
-			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
-				$vatformated=vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
-				$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
-				$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
-			}
-		}
-		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
-			$extrafieldkey=$object->element;
-
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-			$object->fetch_optionals();
-
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
-		}
-		return $resarray;
-	}
+        $array_key.'_date'=>dol_print_date($date,'day'),
+        $array_key.'_date_rfc'=>dol_print_date($date,'dayrfc'),
+        $array_key.'_date_limit'=>(! empty($object->date_lim_reglement)?dol_print_date($object->date_lim_reglement,'day'):''),
+        $array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''),
+        $array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
+        $array_key.'_date_modification'=>(! empty($object->date_modification)?dol_print_date($object->date_modification,'day'):''),
+        $array_key.'_date_validation'=>(! empty($object->date_validation)?dol_print_date($object->date_validation,'dayhour'):''),
+        $array_key.'_date_delivery_planed'=>(! empty($object->date_livraison)?dol_print_date($object->date_livraison,'day'):''),
+        $array_key.'_date_close'=>(! empty($object->date_cloture)?dol_print_date($object->date_cloture,'dayhour'):''),
+
+        $array_key.'_payment_mode_code'=>$object->mode_reglement_code,
+        $array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
+        $array_key.'_payment_term_code'=>$object->cond_reglement_code,
+        $array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):($object->cond_reglement_doc?$object->cond_reglement_doc:$object->cond_reglement)),
+
+        $array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
+        $array_key.'_total_vat_locale'=>(! empty($object->total_vat)?price($object->total_vat, 0, $outputlangs):price($object->total_tva, 0, $outputlangs)),
+        $array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
+        $array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
+        $array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
+
+        $array_key.'_total_ht'=>price2num($object->total_ht),
+        $array_key.'_total_vat'=>(! empty($object->total_vat)?price2num($object->total_vat):price2num($object->total_tva)),
+        $array_key.'_total_localtax1'=>price2num($object->total_localtax1),
+        $array_key.'_total_localtax2'=>price2num($object->total_localtax2),
+        $array_key.'_total_ttc'=>price2num($object->total_ttc),
+
+        $array_key.'_multicurrency_code' => price2num($object->multicurrency_code),
+        $array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
+        $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
+        $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
+        $array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),
+        $array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),
+        $array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
+        $array_key.'_multicurrency_total_ttc_locale' => price($object->multicurrency_total_ttc, 0, $outputlangs),
+
+        $array_key.'_note_private'=>$object->note,
+        $array_key.'_note_public'=>$object->note_public,
+        $array_key.'_note'=>$object->note_public,			// For backward compatibility
+
+        // Payments
+        $array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
+        $array_key.'_already_payed'=>price2num($sumpayed),
+        $array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),
+        $array_key.'_already_deposit'=>price2num($sumdeposit),
+        $array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
+        $array_key.'_already_creditnote'=>price2num($sumcreditnote),
+
+        $array_key.'_already_payed_all_locale'=>price(price2num($sumpayed + $sumdeposit + $sumcreditnote, 'MT'), 0, $outputlangs),
+        $array_key.'_already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'),
+
+        // Remain to pay with all know infrmation (except open direct debit requests)
+        $array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT'), 0, $outputlangs),
+        $array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT')
+        );
+
+        if (method_exists($object, 'getTotalDiscount')) {
+            $resarray[$array_key.'_total_discount_ht_locale'] = price($object->getTotalDiscount(), 0, $outputlangs);
+            $resarray[$array_key.'_total_discount_ht'] = price2num($object->getTotalDiscount());
+        } else {
+            $resarray[$array_key.'_total_discount_ht_locale'] = '';
+            $resarray[$array_key.'_total_discount_ht'] = '';
+        }
+
+        // Fetch project information if there is a project assigned to this object
+        if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0)
+        {
+            if (! is_object($object->project))
+            {
+                $object->fetch_projet();
+            }
+
+            $resarray[$array_key.'_project_ref'] = $object->project->ref;
+            $resarray[$array_key.'_project_title'] = $object->project->title;
+            $resarray[$array_key.'_project_description'] = $object->project->description;
+            $resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
+            $resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
+        }
+
+        // Add vat by rates
+        if (is_array($object->lines) && count($object->lines)>0)
+        {
+            foreach ($object->lines as $line)
+            {
+                // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
+                if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+                $resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
+                $resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
+                // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
+                $vatformated=vatrate($line->tva_tx);
+                if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+                $resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
+                $resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
+            }
+        }
+        // Retrieve extrafields
+        if (is_array($object->array_options) && count($object->array_options))
+        {
+            $extrafieldkey=$object->element;
+
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+            $object->fetch_optionals();
+
+            $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+        }
+        return $resarray;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  Object			$line				Object line
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_lines($line, $outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  Object			$line				Object line
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_lines($line, $outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		$resarray= array(
-			'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
-			'line_product_ref'=>$line->product_ref,
-			'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines
-			'line_product_label'=>$line->product_label,
-			'line_product_type'=>$line->product_type,
-			'line_desc'=>$line->desc,
-			'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
-			'line_up'=>price2num($line->subprice),
-			'line_up_locale'=>price($line->subprice, 0, $outputlangs),
-			'line_qty'=>$line->qty,
-			'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
-			'line_price_ht'=>price2num($line->total_ht),
-			'line_price_ttc'=>price2num($line->total_ttc),
-			'line_price_vat'=>price2num($line->total_tva),
-			'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
-			'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
-			'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
-		    // Dates
-			'line_date_start'=>dol_print_date($line->date_start, 'day', 'tzuser'),
-			'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzuser', $outputlangs),
-		    'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc', 'tzuser'),
-		    'line_date_end'=>dol_print_date($line->date_end, 'day', 'tzuser'),
-		    'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzuser', $outputlangs),
-		    'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc', 'tzuser'),
-
-		    'line_multicurrency_code' => price2num($line->multicurrency_code),
-		    'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
-		    'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
-		    'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
-		    'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
-		    'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
-		    'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
-		    'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
-		    'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
-		);
-
-		    // Units
-		if ($conf->global->PRODUCT_USE_UNITS)
-		{
-		      $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
-		      $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short'));
-		}
-
-		// Retrieve extrafields
-		$extrafieldkey=$line->element;
-		$array_key="line";
-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-		$line->fetch_optionals();
-
-		$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
-
-		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
-		if (isset($line->fk_product) && $line->fk_product > 0)
-		{
-			$tmpproduct = new Product($this->db);
-			$result = $tmpproduct->fetch($line->fk_product);
-			foreach($tmpproduct->array_options as $key=>$label)
-				$resarray["line_product_".$key] = $label;
-		}
-
-		return $resarray;
-	}
+        global $conf;
+
+        $resarray= array(
+            'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
+            'line_product_ref'=>$line->product_ref,
+            'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines
+            'line_product_label'=>$line->product_label,
+            'line_product_type'=>$line->product_type,
+            'line_desc'=>$line->desc,
+            'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
+            'line_up'=>price2num($line->subprice),
+            'line_up_locale'=>price($line->subprice, 0, $outputlangs),
+            'line_qty'=>$line->qty,
+            'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
+            'line_price_ht'=>price2num($line->total_ht),
+            'line_price_ttc'=>price2num($line->total_ttc),
+            'line_price_vat'=>price2num($line->total_tva),
+            'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
+            'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
+            'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
+            // Dates
+            'line_date_start'=>dol_print_date($line->date_start, 'day', 'tzuser'),
+            'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzuser', $outputlangs),
+            'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc', 'tzuser'),
+            'line_date_end'=>dol_print_date($line->date_end, 'day', 'tzuser'),
+            'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzuser', $outputlangs),
+            'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc', 'tzuser'),
+
+            'line_multicurrency_code' => price2num($line->multicurrency_code),
+            'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
+            'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
+            'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
+            'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
+            'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
+            'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
+            'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
+            'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
+        );
+
+            // Units
+        if ($conf->global->PRODUCT_USE_UNITS)
+        {
+                $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
+                $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short'));
+        }
+
+        // Retrieve extrafields
+        $extrafieldkey=$line->element;
+        $array_key="line";
+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafields = new ExtraFields($this->db);
+        $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+        $line->fetch_optionals();
+
+        $resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
+
+        // Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
+        if (isset($line->fk_product) && $line->fk_product > 0)
+        {
+            $tmpproduct = new Product($this->db);
+            $result = $tmpproduct->fetch($line->fk_product);
+            foreach($tmpproduct->array_options as $key=>$label)
+                $resarray["line_product_".$key] = $label;
+        }
+
+        return $resarray;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -591,54 +591,54 @@ 
     function get_substitutionarray_shipment($object,$outputlangs,$array_key='object')
     {
         // phpcs:enable
-    	global $conf;
-		dol_include_once('/core/lib/product.lib.php');
-		$object->list_delivery_methods($object->shipping_method_id);
-		$calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
-
-    	$array_shipment=array(
-	    	$array_key.'_id'=>$object->id,
-	    	$array_key.'_ref'=>$object->ref,
-	    	$array_key.'_ref_ext'=>$object->ref_ext,
-	    	$array_key.'_ref_customer'=>$object->ref_customer,
-	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery,'day'),
-	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery,'hour'),
-	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
-	    	$array_key.'_total_ht'=>price($object->total_ht),
-	    	$array_key.'_total_vat'=>price($object->total_tva),
-	    	$array_key.'_total_ttc'=>price($object->total_ttc),
-	    	$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
-	    	$array_key.'_note_private'=>$object->note_private,
-	    	$array_key.'_note'=>$object->note_public,
-	    	$array_key.'_tracking_number'=>$object->tracking_number,
-	    	$array_key.'_tracking_url'=>$object->tracking_url,
-	    	$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
-	    	$array_key.'_weight'=>$object->trueWeight.' '.measuring_units_string($object->weight_units, 'weight'),
-	    	$array_key.'_width'=>$object->trueWidth.' '.measuring_units_string($object->width_units, 'size'),
-	    	$array_key.'_height'=>$object->trueHeight.' '.measuring_units_string($object->height_units, 'size'),
-	    	$array_key.'_depth'=>$object->trueDepth.' '.measuring_units_string($object->depth_units, 'size'),
-	    	$array_key.'_size'=>$calculatedVolume.' '.measuring_units_string(0, 'volume'),
-    	);
-
-    	// Add vat by rates
-    	foreach ($object->lines as $line)
-    	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
-    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
-    	}
-
-    	// Retrieve extrafields
-    	if (is_array($object->array_options) && count($object->array_options))
-    	{
-    		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-    		$extrafields = new ExtraFields($this->db);
-    		$extralabels = $extrafields->fetch_name_optionals_label('expedition',true);
-    		$object->fetch_optionals();
-
-    		$array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs);
-    	}
-
-    	return $array_shipment;
+        global $conf;
+        dol_include_once('/core/lib/product.lib.php');
+        $object->list_delivery_methods($object->shipping_method_id);
+        $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
+
+        $array_shipment=array(
+            $array_key.'_id'=>$object->id,
+            $array_key.'_ref'=>$object->ref,
+            $array_key.'_ref_ext'=>$object->ref_ext,
+            $array_key.'_ref_customer'=>$object->ref_customer,
+            $array_key.'_date_delivery'=>dol_print_date($object->date_delivery,'day'),
+            $array_key.'_hour_delivery'=>dol_print_date($object->date_delivery,'hour'),
+            $array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
+            $array_key.'_total_ht'=>price($object->total_ht),
+            $array_key.'_total_vat'=>price($object->total_tva),
+            $array_key.'_total_ttc'=>price($object->total_ttc),
+            $array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
+            $array_key.'_note_private'=>$object->note_private,
+            $array_key.'_note'=>$object->note_public,
+            $array_key.'_tracking_number'=>$object->tracking_number,
+            $array_key.'_tracking_url'=>$object->tracking_url,
+            $array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
+            $array_key.'_weight'=>$object->trueWeight.' '.measuring_units_string($object->weight_units, 'weight'),
+            $array_key.'_width'=>$object->trueWidth.' '.measuring_units_string($object->width_units, 'size'),
+            $array_key.'_height'=>$object->trueHeight.' '.measuring_units_string($object->height_units, 'size'),
+            $array_key.'_depth'=>$object->trueDepth.' '.measuring_units_string($object->depth_units, 'size'),
+            $array_key.'_size'=>$calculatedVolume.' '.measuring_units_string(0, 'volume'),
+        );
+
+        // Add vat by rates
+        foreach ($object->lines as $line)
+        {
+            if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+            $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
+        }
+
+        // Retrieve extrafields
+        if (is_array($object->array_options) && count($object->array_options))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $extralabels = $extrafields->fetch_name_optionals_label('expedition',true);
+            $object->fetch_optionals();
+
+            $array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs);
+        }
+
+        return $array_shipment;
     }
 
 
@@ -657,24 +657,24 @@ 
         dol_include_once('/core/lib/product.lib.php');
 
         $resarray = array(
-	    	'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
-	    	'line_product_ref'=>$line->product_ref,
-	    	'line_product_label'=>$line->product_label,
-	    	'line_desc'=>$line->desc,
-	    	'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
-	    	'line_up'=>price($line->subprice),
-	    	'line_qty'=>$line->qty,
-	    	'line_qty_shipped'=>$line->qty_shipped,
-	    	'line_qty_asked'=>$line->qty_asked,
-	    	'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
-	    	'line_price_ht'=>price($line->total_ht),
-	    	'line_price_ttc'=>price($line->total_ttc),
-	    	'line_price_vat'=>price($line->total_tva),
-	    	'line_weight'=>empty($line->weight) ? '' : $line->weight*$line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
-	    	'line_length'=>empty($line->length) ? '' : $line->length*$line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
-	    	'line_surface'=>empty($line->surface) ? '' : $line->surface*$line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
-	    	'line_volume'=>empty($line->volume) ? '' : $line->volume*$line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
-    	);
+            'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
+            'line_product_ref'=>$line->product_ref,
+            'line_product_label'=>$line->product_label,
+            'line_desc'=>$line->desc,
+            'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
+            'line_up'=>price($line->subprice),
+            'line_qty'=>$line->qty,
+            'line_qty_shipped'=>$line->qty_shipped,
+            'line_qty_asked'=>$line->qty_asked,
+            'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
+            'line_price_ht'=>price($line->total_ht),
+            'line_price_ttc'=>price($line->total_ttc),
+            'line_price_vat'=>price($line->total_tva),
+            'line_weight'=>empty($line->weight) ? '' : $line->weight*$line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
+            'line_length'=>empty($line->length) ? '' : $line->length*$line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
+            'line_surface'=>empty($line->surface) ? '' : $line->surface*$line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
+            'line_volume'=>empty($line->volume) ? '' : $line->volume*$line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
+        );
 
         // Retrieve extrafields
         $extrafieldkey = $line->element;
@@ -731,92 +731,92 @@ 
      *	@return	array								Substitution array
      */
     function fill_substitutionarray_with_extrafields($object,$array_to_fill,$extrafields,$array_key,$outputlangs)
-	{
+    {
         // phpcs:enable
-		global $conf;
-		foreach($extrafields->attribute_label as $key=>$label)
-		{
-			if($extrafields->attribute_type[$key] == 'price')
-			{
-				$object->array_options['options_'.$key] = price2num($object->array_options['options_'.$key]);
-				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
-				//Add value to store price with currency
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-			}
-			else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
-			{
-				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
-			}
-			else if($extrafields->attribute_type[$key] == 'date')
-			{
-				if (strlen($object->array_options['options_'.$key])>0)
-				{
-					$date = $object->array_options['options_'.$key];
-					$object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
-					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
-					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
-				}
-				else
-				{
-					$object->array_options['options_'.$key] = '';
-					$object->array_options['options_'.$key.'_locale'] = '';
-					$object->array_options['options_'.$key.'_rfc'] = '';
-				}
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'datetime')
-			{
-				$datetime = $object->array_options['options_'.$key];
-				$object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
-				$object->array_options['options_'.$key.'_locale'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour','tzserver',$outputlangs):'');    // using output language format
-				$object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):'');                             // international format
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'link')
-			{
-				$id = $object->array_options['options_'.$key];
-				if ($id != "")
-				{
-					$param = $extrafields->attribute_param[$key];
-					$param_list=array_keys($param['options']);              // $param_list='ObjectName:classPath'
-					$InfoFieldList = explode(":", $param_list[0]);
-					$classname=$InfoFieldList[0];
-					$classpath=$InfoFieldList[1];
-					if (! empty($classpath))
-					{
-						dol_include_once($InfoFieldList[1]);
-						if ($classname && class_exists($classname))
-						{
-							$tmpobject = new $classname($this->db);
-							$tmpobject->fetch($id);
-							// completely replace the id with the linked object name
-							$object->array_options['options_'.$key] = $tmpobject->name;
-						}
-					}
-				}
-			}
-
-			$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
-		}
-
-		return $array_to_fill;
-	}
-
-
-	/**
-	 * Rect pdf
-	 *
-	 * @param	TCPDF	$pdf			Object PDF
-	 * @param	float	$x				Abscissa of first point
-	 * @param	float	$y		        Ordinate of first point
-	 * @param	float	$l				??
-	 * @param	float	$h				??
-	 * @param	int		$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
-	 * @param	int		$hidebottom		Hide bottom
-	 * @return	void
-	 */
+        global $conf;
+        foreach($extrafields->attribute_label as $key=>$label)
+        {
+            if($extrafields->attribute_type[$key] == 'price')
+            {
+                $object->array_options['options_'.$key] = price2num($object->array_options['options_'.$key]);
+                $object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
+                //Add value to store price with currency
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
+            }
+            else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+            {
+                $object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
+            }
+            else if($extrafields->attribute_type[$key] == 'date')
+            {
+                if (strlen($object->array_options['options_'.$key])>0)
+                {
+                    $date = $object->array_options['options_'.$key];
+                    $object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
+                    $object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
+                    $object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
+                }
+                else
+                {
+                    $object->array_options['options_'.$key] = '';
+                    $object->array_options['options_'.$key.'_locale'] = '';
+                    $object->array_options['options_'.$key.'_rfc'] = '';
+                }
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
+            }
+            else if($extrafields->attribute_type[$key] == 'datetime')
+            {
+                $datetime = $object->array_options['options_'.$key];
+                $object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
+                $object->array_options['options_'.$key.'_locale'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour','tzserver',$outputlangs):'');    // using output language format
+                $object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):'');                             // international format
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
+            }
+            else if($extrafields->attribute_type[$key] == 'link')
+            {
+                $id = $object->array_options['options_'.$key];
+                if ($id != "")
+                {
+                    $param = $extrafields->attribute_param[$key];
+                    $param_list=array_keys($param['options']);              // $param_list='ObjectName:classPath'
+                    $InfoFieldList = explode(":", $param_list[0]);
+                    $classname=$InfoFieldList[0];
+                    $classpath=$InfoFieldList[1];
+                    if (! empty($classpath))
+                    {
+                        dol_include_once($InfoFieldList[1]);
+                        if ($classname && class_exists($classname))
+                        {
+                            $tmpobject = new $classname($this->db);
+                            $tmpobject->fetch($id);
+                            // completely replace the id with the linked object name
+                            $object->array_options['options_'.$key] = $tmpobject->name;
+                        }
+                    }
+                }
+            }
+
+            $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
+        }
+
+        return $array_to_fill;
+    }
+
+
+    /**
+     * Rect pdf
+     *
+     * @param	TCPDF	$pdf			Object PDF
+     * @param	float	$x				Abscissa of first point
+     * @param	float	$y		        Ordinate of first point
+     * @param	float	$l				??
+     * @param	float	$h				??
+     * @param	int		$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+     * @param	int		$hidebottom		Hide bottom
+     * @return	void
+     */
     function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
     {
         if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);

Spacing +196 added lines, -196 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     /**
      * @var string[]    Array of error strings
@@ -69,17 +69,17 @@ 
      * @param   Translate	$outputlangs    Language object for output
      * @return	array						Array of substitution key->code
      */
-    function get_substitutionarray_user($user,$outputlangs)
+    function get_substitutionarray_user($user, $outputlangs)
     {
         // phpcs:enable
         global $conf;
 
-        $logotouse=$conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
+        $logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
 
         return array(
             'myuser_lastname'=>$user->lastname,
             'myuser_firstname'=>$user->firstname,
-            'myuser_fullname'=>$user->getFullName($outputlangs,1),
+            'myuser_fullname'=>$user->getFullName($outputlangs, 1),
             'myuser_login'=>$user->login,
             'myuser_phone'=>$user->office_phone,
        		'myuser_address'=>$user->address,
@@ -107,25 +107,25 @@ 
      * @param   Translate	$outputlangs    Language object for output
      * @return	array						Array of substitution key->code
      */
-    function get_substitutionarray_mysoc($mysoc,$outputlangs)
+    function get_substitutionarray_mysoc($mysoc, $outputlangs)
     {
         // phpcs:enable
         global $conf;
 
-        if (empty($mysoc->forme_juridique) && ! empty($mysoc->forme_juridique_code))
+        if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))
         {
-            $mysoc->forme_juridique=getFormeJuridiqueLabel($mysoc->forme_juridique_code);
+            $mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);
         }
-        if (empty($mysoc->country) && ! empty($mysoc->country_code))
+        if (empty($mysoc->country) && !empty($mysoc->country_code))
         {
-        	$mysoc->country=$outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
+        	$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
         }
-        if (empty($mysoc->state) && ! empty($mysoc->state_code))
+        if (empty($mysoc->state) && !empty($mysoc->state_code))
         {
-        	$mysoc->state=getState($mysoc->state_code,0);
+        	$mysoc->state = getState($mysoc->state_code, 0);
         }
 
-        $logotouse=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+        $logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
 
         return array(
             'mycompany_logo'=>$logotouse,
@@ -167,18 +167,18 @@ 
      * @param   Translate	$outputlangs    Language object for output
      * @return	array						Array of substitution key->code
      */
-    function get_substitutionarray_thirdparty($object,$outputlangs)
+    function get_substitutionarray_thirdparty($object, $outputlangs)
     {
         // phpcs:enable
         global $conf;
 
-        if (empty($object->country) && ! empty($object->country_code))
+        if (empty($object->country) && !empty($object->country_code))
         {
-        	$object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code);
+        	$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
         }
-        if (empty($object->state) && ! empty($object->state_code))
+        if (empty($object->state) && !empty($object->state_code))
         {
-        	$object->state=getState($object->state_code,0);
+        	$object->state = getState($object->state_code, 0);
         }
 
         $array_thirdparty = array(
@@ -217,24 +217,24 @@ 
         );
 
         // Retrieve extrafields
-        if(is_array($object->array_options) && count($object->array_options))
+        if (is_array($object->array_options) && count($object->array_options))
         {
         	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
         	$extrafields = new ExtraFields($this->db);
-        	$extralabels = $extrafields->fetch_name_optionals_label('societe',true);
+        	$extralabels = $extrafields->fetch_name_optionals_label('societe', true);
         	$object->fetch_optionals();
 
-        	foreach($extrafields->attribute_label as $key=>$label)
+        	foreach ($extrafields->attribute_label as $key=>$label)
         	{
-        		if($extrafields->attribute_type[$key] == 'price')
+        		if ($extrafields->attribute_type[$key] == 'price')
         		{
-        			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
+        			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);
         		}
-        		else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+        		else if ($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
         		{
         			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
         		}
-        		$array_thirdparty = array_merge($array_thirdparty, array ('company_options_'.$key => $object->array_options ['options_' . $key]));
+        		$array_thirdparty = array_merge($array_thirdparty, array('company_options_'.$key => $object->array_options ['options_'.$key]));
 			}
 		}
 		return $array_thirdparty;
@@ -254,61 +254,61 @@ 
         // phpcs:enable
 		global $conf;
 
-		if(empty($object->country) && ! empty($object->country_code))
+		if (empty($object->country) && !empty($object->country_code))
 		{
-			$object->country = $outputlangs->transnoentitiesnoconv("Country" . $object->country_code);
+			$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
 		}
-		if(empty($object->state) && ! empty($object->state_code))
+		if (empty($object->state) && !empty($object->state_code))
 		{
 			$object->state = getState($object->state_code, 0);
 		}
 
-		$array_contact = array (
-		    $array_key . '_fullname' => $object->getFullName($outputlangs, 1),
-            $array_key . '_lastname' => $object->lastname,
-            $array_key . '_firstname' => $object->firstname,
-            $array_key . '_address' => $object->address,
-            $array_key . '_zip' => $object->zip,
-            $array_key . '_town' => $object->town,
-            $array_key . '_state_id' => $object->state_id,
-            $array_key . '_state_code' => $object->state_code,
-            $array_key . '_state' => $object->state,
-            $array_key . '_country_id' => $object->country_id,
-            $array_key . '_country_code' => $object->country_code,
-            $array_key . '_country' => $object->country,
-            $array_key . '_poste' => $object->poste,
-            $array_key . '_socid' => $object->socid,
-            $array_key . '_statut' => $object->statut,
-            $array_key . '_code' => $object->code,
-            $array_key . '_email' => $object->email,
-            $array_key . '_jabberid' => $object->jabberid,
-            $array_key . '_phone_pro' => $object->phone_pro,
-            $array_key . '_phone_perso' => $object->phone_perso,
-            $array_key . '_phone_mobile' => $object->phone_mobile,
-            $array_key . '_fax' => $object->fax,
-            $array_key . '_birthday' => $object->birthday,
-            $array_key . '_default_lang' => $object->default_lang,
-            $array_key . '_note_public' => $object->note_public,
-            $array_key . '_note_private' => $object->note_private
+		$array_contact = array(
+		    $array_key.'_fullname' => $object->getFullName($outputlangs, 1),
+            $array_key.'_lastname' => $object->lastname,
+            $array_key.'_firstname' => $object->firstname,
+            $array_key.'_address' => $object->address,
+            $array_key.'_zip' => $object->zip,
+            $array_key.'_town' => $object->town,
+            $array_key.'_state_id' => $object->state_id,
+            $array_key.'_state_code' => $object->state_code,
+            $array_key.'_state' => $object->state,
+            $array_key.'_country_id' => $object->country_id,
+            $array_key.'_country_code' => $object->country_code,
+            $array_key.'_country' => $object->country,
+            $array_key.'_poste' => $object->poste,
+            $array_key.'_socid' => $object->socid,
+            $array_key.'_statut' => $object->statut,
+            $array_key.'_code' => $object->code,
+            $array_key.'_email' => $object->email,
+            $array_key.'_jabberid' => $object->jabberid,
+            $array_key.'_phone_pro' => $object->phone_pro,
+            $array_key.'_phone_perso' => $object->phone_perso,
+            $array_key.'_phone_mobile' => $object->phone_mobile,
+            $array_key.'_fax' => $object->fax,
+            $array_key.'_birthday' => $object->birthday,
+            $array_key.'_default_lang' => $object->default_lang,
+            $array_key.'_note_public' => $object->note_public,
+            $array_key.'_note_private' => $object->note_private
 		);
 
 		// Retrieve extrafields
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
 		$extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
 		$object->fetch_optionals();
 
-		foreach($extrafields->attribute_label as $key => $label)
+		foreach ($extrafields->attribute_label as $key => $label)
 		{
 			if ($extrafields->attribute_type[$key] == 'price')
 			{
-				$object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
+				$object->array_options['options_'.$key] = price($object->array_options ['options_'.$key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
 			}
-			elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			elseif ($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
-				$object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
+				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
 			}
-			$array_contact = array_merge($array_contact, array($array_key.'_options_' . $key => $object->array_options['options_'. $key]));
+			$array_contact = array_merge($array_contact, array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
 		}
 		return $array_contact;
 	}
@@ -326,22 +326,22 @@ 
         // phpcs:enable
     	global $conf;
 
-    	$now=dol_now('gmt');	// gmt
+    	$now = dol_now('gmt'); // gmt
     	$array_other = array(
     	    // Date in default language
-    	    'current_date'=>dol_print_date($now,'day','tzuser'),
-    	    'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
-   			'current_server_date'=>dol_print_date($now,'day','tzserver'),
-   			'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'),
+    	    'current_date'=>dol_print_date($now, 'day', 'tzuser'),
+    	    'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
+   			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),
+   			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),
     	    // Date in requested output language
-    	    'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs),
-   			'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs),
-   			'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs),
-   			'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
+    	    'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
+   			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
+   			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),
+   			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
     	);
 
 
-    	foreach($conf->global as $key => $val)
+    	foreach ($conf->global as $key => $val)
     	{
     		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
     		else $newval = $val;
@@ -361,15 +361,15 @@ 
      * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+	function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
         // phpcs:enable
 		global $conf;
 
-		$sumpayed=$sumdeposit=$sumcreditnote='';
+		$sumpayed = $sumdeposit = $sumcreditnote = '';
 		if ($object->element == 'facture')
 		{
-			$invoice_source=new Facture($this->db);
+			$invoice_source = new Facture($this->db);
 			if ($object->fk_facture_source > 0)
 			{
 				$invoice_source->fetch($object->fk_facture_source);
@@ -381,38 +381,38 @@ 
 
 		$date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
 
-		$resarray=array(
+		$resarray = array(
 		$array_key.'_id'=>$object->id,
 		$array_key.'_ref'=>$object->ref,
 		$array_key.'_ref_ext'=>$object->ref_ext,
-		$array_key.'_ref_customer'=>(! empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
-		$array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
+		$array_key.'_ref_customer'=>(!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
+		$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
 		$array_key.'_source_invoice_ref'=>$invoice_source->ref,
 		// Dates
-        $array_key.'_hour'=>dol_print_date($date,'hour'),
-		$array_key.'_date'=>dol_print_date($date,'day'),
-		$array_key.'_date_rfc'=>dol_print_date($date,'dayrfc'),
-		$array_key.'_date_limit'=>(! empty($object->date_lim_reglement)?dol_print_date($object->date_lim_reglement,'day'):''),
-	    $array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''),
-		$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
-		$array_key.'_date_modification'=>(! empty($object->date_modification)?dol_print_date($object->date_modification,'day'):''),
-		$array_key.'_date_validation'=>(! empty($object->date_validation)?dol_print_date($object->date_validation,'dayhour'):''),
-		$array_key.'_date_delivery_planed'=>(! empty($object->date_livraison)?dol_print_date($object->date_livraison,'day'):''),
-		$array_key.'_date_close'=>(! empty($object->date_cloture)?dol_print_date($object->date_cloture,'dayhour'):''),
+        $array_key.'_hour'=>dol_print_date($date, 'hour'),
+		$array_key.'_date'=>dol_print_date($date, 'day'),
+		$array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'),
+		$array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ?dol_print_date($object->date_lim_reglement, 'day') : ''),
+	    $array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''),
+		$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
+		$array_key.'_date_modification'=>(!empty($object->date_modification) ?dol_print_date($object->date_modification, 'day') : ''),
+		$array_key.'_date_validation'=>(!empty($object->date_validation) ?dol_print_date($object->date_validation, 'dayhour') : ''),
+		$array_key.'_date_delivery_planed'=>(!empty($object->date_livraison) ?dol_print_date($object->date_livraison, 'day') : ''),
+		$array_key.'_date_close'=>(!empty($object->date_cloture) ?dol_print_date($object->date_cloture, 'dayhour') : ''),
 
 		$array_key.'_payment_mode_code'=>$object->mode_reglement_code,
-		$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
+		$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) != 'PaymentType'.$object->mode_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) : $object->mode_reglement),
 		$array_key.'_payment_term_code'=>$object->cond_reglement_code,
-		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):($object->cond_reglement_doc?$object->cond_reglement_doc:$object->cond_reglement)),
+		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
 
 		$array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
-		$array_key.'_total_vat_locale'=>(! empty($object->total_vat)?price($object->total_vat, 0, $outputlangs):price($object->total_tva, 0, $outputlangs)),
+		$array_key.'_total_vat_locale'=>(!empty($object->total_vat) ?price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),
 		$array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
 		$array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
 		$array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
 
 		$array_key.'_total_ht'=>price2num($object->total_ht),
-		$array_key.'_total_vat'=>(! empty($object->total_vat)?price2num($object->total_vat):price2num($object->total_tva)),
+		$array_key.'_total_vat'=>(!empty($object->total_vat) ?price2num($object->total_vat) : price2num($object->total_tva)),
 		$array_key.'_total_localtax1'=>price2num($object->total_localtax1),
 		$array_key.'_total_localtax2'=>price2num($object->total_localtax2),
 		$array_key.'_total_ttc'=>price2num($object->total_ttc),
@@ -428,7 +428,7 @@ 
 
 		$array_key.'_note_private'=>$object->note,
 		$array_key.'_note_public'=>$object->note_public,
-		$array_key.'_note'=>$object->note_public,			// For backward compatibility
+		$array_key.'_note'=>$object->note_public, // For backward compatibility
 
 		// Payments
 		$array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
@@ -455,9 +455,9 @@ 
 		}
 
 		// Fetch project information if there is a project assigned to this object
-		if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0)
+		if ($object->element != "project" && !empty($object->fk_project) && $object->fk_project > 0)
 		{
-			if (! is_object($object->project))
+			if (!is_object($object->project))
 			{
 				$object->fetch_projet();
 			}
@@ -470,32 +470,32 @@ 
 		}
 
 		// Add vat by rates
-		if (is_array($object->lines) && count($object->lines)>0)
+		if (is_array($object->lines) && count($object->lines) > 0)
 		{
 			foreach ($object->lines as $line)
 			{
 			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
-				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
-				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
+				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+				$resarray[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
+				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx] = price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
 			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
-				$vatformated=vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
-				$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
-				$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
+				$vatformated = vatrate($line->tva_tx);
+				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated] = 0;
+				$resarray[$array_key.'_total_vat_'.$vatformated] += $line->total_tva;
+				$resarray[$array_key.'_total_vat_locale_'.$vatformated] = price($resarray[$array_key.'_total_vat_'.$vatformated]);
 			}
 		}
 		// Retrieve extrafields
 		if (is_array($object->array_options) && count($object->array_options))
 		{
-			$extrafieldkey=$object->element;
+			$extrafieldkey = $object->element;
 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true);
 			$object->fetch_optionals();
 
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+			$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
 		}
 		return $resarray;
 	}
@@ -513,18 +513,18 @@ 
         // phpcs:enable
 		global $conf;
 
-		$resarray= array(
-			'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
+		$resarray = array(
+			'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
 			'line_product_ref'=>$line->product_ref,
 			'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines
 			'line_product_label'=>$line->product_label,
 			'line_product_type'=>$line->product_type,
 			'line_desc'=>$line->desc,
-			'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
+			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
 			'line_up'=>price2num($line->subprice),
 			'line_up_locale'=>price($line->subprice, 0, $outputlangs),
 			'line_qty'=>$line->qty,
-			'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
+			'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
 			'line_price_ht'=>price2num($line->total_ht),
 			'line_price_ttc'=>price2num($line->total_ttc),
 			'line_price_vat'=>price2num($line->total_tva),
@@ -553,26 +553,26 @@ 
 		    // Units
 		if ($conf->global->PRODUCT_USE_UNITS)
 		{
-		      $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
-		      $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short'));
+		      $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
+		      $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
 		}
 
 		// Retrieve extrafields
-		$extrafieldkey=$line->element;
-		$array_key="line";
+		$extrafieldkey = $line->element;
+		$array_key = "line";
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true);
 		$line->fetch_optionals();
 
-		$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key = $array_key, $outputlangs);
 
 		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
 		if (isset($line->fk_product) && $line->fk_product > 0)
 		{
 			$tmpproduct = new Product($this->db);
 			$result = $tmpproduct->fetch($line->fk_product);
-			foreach($tmpproduct->array_options as $key=>$label)
+			foreach ($tmpproduct->array_options as $key=>$label)
 				$resarray["line_product_".$key] = $label;
 		}
 
@@ -588,22 +588,22 @@ 
      * @param   array			$array_key	        Name of the key for return array
      * @return	array								Array of substitution
      */
-    function get_substitutionarray_shipment($object,$outputlangs,$array_key='object')
+    function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')
     {
         // phpcs:enable
     	global $conf;
 		dol_include_once('/core/lib/product.lib.php');
 		$object->list_delivery_methods($object->shipping_method_id);
-		$calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
+		$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
 
-    	$array_shipment=array(
+    	$array_shipment = array(
 	    	$array_key.'_id'=>$object->id,
 	    	$array_key.'_ref'=>$object->ref,
 	    	$array_key.'_ref_ext'=>$object->ref_ext,
 	    	$array_key.'_ref_customer'=>$object->ref_customer,
-	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery,'day'),
-	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery,'hour'),
-	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
+	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
+	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
+	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
 	    	$array_key.'_total_ht'=>price($object->total_ht),
 	    	$array_key.'_total_vat'=>price($object->total_tva),
 	    	$array_key.'_total_ttc'=>price($object->total_ttc),
@@ -623,8 +623,8 @@ 
     	// Add vat by rates
     	foreach ($object->lines as $line)
     	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
-    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
+    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
     	}
 
     	// Retrieve extrafields
@@ -632,10 +632,10 @@ 
     	{
     		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
     		$extrafields = new ExtraFields($this->db);
-    		$extralabels = $extrafields->fetch_name_optionals_label('expedition',true);
+    		$extralabels = $extrafields->fetch_name_optionals_label('expedition', true);
     		$object->fetch_optionals();
 
-    		$array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs);
+    		$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
     	}
 
     	return $array_shipment;
@@ -657,23 +657,23 @@ 
         dol_include_once('/core/lib/product.lib.php');
 
         $resarray = array(
-	    	'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
+	    	'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
 	    	'line_product_ref'=>$line->product_ref,
 	    	'line_product_label'=>$line->product_label,
 	    	'line_desc'=>$line->desc,
-	    	'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
+	    	'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
 	    	'line_up'=>price($line->subprice),
 	    	'line_qty'=>$line->qty,
 	    	'line_qty_shipped'=>$line->qty_shipped,
 	    	'line_qty_asked'=>$line->qty_asked,
-	    	'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
+	    	'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
 	    	'line_price_ht'=>price($line->total_ht),
 	    	'line_price_ttc'=>price($line->total_ttc),
 	    	'line_price_vat'=>price($line->total_tva),
-	    	'line_weight'=>empty($line->weight) ? '' : $line->weight*$line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
-	    	'line_length'=>empty($line->length) ? '' : $line->length*$line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
-	    	'line_surface'=>empty($line->surface) ? '' : $line->surface*$line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
-	    	'line_volume'=>empty($line->volume) ? '' : $line->volume*$line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
+	    	'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
+	    	'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
+	    	'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
+	    	'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
     	);
 
         // Retrieve extrafields
@@ -699,18 +699,18 @@ 
      * @param   boolean		$recursive    	Want to fetch child array or child object
      * @return	array						Array of substitution key->code
      */
-    function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true)
+    function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)
     {
         // phpcs:enable
         $array_other = array();
         if (!empty($object)) {
-            foreach($object as $key => $value) {
+            foreach ($object as $key => $value) {
                 if (!empty($value)) {
                     if (!is_array($value) && !is_object($value)) {
                         $array_other['object_'.$key] = $value;
                     }
                     if (is_array($value) && $recursive) {
-                        $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value,$outputlangs,false);
+                        $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);
                     }
                 }
             }
@@ -730,31 +730,31 @@ 
      *  @param  Translate		$outputlangs        Lang object to use for output
      *	@return	array								Substitution array
      */
-    function fill_substitutionarray_with_extrafields($object,$array_to_fill,$extrafields,$array_key,$outputlangs)
+    function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
-		foreach($extrafields->attribute_label as $key=>$label)
+		foreach ($extrafields->attribute_label as $key=>$label)
 		{
-			if($extrafields->attribute_type[$key] == 'price')
+			if ($extrafields->attribute_type[$key] == 'price')
 			{
 				$object->array_options['options_'.$key] = price2num($object->array_options['options_'.$key]);
-				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
+				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);
 				//Add value to store price with currency
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
 			}
-			else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			else if ($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
 			}
-			else if($extrafields->attribute_type[$key] == 'date')
+			else if ($extrafields->attribute_type[$key] == 'date')
 			{
-				if (strlen($object->array_options['options_'.$key])>0)
+				if (strlen($object->array_options['options_'.$key]) > 0)
 				{
 					$date = $object->array_options['options_'.$key];
-					$object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
-					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
-					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
+					$object->array_options['options_'.$key] = dol_print_date($date, 'day'); // using company output language
+					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format
+					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date, 'dayrfc'); // international format
 				}
 				else
 				{
@@ -762,29 +762,29 @@ 
 					$object->array_options['options_'.$key.'_locale'] = '';
 					$object->array_options['options_'.$key.'_rfc'] = '';
 				}
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
 			}
-			else if($extrafields->attribute_type[$key] == 'datetime')
+			else if ($extrafields->attribute_type[$key] == 'datetime')
 			{
 				$datetime = $object->array_options['options_'.$key];
-				$object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
-				$object->array_options['options_'.$key.'_locale'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour','tzserver',$outputlangs):'');    // using output language format
-				$object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):'');                             // international format
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
+				$object->array_options['options_'.$key] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour') : ''); // using company output language
+				$object->array_options['options_'.$key.'_locale'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour', 'tzserver', $outputlangs) : ''); // using output language format
+				$object->array_options['options_'.$key.'_rfc'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhourrfc') : ''); // international format
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
 			}
-			else if($extrafields->attribute_type[$key] == 'link')
+			else if ($extrafields->attribute_type[$key] == 'link')
 			{
 				$id = $object->array_options['options_'.$key];
 				if ($id != "")
 				{
 					$param = $extrafields->attribute_param[$key];
-					$param_list=array_keys($param['options']);              // $param_list='ObjectName:classPath'
+					$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 					$InfoFieldList = explode(":", $param_list[0]);
-					$classname=$InfoFieldList[0];
-					$classpath=$InfoFieldList[1];
-					if (! empty($classpath))
+					$classname = $InfoFieldList[0];
+					$classpath = $InfoFieldList[1];
+					if (!empty($classpath))
 					{
 						dol_include_once($InfoFieldList[1]);
 						if ($classname && class_exists($classname))
@@ -798,7 +798,7 @@ 
 				}
 			}
 
-			$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
+			$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
 		}
 
 		return $array_to_fill;
@@ -817,12 +817,12 @@ 
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
+    function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
     {
-        if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
-        $pdf->line($x+$l, $y, $x+$l, $y+$h);
-        if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
-        $pdf->line($x, $y+$h, $x, $y);
+        if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
+        $pdf->line($x + $l, $y, $x + $l, $y + $h);
+        if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
+        $pdf->line($x, $y + $h, $x, $y);
     }
 
 
@@ -835,8 +835,8 @@ 
      */
     function columnSort($a, $b)
     {
-        if(empty($a['rank'])){ $a['rank'] = 0; }
-        if(empty($b['rank'])){ $b['rank'] = 0; }
+        if (empty($a['rank'])) { $a['rank'] = 0; }
+        if (empty($b['rank'])) { $b['rank'] = 0; }
         if ($a['rank'] == $b['rank']) {
             return 0;
         }
@@ -853,38 +853,38 @@ 
      *      @param	int				$hideref			Do not show ref
      *      @return	null
      */
-    function prepareArrayColumnField($object,$outputlangs,$hidedetails=0,$hidedesc=0,$hideref=0)
+    function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
     {
         global $conf;
 
-        $this->defineColumnField($object,$outputlangs,$hidedetails,$hidedesc,$hideref);
+        $this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 
         // Sorting
-        uasort ( $this->cols, array( $this, 'columnSort' ) );
+        uasort($this->cols, array($this, 'columnSort'));
 
         // Positionning
-        $curX = $this->page_largeur-$this->marge_droite; // start from right
+        $curX = $this->page_largeur - $this->marge_droite; // start from right
 
         // Array witdh
-        $arrayWidth = $this->page_largeur-$this->marge_droite-$this->marge_gauche;
+        $arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;
 
         // Count flexible column
         $totalDefinedColWidth = 0;
         $countFlexCol = 0;
         foreach ($this->cols as $colKey =>& $colDef)
         {
-            if(!$this->getColumnStatus($colKey)) continue; // continue if desable
+            if (!$this->getColumnStatus($colKey)) continue; // continue if desable
 
-            if(!empty($colDef['scale'])){
+            if (!empty($colDef['scale'])) {
                 // In case of column widht is defined by percentage
-                $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100 );
+                $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);
             }
 
-            if(empty($colDef['width'])){
+            if (empty($colDef['width'])) {
                 $countFlexCol++;
             }
-            else{
+            else {
                 $totalDefinedColWidth += $colDef['width'];
             }
         }
@@ -892,25 +892,25 @@ 
         foreach ($this->cols as $colKey =>& $colDef)
         {
             // setting empty conf with default
-            if(!empty($colDef['title'])){
+            if (!empty($colDef['title'])) {
                 $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
             }
-            else{
+            else {
                 $colDef['title'] = $this->defaultTitlesFieldsStyle;
             }
 
             // setting empty conf with default
-            if(!empty($colDef['content'])){
+            if (!empty($colDef['content'])) {
                 $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
             }
-            else{
+            else {
                 $colDef['content'] = $this->defaultContentsFieldsStyle;
             }
 
-            if($this->getColumnStatus($colKey))
+            if ($this->getColumnStatus($colKey))
             {
                 // In case of flexible column
-                if(empty($colDef['width'])){
+                if (empty($colDef['width'])) {
                     $colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;
                 }
 
@@ -956,7 +956,7 @@ 
      */
     function getColumnRank($colKey)
     {
-        if(!isset($this->cols[$colKey]['rank'])) return -1;
+        if (!isset($this->cols[$colKey]['rank'])) return -1;
         return  $this->cols[$colKey]['rank'];
     }
 
@@ -975,22 +975,22 @@ 
         $rank = -1;
 
         // try to get rank from target column
-        if(!empty($targetCol)){
+        if (!empty($targetCol)) {
             $rank = $this->getColumnRank($targetCol);
-            if($rank>=0 && $insertAfterTarget){ $rank++; }
+            if ($rank >= 0 && $insertAfterTarget) { $rank++; }
         }
 
         // get rank from new column definition
-        if($rank<0 && !empty($defArray['rank'])){
+        if ($rank < 0 && !empty($defArray['rank'])) {
             $rank = $defArray['rank'];
         }
 
         // error: no rank
-        if($rank<0){ return -1; }
+        if ($rank < 0) { return -1; }
 
         foreach ($this->cols as $colKey =>& $colDef)
         {
-            if( $rank <= $colDef['rank'])
+            if ($rank <= $colDef['rank'])
             {
                 $colDef['rank'] = $colDef['rank'] + 1;
             }
@@ -1016,19 +1016,19 @@ 
     {
         global $hookmanager;
 
-        $parameters=array(
+        $parameters = array(
             'curY' => &$curY,
             'columnText' => $columnText,
             'colKey' => $colKey
         );
-        $reshook=$hookmanager->executeHooks('printStdColumnContent',$parameters,$this);    // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error,$hookmanager->errors,'errors');
+        $reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
+        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
         if (!$reshook)
         {
-            if(empty($columnText)) return;
-            $pdf->SetXY($this->getColumnContentXStart($colKey),$curY); // Set curent position
+            if (empty($columnText)) return;
+            $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
             $colDef = $this->cols[$colKey];
-            $pdf->writeHTMLCell( $this->getColumnContentWidth($colKey),2,$this->getColumnContentXStart($colKey),$curY, $columnText,0,0,0,true,$colDef['content']['align']);
+            $pdf->writeHTMLCell($this->getColumnContentWidth($colKey), 2, $this->getColumnContentXStart($colKey), $curY, $columnText, 0, 0, 0, true, $colDef['content']['align']);
         }
     }
 
@@ -1041,7 +1041,7 @@ 
      */
     function getColumnStatus($colKey)
     {
-        if( !empty($this->cols[$colKey]['status'])){
+        if (!empty($this->cols[$colKey]['status'])) {
             return true;
         }
         else  return  false;

Braces +48 added lines, -34 removed lines

@@ -229,8 +229,7 @@ 
         		if($extrafields->attribute_type[$key] == 'price')
         		{
         			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
-        		}
-        		else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+        		} else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
         		{
         			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
         		}
@@ -303,8 +302,7 @@ 
 			if ($extrafields->attribute_type[$key] == 'price')
 			{
 				$object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
-			}
-			elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			} elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
 			}
@@ -343,8 +341,11 @@ 
 
     	foreach($conf->global as $key => $val)
     	{
-    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
-    		else $newval = $val;
+    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) {
+    		    $newval = '*****forbidden*****';
+    		} else {
+    		    $newval = $val;
+    		}
     		$array_other['__['.$key.']__'] = $newval;
     	}
 
@@ -475,12 +476,16 @@ 
 			foreach ($object->lines as $line)
 			{
 			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) {
+				    $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+				}
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
 			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated=vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) {
+				    $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+				}
 				$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
 			}
@@ -572,8 +577,9 @@ 
 		{
 			$tmpproduct = new Product($this->db);
 			$result = $tmpproduct->fetch($line->fk_product);
-			foreach($tmpproduct->array_options as $key=>$label)
-				$resarray["line_product_".$key] = $label;
+			foreach($tmpproduct->array_options as $key=>$label) {
+							$resarray["line_product_".$key] = $label;
+			}
 		}
 
 		return $resarray;
@@ -623,7 +629,9 @@ 
     	// Add vat by rates
     	foreach ($object->lines as $line)
     	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) {
+    		    $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+    		}
     		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
     	}
 
@@ -742,12 +750,10 @@ 
 				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
 				//Add value to store price with currency
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-			}
-			else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			} else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
-			}
-			else if($extrafields->attribute_type[$key] == 'date')
+			} else if($extrafields->attribute_type[$key] == 'date')
 			{
 				if (strlen($object->array_options['options_'.$key])>0)
 				{
@@ -755,8 +761,7 @@ 
 					$object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
 					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
 					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
-				}
-				else
+				} else
 				{
 					$object->array_options['options_'.$key] = '';
 					$object->array_options['options_'.$key.'_locale'] = '';
@@ -764,8 +769,7 @@ 
 				}
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'datetime')
+			} else if($extrafields->attribute_type[$key] == 'datetime')
 			{
 				$datetime = $object->array_options['options_'.$key];
 				$object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
@@ -773,8 +777,7 @@ 
 				$object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):'');                             // international format
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'link')
+			} else if($extrafields->attribute_type[$key] == 'link')
 			{
 				$id = $object->array_options['options_'.$key];
 				if ($id != "")
@@ -819,9 +822,13 @@ 
 	 */
     function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
     {
-        if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
+        if (empty($hidetop) || $hidetop==-1) {
+            $pdf->line($x, $y, $x+$l, $y);
+        }
         $pdf->line($x+$l, $y, $x+$l, $y+$h);
-        if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
+        if (empty($hidebottom)) {
+            $pdf->line($x+$l, $y+$h, $x, $y+$h);
+        }
         $pdf->line($x, $y+$h, $x, $y);
     }
 
@@ -874,7 +881,10 @@ 
         $countFlexCol = 0;
         foreach ($this->cols as $colKey =>& $colDef)
         {
-            if(!$this->getColumnStatus($colKey)) continue; // continue if desable
+            if(!$this->getColumnStatus($colKey)) {
+                continue;
+            }
+            // continue if desable
 
             if(!empty($colDef['scale'])){
                 // In case of column widht is defined by percentage
@@ -883,8 +893,7 @@ 
 
             if(empty($colDef['width'])){
                 $countFlexCol++;
-            }
-            else{
+            } else{
                 $totalDefinedColWidth += $colDef['width'];
             }
         }
@@ -894,16 +903,14 @@ 
             // setting empty conf with default
             if(!empty($colDef['title'])){
                 $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
-            }
-            else{
+            } else{
                 $colDef['title'] = $this->defaultTitlesFieldsStyle;
             }
 
             // setting empty conf with default
             if(!empty($colDef['content'])){
                 $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
-            }
-            else{
+            } else{
                 $colDef['content'] = $this->defaultContentsFieldsStyle;
             }
 
@@ -956,7 +963,9 @@ 
      */
     function getColumnRank($colKey)
     {
-        if(!isset($this->cols[$colKey]['rank'])) return -1;
+        if(!isset($this->cols[$colKey]['rank'])) {
+            return -1;
+        }
         return  $this->cols[$colKey]['rank'];
     }
 
@@ -1022,10 +1031,14 @@ 
             'colKey' => $colKey
         );
         $reshook=$hookmanager->executeHooks('printStdColumnContent',$parameters,$this);    // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error,$hookmanager->errors,'errors');
+        if ($reshook < 0) {
+            setEventMessages($hookmanager->error,$hookmanager->errors,'errors');
+        }
         if (!$reshook)
         {
-            if(empty($columnText)) return;
+            if(empty($columnText)) {
+                return;
+            }
             $pdf->SetXY($this->getColumnContentXStart($colKey),$curY); // Set curent position
             $colDef = $this->cols[$colKey];
             $pdf->writeHTMLCell( $this->getColumnContentWidth($colKey),2,$this->getColumnContentXStart($colKey),$curY, $columnText,0,0,0,true,$colDef['content']['align']);
@@ -1043,7 +1056,8 @@ 
     {
         if( !empty($this->cols[$colKey]['status'])){
             return true;
+        } else {
+            return  false;
         }
-        else  return  false;
     }
 }

dolibarr/htdocs/core/class/canvas.class.php

Indentation +118 added lines, -118 removed lines

@@ -28,22 +28,22 @@ 
  */
 class Canvas
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
-	public $actiontype;
+    public $actiontype;
 
     public $dirmodule;			// Module directory
     public $targetmodule;      // Module concerned by canvas (ex: thirdparty, contact, ...)
@@ -54,65 +54,65 @@ 
     public $control;           	// Initialized by getCanvas with controller instance
 
 
-   /**
-	*   Constructor
-	*
-	*   @param     DoliDB	$db          	Database handler
-	*   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
-	*/
-	function __construct($db, $actiontype='view')
-	{
-		$this->db = $db;
-
-		$this->actiontype = $this->_cleanaction($actiontype);
-	}
-
-	/**
-	 * Return action code cleaned
-	 *
-	 * @param	string	$action		Action type ('create', 'view', 'edit', 'list', 'add', 'update')
-	 * @return 	string				Cleaned action type ('create', 'view', 'edit', 'list')
-	 */
-	private function _cleanaction($action)
-	{
-	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
-	    return $newaction;
-	}
-
-
-	/**
-	 * 	Initialize properties: ->targetmodule, ->canvas, ->card, ->dirmodule, ->template_dir
-	 *
-	 * 	@param	string	$module		Name of target module (thirdparty, contact, ...)
-	 * 	@param	string	$card	 	Tab name of card (ex: 'card', 'info', 'contactcard', ...) or '' for a list page
-	 * 	@param	string	$canvas		Name of canvas (ex: mycanvas, default, or mycanvas@myexternalmodule)
-	 * 	@return	void
-	 */
-	function getCanvas($module, $card, $canvas)
-	{
-		global $conf, $langs;
-
-		// Set properties with value specific to dolibarr core: this->targetmodule, this->card, this->canvas
+    /**
+     *   Constructor
+     *
+     *   @param     DoliDB	$db          	Database handler
+     *   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
+     */
+    function __construct($db, $actiontype='view')
+    {
+        $this->db = $db;
+
+        $this->actiontype = $this->_cleanaction($actiontype);
+    }
+
+    /**
+     * Return action code cleaned
+     *
+     * @param	string	$action		Action type ('create', 'view', 'edit', 'list', 'add', 'update')
+     * @return 	string				Cleaned action type ('create', 'view', 'edit', 'list')
+     */
+    private function _cleanaction($action)
+    {
+        $newaction = $action;
+        if ($newaction == 'add')    $newaction='create';
+        if ($newaction == 'update') $newaction='edit';
+        if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+        return $newaction;
+    }
+
+
+    /**
+     * 	Initialize properties: ->targetmodule, ->canvas, ->card, ->dirmodule, ->template_dir
+     *
+     * 	@param	string	$module		Name of target module (thirdparty, contact, ...)
+     * 	@param	string	$card	 	Tab name of card (ex: 'card', 'info', 'contactcard', ...) or '' for a list page
+     * 	@param	string	$canvas		Name of canvas (ex: mycanvas, default, or mycanvas@myexternalmodule)
+     * 	@return	void
+     */
+    function getCanvas($module, $card, $canvas)
+    {
+        global $conf, $langs;
+
+        // Set properties with value specific to dolibarr core: this->targetmodule, this->card, this->canvas
         $this->targetmodule = $module;
         $this->canvas = $canvas;
         $this->card = $card;
         $this->dirmodule = $module;
         // Correct values if canvas is into an external module
-		if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs))
-		{
+        if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs))
+        {
             $this->canvas = $regs[1];
-		    $this->dirmodule = $regs[2];
-		}
-		// For compatibility
+            $this->dirmodule = $regs[2];
+        }
+        // For compatibility
         if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }
 
         // Control file
-		$controlclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php');
-		if (file_exists($controlclassfile))
-		{
+        $controlclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php');
+        if (file_exists($controlclassfile))
+        {
             // Include actions class (controller)
             $this->control_file=$controlclassfile;
             require_once $controlclassfile;
@@ -120,10 +120,10 @@ 
             // Instantiate actions class (controller)
             $controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);
             $this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);
-		}
+        }
 
-		// Template dir
-		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
+        // Template dir
+        $this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
         if (! is_dir($this->template_dir))
         {
             $this->template_dir='';
@@ -131,27 +131,27 @@ 
 
         //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
         //print ' => template_dir='.$this->template_dir.'<br>';
-	}
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 * 	Shared method for canvas to assign values for templates
-	 *
-	 * 	@param		string		$action	Action string
-	 * 	@param		int			$id			Object id (if ref not provided)
-	 * 	@param		string		$ref		Object ref (if id not provided)
-	 * 	@return		void
-	 */
-	function assign_values(&$action='view', $id=0, $ref='')
-	{
+     * 	Shared method for canvas to assign values for templates
+     *
+     * 	@param		string		$action	Action string
+     * 	@param		int			$id			Object id (if ref not provided)
+     * 	@param		string		$ref		Object ref (if id not provided)
+     * 	@return		void
+     */
+    function assign_values(&$action='view', $id=0, $ref='')
+    {
         // phpcs:enable
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
-	}
+        if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+    }
 
     /**
      *	Return the template to display canvas (if it exists)
-	 *
-	 *	@param	string	$action		Action code
+     *
+     *	@param	string	$action		Action code
      *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists
      */
     function displayCanvasExists($action)
@@ -163,53 +163,53 @@ 
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Display a canvas page. This will include the template for output.
-	 *	Variables used by templates may have been defined or loaded before into the assign_values function.
-	 *
-	 *	@param	string	$action		Action code
-	 *	@return	void
-	 */
-	function display_canvas($action)
-	{
+    /**
+     *	Display a canvas page. This will include the template for output.
+     *	Variables used by templates may have been defined or loaded before into the assign_values function.
+     *
+     *	@param	string	$action		Action code
+     *	@return	void
+     */
+    function display_canvas($action)
+    {
         // phpcs:enable
-		global $db, $conf, $langs, $user, $canvas;
-		global $form, $formfile;
+        global $db, $conf, $langs, $user, $canvas;
+        global $form, $formfile;
 
-		include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php';        // Include native PHP template
-	}
+        include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php';        // Include native PHP template
+    }
 
 
-	// This functions should not be used anymore because canvas should contains only templates.
-	// http://wiki.dolibarr.org/index.php/Canvas_development
+    // This functions should not be used anymore because canvas should contains only templates.
+    // http://wiki.dolibarr.org/index.php/Canvas_development
 
-	/**
-	 * 	Return if a canvas contains an action controller
-	 *
-	 * 	@return		boolean		Return if canvas contains actions (old feature. now actions should be inside hooks)
-	 */
-	function hasActions()
-	{
+    /**
+     * 	Return if a canvas contains an action controller
+     *
+     * 	@return		boolean		Return if canvas contains actions (old feature. now actions should be inside hooks)
+     */
+    function hasActions()
+    {
         return (is_object($this->control));
-	}
+    }
 
-	/**
-	 * 	Shared method for canvas to execute actions.
+    /**
+     * 	Shared method for canvas to execute actions.
      *  @deprecated Use the doActions of hooks instead of this.
-	 * 	            This function is called if you add a doActions class inside your canvas. Try to not
-	 * 				do that and add action code into a hook instead.
-	 *
-	 * 	@param		string		$action	Action string
-	 * 	@param		int			$id			Object id
-	 * 	@return		mixed					Return return code of doActions of canvas
-	 * 	@see		http://wiki.dolibarr.org/index.php/Canvas_development
-	 */
-	function doActions(&$action='view', $id=0)
-	{
-		if (method_exists($this->control,'doActions'))
-		{
-			$ret = $this->control->doActions($action, $id);
-			return $ret;
-		}
-	}
+     * 	            This function is called if you add a doActions class inside your canvas. Try to not
+     * 				do that and add action code into a hook instead.
+     *
+     * 	@param		string		$action	Action string
+     * 	@param		int			$id			Object id
+     * 	@return		mixed					Return return code of doActions of canvas
+     * 	@see		http://wiki.dolibarr.org/index.php/Canvas_development
+     */
+    function doActions(&$action='view', $id=0)
+    {
+        if (method_exists($this->control,'doActions'))
+        {
+            $ret = $this->control->doActions($action, $id);
+            return $ret;
+        }
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -36,7 +36,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -45,13 +45,13 @@ 
 
 	public $actiontype;
 
-    public $dirmodule;			// Module directory
-    public $targetmodule;      // Module concerned by canvas (ex: thirdparty, contact, ...)
-    public $canvas;            // Name of canvas (ex: company, individual, product, service, ...)
-    public $card;              // Tab (sub-canvas)
+    public $dirmodule; // Module directory
+    public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
+    public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
+    public $card; // Tab (sub-canvas)
 
-    public $template_dir;		// Initialized by getCanvas with templates directory
-    public $control;           	// Initialized by getCanvas with controller instance
+    public $template_dir; // Initialized by getCanvas with templates directory
+    public $control; // Initialized by getCanvas with controller instance
 
 
    /**
@@ -60,7 +60,7 @@ 
 	*   @param     DoliDB	$db          	Database handler
 	*   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
 	*/
-	function __construct($db, $actiontype='view')
+	function __construct($db, $actiontype = 'view')
 	{
 		$this->db = $db;
 
@@ -76,9 +76,9 @@ 
 	private function _cleanaction($action)
 	{
 	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+	    if ($newaction == 'add')    $newaction = 'create';
+	    if ($newaction == 'update') $newaction = 'edit';
+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';
 	    return $newaction;
 	}
 
@@ -101,7 +101,7 @@ 
         $this->card = $card;
         $this->dirmodule = $module;
         // Correct values if canvas is into an external module
-		if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs))
+		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs))
 		{
             $this->canvas = $regs[1];
 		    $this->dirmodule = $regs[2];
@@ -114,7 +114,7 @@ 
 		if (file_exists($controlclassfile))
 		{
             // Include actions class (controller)
-            $this->control_file=$controlclassfile;
+            $this->control_file = $controlclassfile;
             require_once $controlclassfile;
 
             // Instantiate actions class (controller)
@@ -124,9 +124,9 @@ 
 
 		// Template dir
 		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
-        if (! is_dir($this->template_dir))
+        if (!is_dir($this->template_dir))
         {
-            $this->template_dir='';
+            $this->template_dir = '';
         }
 
         //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
@@ -142,10 +142,10 @@ 
 	 * 	@param		string		$ref		Object ref (if id not provided)
 	 * 	@return		void
 	 */
-	function assign_values(&$action='view', $id=0, $ref='')
+	function assign_values(&$action = 'view', $id = 0, $ref = '')
 	{
         // phpcs:enable
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+		if (method_exists($this->control, 'assign_values')) $this->control->assign_values($action, $id, $ref);
 	}
 
     /**
@@ -158,7 +158,7 @@ 
     {
         if (empty($this->template_dir)) return 0;
 
-        if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
+        if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;
         else return 0;
     }
 
@@ -176,7 +176,7 @@ 
 		global $db, $conf, $langs, $user, $canvas;
 		global $form, $formfile;
 
-		include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php';        // Include native PHP template
+		include $this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template
 	}
 
 
@@ -204,9 +204,9 @@ 
 	 * 	@return		mixed					Return return code of doActions of canvas
 	 * 	@see		http://wiki.dolibarr.org/index.php/Canvas_development
 	 */
-	function doActions(&$action='view', $id=0)
+	function doActions(&$action = 'view', $id = 0)
 	{
-		if (method_exists($this->control,'doActions'))
+		if (method_exists($this->control, 'doActions'))
 		{
 			$ret = $this->control->doActions($action, $id);
 			return $ret;

Braces +20 added lines, -7 removed lines

@@ -76,9 +76,15 @@ 
 	private function _cleanaction($action)
 	{
 	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+	    if ($newaction == 'add') {
+	        $newaction='create';
+	    }
+	    if ($newaction == 'update') {
+	        $newaction='edit';
+	    }
+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') {
+	        $newaction='view';
+	    }
 	    return $newaction;
 	}
 
@@ -145,7 +151,9 @@ 
 	function assign_values(&$action='view', $id=0, $ref='')
 	{
         // phpcs:enable
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+		if (method_exists($this->control,'assign_values')) {
+		    $this->control->assign_values($action, $id, $ref);
+		}
 	}
 
     /**
@@ -156,10 +164,15 @@ 
      */
     function displayCanvasExists($action)
     {
-        if (empty($this->template_dir)) return 0;
+        if (empty($this->template_dir)) {
+            return 0;
+        }
 
-        if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
-        else return 0;
+        if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) {
+            return 1;
+        } else {
+            return 0;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps