alxarafe / alixar

dolibarr/htdocs/core/lib/files.lib.php

Indentation +2345 added lines, -2345 removed lines

@@ -34,7 +34,7 @@ 
  */
 function dol_basename($pathfile)
 {
-	return preg_replace('/^.*\/([^\/]+)$/','$1',rtrim($pathfile,'/'));
+    return preg_replace('/^.*\/([^\/]+)$/','$1',rtrim($pathfile,'/'));
 }
 
 /**
@@ -58,158 +58,158 @@ 
  */
 function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=0, $relativename="", $donotfollowsymlinks=0)
 {
-	global $db, $hookmanager;
-	global $object;
-
-	dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));
-	//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
-
-	$loaddate=($mode==1||$mode==2)?true:false;
-	$loadsize=($mode==1||$mode==3)?true:false;
-
-	// Clean parameters
-	$path=preg_replace('/([\\/]+)$/i','',$path);
-	$newpath=dol_osencode($path);
-
-	$reshook = 0;
-	$file_list = array();
-
-	if (is_object($hookmanager) && ! $nohook)
-	{
-		$hookmanager->resArray=array();
-
-		$hookmanager->initHooks(array('fileslib'));
-
-		$parameters=array(
-				'path' => $newpath,
-				'types'=> $types,
-				'recursive' => $recursive,
-				'filter' => $filter,
-				'excludefilter' => $excludefilter,
-				'sortcriteria' => $sortcriteria,
-				'sortorder' => $sortorder,
-				'loaddate' => $loaddate,
-				'loadsize' => $loadsize,
-				'mode' => $mode
-		);
-		$reshook=$hookmanager->executeHooks('getDirList', $parameters, $object);
-	}
-
-	// $hookmanager->resArray may contain array stacked by other modules
-	if (empty($reshook))
-	{
-		if (! is_dir($newpath)) return array();
-
-		if ($dir = opendir($newpath))
-		{
-			$filedate='';
-			$filesize='';
-
-			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
-			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
-				$fullpathfile=($newpath?$newpath.'/':'').$file;
-
-				$qualified=1;
-
-				// Define excludefilterarray
-				$excludefilterarray=array('^\.');
-				if (is_array($excludefilter))
-				{
-					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
-				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
-				// Check if file is qualified
-				foreach($excludefilterarray as $filt)
-				{
-					if (preg_match('/'.$filt.'/i', $file) || preg_match('/'.$filt.'/i', $fullpathfile)) {
-						$qualified=0; break;
-					}
-				}
-				//print $fullpathfile.' '.$file.' '.$qualified.'<br>';
-
-				if ($qualified)
-				{
-					$isdir=is_dir(dol_osencode($path."/".$file));
-					// Check whether this is a file or directory and whether we're interested in that type
-					if ($isdir && (($types=="directories") || ($types=="all") || $recursive))
-					{
-						// Add entry into file_list array
-						if (($types=="directories") || ($types=="all"))
-						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
-
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
-							{
-								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-								$level1name=(isset($reg[1])?$reg[1]:'');
-								$file_list[] = array(
-										"name" => $file,
-										"path" => $path,
-										"level1name" => $level1name,
-										"relativename" => ($relativename?$relativename.'/':'').$file,
-										"fullname" => $path.'/'.$file,
-										"date" => $filedate,
-										"size" => $filesize,
-										"type" => 'dir'
-								);
-							}
-						}
-
-						// if we're in a directory and we want recursive behavior, call this function again
-						if ($recursive)
-						{
-							if (empty($donotfollowsymlinks) || ! is_link($path."/".$file))
-							{
-								//var_dump('eee '. $path."/".$file. ' '.is_dir($path."/".$file).' '.is_link($path."/".$file));
-								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file, $donotfollowsymlinks));
-							}
-						}
-					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
-					{
-						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
-
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
-						{
-							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-							$level1name=(isset($reg[1])?$reg[1]:'');
-							$file_list[] = array(
-									"name" => $file,
-									"path" => $path,
-									"level1name" => $level1name,
-									"relativename" => ($relativename?$relativename.'/':'').$file,
-									"fullname" => $path.'/'.$file,
-									"date" => $filedate,
-									"size" => $filesize,
-									"type" => 'file'
-							);
-						}
-					}
-				}
-			}
-			closedir($dir);
-
-			// Obtain a list of columns
-			if (! empty($sortcriteria))
-			{
-				$myarray=array();
-				foreach ($file_list as $key => $row)
-				{
-					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
-				}
-				// Sort the data
-				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
-			}
-		}
-	}
-
-	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
-
-	return $file_list;
+    global $db, $hookmanager;
+    global $object;
+
+    dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));
+    //print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
+
+    $loaddate=($mode==1||$mode==2)?true:false;
+    $loadsize=($mode==1||$mode==3)?true:false;
+
+    // Clean parameters
+    $path=preg_replace('/([\\/]+)$/i','',$path);
+    $newpath=dol_osencode($path);
+
+    $reshook = 0;
+    $file_list = array();
+
+    if (is_object($hookmanager) && ! $nohook)
+    {
+        $hookmanager->resArray=array();
+
+        $hookmanager->initHooks(array('fileslib'));
+
+        $parameters=array(
+                'path' => $newpath,
+                'types'=> $types,
+                'recursive' => $recursive,
+                'filter' => $filter,
+                'excludefilter' => $excludefilter,
+                'sortcriteria' => $sortcriteria,
+                'sortorder' => $sortorder,
+                'loaddate' => $loaddate,
+                'loadsize' => $loadsize,
+                'mode' => $mode
+        );
+        $reshook=$hookmanager->executeHooks('getDirList', $parameters, $object);
+    }
+
+    // $hookmanager->resArray may contain array stacked by other modules
+    if (empty($reshook))
+    {
+        if (! is_dir($newpath)) return array();
+
+        if ($dir = opendir($newpath))
+        {
+            $filedate='';
+            $filesize='';
+
+            while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
+            {
+                if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
+                $fullpathfile=($newpath?$newpath.'/':'').$file;
+
+                $qualified=1;
+
+                // Define excludefilterarray
+                $excludefilterarray=array('^\.');
+                if (is_array($excludefilter))
+                {
+                    $excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+                }
+                else if ($excludefilter) $excludefilterarray[]=$excludefilter;
+                // Check if file is qualified
+                foreach($excludefilterarray as $filt)
+                {
+                    if (preg_match('/'.$filt.'/i', $file) || preg_match('/'.$filt.'/i', $fullpathfile)) {
+                        $qualified=0; break;
+                    }
+                }
+                //print $fullpathfile.' '.$file.' '.$qualified.'<br>';
+
+                if ($qualified)
+                {
+                    $isdir=is_dir(dol_osencode($path."/".$file));
+                    // Check whether this is a file or directory and whether we're interested in that type
+                    if ($isdir && (($types=="directories") || ($types=="all") || $recursive))
+                    {
+                        // Add entry into file_list array
+                        if (($types=="directories") || ($types=="all"))
+                        {
+                            if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
+                            if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+
+                            if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+                            {
+                                preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+                                $level1name=(isset($reg[1])?$reg[1]:'');
+                                $file_list[] = array(
+                                        "name" => $file,
+                                        "path" => $path,
+                                        "level1name" => $level1name,
+                                        "relativename" => ($relativename?$relativename.'/':'').$file,
+                                        "fullname" => $path.'/'.$file,
+                                        "date" => $filedate,
+                                        "size" => $filesize,
+                                        "type" => 'dir'
+                                );
+                            }
+                        }
+
+                        // if we're in a directory and we want recursive behavior, call this function again
+                        if ($recursive)
+                        {
+                            if (empty($donotfollowsymlinks) || ! is_link($path."/".$file))
+                            {
+                                //var_dump('eee '. $path."/".$file. ' '.is_dir($path."/".$file).' '.is_link($path."/".$file));
+                                $file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file, $donotfollowsymlinks));
+                            }
+                        }
+                    }
+                    else if (! $isdir && (($types == "files") || ($types == "all")))
+                    {
+                        // Add file into file_list array
+                        if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
+                        if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+
+                        if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+                        {
+                            preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+                            $level1name=(isset($reg[1])?$reg[1]:'');
+                            $file_list[] = array(
+                                    "name" => $file,
+                                    "path" => $path,
+                                    "level1name" => $level1name,
+                                    "relativename" => ($relativename?$relativename.'/':'').$file,
+                                    "fullname" => $path.'/'.$file,
+                                    "date" => $filedate,
+                                    "size" => $filesize,
+                                    "type" => 'file'
+                            );
+                        }
+                    }
+                }
+            }
+            closedir($dir);
+
+            // Obtain a list of columns
+            if (! empty($sortcriteria))
+            {
+                $myarray=array();
+                foreach ($file_list as $key => $row)
+                {
+                    $myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+                }
+                // Sort the data
+                if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+            }
+        }
+    }
+
+    if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
+
+    return $file_list;
 }
 
 
@@ -228,68 +228,68 @@ 
  */
 function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
 {
-	global $conf, $db;
-
-	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
-	$sql.=" acl, position, share";
-	if ($mode) $sql.=", description";
-	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
-	$sql.=" WHERE filepath = '".$db->escape($path)."'";
-	$sql.=" AND entity = ".$conf->entity;
-
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$file_list=array();
-		$num = $db->num_rows($resql);
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
-				$level1name=(isset($reg[1])?$reg[1]:'');
-				$file_list[] = array(
-					"rowid" => $obj->rowid,
-					"label" => $obj->label,         // md5
-					"name" => $obj->filename,
-					"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
-					"level1name" => $level1name,
-					"fullname" => DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,
-					"fullpath_orig" => $obj->fullpath_orig,
-					"date_c" => $db->jdate($obj->date_c),
-					"date_m" => $db->jdate($obj->date_m),
-					"type" => 'file',
-					"keywords" => $obj->keywords,
-					"cover" => $obj->cover,
-					"position" => (int) $obj->position,
-					"acl" => $obj->acl,
-					"share" => $obj->share
-				);
-			}
-			$i++;
-		}
-
-		// Obtain a list of columns
-		if (! empty($sortcriteria))
-		{
-			$myarray=array();
-			foreach ($file_list as $key => $row)
-			{
-				$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
-			}
-			// Sort the data
-			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
-		}
-
-		return $file_list;
-	}
-	else
-	{
-		dol_print_error($db);
-		return array();
-	}
+    global $conf, $db;
+
+    $sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
+    $sql.=" acl, position, share";
+    if ($mode) $sql.=", description";
+    $sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
+    $sql.=" WHERE filepath = '".$db->escape($path)."'";
+    $sql.=" AND entity = ".$conf->entity;
+
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $file_list=array();
+        $num = $db->num_rows($resql);
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj)
+            {
+                preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
+                $level1name=(isset($reg[1])?$reg[1]:'');
+                $file_list[] = array(
+                    "rowid" => $obj->rowid,
+                    "label" => $obj->label,         // md5
+                    "name" => $obj->filename,
+                    "path" => DOL_DATA_ROOT.'/'.$obj->filepath,
+                    "level1name" => $level1name,
+                    "fullname" => DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,
+                    "fullpath_orig" => $obj->fullpath_orig,
+                    "date_c" => $db->jdate($obj->date_c),
+                    "date_m" => $db->jdate($obj->date_m),
+                    "type" => 'file',
+                    "keywords" => $obj->keywords,
+                    "cover" => $obj->cover,
+                    "position" => (int) $obj->position,
+                    "acl" => $obj->acl,
+                    "share" => $obj->share
+                );
+            }
+            $i++;
+        }
+
+        // Obtain a list of columns
+        if (! empty($sortcriteria))
+        {
+            $myarray=array();
+            foreach ($file_list as $key => $row)
+            {
+                $myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+            }
+            // Sort the data
+            if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+        }
+
+        return $file_list;
+    }
+    else
+    {
+        dol_print_error($db);
+        return array();
+    }
 }
 
 
@@ -303,94 +303,94 @@ 
  */
 function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 {
-	global $conf, $db, $user;
-
-	$filearrayindatabase = dol_dir_list_in_database($relativedir, '', null, 'name', SORT_ASC);
-
-	// TODO Remove this when PRODUCT_USE_OLD_PATH_FOR_PHOTO will be removed
-	global $modulepart;
-	if ($modulepart == 'produit' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-		global $object;
-		if (! empty($object->id))
-		{
-			if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-			else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-
-			$relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dirold);
-			$relativedirold = preg_replace('/^[\\/]/','',$relativedirold);
-
-			$filearrayindatabase = array_merge($filearrayindatabase, dol_dir_list_in_database($relativedirold, '', null, 'name', SORT_ASC));
-		}
-	}
-
-	//var_dump($filearray);
-	//var_dump($filearrayindatabase);
-
-	// Complete filearray with properties found into $filearrayindatabase
-	foreach($filearray as $key => $val)
-	{
-		$found=0;
-		// Search if it exists into $filearrayindatabase
-		foreach($filearrayindatabase as $key2 => $val2)
-		{
-			if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
-			{
-				$filearray[$key]['position_name']=($filearrayindatabase[$key2]['position']?$filearrayindatabase[$key2]['position']:'0').'_'.$filearrayindatabase[$key2]['name'];
-				$filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
-				$filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
-				$filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
-				$filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
-				$filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
-				$filearray[$key]['share']=$filearrayindatabase[$key2]['share'];
-				$found=1;
-				break;
-			}
-		}
-
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
-		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
-			$filearray[$key]['cover']=0;
-			$filearray[$key]['acl']='';
-
-			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
-			{
-				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
-				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-				$ecmfile=new EcmFiles($db);
-
-				// Add entry into database
-				$filename = basename($rel_filename);
-				$rel_dir = dirname($rel_filename);
-				$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-				$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-				$ecmfile->filepath = $rel_dir;
-				$ecmfile->filename = $filename;
-				$ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
-				$ecmfile->fullpath_orig = $filearray[$key]['fullname'];
-				$ecmfile->gen_or_uploaded = 'unknown';
-				$ecmfile->description = '';    // indexed content
-				$ecmfile->keyword = '';        // keyword content
-				$result = $ecmfile->create($user);
-				if ($result < 0)
-				{
-					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else
-				{
-					$filearray[$key]['rowid']=$result;
-				}
-			}
-			else
-			{
-				$filearray[$key]['rowid']=0;     // Should not happened
-			}
-		}
-	}
-
-	/*var_dump($filearray);*/
+    global $conf, $db, $user;
+
+    $filearrayindatabase = dol_dir_list_in_database($relativedir, '', null, 'name', SORT_ASC);
+
+    // TODO Remove this when PRODUCT_USE_OLD_PATH_FOR_PHOTO will be removed
+    global $modulepart;
+    if ($modulepart == 'produit' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+        global $object;
+        if (! empty($object->id))
+        {
+            if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+            else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+
+            $relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dirold);
+            $relativedirold = preg_replace('/^[\\/]/','',$relativedirold);
+
+            $filearrayindatabase = array_merge($filearrayindatabase, dol_dir_list_in_database($relativedirold, '', null, 'name', SORT_ASC));
+        }
+    }
+
+    //var_dump($filearray);
+    //var_dump($filearrayindatabase);
+
+    // Complete filearray with properties found into $filearrayindatabase
+    foreach($filearray as $key => $val)
+    {
+        $found=0;
+        // Search if it exists into $filearrayindatabase
+        foreach($filearrayindatabase as $key2 => $val2)
+        {
+            if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
+            {
+                $filearray[$key]['position_name']=($filearrayindatabase[$key2]['position']?$filearrayindatabase[$key2]['position']:'0').'_'.$filearrayindatabase[$key2]['name'];
+                $filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
+                $filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
+                $filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
+                $filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
+                $filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
+                $filearray[$key]['share']=$filearrayindatabase[$key2]['share'];
+                $found=1;
+                break;
+            }
+        }
+
+        if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+        {
+            $filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
+            $filearray[$key]['cover']=0;
+            $filearray[$key]['acl']='';
+
+            $rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
+            if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+            {
+                dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
+                include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+                $ecmfile=new EcmFiles($db);
+
+                // Add entry into database
+                $filename = basename($rel_filename);
+                $rel_dir = dirname($rel_filename);
+                $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+                $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+                $ecmfile->filepath = $rel_dir;
+                $ecmfile->filename = $filename;
+                $ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
+                $ecmfile->fullpath_orig = $filearray[$key]['fullname'];
+                $ecmfile->gen_or_uploaded = 'unknown';
+                $ecmfile->description = '';    // indexed content
+                $ecmfile->keyword = '';        // keyword content
+                $result = $ecmfile->create($user);
+                if ($result < 0)
+                {
+                    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                }
+                else
+                {
+                    $filearray[$key]['rowid']=$result;
+                }
+            }
+            else
+            {
+                $filearray[$key]['rowid']=0;     // Should not happened
+            }
+        }
+    }
+
+    /*var_dump($filearray);*/
 }
 
 
@@ -403,29 +403,29 @@ 
  */
 function dol_compare_file($a, $b)
 {
-	global $sortorder;
-	global $sortfield;
-
-	$sortorder=strtoupper($sortorder);
-
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
-
-	if ($sortfield == 'name')
-	{
-		if ($a->name == $b->name) return 0;
-		return ($a->name < $b->name) ? $retup : $retdown;
-	}
-	if ($sortfield == 'date')
-	{
-		if ($a->date == $b->date) return 0;
-		return ($a->date < $b->date) ? $retup : $retdown;
-	}
-	if ($sortfield == 'size')
-	{
-		if ($a->size == $b->size) return 0;
-		return ($a->size < $b->size) ? $retup : $retdown;
-	}
+    global $sortorder;
+    global $sortfield;
+
+    $sortorder=strtoupper($sortorder);
+
+    if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
+    else { $retup=1; $retdown=-1; }
+
+    if ($sortfield == 'name')
+    {
+        if ($a->name == $b->name) return 0;
+        return ($a->name < $b->name) ? $retup : $retdown;
+    }
+    if ($sortfield == 'date')
+    {
+        if ($a->date == $b->date) return 0;
+        return ($a->date < $b->date) ? $retup : $retdown;
+    }
+    if ($sortfield == 'size')
+    {
+        if ($a->size == $b->size) return 0;
+        return ($a->size < $b->size) ? $retup : $retdown;
+    }
 }
 
 
@@ -437,9 +437,9 @@ 
  */
 function dol_is_dir($folder)
 {
-	$newfolder=dol_osencode($folder);
-	if (is_dir($newfolder)) return true;
-	else return false;
+    $newfolder=dol_osencode($folder);
+    if (is_dir($newfolder)) return true;
+    else return false;
 }
 
 /**
@@ -450,8 +450,8 @@ 
  */
 function dol_is_file($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
-	return is_file($newpathoffile);
+    $newpathoffile=dol_osencode($pathoffile);
+    return is_file($newpathoffile);
 }
 
 /**
@@ -462,8 +462,8 @@ 
  */
 function dol_is_link($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
-	return is_link($newpathoffile);
+    $newpathoffile=dol_osencode($pathoffile);
+    return is_link($newpathoffile);
 }
 
 /**
@@ -474,12 +474,12 @@ 
  */
 function dol_is_url($url)
 {
-	$tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
-	foreach($tmpprot as $prot)
-	{
-		if (preg_match('/^'.$prot.':/i',$url)) return true;
-	}
-	return false;
+    $tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
+    foreach($tmpprot as $prot)
+    {
+        if (preg_match('/^'.$prot.':/i',$url)) return true;
+    }
+    return false;
 }
 
 /**
@@ -490,24 +490,24 @@ 
  */
 function dol_dir_is_emtpy($folder)
 {
-	$newfolder=dol_osencode($folder);
-	if (is_dir($newfolder))
-	{
-		$handle = opendir($newfolder);
-		$folder_content = '';
-		while ((gettype($name = readdir($handle)) != "boolean"))
-		{
-			$name_array[] = $name;
-		}
-		foreach($name_array as $temp) $folder_content .= $temp;
-
-		closedir($handle);
-
-		if ($folder_content == "...") return true;
-		else return false;
-	}
-	else
-	return true; // Dir does not exists
+    $newfolder=dol_osencode($folder);
+    if (is_dir($newfolder))
+    {
+        $handle = opendir($newfolder);
+        $folder_content = '';
+        while ((gettype($name = readdir($handle)) != "boolean"))
+        {
+            $name_array[] = $name;
+        }
+        foreach($name_array as $temp) $folder_content .= $temp;
+
+        closedir($handle);
+
+        if ($folder_content == "...") return true;
+        else return false;
+    }
+    else
+    return true; // Dir does not exists
 }
 
 /**
@@ -519,27 +519,27 @@ 
  */
 function dol_count_nb_of_line($file)
 {
-	$nb=0;
-
-	$newfile=dol_osencode($file);
-	//print 'x'.$file;
-	$fp=fopen($newfile,'r');
-	if ($fp)
-	{
-		while (!feof($fp))
-		{
-			$line=fgets($fp);
-			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$nb=-1;
-	}
-
-	return $nb;
+    $nb=0;
+
+    $newfile=dol_osencode($file);
+    //print 'x'.$file;
+    $fp=fopen($newfile,'r');
+    if ($fp)
+    {
+        while (!feof($fp))
+        {
+            $line=fgets($fp);
+            // We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
+            if (! $line === false) $nb++;
+        }
+        fclose($fp);
+    }
+    else
+    {
+        $nb=-1;
+    }
+
+    return $nb;
 }
 
 
@@ -551,8 +551,8 @@ 
  */
 function dol_filesize($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
-	return filesize($newpathoffile);
+    $newpathoffile=dol_osencode($pathoffile);
+    return filesize($newpathoffile);
 }
 
 /**
@@ -563,8 +563,8 @@ 
  */
 function dol_filemtime($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
-	return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
+    $newpathoffile=dol_osencode($pathoffile);
+    return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
 }
 
 /**
@@ -580,61 +580,61 @@ 
  */
 function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
 {
-	global $conf;
+    global $conf;
 
-	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
+    dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
-	if (empty($srcfile)) return -1;
-	if (empty($destfile)) $destfile=$srcfile;
+    if (empty($srcfile)) return -1;
+    if (empty($destfile)) $destfile=$srcfile;
 
-	$destexists=dol_is_file($destfile);
-	if (($destfile != $srcfile) && $destexists) return 0;
+    $destexists=dol_is_file($destfile);
+    if (($destfile != $srcfile) && $destexists) return 0;
 
-	$tmpdestfile=$destfile.'.tmp';
+    $tmpdestfile=$destfile.'.tmp';
 
-	$newpathofsrcfile=dol_osencode($srcfile);
-	$newpathoftmpdestfile=dol_osencode($tmpdestfile);
-	$newpathofdestfile=dol_osencode($destfile);
-	$newdirdestfile=dirname($newpathofdestfile);
+    $newpathofsrcfile=dol_osencode($srcfile);
+    $newpathoftmpdestfile=dol_osencode($tmpdestfile);
+    $newpathofdestfile=dol_osencode($destfile);
+    $newdirdestfile=dirname($newpathofdestfile);
 
-	if ($destexists && ! is_writable($newpathofdestfile))
-	{
-		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
-		return -1;
-	}
-	if (! is_writable($newdirdestfile))
-	{
-		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
-		return -2;
-	}
+    if ($destexists && ! is_writable($newpathofdestfile))
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
+        return -1;
+    }
+    if (! is_writable($newdirdestfile))
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
+        return -2;
+    }
 
-	dol_delete_file($tmpdestfile);
+    dol_delete_file($tmpdestfile);
 
-	// Create $newpathoftmpdestfile from $newpathofsrcfile
-	$content = file_get_contents($newpathofsrcfile, 'r');
+    // Create $newpathoftmpdestfile from $newpathofsrcfile
+    $content = file_get_contents($newpathofsrcfile, 'r');
 
-	$content = make_substitutions($content, $arrayreplacement, null);
+    $content = make_substitutions($content, $arrayreplacement, null);
 
-	file_put_contents($newpathoftmpdestfile, $content);
-	@chmod($newpathoftmpdestfile, octdec($newmask));
+    file_put_contents($newpathoftmpdestfile, $content);
+    @chmod($newpathoftmpdestfile, octdec($newmask));
 
-	// Rename
-	$result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
-	if (! $result)
-	{
-		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
-		return -3;
-	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
-	{
-		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
-		$newmask='0664';
-	}
+    // Rename
+    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
+    if (! $result)
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
+        return -3;
+    }
+    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+    if (empty($newmask))	// This should no happen
+    {
+        dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+        $newmask='0664';
+    }
 
-	@chmod($newpathofdestfile, octdec($newmask));
+    @chmod($newpathofdestfile, octdec($newmask));
 
-	return 1;
+    return 1;
 }
 
 /**
@@ -650,7 +650,7 @@ 
  */
 function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
 {
-	// TODO
+    // TODO
 }
 
 /**
@@ -665,47 +665,47 @@ 
  */
 function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
 {
-	global $conf;
-
-	dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
-
-	if (empty($srcfile) || empty($destfile)) return -1;
-
-	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
-
-	$newpathofsrcfile=dol_osencode($srcfile);
-	$newpathofdestfile=dol_osencode($destfile);
-	$newdirdestfile=dirname($newpathofdestfile);
-
-	if ($destexists && ! is_writable($newpathofdestfile))
-	{
-		dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
-		return -1;
-	}
-	if (! is_writable($newdirdestfile))
-	{
-		dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
-		return -2;
-	}
-	// Copy with overwriting if exists
-	$result=@copy($newpathofsrcfile, $newpathofdestfile);
-	//$result=copy($newpathofsrcfile, $newpathofdestfile);	// To see errors, remove @
-	if (! $result)
-	{
-		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
-		return -3;
-	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
-	{
-		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
-		$newmask='0664';
-	}
-
-	@chmod($newpathofdestfile, octdec($newmask));
-
-	return 1;
+    global $conf;
+
+    dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
+
+    if (empty($srcfile) || empty($destfile)) return -1;
+
+    $destexists=dol_is_file($destfile);
+    if (! $overwriteifexists && $destexists) return 0;
+
+    $newpathofsrcfile=dol_osencode($srcfile);
+    $newpathofdestfile=dol_osencode($destfile);
+    $newdirdestfile=dirname($newpathofdestfile);
+
+    if ($destexists && ! is_writable($newpathofdestfile))
+    {
+        dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
+        return -1;
+    }
+    if (! is_writable($newdirdestfile))
+    {
+        dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
+        return -2;
+    }
+    // Copy with overwriting if exists
+    $result=@copy($newpathofsrcfile, $newpathofdestfile);
+    //$result=copy($newpathofsrcfile, $newpathofdestfile);	// To see errors, remove @
+    if (! $result)
+    {
+        dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
+        return -3;
+    }
+    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+    if (empty($newmask))	// This should no happen
+    {
+        dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
+        $newmask='0664';
+    }
+
+    @chmod($newpathofdestfile, octdec($newmask));
+
+    return 1;
 }
 
 /**
@@ -721,77 +721,77 @@ 
  */
 function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement=null)
 {
-	global $conf;
-
-	$result=0;
-
-	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
-
-	if (empty($srcfile) || empty($destfile)) return -1;
-
-	$destexists=dol_is_dir($destfile);
-	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
-
-	if (! $destexists)
-	{
-		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
-		umask(0);
-		$dirmaskdec=octdec($newmask);
-		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
-		$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
-		dol_mkdir($destfile, '', decoct($dirmaskdec));
-	}
-
-	$ossrcfile=dol_osencode($srcfile);
-	$osdestfile=dol_osencode($destfile);
-
-	// Recursive function to copy all subdirectories and contents:
-	if (is_dir($ossrcfile))
-	{
-		$dir_handle=opendir($ossrcfile);
-		while ($file=readdir($dir_handle))
-		{
-			if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
-			{
-				if (is_dir($ossrcfile."/".$file))
-				{
-					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-					$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
-				}
-				else
-				{
-					$newfile = $file;
-					// Replace destination filename with a new one
-					if (is_array($arrayreplacement))
-					{
-						foreach($arrayreplacement as $key => $val)
-						{
-							$newfile = str_replace($key, $val, $newfile);
-						}
-					}
-					$tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
-				}
-				// Set result
-				if ($result > 0 && $tmpresult >= 0)
-				{
-					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-				}
-				else
-				{
-					$result=$tmpresult;
-				}
-				if ($result < 0) break;
-			}
-		}
-		closedir($dir_handle);
-	}
-	else
-	{
-		// Source directory does not exists
-		$result = -2;
-	}
-
-	return $result;
+    global $conf;
+
+    $result=0;
+
+    dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
+
+    if (empty($srcfile) || empty($destfile)) return -1;
+
+    $destexists=dol_is_dir($destfile);
+    //if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
+
+    if (! $destexists)
+    {
+        // We must set mask just before creating dir, becaause it can be set differently by dol_copy
+        umask(0);
+        $dirmaskdec=octdec($newmask);
+        if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+        $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
+        dol_mkdir($destfile, '', decoct($dirmaskdec));
+    }
+
+    $ossrcfile=dol_osencode($srcfile);
+    $osdestfile=dol_osencode($destfile);
+
+    // Recursive function to copy all subdirectories and contents:
+    if (is_dir($ossrcfile))
+    {
+        $dir_handle=opendir($ossrcfile);
+        while ($file=readdir($dir_handle))
+        {
+            if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
+            {
+                if (is_dir($ossrcfile."/".$file))
+                {
+                    //var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
+                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
+                }
+                else
+                {
+                    $newfile = $file;
+                    // Replace destination filename with a new one
+                    if (is_array($arrayreplacement))
+                    {
+                        foreach($arrayreplacement as $key => $val)
+                        {
+                            $newfile = str_replace($key, $val, $newfile);
+                        }
+                    }
+                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
+                }
+                // Set result
+                if ($result > 0 && $tmpresult >= 0)
+                {
+                    // Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
+                }
+                else
+                {
+                    $result=$tmpresult;
+                }
+                if ($result < 0) break;
+            }
+        }
+        closedir($dir_handle);
+    }
+    else
+    {
+        // Source directory does not exists
+        $result = -2;
+    }
+
+    return $result;
 }
 
 
@@ -813,123 +813,123 @@ 
  */
 function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0, $indexdatabase=1)
 {
-	global $user, $db, $conf;
-	$result=false;
-
-	dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
-	$srcexists=dol_is_file($srcfile);
-	$destexists=dol_is_file($destfile);
-
-	if (! $srcexists)
-	{
-		dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
-		return false;
-	}
-
-	if ($overwriteifexists || ! $destexists)
-	{
-		$newpathofsrcfile=dol_osencode($srcfile);
-		$newpathofdestfile=dol_osencode($destfile);
-
-		// Check virus
-		$testvirusarray=array();
-		if ($testvirus)
-		{
-			$testvirusarray=dolCheckVirus($newpathofsrcfile);
-			if (count($testvirusarray))
-			{
-				dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
-				return false;
-			}
-		}
-
-		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-		if (! $result)
-		{
-			if ($destexists)
-			{
-				dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
-				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
-				dol_delete_file($destfile);
-				$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-			}
-			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
-		}
-
-		// Move ok
-		if ($result && $indexdatabase)
-		{
-			// Rename entry into ecm database
-			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
-			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
-			{
-				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
-				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
-				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
-
-				dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
-				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-
-				$ecmfiletarget=new EcmFiles($db);
-				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
-				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
-				{
-					$ecmfiletarget->delete($user);
-				}
-
-				$ecmfile=new EcmFiles($db);
-				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
-				{
-					$filename = basename($rel_filetorenameafter);
-					$rel_dir = dirname($rel_filetorenameafter);
-					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-					$ecmfile->filepath = $rel_dir;
-					$ecmfile->filename = $filename;
-					$resultecm = $ecmfile->update($user);
-				}
-				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
-				{
-					$filename = basename($rel_filetorenameafter);
-					$rel_dir = dirname($rel_filetorenameafter);
-					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-					$ecmfile->filepath = $rel_dir;
-					$ecmfile->filename = $filename;
-					$ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
-					$ecmfile->fullpath_orig = $srcfile;
-					$ecmfile->gen_or_uploaded = 'unknown';
-					$ecmfile->description = '';    // indexed content
-					$ecmfile->keyword = '';        // keyword content
-					$resultecm = $ecmfile->create($user);
-					if ($resultecm < 0)
-					{
-						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-					}
-				}
-				elseif ($resultecm < 0)
-				{
-					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-
-				if ($resultecm > 0) $result=true;
-				else $result = false;
-			}
-		}
-
-		if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
-		$newmaskdec=octdec($newmask);
-		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
-		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
-		// if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
-		@chmod($newpathofdestfile, $newmaskdec);
-	}
-
-	return $result;
+    global $user, $db, $conf;
+    $result=false;
+
+    dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
+    $srcexists=dol_is_file($srcfile);
+    $destexists=dol_is_file($destfile);
+
+    if (! $srcexists)
+    {
+        dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
+        return false;
+    }
+
+    if ($overwriteifexists || ! $destexists)
+    {
+        $newpathofsrcfile=dol_osencode($srcfile);
+        $newpathofdestfile=dol_osencode($destfile);
+
+        // Check virus
+        $testvirusarray=array();
+        if ($testvirus)
+        {
+            $testvirusarray=dolCheckVirus($newpathofsrcfile);
+            if (count($testvirusarray))
+            {
+                dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
+                return false;
+            }
+        }
+
+        $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+        if (! $result)
+        {
+            if ($destexists)
+            {
+                dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
+                // We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
+                dol_delete_file($destfile);
+                $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+            }
+            else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
+        }
+
+        // Move ok
+        if ($result && $indexdatabase)
+        {
+            // Rename entry into ecm database
+            $rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
+            $rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
+            if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+            {
+                $rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
+                $rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
+                //var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
+
+                dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
+                include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+
+                $ecmfiletarget=new EcmFiles($db);
+                $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
+                if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+                {
+                    $ecmfiletarget->delete($user);
+                }
+
+                $ecmfile=new EcmFiles($db);
+                $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
+                if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
+                {
+                    $filename = basename($rel_filetorenameafter);
+                    $rel_dir = dirname($rel_filetorenameafter);
+                    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+                    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+                    $ecmfile->filepath = $rel_dir;
+                    $ecmfile->filename = $filename;
+                    $resultecm = $ecmfile->update($user);
+                }
+                elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+                {
+                    $filename = basename($rel_filetorenameafter);
+                    $rel_dir = dirname($rel_filetorenameafter);
+                    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+                    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+                    $ecmfile->filepath = $rel_dir;
+                    $ecmfile->filename = $filename;
+                    $ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
+                    $ecmfile->fullpath_orig = $srcfile;
+                    $ecmfile->gen_or_uploaded = 'unknown';
+                    $ecmfile->description = '';    // indexed content
+                    $ecmfile->keyword = '';        // keyword content
+                    $resultecm = $ecmfile->create($user);
+                    if ($resultecm < 0)
+                    {
+                        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                    }
+                }
+                elseif ($resultecm < 0)
+                {
+                    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                }
+
+                if ($resultecm > 0) $result=true;
+                else $result = false;
+            }
+        }
+
+        if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+        $newmaskdec=octdec($newmask);
+        // Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
+        // to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
+        // if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
+        @chmod($newpathofdestfile, $newmaskdec);
+    }
+
+    return $result;
 }
 
 /**
@@ -941,10 +941,10 @@ 
  */
 function dol_unescapefile($filename)
 {
-	// Remove path information and dots around the filename, to prevent uploading
-	// into different directories or replacing hidden system files.
-	// Also remove control characters and spaces (\x00..\x20) around the filename:
-	return trim(basename($filename), ".\x00..\x20");
+    // Remove path information and dots around the filename, to prevent uploading
+    // into different directories or replacing hidden system files.
+    // Also remove control characters and spaces (\x00..\x20) around the filename:
+    return trim(basename($filename), ".\x00..\x20");
 }
 
 
@@ -956,22 +956,22 @@ 
  */
 function dolCheckVirus($src_file)
 {
-	global $conf;
-
-	if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
-	{
-		if (! class_exists('AntiVir')) {
-			require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
-		}
-		$antivir=new AntiVir($db);
-		$result = $antivir->dol_avscan_file($src_file);
-		if ($result < 0)	// If virus or error, we stop here
-		{
-			$reterrors=$antivir->errors;
-			return $reterrors;
-		}
-	}
-	return array();
+    global $conf;
+
+    if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
+    {
+        if (! class_exists('AntiVir')) {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
+        }
+        $antivir=new AntiVir($db);
+        $result = $antivir->dol_avscan_file($src_file);
+        if ($result < 0)	// If virus or error, we stop here
+        {
+            $reterrors=$antivir->errors;
+            return $reterrors;
+        }
+    }
+    return array();
 }
 
 
@@ -995,131 +995,131 @@ 
  */
 function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan=0, $uploaderrorcode=0, $nohook=0, $varfiles='addedfile')
 {
-	global $conf, $db, $user, $langs;
-	global $object, $hookmanager;
-
-	$reshook=0;
-	$file_name = $dest_file;
-
-	if (empty($nohook))
-	{
-		$reshook=$hookmanager->initHooks(array('fileslib'));
-
-		$parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
-		$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
-	}
-
-	if (empty($reshook))
-	{
-		// If an upload error has been reported
-		if ($uploaderrorcode)
-		{
-			switch($uploaderrorcode)
-			{
-				case UPLOAD_ERR_INI_SIZE:	// 1
-					return 'ErrorFileSizeTooLarge';
-					break;
-				case UPLOAD_ERR_FORM_SIZE:	// 2
-					return 'ErrorFileSizeTooLarge';
-					break;
-				case UPLOAD_ERR_PARTIAL:	// 3
-					return 'ErrorPartialFile';
-					break;
-				case UPLOAD_ERR_NO_TMP_DIR:	//
-					return 'ErrorNoTmpDir';
-					break;
-				case UPLOAD_ERR_CANT_WRITE:
-					return 'ErrorFailedToWriteInDir';
-					break;
-				case UPLOAD_ERR_EXTENSION:
-					return 'ErrorUploadBlockedByAddon';
-					break;
-				default:
-					break;
-			}
-		}
-
-		// If we need to make a virus scan
-		if (empty($disablevirusscan) && file_exists($src_file))
-		{
-			$checkvirusarray=dolCheckVirus($src_file);
-			if (count($checkvirusarray))
-			{
-			   dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
-			   return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
-			}
-		}
-
-		// Security:
-		// Disallow file with some extensions. We rename them.
-		// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-		if (preg_match('/(\.htm|\.html|\.php|\.pl|\.cgi)$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
-		{
-			$file_name.= '.noexe';
-		}
-
-		// Security:
-		// We refuse cache files/dirs, upload using .. and pipes into filenames.
-		if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
-		{
-			dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
-			return -1;
-		}
-
-		// Security:
-		// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-		if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
-		{
-			dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
-			return -2;
-		}
-	}
-
-	if ($reshook < 0)	// At least one blocking error returned by one hook
-	{
-		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
-		return $errmsg;
-	}
-	elseif (empty($reshook))
-	{
-		// The file functions must be in OS filesystem encoding.
-		$src_file_osencoded=dol_osencode($src_file);
-		$file_name_osencoded=dol_osencode($file_name);
-
-		// Check if destination dir is writable
-		if (! is_writable(dirname($file_name_osencoded)))
-		{
-			dol_syslog("Files.lib::dol_move_uploaded_file Dir ".dirname($file_name_osencoded)." is not writable. Return 'ErrorDirNotWritable'", LOG_WARNING);
-			return 'ErrorDirNotWritable';
-		}
-
-		// Check if destination file already exists
-		if (! $allowoverwrite)
-		{
-			if (file_exists($file_name_osencoded))
-			{
-				dol_syslog("Files.lib::dol_move_uploaded_file File ".$file_name." already exists. Return 'ErrorFileAlreadyExists'", LOG_WARNING);
-				return 'ErrorFileAlreadyExists';
-			}
-		}
-
-		// Move file
-		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
-		if ($return)
-		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
-			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
-			return 1;	// Success
-		}
-		else
-		{
-			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
-			return -3;	// Unknown error
-		}
-	}
-
-	return 1;	// Success
+    global $conf, $db, $user, $langs;
+    global $object, $hookmanager;
+
+    $reshook=0;
+    $file_name = $dest_file;
+
+    if (empty($nohook))
+    {
+        $reshook=$hookmanager->initHooks(array('fileslib'));
+
+        $parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
+        $reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
+    }
+
+    if (empty($reshook))
+    {
+        // If an upload error has been reported
+        if ($uploaderrorcode)
+        {
+            switch($uploaderrorcode)
+            {
+                case UPLOAD_ERR_INI_SIZE:	// 1
+                    return 'ErrorFileSizeTooLarge';
+                    break;
+                case UPLOAD_ERR_FORM_SIZE:	// 2
+                    return 'ErrorFileSizeTooLarge';
+                    break;
+                case UPLOAD_ERR_PARTIAL:	// 3
+                    return 'ErrorPartialFile';
+                    break;
+                case UPLOAD_ERR_NO_TMP_DIR:	//
+                    return 'ErrorNoTmpDir';
+                    break;
+                case UPLOAD_ERR_CANT_WRITE:
+                    return 'ErrorFailedToWriteInDir';
+                    break;
+                case UPLOAD_ERR_EXTENSION:
+                    return 'ErrorUploadBlockedByAddon';
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        // If we need to make a virus scan
+        if (empty($disablevirusscan) && file_exists($src_file))
+        {
+            $checkvirusarray=dolCheckVirus($src_file);
+            if (count($checkvirusarray))
+            {
+                dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
+                return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
+            }
+        }
+
+        // Security:
+        // Disallow file with some extensions. We rename them.
+        // Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
+        if (preg_match('/(\.htm|\.html|\.php|\.pl|\.cgi)$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+        {
+            $file_name.= '.noexe';
+        }
+
+        // Security:
+        // We refuse cache files/dirs, upload using .. and pipes into filenames.
+        if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
+        {
+            dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
+            return -1;
+        }
+
+        // Security:
+        // On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
+        if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
+        {
+            dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
+            return -2;
+        }
+    }
+
+    if ($reshook < 0)	// At least one blocking error returned by one hook
+    {
+        $errmsg = join(',', $hookmanager->errors);
+        if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+        return $errmsg;
+    }
+    elseif (empty($reshook))
+    {
+        // The file functions must be in OS filesystem encoding.
+        $src_file_osencoded=dol_osencode($src_file);
+        $file_name_osencoded=dol_osencode($file_name);
+
+        // Check if destination dir is writable
+        if (! is_writable(dirname($file_name_osencoded)))
+        {
+            dol_syslog("Files.lib::dol_move_uploaded_file Dir ".dirname($file_name_osencoded)." is not writable. Return 'ErrorDirNotWritable'", LOG_WARNING);
+            return 'ErrorDirNotWritable';
+        }
+
+        // Check if destination file already exists
+        if (! $allowoverwrite)
+        {
+            if (file_exists($file_name_osencoded))
+            {
+                dol_syslog("Files.lib::dol_move_uploaded_file File ".$file_name." already exists. Return 'ErrorFileAlreadyExists'", LOG_WARNING);
+                return 'ErrorFileAlreadyExists';
+            }
+        }
+
+        // Move file
+        $return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
+        if ($return)
+        {
+            if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+            dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
+            return 1;	// Success
+        }
+        else
+        {
+            dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
+            return -3;	// Unknown error
+        }
+    }
+
+    return 1;	// Success
 }
 
 /**
@@ -1138,103 +1138,103 @@ 
  */
 function dol_delete_file($file, $disableglob=0, $nophperrors=0, $nohook=0, $object=null, $allowdotdot=false, $indexdatabase=1)
 {
-	global $db, $conf, $user, $langs;
-	global $hookmanager;
+    global $db, $conf, $user, $langs;
+    global $hookmanager;
 
-	// Load translation files required by the page
+    // Load translation files required by the page
     $langs->loadLangs(array('other', 'errors'));
 
-	dol_syslog("dol_delete_file file=".$file." disableglob=".$disableglob." nophperrors=".$nophperrors." nohook=".$nohook);
-
-	// Security:
-	// We refuse transversal using .. and pipes into filenames.
-	if ((! $allowdotdot && preg_match('/\.\./',$file)) || preg_match('/[<>|]/',$file))
-	{
-		dol_syslog("Refused to delete file ".$file, LOG_WARNING);
-		return false;
-	}
-
-	if (empty($nohook))
-	{
-		$hookmanager->initHooks(array('fileslib'));
-
-		$parameters=array(
-				'GET' => $_GET,
-				'file' => $file,
-				'disableglob'=> $disableglob,
-				'nophperrors' => $nophperrors
-		);
-		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
-	}
-
-	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
-	{
-		if ($reshook < 0) return false;
-		return true;
-	}
-	else
-	{
-		$error=0;
-
-		//print "x".$file." ".$disableglob;exit;
-		$file_osencoded=dol_osencode($file);    // New filename encoded in OS filesystem encoding charset
-		if (empty($disableglob) && ! empty($file_osencoded))
-		{
-			$ok=true;
-			$globencoded=str_replace('[','\[',$file_osencoded);
-			$globencoded=str_replace(']','\]',$globencoded);
-			$listofdir=glob($globencoded);
-			if (! empty($listofdir) && is_array($listofdir))
-			{
-				foreach ($listofdir as $filename)
-				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
-					if ($ok)
-					{
-						dol_syslog("Removed file ".$filename, LOG_DEBUG);
-
-						// Delete entry into ecm database
-						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
-						{
-							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
-
-							if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
-							{
-								dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
-								include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-								$ecmfile=new EcmFiles($db);
-								$result = $ecmfile->fetch(0, '', $rel_filetodelete);
-								if ($result >= 0 && $ecmfile->id > 0)
-								{
-									$result = $ecmfile->delete($user);
-								}
-								if ($result < 0)
-								{
-									setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-								}
-							}
-						}
-					}
-					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
-					// TODO Failure to remove can be because file was already removed or because of permission
-					// If error because it does not exists, we should return true, and we should return false if this is a permission problem
-				}
-			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else
-		{
-			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
-			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
-		}
-
-		return $ok;
-	}
+    dol_syslog("dol_delete_file file=".$file." disableglob=".$disableglob." nophperrors=".$nophperrors." nohook=".$nohook);
+
+    // Security:
+    // We refuse transversal using .. and pipes into filenames.
+    if ((! $allowdotdot && preg_match('/\.\./',$file)) || preg_match('/[<>|]/',$file))
+    {
+        dol_syslog("Refused to delete file ".$file, LOG_WARNING);
+        return false;
+    }
+
+    if (empty($nohook))
+    {
+        $hookmanager->initHooks(array('fileslib'));
+
+        $parameters=array(
+                'GET' => $_GET,
+                'file' => $file,
+                'disableglob'=> $disableglob,
+                'nophperrors' => $nophperrors
+        );
+        $reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
+    }
+
+    if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
+    {
+        if ($reshook < 0) return false;
+        return true;
+    }
+    else
+    {
+        $error=0;
+
+        //print "x".$file." ".$disableglob;exit;
+        $file_osencoded=dol_osencode($file);    // New filename encoded in OS filesystem encoding charset
+        if (empty($disableglob) && ! empty($file_osencoded))
+        {
+            $ok=true;
+            $globencoded=str_replace('[','\[',$file_osencoded);
+            $globencoded=str_replace(']','\]',$globencoded);
+            $listofdir=glob($globencoded);
+            if (! empty($listofdir) && is_array($listofdir))
+            {
+                foreach ($listofdir as $filename)
+                {
+                    if ($nophperrors) $ok=@unlink($filename);
+                    else $ok=unlink($filename);
+                    if ($ok)
+                    {
+                        dol_syslog("Removed file ".$filename, LOG_DEBUG);
+
+                        // Delete entry into ecm database
+                        $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
+                        if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+                        {
+                            $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
+
+                            if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
+                            {
+                                dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
+                                include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+                                $ecmfile=new EcmFiles($db);
+                                $result = $ecmfile->fetch(0, '', $rel_filetodelete);
+                                if ($result >= 0 && $ecmfile->id > 0)
+                                {
+                                    $result = $ecmfile->delete($user);
+                                }
+                                if ($result < 0)
+                                {
+                                    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                                }
+                            }
+                        }
+                    }
+                    else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
+                    // TODO Failure to remove can be because file was already removed or because of permission
+                    // If error because it does not exists, we should return true, and we should return false if this is a permission problem
+                }
+            }
+            else dol_syslog("No files to delete found", LOG_DEBUG);
+        }
+        else
+        {
+            $ok=false;
+            if ($nophperrors) $ok=@unlink($file_osencoded);
+            else $ok=unlink($file_osencoded);
+            if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
+            else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+        }
+
+        return $ok;
+    }
 }
 
 /**
@@ -1248,16 +1248,16 @@ 
  */
 function dol_delete_dir($dir,$nophperrors=0)
 {
-	// Security:
-	// We refuse transversal using .. and pipes into filenames.
-	if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
-	{
-		dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
-		return false;
-	}
-
-	$dir_osencoded=dol_osencode($dir);
-	return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
+    // Security:
+    // We refuse transversal using .. and pipes into filenames.
+    if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
+    {
+        dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
+        return false;
+    }
+
+    $dir_osencoded=dol_osencode($dir);
+    return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
 }
 
 /**
@@ -1272,44 +1272,44 @@ 
  */
 function dol_delete_dir_recursive($dir, $count=0, $nophperrors=0, $onlysub=0, &$countdeleted=0)
 {
-	dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
-	if (dol_is_dir($dir))
-	{
-		$dir_osencoded=dol_osencode($dir);
-		if ($handle = opendir("$dir_osencoded"))
-		{
-			while (false !== ($item = readdir($handle)))
-			{
-				if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
-
-				if ($item != "." && $item != "..")
-				{
-					if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
-					{
-						$count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-					}
-					else
-					{
-						$result=dol_delete_file("$dir/$item", 1, $nophperrors);
-						$count++;
-						if ($result) $countdeleted++;
-						//else print 'Error on '.$item."\n";
-					}
-				}
-			}
-			closedir($handle);
-
-			if (empty($onlysub))
-			{
-				$result=dol_delete_dir($dir, $nophperrors);
-				$count++;
-				if ($result) $countdeleted++;
-				//else print 'Error on '.$dir."\n";
-			}
-		}
-	}
-
-	return $count;
+    dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
+    if (dol_is_dir($dir))
+    {
+        $dir_osencoded=dol_osencode($dir);
+        if ($handle = opendir("$dir_osencoded"))
+        {
+            while (false !== ($item = readdir($handle)))
+            {
+                if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+
+                if ($item != "." && $item != "..")
+                {
+                    if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
+                    {
+                        $count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
+                    }
+                    else
+                    {
+                        $result=dol_delete_file("$dir/$item", 1, $nophperrors);
+                        $count++;
+                        if ($result) $countdeleted++;
+                        //else print 'Error on '.$item."\n";
+                    }
+                }
+            }
+            closedir($handle);
+
+            if (empty($onlysub))
+            {
+                $result=dol_delete_dir($dir, $nophperrors);
+                $count++;
+                if ($result) $countdeleted++;
+                //else print 'Error on '.$dir."\n";
+            }
+        }
+    }
+
+    return $count;
 }
 
 
@@ -1323,72 +1323,72 @@ 
  */
 function dol_delete_preview($object)
 {
-	global $langs,$conf;
-
-	// Define parent dir of elements
-	$element = $object->element;
-
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
-
-	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
-
-	$refsan = dol_sanitizeFileName($object->ref);
-	$dir = $dir . "/" . $refsan ;
-	$filepreviewnew = $dir . "/" . $refsan . ".pdf_preview.png";
-	$filepreviewnewbis = $dir . "/" . $refsan . ".pdf_preview-0.png";
-	$filepreviewold = $dir . "/" . $refsan . ".pdf.png";
-
-	// For new preview files
-	if (file_exists($filepreviewnew) && is_writable($filepreviewnew))
-	{
-		if (! dol_delete_file($filepreviewnew,1))
-		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnew);
-			return 0;
-		}
-	}
-	if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis))
-	{
-		if (! dol_delete_file($filepreviewnewbis,1))
-		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnewbis);
-			return 0;
-		}
-	}
-	// For old preview files
-	if (file_exists($filepreviewold) && is_writable($filepreviewold))
-	{
-		if (! dol_delete_file($filepreviewold,1))
-		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
-			return 0;
-		}
-	}
-	else
-	{
-		$multiple = $filepreviewold . ".";
-		for ($i = 0; $i < 20; $i++)
-		{
-			$preview = $multiple.$i;
-
-			if (file_exists($preview) && is_writable($preview))
-			{
-				if ( ! dol_delete_file($preview,1) )
-				{
-					$object->error=$langs->trans("ErrorFailedToOpenFile",$preview);
-					return 0;
-				}
-			}
-		}
-	}
-
-	return 1;
+    global $langs,$conf;
+
+    // Define parent dir of elements
+    $element = $object->element;
+
+    if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
+    elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
+    elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
+    elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
+    elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
+    elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
+    else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+
+    if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
+
+    $refsan = dol_sanitizeFileName($object->ref);
+    $dir = $dir . "/" . $refsan ;
+    $filepreviewnew = $dir . "/" . $refsan . ".pdf_preview.png";
+    $filepreviewnewbis = $dir . "/" . $refsan . ".pdf_preview-0.png";
+    $filepreviewold = $dir . "/" . $refsan . ".pdf.png";
+
+    // For new preview files
+    if (file_exists($filepreviewnew) && is_writable($filepreviewnew))
+    {
+        if (! dol_delete_file($filepreviewnew,1))
+        {
+            $object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnew);
+            return 0;
+        }
+    }
+    if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis))
+    {
+        if (! dol_delete_file($filepreviewnewbis,1))
+        {
+            $object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnewbis);
+            return 0;
+        }
+    }
+    // For old preview files
+    if (file_exists($filepreviewold) && is_writable($filepreviewold))
+    {
+        if (! dol_delete_file($filepreviewold,1))
+        {
+            $object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
+            return 0;
+        }
+    }
+    else
+    {
+        $multiple = $filepreviewold . ".";
+        for ($i = 0; $i < 20; $i++)
+        {
+            $preview = $multiple.$i;
+
+            if (file_exists($preview) && is_writable($preview))
+            {
+                if ( ! dol_delete_file($preview,1) )
+                {
+                    $object->error=$langs->trans("ErrorFailedToOpenFile",$preview);
+                    return 0;
+                }
+            }
+        }
+    }
+
+    return 1;
 }
 
 /**
@@ -1401,71 +1401,71 @@ 
  */
 function dol_meta_create($object)
 {
-	global $conf;
-
-	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
-
-	// Define parent dir of elements
-	$element=$object->element;
-
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
-
-	if ($dir)
-	{
-		$object->fetch_thirdparty();
-
-		$objectref = dol_sanitizeFileName($object->ref);
-		$dir = $dir . "/" . $objectref;
-		$file = $dir . "/" . $objectref . ".meta";
-
-		if (! is_dir($dir))
-		{
-			dol_mkdir($dir);
-		}
-
-		if (is_dir($dir))
-		{
-			$nblignes = count($object->lines);
-			$client = $object->thirdparty->name . " " . $object->thirdparty->address . " " . $object->thirdparty->zip . " " . $object->thirdparty->town;
-			$meta = "REFERENCE=\"" . $object->ref . "\"
+    global $conf;
+
+    // Create meta file
+    if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+
+    // Define parent dir of elements
+    $element=$object->element;
+
+    if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
+    elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
+    elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
+    elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
+    elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
+    elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
+    else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+
+    if ($dir)
+    {
+        $object->fetch_thirdparty();
+
+        $objectref = dol_sanitizeFileName($object->ref);
+        $dir = $dir . "/" . $objectref;
+        $file = $dir . "/" . $objectref . ".meta";
+
+        if (! is_dir($dir))
+        {
+            dol_mkdir($dir);
+        }
+
+        if (is_dir($dir))
+        {
+            $nblignes = count($object->lines);
+            $client = $object->thirdparty->name . " " . $object->thirdparty->address . " " . $object->thirdparty->zip . " " . $object->thirdparty->town;
+            $meta = "REFERENCE=\"" . $object->ref . "\"
 			DATE=\"" . dol_print_date($object->date,'') . "\"
 			NB_ITEMS=\"" . $nblignes . "\"
 			CLIENT=\"" . $client . "\"
 			AMOUNT_EXCL_TAX=\"" . $object->total_ht . "\"
 			AMOUNT=\"" . $object->total_ttc . "\"\n";
 
-			for ($i = 0 ; $i < $nblignes ; $i++)
-			{
-				//Pour les articles
-				$meta .= "ITEM_" . $i . "_QUANTITY=\"" . $object->lines[$i]->qty . "\"
+            for ($i = 0 ; $i < $nblignes ; $i++)
+            {
+                //Pour les articles
+                $meta .= "ITEM_" . $i . "_QUANTITY=\"" . $object->lines[$i]->qty . "\"
 				ITEM_" . $i . "_AMOUNT_WO_TAX=\"" . $object->lines[$i]->total_ht . "\"
 				ITEM_" . $i . "_VAT=\"" .$object->lines[$i]->tva_tx . "\"
 				ITEM_" . $i . "_DESCRIPTION=\"" . str_replace("\r\n","",nl2br($object->lines[$i]->desc)) . "\"
 				";
-			}
-		}
-
-		$fp = fopen($file,"w");
-		fputs($fp,$meta);
-		fclose($fp);
-		if (! empty($conf->global->MAIN_UMASK))
-		@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-		return 1;
-	}
-	else
-	{
-		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
-	}
-
-	return 0;
+            }
+        }
+
+        $fp = fopen($file,"w");
+        fputs($fp,$meta);
+        fclose($fp);
+        if (! empty($conf->global->MAIN_UMASK))
+        @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+        return 1;
+    }
+    else
+    {
+        dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
+    }
+
+    return 0;
 }
 
 
@@ -1480,24 +1480,24 @@ 
  */
 function dol_init_file_process($pathtoscan='', $trackid='')
 {
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
-
-	if ($pathtoscan)
-	{
-		$listoffiles=dol_dir_list($pathtoscan,'files');
-		foreach($listoffiles as $key => $val)
-		{
-			$listofpaths[]=$val['fullname'];
-			$listofnames[]=$val['name'];
-			$listofmimes[]=dol_mimetype($val['name']);
-		}
-	}
-	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
-	$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
-	$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
+    $listofpaths=array();
+    $listofnames=array();
+    $listofmimes=array();
+
+    if ($pathtoscan)
+    {
+        $listoffiles=dol_dir_list($pathtoscan,'files');
+        foreach($listoffiles as $key => $val)
+        {
+            $listofpaths[]=$val['fullname'];
+            $listofnames[]=$val['name'];
+            $listofmimes[]=dol_mimetype($val['name']);
+        }
+    }
+    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
+    $_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
+    $_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
+    $_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
 }
 
 
@@ -1518,135 +1518,135 @@ 
  */
 function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesession=0, $varfiles='addedfile', $savingdocmask='', $link=null, $trackid='', $generatethumbs=1)
 {
-	global $db,$user,$conf,$langs;
-
-	$res = 0;
-
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
-	{
-		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
-		if (dol_mkdir($upload_dir) >= 0)
-		{
-			$TFile = $_FILES[$varfiles];
-			if (!is_array($TFile['name']))
-			{
-				foreach ($TFile as $key => &$val)
-				{
-					$val = array($val);
-				}
-			}
-
-			$nbfile = count($TFile['name']);
-			$nbok = 0;
-			for ($i = 0; $i < $nbfile; $i++)
-			{
-				// Define $destfull (path to file including filename) and $destfile (only filename)
-				$destfull=$upload_dir . "/" . $TFile['name'][$i];
-				$destfile=$TFile['name'][$i];
-
-				if ($savingdocmask)
-				{
-					$destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
-					$destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
-				}
-
-				// dol_sanitizeFileName the file name and lowercase extension
-				$info = pathinfo($destfull);
-				$destfull = $info['dirname'].'/'.dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
-				$info = pathinfo($destfile);
-				$destfile = dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
-
-				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
-
-				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
-				{
-					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
-
-					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-					// Generate thumbs.
-					if ($generatethumbs)
-					{
-						if (image_format_supported($destfull) == 1)
-						{
-							// Create thumbs
-							// We can't use $object->addThumbs here because there is no $object known
-
-							// Used on logon for example
-							$imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
-							// Create mini thumbs for image (Ratio is near 16/9)
-							// Used on menu or for setup page for example
-							$imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
-						}
-					}
-
-					// Update session
-					if (empty($donotupdatesession))
-					{
-						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-						$formmail = new FormMail($db);
-						$formmail->trackid = $trackid;
-						$formmail->add_attached_files($destfull, $destfile, $TFile['type'][$i]);
-					}
-
-					// Update table of files
-					if ($donotupdatesession == 1)
-					{
-						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile), $TFile['name'][$i], 'uploaded', 0);
-						if ($result < 0)
-						{
-							setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
-						}
-					}
-
-					$nbok++;
-				}
-				else
-				{
-					$langs->load("errors");
-					if ($resupload < 0)	// Unknown error
-					{
-						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
-					}
-					else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
-					{
-						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-					}
-					else	// Known error
-					{
-						setEventMessages($langs->trans($resupload), null, 'errors');
-					}
-				}
-			}
-			if ($nbok > 0)
-			{
-				$res = 1;
-				setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
-			}
-		}
-	} elseif ($link) {
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-		$linkObject = new Link($db);
-		$linkObject->entity = $conf->entity;
-		$linkObject->url = $link;
-		$linkObject->objecttype = GETPOST('objecttype', 'alpha');
-		$linkObject->objectid = GETPOST('objectid', 'int');
-		$linkObject->label = GETPOST('label', 'alpha');
-		$res = $linkObject->create($user);
-		$langs->load('link');
-		if ($res > 0) {
-			setEventMessages($langs->trans("LinkComplete"), null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
-		}
-	}
-	else
-	{
-		$langs->load("errors");
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
-	}
-
-	return $res;
+    global $db,$user,$conf,$langs;
+
+    $res = 0;
+
+    if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+    {
+        dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
+        if (dol_mkdir($upload_dir) >= 0)
+        {
+            $TFile = $_FILES[$varfiles];
+            if (!is_array($TFile['name']))
+            {
+                foreach ($TFile as $key => &$val)
+                {
+                    $val = array($val);
+                }
+            }
+
+            $nbfile = count($TFile['name']);
+            $nbok = 0;
+            for ($i = 0; $i < $nbfile; $i++)
+            {
+                // Define $destfull (path to file including filename) and $destfile (only filename)
+                $destfull=$upload_dir . "/" . $TFile['name'][$i];
+                $destfile=$TFile['name'][$i];
+
+                if ($savingdocmask)
+                {
+                    $destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
+                    $destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
+                }
+
+                // dol_sanitizeFileName the file name and lowercase extension
+                $info = pathinfo($destfull);
+                $destfull = $info['dirname'].'/'.dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
+                $info = pathinfo($destfile);
+                $destfile = dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
+
+                $resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
+
+                if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
+                {
+                    global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+
+                    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+                    // Generate thumbs.
+                    if ($generatethumbs)
+                    {
+                        if (image_format_supported($destfull) == 1)
+                        {
+                            // Create thumbs
+                            // We can't use $object->addThumbs here because there is no $object known
+
+                            // Used on logon for example
+                            $imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+                            // Create mini thumbs for image (Ratio is near 16/9)
+                            // Used on menu or for setup page for example
+                            $imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+                        }
+                    }
+
+                    // Update session
+                    if (empty($donotupdatesession))
+                    {
+                        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                        $formmail = new FormMail($db);
+                        $formmail->trackid = $trackid;
+                        $formmail->add_attached_files($destfull, $destfile, $TFile['type'][$i]);
+                    }
+
+                    // Update table of files
+                    if ($donotupdatesession == 1)
+                    {
+                        $result = addFileIntoDatabaseIndex($upload_dir, basename($destfile), $TFile['name'][$i], 'uploaded', 0);
+                        if ($result < 0)
+                        {
+                            setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
+                        }
+                    }
+
+                    $nbok++;
+                }
+                else
+                {
+                    $langs->load("errors");
+                    if ($resupload < 0)	// Unknown error
+                    {
+                        setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
+                    }
+                    else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+                    {
+                        setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
+                    }
+                    else	// Known error
+                    {
+                        setEventMessages($langs->trans($resupload), null, 'errors');
+                    }
+                }
+            }
+            if ($nbok > 0)
+            {
+                $res = 1;
+                setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
+            }
+        }
+    } elseif ($link) {
+        require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+        $linkObject = new Link($db);
+        $linkObject->entity = $conf->entity;
+        $linkObject->url = $link;
+        $linkObject->objecttype = GETPOST('objecttype', 'alpha');
+        $linkObject->objectid = GETPOST('objectid', 'int');
+        $linkObject->label = GETPOST('label', 'alpha');
+        $res = $linkObject->create($user);
+        $langs->load('link');
+        if ($res > 0) {
+            setEventMessages($langs->trans("LinkComplete"), null, 'mesgs');
+        } else {
+            setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
+        }
+    }
+    else
+    {
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
+    }
+
+    return $res;
 }
 
 
@@ -1662,41 +1662,41 @@ 
  */
 function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile=1,$trackid='')
 {
-	global $db,$user,$conf,$langs,$_FILES;
-
-	$keytodelete=$filenb;
-	$keytodelete--;
-
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
-	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
-
-	if ($keytodelete >= 0)
-	{
-		$pathtodelete=$listofpaths[$keytodelete];
-		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
-		if ($result >= 0)
-		{
-			if (empty($donotdeletefile))
-			{
-				$langs->load("other");
-				setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
-			}
-			if (empty($donotupdatesession))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-				$formmail = new FormMail($db);
-				$formmail->trackid = $trackid;
-				$formmail->remove_attached_files($keytodelete);
-			}
-		}
-	}
+    global $db,$user,$conf,$langs,$_FILES;
+
+    $keytodelete=$filenb;
+    $keytodelete--;
+
+    $listofpaths=array();
+    $listofnames=array();
+    $listofmimes=array();
+    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
+    if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+    if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+    if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+
+    if ($keytodelete >= 0)
+    {
+        $pathtodelete=$listofpaths[$keytodelete];
+        $filetodelete=$listofnames[$keytodelete];
+        if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
+        else $result=0;
+        if ($result >= 0)
+        {
+            if (empty($donotdeletefile))
+            {
+                $langs->load("other");
+                setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
+            }
+            if (empty($donotupdatesession))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                $formmail = new FormMail($db);
+                $formmail->trackid = $trackid;
+                $formmail->remove_attached_files($keytodelete);
+            }
+        }
+    }
 }
 
 
@@ -1714,41 +1714,41 @@ 
  */
 function addFileIntoDatabaseIndex($dir, $file, $fullpathorig='', $mode='uploaded', $setsharekey=0)
 {
-	global $db, $user;
-
-	$result = 0;
-
-	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
-
-	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
-	{
-		$filename = basename($file);
-		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
-		$ecmfile->filepath = $rel_dir;
-		$ecmfile->filename = $filename;
-		$ecmfile->label = md5_file(dol_osencode($dir.'/'.$file));	// MD5 of file content
-		$ecmfile->fullpath_orig = $fullpathorig;
-		$ecmfile->gen_or_uploaded = $mode;
-		$ecmfile->description = '';    // indexed content
-		$ecmfile->keyword = '';        // keyword content
-		if ($setsharekey)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-			$ecmfile->share = getRandomPassword(true);
-		}
-
-		$result = $ecmfile->create($user);
-		if ($result < 0)
-		{
-			dol_syslog($ecmfile->error);
-		}
-	}
-
-	return $result;
+    global $db, $user;
+
+    $result = 0;
+
+    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+
+    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+    {
+        $filename = basename($file);
+        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+        $ecmfile=new EcmFiles($db);
+        $ecmfile->filepath = $rel_dir;
+        $ecmfile->filename = $filename;
+        $ecmfile->label = md5_file(dol_osencode($dir.'/'.$file));	// MD5 of file content
+        $ecmfile->fullpath_orig = $fullpathorig;
+        $ecmfile->gen_or_uploaded = $mode;
+        $ecmfile->description = '';    // indexed content
+        $ecmfile->keyword = '';        // keyword content
+        if ($setsharekey)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+            $ecmfile->share = getRandomPassword(true);
+        }
+
+        $result = $ecmfile->create($user);
+        if ($result < 0)
+        {
+            dol_syslog($ecmfile->error);
+        }
+    }
+
+    return $result;
 }
 
 
@@ -1762,48 +1762,48 @@ 
  */
 function deleteFilesIntoDatabaseIndex($dir, $file, $mode='uploaded')
 {
-	global $conf, $db, $user;
-
-	$error = 0;
-
-	if (empty($dir))
-	{
-		dol_syslog("deleteFilesIntoDatabaseIndex: dir parameter can't be empty", LOG_ERR);
-		return -1;
-	}
-
-	$db->begin();
-
-	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
-
-	$filename = basename($file);
-	$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-	$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-	if (! $error)
-	{
-		$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
-		$sql.= ' WHERE entity = '.$conf->entity;
-		$sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
-		if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
-		if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
-
-		$resql = $db->query($sql);
-		if (!$resql)
-		{
-			$error++;
-			dol_syslog(__METHOD__ . ' ' . $db->lasterror(), LOG_ERR);
-		}
-	}
-
-	// Commit or rollback
-	if ($error) {
-		$db->rollback();
-		return - 1 * $error;
-	} else {
-		$db->commit();
-		return 1;
-	}
+    global $conf, $db, $user;
+
+    $error = 0;
+
+    if (empty($dir))
+    {
+        dol_syslog("deleteFilesIntoDatabaseIndex: dir parameter can't be empty", LOG_ERR);
+        return -1;
+    }
+
+    $db->begin();
+
+    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+
+    $filename = basename($file);
+    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+    if (! $error)
+    {
+        $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
+        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
+        if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
+        if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+
+        $resql = $db->query($sql);
+        if (!$resql)
+        {
+            $error++;
+            dol_syslog(__METHOD__ . ' ' . $db->lasterror(), LOG_ERR);
+        }
+    }
+
+    // Commit or rollback
+    if ($error) {
+        $db->rollback();
+        return - 1 * $error;
+    } else {
+        $db->commit();
+        return 1;
+    }
 }
 
 
@@ -1818,51 +1818,51 @@ 
  */
 function dol_convert_file($fileinput, $ext='png', $fileoutput='')
 {
-	global $langs;
-
-	if (class_exists('Imagick'))
-	{
-		$image=new Imagick();
-		try {
-			$ret = $image->readImage($fileinput);
-		} catch(Exception $e) {
-			dol_syslog("Failed to read image using Imagick. Try to install package 'apt-get install ghostscript'.", LOG_WARNING);
-			return 0;
-		}
-		if ($ret)
-		{
-			$ret = $image->setImageFormat($ext);
-			if ($ret)
-			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
-
-				$count = $image->getNumberImages();
-
-				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
-				{
-					$ret = $image->writeImages($fileoutput, true);
-				}
-				else
-				{
-					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
-				}
-				if ($ret) return $count;
-				else return -3;
-			}
-			else
-			{
-				return -2;
-			}
-		}
-		else
-		{
-			return -1;
-		}
-	}
-	else
-	{
-		return 0;
-	}
+    global $langs;
+
+    if (class_exists('Imagick'))
+    {
+        $image=new Imagick();
+        try {
+            $ret = $image->readImage($fileinput);
+        } catch(Exception $e) {
+            dol_syslog("Failed to read image using Imagick. Try to install package 'apt-get install ghostscript'.", LOG_WARNING);
+            return 0;
+        }
+        if ($ret)
+        {
+            $ret = $image->setImageFormat($ext);
+            if ($ret)
+            {
+                if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+
+                $count = $image->getNumberImages();
+
+                if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
+                {
+                    $ret = $image->writeImages($fileoutput, true);
+                }
+                else
+                {
+                    dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
+                }
+                if ($ret) return $count;
+                else return -3;
+            }
+            else
+            {
+                return -2;
+            }
+        }
+        else
+        {
+            return -1;
+        }
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 
@@ -1876,48 +1876,48 @@ 
  */
 function dol_compress_file($inputfile, $outputfile, $mode="gz")
 {
-	$foundhandler=0;
-
-	try
-	{
-		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
-		elseif ($mode == 'zip')
-		{
-			if (defined('ODTPHP_PATHTOPCLZIP'))
-			{
-				$foundhandler=1;
-
-				include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
-				$archive = new PclZip($outputfile);
-				$archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
-				//$archive->add($inputfile);
-				return 1;
-			}
-		}
-
-		if ($foundhandler)
-		{
-			$fp = fopen($outputfile, "w");
-			fwrite($fp, $compressdata);
-			fclose($fp);
-			return 1;
-		}
-		else
-		{
-			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
-			return -2;
-		}
-	}
-	catch (Exception $e)
-	{
-		global $langs, $errormsg;
-		$langs->load("errors");
-		dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir");
-		return -1;
-	}
+    $foundhandler=0;
+
+    try
+    {
+        $data = implode("", file(dol_osencode($inputfile)));
+        if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
+        elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
+        elseif ($mode == 'zip')
+        {
+            if (defined('ODTPHP_PATHTOPCLZIP'))
+            {
+                $foundhandler=1;
+
+                include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+                $archive = new PclZip($outputfile);
+                $archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
+                //$archive->add($inputfile);
+                return 1;
+            }
+        }
+
+        if ($foundhandler)
+        {
+            $fp = fopen($outputfile, "w");
+            fwrite($fp, $compressdata);
+            fclose($fp);
+            return 1;
+        }
+        else
+        {
+            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+            return -2;
+        }
+    }
+    catch (Exception $e)
+    {
+        global $langs, $errormsg;
+        $langs->load("errors");
+        dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+        return -1;
+    }
 }
 
 /**
@@ -1929,54 +1929,54 @@ 
  */
 function dol_uncompress($inputfile,$outputdir)
 {
-	global $langs;
-
-	if (defined('ODTPHP_PATHTOPCLZIP'))
-	{
-		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
-		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
-		$archive = new PclZip($inputfile);
-		$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
-		//var_dump($result);
-		if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else
-		{
-			$ok=1; $errmsg='';
-			// Loop on each file to check result for unzipping file
-			foreach($result as $key => $val)
-			{
-				if ($val['status'] == 'path_creation_fail')
-				{
-					$langs->load("errors");
-					$ok=0;
-					$errmsg=$langs->trans("ErrorFailToCreateDir", $val['filename']);
-					break;
-				}
-			}
-
-			if ($ok) return array();
-			else return array('error'=>$errmsg);
-		}
-	}
-
-	if (class_exists('ZipArchive'))
-	{
-		dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
-		$zip = new ZipArchive;
-		$res = $zip->open($inputfile);
-		if ($res === true)
-		{
-			$zip->extractTo($outputdir.'/');
-			$zip->close();
-			return array();
-		}
-		else
-		{
-			return array('error'=>'ErrUnzipFails');
-		}
-	}
-
-	return array('error'=>'ErrNoZipEngine');
+    global $langs;
+
+    if (defined('ODTPHP_PATHTOPCLZIP'))
+    {
+        dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
+        include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+        $archive = new PclZip($inputfile);
+        $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
+        //var_dump($result);
+        if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
+        else
+        {
+            $ok=1; $errmsg='';
+            // Loop on each file to check result for unzipping file
+            foreach($result as $key => $val)
+            {
+                if ($val['status'] == 'path_creation_fail')
+                {
+                    $langs->load("errors");
+                    $ok=0;
+                    $errmsg=$langs->trans("ErrorFailToCreateDir", $val['filename']);
+                    break;
+                }
+            }
+
+            if ($ok) return array();
+            else return array('error'=>$errmsg);
+        }
+    }
+
+    if (class_exists('ZipArchive'))
+    {
+        dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
+        $zip = new ZipArchive;
+        $res = $zip->open($inputfile);
+        if ($res === true)
+        {
+            $zip->extractTo($outputdir.'/');
+            $zip->close();
+            return array();
+        }
+        else
+        {
+            return array('error'=>'ErrUnzipFails');
+        }
+    }
+
+    return array('error'=>'ErrNoZipEngine');
 }
 
 
@@ -1990,25 +1990,25 @@ 
  */
 function dol_compress_dir($inputdir, $outputfile, $mode="zip")
 {
-	$foundhandler=0;
-
-	dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
-
-	if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
-	{
-		global $langs, $errormsg;
-		$langs->load("errors");
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
-		return -3;
-	}
-
-	try
-	{
-		if ($mode == 'gz')     { $foundhandler=0; }
-		elseif ($mode == 'bz') { $foundhandler=0; }
-		elseif ($mode == 'zip')
-		{
-			/*if (defined('ODTPHP_PATHTOPCLZIP'))
+    $foundhandler=0;
+
+    dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
+
+    if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
+    {
+        global $langs, $errormsg;
+        $langs->load("errors");
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+        return -3;
+    }
+
+    try
+    {
+        if ($mode == 'gz')     { $foundhandler=0; }
+        elseif ($mode == 'bz') { $foundhandler=0; }
+        elseif ($mode == 'zip')
+        {
+            /*if (defined('ODTPHP_PATHTOPCLZIP'))
             {
                 $foundhandler=0;        // TODO implement this
 
@@ -2019,61 +2019,61 @@ 
                 return 1;
             }
             else*/
-			if (class_exists('ZipArchive'))
-			{
-				$foundhandler=1;
-
-				// Initialize archive object
-				$zip = new ZipArchive();
-				$result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-
-				// Create recursive directory iterator
-				/** @var SplFileInfo[] $files */
-				$files = new RecursiveIteratorIterator(
-					new RecursiveDirectoryIterator($inputdir),
-					RecursiveIteratorIterator::LEAVES_ONLY
-					);
-
-				foreach ($files as $name => $file)
-				{
-					// Skip directories (they would be added automatically)
-					if (!$file->isDir())
-					{
-						// Get real and relative path for current file
-						$filePath = $file->getRealPath();
-						$relativePath = substr($filePath, strlen($inputdir) + 1);
-
-						// Add current file to archive
-						$zip->addFile($filePath, $relativePath);
-					}
-				}
-
-				// Zip archive will be created only after closing object
-				$zip->close();
-
-				return 1;
-			}
-		}
-
-		if (! $foundhandler)
-		{
-			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
-			return -2;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	catch (Exception $e)
-	{
-		global $langs, $errormsg;
-		$langs->load("errors");
-		dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
-		dol_syslog($e->getMessage(), LOG_ERR);
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
-		return -1;
-	}
+            if (class_exists('ZipArchive'))
+            {
+                $foundhandler=1;
+
+                // Initialize archive object
+                $zip = new ZipArchive();
+                $result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
+
+                // Create recursive directory iterator
+                /** @var SplFileInfo[] $files */
+                $files = new RecursiveIteratorIterator(
+                    new RecursiveDirectoryIterator($inputdir),
+                    RecursiveIteratorIterator::LEAVES_ONLY
+                    );
+
+                foreach ($files as $name => $file)
+                {
+                    // Skip directories (they would be added automatically)
+                    if (!$file->isDir())
+                    {
+                        // Get real and relative path for current file
+                        $filePath = $file->getRealPath();
+                        $relativePath = substr($filePath, strlen($inputdir) + 1);
+
+                        // Add current file to archive
+                        $zip->addFile($filePath, $relativePath);
+                    }
+                }
+
+                // Zip archive will be created only after closing object
+                $zip->close();
+
+                return 1;
+            }
+        }
+
+        if (! $foundhandler)
+        {
+            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+            return -2;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+    catch (Exception $e)
+    {
+        global $langs, $errormsg;
+        $langs->load("errors");
+        dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+        dol_syslog($e->getMessage(), LOG_ERR);
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+        return -1;
+    }
 }
 
 
@@ -2090,8 +2090,8 @@ 
  */
 function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview.*\.png)$','^\.'),$nohook=false,$mode='')
 {
-	$tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
-	return $tmparray[0];
+    $tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
+    return $tmparray[0];
 }
 
 /**
@@ -2108,770 +2108,770 @@ 
  */
 function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser='', $refname='', $mode='read')
 {
-	global $conf, $db, $user;
-	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
-
-	if (! is_object($fuser)) $fuser=$user;
-
-	if (empty($modulepart)) return 'ErrorBadParameter';
-	if (empty($entity))
-	{
-		if (empty($conf->multicompany->enabled)) $entity=1;
-		else $entity=0;
-	}
-	// Fix modulepart
-	if ($modulepart == 'users') $modulepart='user';
-
-	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
-	// We define $accessallowed and $sqlprotectagainstexternals
-	$accessallowed=0;
-	$sqlprotectagainstexternals='';
-	$ret=array();
-
-	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
-
-	$relative_original_file = $original_file;
-
-	// Define possible keys to use for permission check
-	$lire='lire'; $read='read'; $download='download';
-	if ($mode == 'write')
-	{
-		$lire='creer'; $read='write'; $download='upload';
-	}
-
-	// Wrapping for miscellaneous medias files
-	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
-	{
-		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		$accessallowed=1;
-		$original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
-	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
-	{
-		$accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
-		$original_file=$dolibarr_main_data_root.'/'.$original_file;
-	}
-	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
-	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
-	{
-		// Dir for custom dirs
-		$tmp=explode(',', $dolibarr_main_document_root_alt);
-		$dirins = $tmp[0];
-
-		$accessallowed=($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
-		$original_file=$dirins.'/'.$original_file;
-	}
-	// Wrapping for some images
-	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->mycompany->dir_output.'/'.$original_file;
-	}
-	// Wrapping for users photos
-	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->user->dir_output.'/'.$original_file;
-	}
-	// Wrapping for members photos
-	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu factures
-	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
-	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu propal
-	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
-	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu commande
-	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
-	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu intervention
-	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
-	{
-		if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu conat
-	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
-	{
-		if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
-		$original_file=$conf->contrat->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier proposal
-	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
-	{
-		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
-		$original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier order
-	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
-	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
-	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
-	{
-		if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
-		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats propales
-	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
-	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les images des stats commandes
-	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
-	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats factures
-	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
-	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
-	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
-		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
-	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
-		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
-	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
-		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats produits
-	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
-	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
-		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
-	}
-	// Wrapping for taxes
-	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
-	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
-		$original_file=$conf->tax->dir_output.'/'.$original_file;
-	}
-	// Wrapping for events
-	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
-	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
-	}
-	// Wrapping for categories
-	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
-	{
-		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
-		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les prelevements
-	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
-	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
-		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les graph energie
-	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->stock->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph fournisseurs
-	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->fournisseur->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph des produits
-	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->product->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les code barre
-	elseif ($modulepart == 'barcode')
-	{
-		$accessallowed=1;
-		// If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
-		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
-		$original_file='';
-	}
-	// Wrapping pour les icones de background des mailings
-	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->mailing->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour le scanner
-	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-	// Wrapping pour les images fckeditor
-	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for users
-	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
-	{
-		$canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
-		if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
-		if ($canreaduser || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->user->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for third parties
-	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
-	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->societe->multidir_output[$entity].'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
-	}
-
-	// Wrapping for contact
-	else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
-	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->societe->{$lire})
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->societe->multidir_output[$entity].'/contact/'.$original_file;
-	}
-
-	// Wrapping for invoices
-	else if (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping for mass actions
-	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
-	{
-		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_orders')
-	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_invoices')
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_expensereport')
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_interventions')
-	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
-	{
-		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_order')
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_invoice')
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
-	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-
-	// Wrapping for interventions
-	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
-	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les deplacements et notes de frais
-	else if ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
-	{
-		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->deplacement->dir_output.'/'.$original_file;
-		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les propales
-	else if (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))
-	{
-		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les commandes
-	else if (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
-	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les projets
-	else if ($modulepart == 'project' && !empty($conf->projet->dir_output))
-	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
-	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-
-	// Wrapping pour les commandes fournisseurs
-	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les factures fournisseurs
-	else if (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les rapport de paiements
-	else if ($modulepart == 'supplier_payment')
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->payment->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les rapport de paiements
-	else if ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
-	}
-
-	// Wrapping for accounting exports
-	else if ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
-	{
-		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->accounting->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les expedition
-	else if ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
-	{
-		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->expedition->dir_output."/sending/".$original_file;
-	}
-	// Wrapping pour les bons de livraison
-	else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
-	{
-		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->expedition->dir_output."/receipt/".$original_file;
-	}
-
-	// Wrapping pour les actions
-	else if ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
-	{
-		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les actions
-	else if ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
-	{
-		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file = $conf->agenda->dir_temp."/".$original_file;
-	}
-
-	// Wrapping pour les produits et services
-	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
-	{
-		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping pour les lots produits
-	else if ($modulepart == 'product_batch' || $modulepart == 'produitlot')
-	{
-		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		if (! empty($conf->productbatch->enabled)) $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping pour les contrats
-	else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
-	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->contrat->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
-	}
-
-	// Wrapping pour les dons
-	else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
-	{
-		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->don->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les dons
-	else if ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
-	{
-		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->resource->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les remises de cheques
-	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
-	{
-		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-
-		$original_file=$conf->bank->dir_output.'/checkdeposits/'.$original_file;		// original_file should contains relative path so include the get_exdir result
-	}
-
-	// Wrapping for bank
-	else if ($modulepart == 'bank' && !empty($conf->bank->dir_output))
-	{
-		if ($fuser->rights->banque->{$lire})
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->bank->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for export module
-	else if ($modulepart == 'export' && !empty($conf->export->dir_temp))
-	{
-		// Aucun test necessaire car on force le rep de download sur
-		// le rep export qui est propre a l'utilisateur
-		$accessallowed=1;
-		$original_file=$conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// Wrapping for import module
-	else if ($modulepart == 'import' && !empty($conf->import->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->import->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour l'editeur wysiwyg
-	else if ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for backups
-	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
-	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for upload file test
-	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
-	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour BitTorrent
-	else if ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
-	{
-		$accessallowed=1;
-		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
-		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
-	}
-
-	// Wrapping pour Foundation module
-	else if ($modulepart == 'member' && !empty($conf->adherent->dir_output))
-	{
-		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for Scanner
-	else if ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// GENERIC Wrapping
-	// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
-	// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
-	// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
-	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
-	else
-	{
-		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-		if ($fuser->admin) $accessallowed=1;    // If user is admin
-
-		// Define $accessallowed
-		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))
-			{
-				$accessallowed=1;
-			}
-			$original_file=$conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-		}
-		else
-		{
-			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-
-			$perm=GETPOST('perm');
-			$subperm=GETPOST('subperm');
-			if ($perm || $subperm)
-			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-			else
-			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-		}
-
-		// For modules who wants to manage different levels of permissions for documents
-		$subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';
-		if (! empty($conf->global->$subPermCategoryConstName))
-		{
-			$subPermCategory = $conf->global->$subPermCategoryConstName;
-			if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
-			{
-				$accessallowed=1;
-			}
-		}
-
-		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
-		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
-		{
-			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
-		}
-	}
-
-	$ret = array(
-		'accessallowed' => $accessallowed,
-		'sqlprotectagainstexternals'=>$sqlprotectagainstexternals,
-		'original_file'=>$original_file
-	);
-
-	return $ret;
+    global $conf, $db, $user;
+    global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
+
+    if (! is_object($fuser)) $fuser=$user;
+
+    if (empty($modulepart)) return 'ErrorBadParameter';
+    if (empty($entity))
+    {
+        if (empty($conf->multicompany->enabled)) $entity=1;
+        else $entity=0;
+    }
+    // Fix modulepart
+    if ($modulepart == 'users') $modulepart='user';
+
+    dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
+    // We define $accessallowed and $sqlprotectagainstexternals
+    $accessallowed=0;
+    $sqlprotectagainstexternals='';
+    $ret=array();
+
+    // Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
+    if (empty($refname)) $refname=basename(dirname($original_file)."/");
+
+    $relative_original_file = $original_file;
+
+    // Define possible keys to use for permission check
+    $lire='lire'; $read='read'; $download='download';
+    if ($mode == 'write')
+    {
+        $lire='creer'; $read='write'; $download='upload';
+    }
+
+    // Wrapping for miscellaneous medias files
+    if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
+    {
+        if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        $accessallowed=1;
+        $original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
+    }
+    // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+    elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
+    {
+        $accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
+        $original_file=$dolibarr_main_data_root.'/'.$original_file;
+    }
+    // Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
+    elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
+    {
+        // Dir for custom dirs
+        $tmp=explode(',', $dolibarr_main_document_root_alt);
+        $dirins = $tmp[0];
+
+        $accessallowed=($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
+        $original_file=$dirins.'/'.$original_file;
+    }
+    // Wrapping for some images
+    elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->mycompany->dir_output.'/'.$original_file;
+    }
+    // Wrapping for users photos
+    elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->user->dir_output.'/'.$original_file;
+    }
+    // Wrapping for members photos
+    elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->adherent->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu factures
+    elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
+    {
+        if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+        $original_file=$conf->facture->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu propal
+    elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
+    {
+        if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+        $original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
+    }
+    // Wrapping pour les apercu commande
+    elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
+    {
+        if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+        $original_file=$conf->commande->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu intervention
+    elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
+    {
+        if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
+        $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu conat
+    elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
+    {
+        if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
+        $original_file=$conf->contrat->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu supplier proposal
+    elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
+    {
+        if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
+        $original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu supplier order
+    elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
+    {
+        if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+        $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu supplier invoice
+    elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+        $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu supplier invoice
+    elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
+    {
+        if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+        $original_file=$conf->expensereport->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats propales
+    elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
+    {
+        if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+        $original_file=$conf->propal->multidir_temp[$entity].'/'.$original_file;
+    }
+    // Wrapping pour les images des stats commandes
+    elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
+    {
+        if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+        $original_file=$conf->commande->dir_temp.'/'.$original_file;
+    }
+    elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+    {
+        if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+        $original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats factures
+    elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
+    {
+        if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+        $original_file=$conf->facture->dir_temp.'/'.$original_file;
+    }
+    elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+        $original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats expeditions
+    elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
+    {
+        if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
+        $original_file=$conf->expedition->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats expeditions
+    elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
+    {
+        if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
+        $original_file=$conf->deplacement->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats expeditions
+    elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
+    {
+        if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
+        $original_file=$conf->adherent->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats produits
+    elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
+    {
+        if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
+        $original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
+    }
+    // Wrapping for taxes
+    elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
+    {
+        if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
+        $original_file=$conf->tax->dir_output.'/'.$original_file;
+    }
+    // Wrapping for events
+    elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
+    {
+        if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
+        $original_file=$conf->agenda->dir_output.'/'.$original_file;
+    }
+    // Wrapping for categories
+    elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
+    {
+        if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
+        $original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
+    }
+    // Wrapping pour les prelevements
+    elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
+    {
+        if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
+        $original_file=$conf->prelevement->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les graph energie
+    elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->stock->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les graph fournisseurs
+    elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->fournisseur->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les graph des produits
+    elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->product->multidir_temp[$entity].'/'.$original_file;
+    }
+    // Wrapping pour les code barre
+    elseif ($modulepart == 'barcode')
+    {
+        $accessallowed=1;
+        // If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
+        //$original_file=$conf->barcode->dir_temp.'/'.$original_file;
+        $original_file='';
+    }
+    // Wrapping pour les icones de background des mailings
+    elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->mailing->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour le scanner
+    elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+    }
+    // Wrapping pour les images fckeditor
+    elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for users
+    else if ($modulepart == 'user' && !empty($conf->user->dir_output))
+    {
+        $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
+        if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
+        if ($canreaduser || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->user->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for third parties
+    else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
+    {
+        if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->societe->multidir_output[$entity].'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
+    }
+
+    // Wrapping for contact
+    else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
+    {
+        if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if ($fuser->rights->societe->{$lire})
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->societe->multidir_output[$entity].'/contact/'.$original_file;
+    }
+
+    // Wrapping for invoices
+    else if (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
+    {
+        if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->facture->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+    // Wrapping for mass actions
+    else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
+    {
+        if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_orders')
+    {
+        if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_invoices')
+    {
+        if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_expensereport')
+    {
+        if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_interventions')
+    {
+        if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
+    {
+        if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_supplier_order')
+    {
+        if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_supplier_invoice')
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+    {
+        if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+
+    // Wrapping for interventions
+    else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
+    {
+        if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les deplacements et notes de frais
+    else if ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
+    {
+        if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->deplacement->dir_output.'/'.$original_file;
+        //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+    // Wrapping pour les propales
+    else if (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))
+    {
+        if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les commandes
+    else if (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
+    {
+        if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->commande->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les projets
+    else if ($modulepart == 'project' && !empty($conf->projet->dir_output))
+    {
+        if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->projet->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
+    }
+    else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+    {
+        if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->projet->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
+    }
+
+    // Wrapping pour les commandes fournisseurs
+    else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
+    {
+        if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les factures fournisseurs
+    else if (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+    // Wrapping pour les rapport de paiements
+    else if ($modulepart == 'supplier_payment')
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->payment->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les rapport de paiements
+    else if ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
+    {
+        if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+        else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+    }
+
+    // Wrapping for accounting exports
+    else if ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
+    {
+        if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->accounting->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping pour les expedition
+    else if ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
+    {
+        if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->expedition->dir_output."/sending/".$original_file;
+    }
+    // Wrapping pour les bons de livraison
+    else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
+    {
+        if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->expedition->dir_output."/receipt/".$original_file;
+    }
+
+    // Wrapping pour les actions
+    else if ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
+    {
+        if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->agenda->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping pour les actions
+    else if ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
+    {
+        if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file = $conf->agenda->dir_temp."/".$original_file;
+    }
+
+    // Wrapping pour les produits et services
+    else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
+    {
+        if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
+        elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+    }
+
+    // Wrapping pour les lots produits
+    else if ($modulepart == 'product_batch' || $modulepart == 'produitlot')
+    {
+        if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        if (! empty($conf->productbatch->enabled)) $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+    }
+
+    // Wrapping pour les contrats
+    else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
+    {
+        if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->contrat->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
+    }
+
+    // Wrapping pour les dons
+    else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
+    {
+        if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->don->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping pour les dons
+    else if ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
+    {
+        if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->resource->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping pour les remises de cheques
+    else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
+    {
+        if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+
+        $original_file=$conf->bank->dir_output.'/checkdeposits/'.$original_file;		// original_file should contains relative path so include the get_exdir result
+    }
+
+    // Wrapping for bank
+    else if ($modulepart == 'bank' && !empty($conf->bank->dir_output))
+    {
+        if ($fuser->rights->banque->{$lire})
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->bank->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for export module
+    else if ($modulepart == 'export' && !empty($conf->export->dir_temp))
+    {
+        // Aucun test necessaire car on force le rep de download sur
+        // le rep export qui est propre a l'utilisateur
+        $accessallowed=1;
+        $original_file=$conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
+    }
+
+    // Wrapping for import module
+    else if ($modulepart == 'import' && !empty($conf->import->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->import->dir_temp.'/'.$original_file;
+    }
+
+    // Wrapping pour l'editeur wysiwyg
+    else if ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for backups
+    else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
+    {
+        if ($fuser->admin) $accessallowed=1;
+        $original_file=$conf->admin->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for upload file test
+    else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
+    {
+        if ($fuser->admin) $accessallowed=1;
+        $original_file=$conf->admin->dir_temp.'/'.$original_file;
+    }
+
+    // Wrapping pour BitTorrent
+    else if ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
+    {
+        $accessallowed=1;
+        $dir='files';
+        if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
+        $original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
+    }
+
+    // Wrapping pour Foundation module
+    else if ($modulepart == 'member' && !empty($conf->adherent->dir_output))
+    {
+        if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->adherent->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for Scanner
+    else if ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+    }
+
+    // GENERIC Wrapping
+    // If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
+    // If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
+    // If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
+    // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
+    else
+    {
+        if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
+        if ($fuser->admin) $accessallowed=1;    // If user is admin
+
+        // Define $accessallowed
+        if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
+        {
+            if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+            if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+            $original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
+        }
+        else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+        {
+            if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+            if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+            $original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
+        }
+        else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+        {
+            if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+            if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+            $original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
+        }
+        else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
+        {
+            if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+            if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))
+            {
+                $accessallowed=1;
+            }
+            $original_file=$conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+        }
+        else
+        {
+            if (empty($conf->$modulepart->dir_output))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+
+            $perm=GETPOST('perm');
+            $subperm=GETPOST('subperm');
+            if ($perm || $subperm)
+            {
+                if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
+                $original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+            }
+            else
+            {
+                if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
+                $original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+            }
+        }
+
+        // For modules who wants to manage different levels of permissions for documents
+        $subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';
+        if (! empty($conf->global->$subPermCategoryConstName))
+        {
+            $subPermCategory = $conf->global->$subPermCategoryConstName;
+            if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
+            {
+                $accessallowed=1;
+            }
+        }
+
+        // Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
+        $sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
+        if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+        {
+            // Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+            eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
+        }
+    }
+
+    $ret = array(
+        'accessallowed' => $accessallowed,
+        'sqlprotectagainstexternals'=>$sqlprotectagainstexternals,
+        'original_file'=>$original_file
+    );
+
+    return $ret;
 }
 
 /**
@@ -2884,10 +2884,10 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-	if (! dol_is_dir($directory)) dol_mkdir($directory);
-	$cachefile = $directory . $filename;
-	file_put_contents($cachefile, serialize($object), LOCK_EX);
-	@chmod($cachefile, 0644);
+    if (! dol_is_dir($directory)) dol_mkdir($directory);
+    $cachefile = $directory . $filename;
+    file_put_contents($cachefile, serialize($object), LOCK_EX);
+    @chmod($cachefile, 0644);
 }
 
 /**
@@ -2900,10 +2900,10 @@ 
  */
 function dol_cache_refresh($directory, $filename, $cachetime)
 {
-	$now = dol_now();
-	$cachefile = $directory . $filename;
-	$refresh = !file_exists($cachefile) || ($now-$cachetime) > dol_filemtime($cachefile);
-	return $refresh;
+    $now = dol_now();
+    $cachefile = $directory . $filename;
+    $refresh = !file_exists($cachefile) || ($now-$cachetime) > dol_filemtime($cachefile);
+    return $refresh;
 }
 
 /**
@@ -2915,9 +2915,9 @@ 
  */
 function dol_readcachefile($directory, $filename)
 {
-	$cachefile = $directory . $filename;
-	$object = unserialize(file_get_contents($cachefile));
-	return $object;
+    $cachefile = $directory . $filename;
+    $object = unserialize(file_get_contents($cachefile));
+    return $object;
 }
 
 
@@ -2934,43 +2934,43 @@ 
  */
 function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathref = '', &$checksumconcat = array())
 {
-	global $conffile;
-
-	$exclude = 'install';
-
-	foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
-	{
-		$filename = $path.$file['name'];
-		$file_list['insignature'][] = $filename;
-		$expectedmd5 = (string) $file;
-
-		//if (preg_match('#'.$exclude.'#', $filename)) continue;
-
-		if (!file_exists($pathref.'/'.$filename))
-		{
-			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5);
-		}
-		else
-		{
-			$md5_local = md5_file($pathref.'/'.$filename);
-
-			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
-			{
-				$checksumconcat[] = $expectedmd5;
-			}
-			else
-			{
-				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
-				$checksumconcat[] = $md5_local;
-			}
-		}
-	}
-
-	foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example
-	{
-		getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/', $pathref, $checksumconcat);
-	}
-
-	return $file_list;
+    global $conffile;
+
+    $exclude = 'install';
+
+    foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
+    {
+        $filename = $path.$file['name'];
+        $file_list['insignature'][] = $filename;
+        $expectedmd5 = (string) $file;
+
+        //if (preg_match('#'.$exclude.'#', $filename)) continue;
+
+        if (!file_exists($pathref.'/'.$filename))
+        {
+            $file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5);
+        }
+        else
+        {
+            $md5_local = md5_file($pathref.'/'.$filename);
+
+            if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
+            {
+                $checksumconcat[] = $expectedmd5;
+            }
+            else
+            {
+                if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+                $checksumconcat[] = $md5_local;
+            }
+        }
+    }
+
+    foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example
+    {
+        getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/', $pathref, $checksumconcat);
+    }
+
+    return $file_list;
 }
 

Spacing +595 added lines, -595 removed lines

@@ -34,7 +34,7 @@ 
  */
 function dol_basename($pathfile)
 {
-	return preg_replace('/^.*\/([^\/]+)$/','$1',rtrim($pathfile,'/'));
+	return preg_replace('/^.*\/([^\/]+)$/', '$1', rtrim($pathfile, '/'));
 }
 
 /**
@@ -56,7 +56,7 @@ 
  *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
  *  @see dol_dir_list_indatabase
  */
-function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=0, $relativename="", $donotfollowsymlinks=0)
+function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0, $nohook = 0, $relativename = "", $donotfollowsymlinks = 0)
 {
 	global $db, $hookmanager;
 	global $object;
@@ -64,23 +64,23 @@ 
 	dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));
 	//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
 
-	$loaddate=($mode==1||$mode==2)?true:false;
-	$loadsize=($mode==1||$mode==3)?true:false;
+	$loaddate = ($mode == 1 || $mode == 2) ?true:false;
+	$loadsize = ($mode == 1 || $mode == 3) ?true:false;
 
 	// Clean parameters
-	$path=preg_replace('/([\\/]+)$/i','',$path);
-	$newpath=dol_osencode($path);
+	$path = preg_replace('/([\\/]+)$/i', '', $path);
+	$newpath = dol_osencode($path);
 
 	$reshook = 0;
 	$file_list = array();
 
-	if (is_object($hookmanager) && ! $nohook)
+	if (is_object($hookmanager) && !$nohook)
 	{
-		$hookmanager->resArray=array();
+		$hookmanager->resArray = array();
 
 		$hookmanager->initHooks(array('fileslib'));
 
-		$parameters=array(
+		$parameters = array(
 				'path' => $newpath,
 				'types'=> $types,
 				'recursive' => $recursive,
@@ -92,63 +92,63 @@ 
 				'loadsize' => $loadsize,
 				'mode' => $mode
 		);
-		$reshook=$hookmanager->executeHooks('getDirList', $parameters, $object);
+		$reshook = $hookmanager->executeHooks('getDirList', $parameters, $object);
 	}
 
 	// $hookmanager->resArray may contain array stacked by other modules
 	if (empty($reshook))
 	{
-		if (! is_dir($newpath)) return array();
+		if (!is_dir($newpath)) return array();
 
 		if ($dir = opendir($newpath))
 		{
-			$filedate='';
-			$filesize='';
+			$filedate = '';
+			$filesize = '';
 
 			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
 			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
-				$fullpathfile=($newpath?$newpath.'/':'').$file;
+				if (!utf8_check($file)) $file = utf8_encode($file); // To be sure data is stored in utf8 in memory
+				$fullpathfile = ($newpath ? $newpath.'/' : '').$file;
 
-				$qualified=1;
+				$qualified = 1;
 
 				// Define excludefilterarray
-				$excludefilterarray=array('^\.');
+				$excludefilterarray = array('^\.');
 				if (is_array($excludefilter))
 				{
-					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+					$excludefilterarray = array_merge($excludefilterarray, $excludefilter);
 				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
+				else if ($excludefilter) $excludefilterarray[] = $excludefilter;
 				// Check if file is qualified
-				foreach($excludefilterarray as $filt)
+				foreach ($excludefilterarray as $filt)
 				{
 					if (preg_match('/'.$filt.'/i', $file) || preg_match('/'.$filt.'/i', $fullpathfile)) {
-						$qualified=0; break;
+						$qualified = 0; break;
 					}
 				}
 				//print $fullpathfile.' '.$file.' '.$qualified.'<br>';
 
 				if ($qualified)
 				{
-					$isdir=is_dir(dol_osencode($path."/".$file));
+					$isdir = is_dir(dol_osencode($path."/".$file));
 					// Check whether this is a file or directory and whether we're interested in that type
-					if ($isdir && (($types=="directories") || ($types=="all") || $recursive))
+					if ($isdir && (($types == "directories") || ($types == "all") || $recursive))
 					{
 						// Add entry into file_list array
-						if (($types=="directories") || ($types=="all"))
+						if (($types == "directories") || ($types == "all"))
 						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+							if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
+							if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);
 
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+							if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into all $path, only into $file part
 							{
-								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-								$level1name=(isset($reg[1])?$reg[1]:'');
+								preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
+								$level1name = (isset($reg[1]) ? $reg[1] : '');
 								$file_list[] = array(
 										"name" => $file,
 										"path" => $path,
 										"level1name" => $level1name,
-										"relativename" => ($relativename?$relativename.'/':'').$file,
+										"relativename" => ($relativename ? $relativename.'/' : '').$file,
 										"fullname" => $path.'/'.$file,
 										"date" => $filedate,
 										"size" => $filesize,
@@ -160,28 +160,28 @@ 
 						// if we're in a directory and we want recursive behavior, call this function again
 						if ($recursive)
 						{
-							if (empty($donotfollowsymlinks) || ! is_link($path."/".$file))
+							if (empty($donotfollowsymlinks) || !is_link($path."/".$file))
 							{
 								//var_dump('eee '. $path."/".$file. ' '.is_dir($path."/".$file).' '.is_link($path."/".$file));
-								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file, $donotfollowsymlinks));
+								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks));
 							}
 						}
 					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
+					else if (!$isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+						if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
+						if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);
 
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+						if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into $path, only into $file
 						{
-							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-							$level1name=(isset($reg[1])?$reg[1]:'');
+							preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
+							$level1name = (isset($reg[1]) ? $reg[1] : '');
 							$file_list[] = array(
 									"name" => $file,
 									"path" => $path,
 									"level1name" => $level1name,
-									"relativename" => ($relativename?$relativename.'/':'').$file,
+									"relativename" => ($relativename ? $relativename.'/' : '').$file,
 									"fullname" => $path.'/'.$file,
 									"date" => $filedate,
 									"size" => $filesize,
@@ -194,12 +194,12 @@ 
 			closedir($dir);
 
 			// Obtain a list of columns
-			if (! empty($sortcriteria))
+			if (!empty($sortcriteria))
 			{
-				$myarray=array();
+				$myarray = array();
 				foreach ($file_list as $key => $row)
 				{
-					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+					$myarray[$key] = (isset($row[$sortcriteria]) ? $row[$sortcriteria] : '');
 				}
 				// Sort the data
 				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
@@ -226,21 +226,21 @@ 
  *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','type'=>'dir|file',...)
  *  @see dol_dir_list
  */
-function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
+function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0)
 {
 	global $conf, $db;
 
-	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
-	$sql.=" acl, position, share";
-	if ($mode) $sql.=", description";
-	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
-	$sql.=" WHERE filepath = '".$db->escape($path)."'";
-	$sql.=" AND entity = ".$conf->entity;
+	$sql = " SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
+	$sql .= " acl, position, share";
+	if ($mode) $sql .= ", description";
+	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
+	$sql .= " WHERE filepath = '".$db->escape($path)."'";
+	$sql .= " AND entity = ".$conf->entity;
 
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$file_list=array();
+		$file_list = array();
 		$num = $db->num_rows($resql);
 		$i = 0;
 		while ($i < $num)
@@ -248,11 +248,11 @@ 
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
-				$level1name=(isset($reg[1])?$reg[1]:'');
+				preg_match('/([^\/]+)\/[^\/]+$/', DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename, $reg);
+				$level1name = (isset($reg[1]) ? $reg[1] : '');
 				$file_list[] = array(
 					"rowid" => $obj->rowid,
-					"label" => $obj->label,         // md5
+					"label" => $obj->label, // md5
 					"name" => $obj->filename,
 					"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
 					"level1name" => $level1name,
@@ -272,12 +272,12 @@ 
 		}
 
 		// Obtain a list of columns
-		if (! empty($sortcriteria))
+		if (!empty($sortcriteria))
 		{
-			$myarray=array();
+			$myarray = array();
 			foreach ($file_list as $key => $row)
 			{
-				$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+				$myarray[$key] = (isset($row[$sortcriteria]) ? $row[$sortcriteria] : '');
 			}
 			// Sort the data
 			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
@@ -309,15 +309,15 @@ 
 
 	// TODO Remove this when PRODUCT_USE_OLD_PATH_FOR_PHOTO will be removed
 	global $modulepart;
-	if ($modulepart == 'produit' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+	if ($modulepart == 'produit' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 		global $object;
-		if (! empty($object->id))
+		if (!empty($object->id))
 		{
-			if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-			else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			if (!empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
+			else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
 
-			$relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dirold);
-			$relativedirold = preg_replace('/^[\\/]/','',$relativedirold);
+			$relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dirold);
+			$relativedirold = preg_replace('/^[\\/]/', '', $relativedirold);
 
 			$filearrayindatabase = array_merge($filearrayindatabase, dol_dir_list_in_database($relativedirold, '', null, 'name', SORT_ASC));
 		}
@@ -327,38 +327,38 @@ 
 	//var_dump($filearrayindatabase);
 
 	// Complete filearray with properties found into $filearrayindatabase
-	foreach($filearray as $key => $val)
+	foreach ($filearray as $key => $val)
 	{
-		$found=0;
+		$found = 0;
 		// Search if it exists into $filearrayindatabase
-		foreach($filearrayindatabase as $key2 => $val2)
+		foreach ($filearrayindatabase as $key2 => $val2)
 		{
 			if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
 			{
-				$filearray[$key]['position_name']=($filearrayindatabase[$key2]['position']?$filearrayindatabase[$key2]['position']:'0').'_'.$filearrayindatabase[$key2]['name'];
-				$filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
-				$filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
-				$filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
-				$filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
-				$filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
-				$filearray[$key]['share']=$filearrayindatabase[$key2]['share'];
-				$found=1;
+				$filearray[$key]['position_name'] = ($filearrayindatabase[$key2]['position'] ? $filearrayindatabase[$key2]['position'] : '0').'_'.$filearrayindatabase[$key2]['name'];
+				$filearray[$key]['position'] = $filearrayindatabase[$key2]['position'];
+				$filearray[$key]['cover'] = $filearrayindatabase[$key2]['cover'];
+				$filearray[$key]['acl'] = $filearrayindatabase[$key2]['acl'];
+				$filearray[$key]['rowid'] = $filearrayindatabase[$key2]['rowid'];
+				$filearray[$key]['label'] = $filearrayindatabase[$key2]['label'];
+				$filearray[$key]['share'] = $filearrayindatabase[$key2]['share'];
+				$found = 1;
 				break;
 			}
 		}
 
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+		if (!$found)    // This happen in transition toward version 6, or if files were added manually into os dir.
 		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
-			$filearray[$key]['cover']=0;
-			$filearray[$key]['acl']='';
+			$filearray[$key]['position'] = '999999'; // File not indexed are at end. So if we add a file, it will not replace an existing position
+			$filearray[$key]['cover'] = 0;
+			$filearray[$key]['acl'] = '';
 
-			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filearray[$key]['fullname']);
+			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
 			{
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-				$ecmfile=new EcmFiles($db);
+				$ecmfile = new EcmFiles($db);
 
 				// Add entry into database
 				$filename = basename($rel_filename);
@@ -368,11 +368,11 @@ 
 
 				$ecmfile->filepath = $rel_dir;
 				$ecmfile->filename = $filename;
-				$ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
+				$ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname'])); // $destfile is a full path to file
 				$ecmfile->fullpath_orig = $filearray[$key]['fullname'];
 				$ecmfile->gen_or_uploaded = 'unknown';
-				$ecmfile->description = '';    // indexed content
-				$ecmfile->keyword = '';        // keyword content
+				$ecmfile->description = ''; // indexed content
+				$ecmfile->keyword = ''; // keyword content
 				$result = $ecmfile->create($user);
 				if ($result < 0)
 				{
@@ -380,12 +380,12 @@ 
 				}
 				else
 				{
-					$filearray[$key]['rowid']=$result;
+					$filearray[$key]['rowid'] = $result;
 				}
 			}
 			else
 			{
-				$filearray[$key]['rowid']=0;     // Should not happened
+				$filearray[$key]['rowid'] = 0; // Should not happened
 			}
 		}
 	}
@@ -406,10 +406,10 @@ 
 	global $sortorder;
 	global $sortfield;
 
-	$sortorder=strtoupper($sortorder);
+	$sortorder = strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
+	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; }
+	else { $retup = 1; $retdown = -1; }
 
 	if ($sortfield == 'name')
 	{
@@ -437,7 +437,7 @@ 
  */
 function dol_is_dir($folder)
 {
-	$newfolder=dol_osencode($folder);
+	$newfolder = dol_osencode($folder);
 	if (is_dir($newfolder)) return true;
 	else return false;
 }
@@ -450,7 +450,7 @@ 
  */
 function dol_is_file($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
+	$newpathoffile = dol_osencode($pathoffile);
 	return is_file($newpathoffile);
 }
 
@@ -462,7 +462,7 @@ 
  */
 function dol_is_link($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
+	$newpathoffile = dol_osencode($pathoffile);
 	return is_link($newpathoffile);
 }
 
@@ -474,10 +474,10 @@ 
  */
 function dol_is_url($url)
 {
-	$tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
-	foreach($tmpprot as $prot)
+	$tmpprot = array('file', 'http', 'https', 'ftp', 'zlib', 'data', 'ssh', 'ssh2', 'ogg', 'expect');
+	foreach ($tmpprot as $prot)
 	{
-		if (preg_match('/^'.$prot.':/i',$url)) return true;
+		if (preg_match('/^'.$prot.':/i', $url)) return true;
 	}
 	return false;
 }
@@ -490,7 +490,7 @@ 
  */
 function dol_dir_is_emtpy($folder)
 {
-	$newfolder=dol_osencode($folder);
+	$newfolder = dol_osencode($folder);
 	if (is_dir($newfolder))
 	{
 		$handle = opendir($newfolder);
@@ -499,7 +499,7 @@ 
 		{
 			$name_array[] = $name;
 		}
-		foreach($name_array as $temp) $folder_content .= $temp;
+		foreach ($name_array as $temp) $folder_content .= $temp;
 
 		closedir($handle);
 
@@ -519,24 +519,24 @@ 
  */
 function dol_count_nb_of_line($file)
 {
-	$nb=0;
+	$nb = 0;
 
-	$newfile=dol_osencode($file);
+	$newfile = dol_osencode($file);
 	//print 'x'.$file;
-	$fp=fopen($newfile,'r');
+	$fp = fopen($newfile, 'r');
 	if ($fp)
 	{
 		while (!feof($fp))
 		{
-			$line=fgets($fp);
+			$line = fgets($fp);
 			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
+			if (!$line === false) $nb++;
 		}
 		fclose($fp);
 	}
 	else
 	{
-		$nb=-1;
+		$nb = -1;
 	}
 
 	return $nb;
@@ -551,7 +551,7 @@ 
  */
 function dol_filesize($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
+	$newpathoffile = dol_osencode($pathoffile);
 	return filesize($newpathoffile);
 }
 
@@ -563,7 +563,7 @@ 
  */
 function dol_filemtime($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
+	$newpathoffile = dol_osencode($pathoffile);
 	return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
 }
 
@@ -578,31 +578,31 @@ 
  * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dol_copy dolReplaceRegExInFile
  */
-function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
+function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask = 0, $indexdatabase = 0)
 {
 	global $conf;
 
 	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
 	if (empty($srcfile)) return -1;
-	if (empty($destfile)) $destfile=$srcfile;
+	if (empty($destfile)) $destfile = $srcfile;
 
-	$destexists=dol_is_file($destfile);
+	$destexists = dol_is_file($destfile);
 	if (($destfile != $srcfile) && $destexists) return 0;
 
-	$tmpdestfile=$destfile.'.tmp';
+	$tmpdestfile = $destfile.'.tmp';
 
-	$newpathofsrcfile=dol_osencode($srcfile);
-	$newpathoftmpdestfile=dol_osencode($tmpdestfile);
-	$newpathofdestfile=dol_osencode($destfile);
-	$newdirdestfile=dirname($newpathofdestfile);
+	$newpathofsrcfile = dol_osencode($srcfile);
+	$newpathoftmpdestfile = dol_osencode($tmpdestfile);
+	$newpathofdestfile = dol_osencode($destfile);
+	$newdirdestfile = dirname($newpathofdestfile);
 
-	if ($destexists && ! is_writable($newpathofdestfile))
+	if ($destexists && !is_writable($newpathofdestfile))
 	{
 		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
 		return -1;
 	}
-	if (! is_writable($newdirdestfile))
+	if (!is_writable($newdirdestfile))
 	{
 		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
 		return -2;
@@ -619,17 +619,17 @@ 
 	@chmod($newpathoftmpdestfile, octdec($newmask));
 
 	// Rename
-	$result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
-	if (! $result)
+	$result = dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile) ? 1 : 0), 0, $indexdatabase);
+	if (!$result)
 	{
 		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 	if (empty($newmask))	// This should no happen
 	{
 		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
-		$newmask='0664';
+		$newmask = '0664';
 	}
 
 	@chmod($newpathofdestfile, octdec($newmask));
@@ -648,7 +648,7 @@ 
  * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dol_copy dolReplaceInFile
  */
-function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
+function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile = '', $newmask = 0, $indexdatabase = 0)
 {
 	// TODO
 }
@@ -663,7 +663,7 @@ 
  * @return	int							<0 if error, 0 if nothing done (dest file already exists and overwriteifexists=0), >0 if OK
  * @see		dol_delete_file
  */
-function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
+function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1)
 {
 	global $conf;
 
@@ -671,36 +671,36 @@ 
 
 	if (empty($srcfile) || empty($destfile)) return -1;
 
-	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	$destexists = dol_is_file($destfile);
+	if (!$overwriteifexists && $destexists) return 0;
 
-	$newpathofsrcfile=dol_osencode($srcfile);
-	$newpathofdestfile=dol_osencode($destfile);
-	$newdirdestfile=dirname($newpathofdestfile);
+	$newpathofsrcfile = dol_osencode($srcfile);
+	$newpathofdestfile = dol_osencode($destfile);
+	$newdirdestfile = dirname($newpathofdestfile);
 
-	if ($destexists && ! is_writable($newpathofdestfile))
+	if ($destexists && !is_writable($newpathofdestfile))
 	{
 		dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
 		return -1;
 	}
-	if (! is_writable($newdirdestfile))
+	if (!is_writable($newdirdestfile))
 	{
 		dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
 		return -2;
 	}
 	// Copy with overwriting if exists
-	$result=@copy($newpathofsrcfile, $newpathofdestfile);
+	$result = @copy($newpathofsrcfile, $newpathofdestfile);
 	//$result=copy($newpathofsrcfile, $newpathofdestfile);	// To see errors, remove @
-	if (! $result)
+	if (!$result)
 	{
 		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 	if (empty($newmask))	// This should no happen
 	{
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
-		$newmask='0664';
+		$newmask = '0664';
 	}
 
 	@chmod($newpathofdestfile, octdec($newmask));
@@ -719,44 +719,44 @@ 
  * @return	int							<0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
  * @see		dol_copy
  */
-function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement=null)
+function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null)
 {
 	global $conf;
 
-	$result=0;
+	$result = 0;
 
 	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
 	if (empty($srcfile) || empty($destfile)) return -1;
 
-	$destexists=dol_is_dir($destfile);
+	$destexists = dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
 
-	if (! $destexists)
+	if (!$destexists)
 	{
 		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
 		umask(0);
-		$dirmaskdec=octdec($newmask);
-		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
-		$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
+		$dirmaskdec = octdec($newmask);
+		if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $dirmaskdec = octdec($conf->global->MAIN_UMASK);
+		$dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
 		dol_mkdir($destfile, '', decoct($dirmaskdec));
 	}
 
-	$ossrcfile=dol_osencode($srcfile);
-	$osdestfile=dol_osencode($destfile);
+	$ossrcfile = dol_osencode($srcfile);
+	$osdestfile = dol_osencode($destfile);
 
 	// Recursive function to copy all subdirectories and contents:
 	if (is_dir($ossrcfile))
 	{
-		$dir_handle=opendir($ossrcfile);
-		while ($file=readdir($dir_handle))
+		$dir_handle = opendir($ossrcfile);
+		while ($file = readdir($dir_handle))
 		{
-			if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
+			if ($file != "." && $file != ".." && !is_link($ossrcfile."/".$file))
 			{
 				if (is_dir($ossrcfile."/".$file))
 				{
 					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-					$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
+					$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
 				}
 				else
 				{
@@ -764,12 +764,12 @@ 
 					// Replace destination filename with a new one
 					if (is_array($arrayreplacement))
 					{
-						foreach($arrayreplacement as $key => $val)
+						foreach ($arrayreplacement as $key => $val)
 						{
 							$newfile = str_replace($key, $val, $newfile);
 						}
 					}
-					$tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
+					$tmpresult = dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
 				}
 				// Set result
 				if ($result > 0 && $tmpresult >= 0)
@@ -778,7 +778,7 @@ 
 				}
 				else
 				{
-					$result=$tmpresult;
+					$result = $tmpresult;
 				}
 				if ($result < 0) break;
 			}
@@ -811,31 +811,31 @@ 
  * @return  boolean 		            True if OK, false if KO
  * @see dol_move_uploaded_file
  */
-function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0, $indexdatabase=1)
+function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $testvirus = 0, $indexdatabase = 1)
 {
 	global $user, $db, $conf;
-	$result=false;
+	$result = false;
 
 	dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
-	$srcexists=dol_is_file($srcfile);
-	$destexists=dol_is_file($destfile);
+	$srcexists = dol_is_file($srcfile);
+	$destexists = dol_is_file($destfile);
 
-	if (! $srcexists)
+	if (!$srcexists)
 	{
 		dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
 		return false;
 	}
 
-	if ($overwriteifexists || ! $destexists)
+	if ($overwriteifexists || !$destexists)
 	{
-		$newpathofsrcfile=dol_osencode($srcfile);
-		$newpathofdestfile=dol_osencode($destfile);
+		$newpathofsrcfile = dol_osencode($srcfile);
+		$newpathofdestfile = dol_osencode($destfile);
 
 		// Check virus
-		$testvirusarray=array();
+		$testvirusarray = array();
 		if ($testvirus)
 		{
-			$testvirusarray=dolCheckVirus($newpathofsrcfile);
+			$testvirusarray = dolCheckVirus($newpathofsrcfile);
 			if (count($testvirusarray))
 			{
 				dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
@@ -843,15 +843,15 @@ 
 			}
 		}
 
-		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-		if (! $result)
+		$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+		if (!$result)
 		{
 			if ($destexists)
 			{
 				dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
-				$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+				$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
 			}
 			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 		}
@@ -860,9 +860,9 @@ 
 		if ($result && $indexdatabase)
 		{
 			// Rename entry into ecm database
-			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
-			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $srcfile);
+			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $destfile);
+			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
 			{
 				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
 				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
@@ -871,14 +871,14 @@ 
 				dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 
-				$ecmfiletarget=new EcmFiles($db);
+				$ecmfiletarget = new EcmFiles($db);
 				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
 				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
 				{
 					$ecmfiletarget->delete($user);
 				}
 
-				$ecmfile=new EcmFiles($db);
+				$ecmfile = new EcmFiles($db);
 				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
 				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
 				{
@@ -900,11 +900,11 @@ 
 
 					$ecmfile->filepath = $rel_dir;
 					$ecmfile->filename = $filename;
-					$ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
+					$ecmfile->label = md5_file(dol_osencode($destfile)); // $destfile is a full path to file
 					$ecmfile->fullpath_orig = $srcfile;
 					$ecmfile->gen_or_uploaded = 'unknown';
-					$ecmfile->description = '';    // indexed content
-					$ecmfile->keyword = '';        // keyword content
+					$ecmfile->description = ''; // indexed content
+					$ecmfile->keyword = ''; // keyword content
 					$resultecm = $ecmfile->create($user);
 					if ($resultecm < 0)
 					{
@@ -916,13 +916,13 @@ 
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
 
-				if ($resultecm > 0) $result=true;
+				if ($resultecm > 0) $result = true;
 				else $result = false;
 			}
 		}
 
-		if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
-		$newmaskdec=octdec($newmask);
+		if (empty($newmask)) $newmask = empty($conf->global->MAIN_UMASK) ? '0755' : $conf->global->MAIN_UMASK;
+		$newmaskdec = octdec($newmask);
 		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
 		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
 		// if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
@@ -958,16 +958,16 @@ 
 {
 	global $conf;
 
-	if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
+	if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 	{
-		if (! class_exists('AntiVir')) {
+		if (!class_exists('AntiVir')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
 		}
-		$antivir=new AntiVir($db);
+		$antivir = new AntiVir($db);
 		$result = $antivir->dol_avscan_file($src_file);
 		if ($result < 0)	// If virus or error, we stop here
 		{
-			$reterrors=$antivir->errors;
+			$reterrors = $antivir->errors;
 			return $reterrors;
 		}
 	}
@@ -993,20 +993,20 @@ 
  *	@return int       			  		>0 if OK, <0 or string if KO
  *  @see    dol_move
  */
-function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan=0, $uploaderrorcode=0, $nohook=0, $varfiles='addedfile')
+function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan = 0, $uploaderrorcode = 0, $nohook = 0, $varfiles = 'addedfile')
 {
 	global $conf, $db, $user, $langs;
 	global $object, $hookmanager;
 
-	$reshook=0;
+	$reshook = 0;
 	$file_name = $dest_file;
 
 	if (empty($nohook))
 	{
-		$reshook=$hookmanager->initHooks(array('fileslib'));
+		$reshook = $hookmanager->initHooks(array('fileslib'));
 
-		$parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
-		$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
+		$parameters = array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
+		$reshook = $hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
 	}
 
 	if (empty($reshook))
@@ -1014,7 +1014,7 @@ 
 		// If an upload error has been reported
 		if ($uploaderrorcode)
 		{
-			switch($uploaderrorcode)
+			switch ($uploaderrorcode)
 			{
 				case UPLOAD_ERR_INI_SIZE:	// 1
 					return 'ErrorFileSizeTooLarge';
@@ -1042,25 +1042,25 @@ 
 		// If we need to make a virus scan
 		if (empty($disablevirusscan) && file_exists($src_file))
 		{
-			$checkvirusarray=dolCheckVirus($src_file);
+			$checkvirusarray = dolCheckVirus($src_file);
 			if (count($checkvirusarray))
 			{
-			   dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
-			   return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
+			   dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',', $checkvirusarray), LOG_WARNING);
+			   return 'ErrorFileIsInfectedWithAVirus: '.join(',', $checkvirusarray);
 			}
 		}
 
 		// Security:
 		// Disallow file with some extensions. We rename them.
 		// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-		if (preg_match('/(\.htm|\.html|\.php|\.pl|\.cgi)$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+		if (preg_match('/(\.htm|\.html|\.php|\.pl|\.cgi)$/i', $dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
 		{
-			$file_name.= '.noexe';
+			$file_name .= '.noexe';
 		}
 
 		// Security:
 		// We refuse cache files/dirs, upload using .. and pipes into filenames.
-		if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
+		if (preg_match('/^\./', $src_file) || preg_match('/\.\./', $src_file) || preg_match('/[<>|]/', $src_file))
 		{
 			dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
 			return -1;
@@ -1068,7 +1068,7 @@ 
 
 		// Security:
 		// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-		if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
+		if (preg_match('/^\./', $dest_file) || preg_match('/\.\./', $dest_file) || preg_match('/[<>|]/', $dest_file))
 		{
 			dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
 			return -2;
@@ -1078,24 +1078,24 @@ 
 	if ($reshook < 0)	// At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
 		return $errmsg;
 	}
 	elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
-		$src_file_osencoded=dol_osencode($src_file);
-		$file_name_osencoded=dol_osencode($file_name);
+		$src_file_osencoded = dol_osencode($src_file);
+		$file_name_osencoded = dol_osencode($file_name);
 
 		// Check if destination dir is writable
-		if (! is_writable(dirname($file_name_osencoded)))
+		if (!is_writable(dirname($file_name_osencoded)))
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Dir ".dirname($file_name_osencoded)." is not writable. Return 'ErrorDirNotWritable'", LOG_WARNING);
 			return 'ErrorDirNotWritable';
 		}
 
 		// Check if destination file already exists
-		if (! $allowoverwrite)
+		if (!$allowoverwrite)
 		{
 			if (file_exists($file_name_osencoded))
 			{
@@ -1105,21 +1105,21 @@ 
 		}
 
 		// Move file
-		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
+		$return = move_uploaded_file($src_file_osencoded, $file_name_osencoded);
 		if ($return)
 		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
-			return 1;	// Success
+			return 1; // Success
 		}
 		else
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
-			return -3;	// Unknown error
+			return -3; // Unknown error
 		}
 	}
 
-	return 1;	// Success
+	return 1; // Success
 }
 
 /**
@@ -1136,7 +1136,7 @@ 
  *  @return boolean         		True if no error (file is deleted or if glob is used and there's nothing to delete), False if error
  *  @see dol_delete_dir
  */
-function dol_delete_file($file, $disableglob=0, $nophperrors=0, $nohook=0, $object=null, $allowdotdot=false, $indexdatabase=1)
+function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0, $object = null, $allowdotdot = false, $indexdatabase = 1)
 {
 	global $db, $conf, $user, $langs;
 	global $hookmanager;
@@ -1148,7 +1148,7 @@ 
 
 	// Security:
 	// We refuse transversal using .. and pipes into filenames.
-	if ((! $allowdotdot && preg_match('/\.\./',$file)) || preg_match('/[<>|]/',$file))
+	if ((!$allowdotdot && preg_match('/\.\./', $file)) || preg_match('/[<>|]/', $file))
 	{
 		dol_syslog("Refused to delete file ".$file, LOG_WARNING);
 		return false;
@@ -1158,13 +1158,13 @@ 
 	{
 		$hookmanager->initHooks(array('fileslib'));
 
-		$parameters=array(
+		$parameters = array(
 				'GET' => $_GET,
 				'file' => $file,
 				'disableglob'=> $disableglob,
 				'nophperrors' => $nophperrors
 		);
-		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
+		$reshook = $hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
 	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
@@ -1174,29 +1174,29 @@ 
 	}
 	else
 	{
-		$error=0;
+		$error = 0;
 
 		//print "x".$file." ".$disableglob;exit;
-		$file_osencoded=dol_osencode($file);    // New filename encoded in OS filesystem encoding charset
-		if (empty($disableglob) && ! empty($file_osencoded))
-		{
-			$ok=true;
-			$globencoded=str_replace('[','\[',$file_osencoded);
-			$globencoded=str_replace(']','\]',$globencoded);
-			$listofdir=glob($globencoded);
-			if (! empty($listofdir) && is_array($listofdir))
+		$file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset
+		if (empty($disableglob) && !empty($file_osencoded))
+		{
+			$ok = true;
+			$globencoded = str_replace('[', '\[', $file_osencoded);
+			$globencoded = str_replace(']', '\]', $globencoded);
+			$listofdir = glob($globencoded);
+			if (!empty($listofdir) && is_array($listofdir))
 			{
 				foreach ($listofdir as $filename)
 				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
+					if ($nophperrors) $ok = @unlink($filename);
+					else $ok = unlink($filename);
 					if ($ok)
 					{
 						dol_syslog("Removed file ".$filename, LOG_DEBUG);
 
 						// Delete entry into ecm database
-						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filename);
+						if (!preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
 						{
 							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
 
@@ -1204,7 +1204,7 @@ 
 							{
 								dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
 								include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-								$ecmfile=new EcmFiles($db);
+								$ecmfile = new EcmFiles($db);
 								$result = $ecmfile->fetch(0, '', $rel_filetodelete);
 								if ($result >= 0 && $ecmfile->id > 0)
 								{
@@ -1226,9 +1226,9 @@ 
 		}
 		else
 		{
-			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
+			$ok = false;
+			if ($nophperrors) $ok = @unlink($file_osencoded);
+			else $ok = unlink($file_osencoded);
 			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
 			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
 		}
@@ -1246,18 +1246,18 @@ 
  *  @return boolean         		True if success, false if error
  *  @see dol_delete_file dol_copy
  */
-function dol_delete_dir($dir,$nophperrors=0)
+function dol_delete_dir($dir, $nophperrors = 0)
 {
 	// Security:
 	// We refuse transversal using .. and pipes into filenames.
-	if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
+	if (preg_match('/\.\./', $dir) || preg_match('/[<>|]/', $dir))
 	{
 		dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
 		return false;
 	}
 
-	$dir_osencoded=dol_osencode($dir);
-	return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
+	$dir_osencoded = dol_osencode($dir);
+	return ($nophperrors ? @rmdir($dir_osencoded) : rmdir($dir_osencoded));
 }
 
 /**
@@ -1270,27 +1270,27 @@ 
  *  @param  int		$countdeleted   Counter to count nb of elements found really deleted
  *  @return int             		Number of files and directory we try to remove. NB really removed is returned into var by reference $countdeleted.
  */
-function dol_delete_dir_recursive($dir, $count=0, $nophperrors=0, $onlysub=0, &$countdeleted=0)
+function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub = 0, &$countdeleted = 0)
 {
-	dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
+	dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir, LOG_DEBUG);
 	if (dol_is_dir($dir))
 	{
-		$dir_osencoded=dol_osencode($dir);
+		$dir_osencoded = dol_osencode($dir);
 		if ($handle = opendir("$dir_osencoded"))
 		{
 			while (false !== ($item = readdir($handle)))
 			{
-				if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+				if (!utf8_check($item)) $item = utf8_encode($item); // should be useless
 
 				if ($item != "." && $item != "..")
 				{
-					if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
+					if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item")))
 					{
-						$count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
+						$count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
 					}
 					else
 					{
-						$result=dol_delete_file("$dir/$item", 1, $nophperrors);
+						$result = dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
 						if ($result) $countdeleted++;
 						//else print 'Error on '.$item."\n";
@@ -1301,7 +1301,7 @@ 
 
 			if (empty($onlysub))
 			{
-				$result=dol_delete_dir($dir, $nophperrors);
+				$result = dol_delete_dir($dir, $nophperrors);
 				$count++;
 				if ($result) $countdeleted++;
 				//else print 'Error on '.$dir."\n";
@@ -1323,7 +1323,7 @@ 
  */
 function dol_delete_preview($object)
 {
-	global $langs,$conf;
+	global $langs, $conf;
 
 	// Define parent dir of elements
 	$element = $object->element;
@@ -1334,54 +1334,54 @@ 
 	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
 	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
 	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
 
 	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
 
 	$refsan = dol_sanitizeFileName($object->ref);
-	$dir = $dir . "/" . $refsan ;
-	$filepreviewnew = $dir . "/" . $refsan . ".pdf_preview.png";
-	$filepreviewnewbis = $dir . "/" . $refsan . ".pdf_preview-0.png";
-	$filepreviewold = $dir . "/" . $refsan . ".pdf.png";
+	$dir = $dir."/".$refsan;
+	$filepreviewnew = $dir."/".$refsan.".pdf_preview.png";
+	$filepreviewnewbis = $dir."/".$refsan.".pdf_preview-0.png";
+	$filepreviewold = $dir."/".$refsan.".pdf.png";
 
 	// For new preview files
 	if (file_exists($filepreviewnew) && is_writable($filepreviewnew))
 	{
-		if (! dol_delete_file($filepreviewnew,1))
+		if (!dol_delete_file($filepreviewnew, 1))
 		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnew);
+			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewnew);
 			return 0;
 		}
 	}
 	if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis))
 	{
-		if (! dol_delete_file($filepreviewnewbis,1))
+		if (!dol_delete_file($filepreviewnewbis, 1))
 		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnewbis);
+			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewnewbis);
 			return 0;
 		}
 	}
 	// For old preview files
 	if (file_exists($filepreviewold) && is_writable($filepreviewold))
 	{
-		if (! dol_delete_file($filepreviewold,1))
+		if (!dol_delete_file($filepreviewold, 1))
 		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
+			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewold);
 			return 0;
 		}
 	}
 	else
 	{
-		$multiple = $filepreviewold . ".";
+		$multiple = $filepreviewold.".";
 		for ($i = 0; $i < 20; $i++)
 		{
 			$preview = $multiple.$i;
 
 			if (file_exists($preview) && is_writable($preview))
 			{
-				if ( ! dol_delete_file($preview,1) )
+				if (!dol_delete_file($preview, 1))
 				{
-					$object->error=$langs->trans("ErrorFailedToOpenFile",$preview);
+					$object->error = $langs->trans("ErrorFailedToOpenFile", $preview);
 					return 0;
 				}
 			}
@@ -1404,10 +1404,10 @@ 
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0; // By default, no metafile.
 
 	// Define parent dir of elements
-	$element=$object->element;
+	$element = $object->element;
 
 	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
 	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
@@ -1415,17 +1415,17 @@ 
 	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
 	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
 	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
 
 	if ($dir)
 	{
 		$object->fetch_thirdparty();
 
 		$objectref = dol_sanitizeFileName($object->ref);
-		$dir = $dir . "/" . $objectref;
-		$file = $dir . "/" . $objectref . ".meta";
+		$dir = $dir."/".$objectref;
+		$file = $dir."/".$objectref.".meta";
 
-		if (! is_dir($dir))
+		if (!is_dir($dir))
 		{
 			dol_mkdir($dir);
 		}
@@ -1433,29 +1433,29 @@ 
 		if (is_dir($dir))
 		{
 			$nblignes = count($object->lines);
-			$client = $object->thirdparty->name . " " . $object->thirdparty->address . " " . $object->thirdparty->zip . " " . $object->thirdparty->town;
-			$meta = "REFERENCE=\"" . $object->ref . "\"
-			DATE=\"" . dol_print_date($object->date,'') . "\"
-			NB_ITEMS=\"" . $nblignes . "\"
-			CLIENT=\"" . $client . "\"
-			AMOUNT_EXCL_TAX=\"" . $object->total_ht . "\"
-			AMOUNT=\"" . $object->total_ttc . "\"\n";
-
-			for ($i = 0 ; $i < $nblignes ; $i++)
+			$client = $object->thirdparty->name." ".$object->thirdparty->address." ".$object->thirdparty->zip." ".$object->thirdparty->town;
+			$meta = "REFERENCE=\"".$object->ref."\"
+			DATE=\"" . dol_print_date($object->date, '')."\"
+			NB_ITEMS=\"" . $nblignes."\"
+			CLIENT=\"" . $client."\"
+			AMOUNT_EXCL_TAX=\"" . $object->total_ht."\"
+			AMOUNT=\"" . $object->total_ttc."\"\n";
+
+			for ($i = 0; $i < $nblignes; $i++)
 			{
 				//Pour les articles
-				$meta .= "ITEM_" . $i . "_QUANTITY=\"" . $object->lines[$i]->qty . "\"
-				ITEM_" . $i . "_AMOUNT_WO_TAX=\"" . $object->lines[$i]->total_ht . "\"
-				ITEM_" . $i . "_VAT=\"" .$object->lines[$i]->tva_tx . "\"
-				ITEM_" . $i . "_DESCRIPTION=\"" . str_replace("\r\n","",nl2br($object->lines[$i]->desc)) . "\"
+				$meta .= "ITEM_".$i."_QUANTITY=\"".$object->lines[$i]->qty."\"
+				ITEM_" . $i."_AMOUNT_WO_TAX=\"".$object->lines[$i]->total_ht."\"
+				ITEM_" . $i."_VAT=\"".$object->lines[$i]->tva_tx."\"
+				ITEM_" . $i."_DESCRIPTION=\"".str_replace("\r\n", "", nl2br($object->lines[$i]->desc))."\"
 				";
 			}
 		}
 
-		$fp = fopen($file,"w");
-		fputs($fp,$meta);
+		$fp = fopen($file, "w");
+		fputs($fp, $meta);
 		fclose($fp);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 		@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 		return 1;
@@ -1478,26 +1478,26 @@ 
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @return	void
  */
-function dol_init_file_process($pathtoscan='', $trackid='')
+function dol_init_file_process($pathtoscan = '', $trackid = '')
 {
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
+	$listofpaths = array();
+	$listofnames = array();
+	$listofmimes = array();
 
 	if ($pathtoscan)
 	{
-		$listoffiles=dol_dir_list($pathtoscan,'files');
-		foreach($listoffiles as $key => $val)
+		$listoffiles = dol_dir_list($pathtoscan, 'files');
+		foreach ($listoffiles as $key => $val)
 		{
-			$listofpaths[]=$val['fullname'];
-			$listofnames[]=$val['name'];
-			$listofmimes[]=dol_mimetype($val['name']);
+			$listofpaths[] = $val['fullname'];
+			$listofnames[] = $val['name'];
+			$listofmimes[] = dol_mimetype($val['name']);
 		}
 	}
-	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
-	$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
-	$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
+	$keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
+	$_SESSION["listofpaths".$keytoavoidconflict] = join(';', $listofpaths);
+	$_SESSION["listofnames".$keytoavoidconflict] = join(';', $listofnames);
+	$_SESSION["listofmimes".$keytoavoidconflict] = join(';', $listofmimes);
 }
 
 
@@ -1516,13 +1516,13 @@ 
  * @param	int		$generatethumbs			1=Generate also thumbs for uploaded image files
  * @return	int                             <=0 if KO, >0 if OK
  */
-function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesession=0, $varfiles='addedfile', $savingdocmask='', $link=null, $trackid='', $generatethumbs=1)
+function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1)
 {
-	global $db,$user,$conf,$langs;
+	global $db, $user, $conf, $langs;
 
 	$res = 0;
 
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+	if (!empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
 		if (dol_mkdir($upload_dir) >= 0)
@@ -1541,13 +1541,13 @@ 
 			for ($i = 0; $i < $nbfile; $i++)
 			{
 				// Define $destfull (path to file including filename) and $destfile (only filename)
-				$destfull=$upload_dir . "/" . $TFile['name'][$i];
-				$destfile=$TFile['name'][$i];
+				$destfull = $upload_dir."/".$TFile['name'][$i];
+				$destfile = $TFile['name'][$i];
 
 				if ($savingdocmask)
 				{
-					$destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
-					$destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
+					$destfull = $upload_dir."/".preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
+					$destfile = preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
 				}
 
 				// dol_sanitizeFileName the file name and lowercase extension
@@ -1608,7 +1608,7 @@ 
 					{
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 					}
-					else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+					else if (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 					}
@@ -1625,7 +1625,7 @@ 
 			}
 		}
 	} elseif ($link) {
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 		$linkObject = new Link($db);
 		$linkObject->entity = $conf->entity;
 		$linkObject->url = $link;
@@ -1660,33 +1660,33 @@ 
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @return	void
  */
-function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile=1,$trackid='')
+function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletefile = 1, $trackid = '')
 {
-	global $db,$user,$conf,$langs,$_FILES;
+	global $db, $user, $conf, $langs, $_FILES;
 
-	$keytodelete=$filenb;
+	$keytodelete = $filenb;
 	$keytodelete--;
 
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
-	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	$listofpaths = array();
+	$listofnames = array();
+	$listofmimes = array();
+	$keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
+	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
 
 	if ($keytodelete >= 0)
 	{
-		$pathtodelete=$listofpaths[$keytodelete];
-		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
+		$pathtodelete = $listofpaths[$keytodelete];
+		$filetodelete = $listofnames[$keytodelete];
+		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete, 1); // The delete of ecm database is inside the function dol_delete_file
+		else $result = 0;
 		if ($result >= 0)
 		{
 			if (empty($donotdeletefile))
 			{
 				$langs->load("other");
-				setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
+				setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
 			}
 			if (empty($donotupdatesession))
 			{
@@ -1712,29 +1712,29 @@ 
  *  @param		int		$setsharekey	Set also the share key
  *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
  */
-function addFileIntoDatabaseIndex($dir, $file, $fullpathorig='', $mode='uploaded', $setsharekey=0)
+function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0)
 {
 	global $db, $user;
 
 	$result = 0;
 
-	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
 
-	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+	if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
 	{
 		$filename = basename($file);
 		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
+		$ecmfile = new EcmFiles($db);
 		$ecmfile->filepath = $rel_dir;
 		$ecmfile->filename = $filename;
-		$ecmfile->label = md5_file(dol_osencode($dir.'/'.$file));	// MD5 of file content
+		$ecmfile->label = md5_file(dol_osencode($dir.'/'.$file)); // MD5 of file content
 		$ecmfile->fullpath_orig = $fullpathorig;
 		$ecmfile->gen_or_uploaded = $mode;
-		$ecmfile->description = '';    // indexed content
-		$ecmfile->keyword = '';        // keyword content
+		$ecmfile->description = ''; // indexed content
+		$ecmfile->keyword = ''; // keyword content
 		if ($setsharekey)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -1760,7 +1760,7 @@ 
  *  @param		string	$mode			How file was created ('uploaded', 'generated', ...)
  *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
  */
-function deleteFilesIntoDatabaseIndex($dir, $file, $mode='uploaded')
+function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
 {
 	global $conf, $db, $user;
 
@@ -1774,32 +1774,32 @@ 
 
 	$db->begin();
 
-	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
 
 	$filename = basename($file);
 	$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 	$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-	if (! $error)
+	if (!$error)
 	{
-		$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
-		$sql.= ' WHERE entity = '.$conf->entity;
-		$sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
-		if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
-		if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'ecm_files';
+		$sql .= ' WHERE entity = '.$conf->entity;
+		$sql .= " AND filepath = '".$db->escape($rel_dir)."'";
+		if ($file) $sql .= " AND filename = '".$db->escape($file)."'";
+		if ($mode) $sql .= " AND gen_or_uploaded = '".$db->escape($mode)."'";
 
 		$resql = $db->query($sql);
 		if (!$resql)
 		{
 			$error++;
-			dol_syslog(__METHOD__ . ' ' . $db->lasterror(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$db->lasterror(), LOG_ERR);
 		}
 	}
 
 	// Commit or rollback
 	if ($error) {
 		$db->rollback();
-		return - 1 * $error;
+		return -1 * $error;
 	} else {
 		$db->commit();
 		return 1;
@@ -1816,16 +1816,16 @@ 
  *  @param	string	$fileoutput	Output filename
  *  @return	int					<0 if KO, 0=Nothing done, >0 if OK
  */
-function dol_convert_file($fileinput, $ext='png', $fileoutput='')
+function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '')
 {
 	global $langs;
 
 	if (class_exists('Imagick'))
 	{
-		$image=new Imagick();
+		$image = new Imagick();
 		try {
 			$ret = $image->readImage($fileinput);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			dol_syslog("Failed to read image using Imagick. Try to install package 'apt-get install ghostscript'.", LOG_WARNING);
 			return 0;
 		}
@@ -1834,11 +1834,11 @@ 
 			$ret = $image->setImageFormat($ext);
 			if ($ret)
 			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+				if (empty($fileoutput)) $fileoutput = $fileinput.".".$ext;
 
 				$count = $image->getNumberImages();
 
-				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
+				if (!dol_is_file($fileoutput) || is_writeable($fileoutput))
 				{
 					$ret = $image->writeImages($fileoutput, true);
 				}
@@ -1874,20 +1874,20 @@ 
  * @param 	string	$mode			'gz' or 'bz' or 'zip'
  * @return	int						<0 if KO, >0 if OK
  */
-function dol_compress_file($inputfile, $outputfile, $mode="gz")
+function dol_compress_file($inputfile, $outputfile, $mode = "gz")
 {
-	$foundhandler=0;
+	$foundhandler = 0;
 
 	try
 	{
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
+		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); }
+		elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); }
 		elseif ($mode == 'zip')
 		{
 			if (defined('ODTPHP_PATHTOPCLZIP'))
 			{
-				$foundhandler=1;
+				$foundhandler = 1;
 
 				include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
 				$archive = new PclZip($outputfile);
@@ -1906,7 +1906,7 @@ 
 		}
 		else
 		{
-			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+			dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
 			return -2;
 		}
 	}
@@ -1914,8 +1914,8 @@ 
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
-		dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir");
+		dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+		$errormsg = $langs->trans("ErrorFailedToWriteInDir");
 		return -1;
 	}
 }
@@ -1927,7 +1927,7 @@ 
  * @param 	string	$outputdir		Target dir name
  * @return 	array					array('error'=>'Error code') or array() if no error
  */
-function dol_uncompress($inputfile,$outputdir)
+function dol_uncompress($inputfile, $outputdir)
 {
 	global $langs;
 
@@ -1936,20 +1936,20 @@ 
 		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
 		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
 		$archive = new PclZip($inputfile);
-		$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
+		$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir);
 		//var_dump($result);
-		if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
+		if (!is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
 		else
 		{
-			$ok=1; $errmsg='';
+			$ok = 1; $errmsg = '';
 			// Loop on each file to check result for unzipping file
-			foreach($result as $key => $val)
+			foreach ($result as $key => $val)
 			{
 				if ($val['status'] == 'path_creation_fail')
 				{
 					$langs->load("errors");
-					$ok=0;
-					$errmsg=$langs->trans("ErrorFailToCreateDir", $val['filename']);
+					$ok = 0;
+					$errmsg = $langs->trans("ErrorFailToCreateDir", $val['filename']);
 					break;
 				}
 			}
@@ -1988,24 +1988,24 @@ 
  * @param 	string	$mode			'zip'
  * @return	int						<0 if KO, >0 if OK
  */
-function dol_compress_dir($inputdir, $outputfile, $mode="zip")
+function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
 {
-	$foundhandler=0;
+	$foundhandler = 0;
 
 	dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
 
-	if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
+	if (!dol_is_dir(dirname($outputfile)) || !is_writable(dirname($outputfile)))
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputfile);
 		return -3;
 	}
 
 	try
 	{
-		if ($mode == 'gz')     { $foundhandler=0; }
-		elseif ($mode == 'bz') { $foundhandler=0; }
+		if ($mode == 'gz') { $foundhandler = 0; }
+		elseif ($mode == 'bz') { $foundhandler = 0; }
 		elseif ($mode == 'zip')
 		{
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
@@ -2021,7 +2021,7 @@ 
             else*/
 			if (class_exists('ZipArchive'))
 			{
-				$foundhandler=1;
+				$foundhandler = 1;
 
 				// Initialize archive object
 				$zip = new ZipArchive();
@@ -2055,9 +2055,9 @@ 
 			}
 		}
 
-		if (! $foundhandler)
+		if (!$foundhandler)
 		{
-			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+			dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
 			return -2;
 		}
 		else
@@ -2071,7 +2071,7 @@ 
 		$langs->load("errors");
 		dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
 		dol_syslog($e->getMessage(), LOG_ERR);
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputfile);
 		return -1;
 	}
 }
@@ -2088,9 +2088,9 @@ 
  * @param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
  * @return	string						Full path to most recent file
  */
-function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview.*\.png)$','^\.'),$nohook=false,$mode='')
+function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = false, $mode = '')
 {
-	$tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
+	$tmparray = dol_dir_list($dir, 'files', 0, $regexfilter, $excludefilter, 'date', SORT_DESC, $mode, $nohook);
 	return $tmparray[0];
 }
 
@@ -2106,278 +2106,278 @@ 
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea
  */
-function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser='', $refname='', $mode='read')
+function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser = '', $refname = '', $mode = 'read')
 {
 	global $conf, $db, $user;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
 
-	if (! is_object($fuser)) $fuser=$user;
+	if (!is_object($fuser)) $fuser = $user;
 
 	if (empty($modulepart)) return 'ErrorBadParameter';
 	if (empty($entity))
 	{
-		if (empty($conf->multicompany->enabled)) $entity=1;
-		else $entity=0;
+		if (empty($conf->multicompany->enabled)) $entity = 1;
+		else $entity = 0;
 	}
 	// Fix modulepart
-	if ($modulepart == 'users') $modulepart='user';
+	if ($modulepart == 'users') $modulepart = 'user';
 
 	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
 	// We define $accessallowed and $sqlprotectagainstexternals
-	$accessallowed=0;
-	$sqlprotectagainstexternals='';
-	$ret=array();
+	$accessallowed = 0;
+	$sqlprotectagainstexternals = '';
+	$ret = array();
 
 	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
+	if (empty($refname)) $refname = basename(dirname($original_file)."/");
 
 	$relative_original_file = $original_file;
 
 	// Define possible keys to use for permission check
-	$lire='lire'; $read='read'; $download='download';
+	$lire = 'lire'; $read = 'read'; $download = 'download';
 	if ($mode == 'write')
 	{
-		$lire='creer'; $read='write'; $download='upload';
+		$lire = 'creer'; $read = 'write'; $download = 'upload';
 	}
 
 	// Wrapping for miscellaneous medias files
 	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
 		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		$accessallowed=1;
-		$original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->medias->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
 	{
-		$accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
-		$original_file=$dolibarr_main_data_root.'/'.$original_file;
+		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
+		$original_file = $dolibarr_main_data_root.'/'.$original_file;
 	}
 	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
 	{
 		// Dir for custom dirs
-		$tmp=explode(',', $dolibarr_main_document_root_alt);
+		$tmp = explode(',', $dolibarr_main_document_root_alt);
 		$dirins = $tmp[0];
 
-		$accessallowed=($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
-		$original_file=$dirins.'/'.$original_file;
+		$accessallowed = ($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
+		$original_file = $dirins.'/'.$original_file;
 	}
 	// Wrapping for some images
 	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->mycompany->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->mycompany->dir_output.'/'.$original_file;
 	}
 	// Wrapping for users photos
 	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->user->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->user->dir_output.'/'.$original_file;
 	}
 	// Wrapping for members photos
 	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
+		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
+		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
+		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
+		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+		if ($fuser->rights->ficheinter->{$lire}) $accessallowed = 1;
+		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
-		$original_file=$conf->contrat->dir_output.'/'.$original_file;
+		if ($fuser->rights->contrat->{$lire}) $accessallowed = 1;
+		$original_file = $conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
-		$original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
+		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed = 1;
+		$original_file = $conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
-		if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
-		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
+		if ($fuser->rights->expensereport->{$lire}) $accessallowed = 1;
+		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->multidir_temp[$entity].'/'.$original_file;
+		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
+		$original_file = $conf->propal->multidir_temp[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_temp.'/'.$original_file;
+		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->commande->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_temp.'/'.$original_file;
+		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->facture->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
-		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
+		if ($fuser->rights->expedition->{$lire}) $accessallowed = 1;
+		$original_file = $conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
-		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
+		if ($fuser->rights->deplacement->{$lire}) $accessallowed = 1;
+		$original_file = $conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
-		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
+		if ($fuser->rights->adherent->{$lire}) $accessallowed = 1;
+		$original_file = $conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
-	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
+	elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
-		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed = 1;
+		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
-		$original_file=$conf->tax->dir_output.'/'.$original_file;
+		if ($fuser->rights->tax->charges->{$lire}) $accessallowed = 1;
+		$original_file = $conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
+		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed = 1;
+		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
 		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
-		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
+		if ($fuser->rights->categorie->{$lire}) $accessallowed = 1;
+		$original_file = $conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
-		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i', $original_file)) $accessallowed = 1;
+		$original_file = $conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
 	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->stock->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->stock->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les graph fournisseurs
 	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->fournisseur->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->fournisseur->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les graph des produits
 	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->product->multidir_temp[$entity].'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->product->multidir_temp[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les code barre
 	elseif ($modulepart == 'barcode')
 	{
-		$accessallowed=1;
+		$accessallowed = 1;
 		// If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
 		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
-		$original_file='';
+		$original_file = '';
 	}
 	// Wrapping pour les icones de background des mailings
 	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->mailing->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->mailing->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour le scanner
 	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 	// Wrapping pour les images fckeditor
 	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for users
 	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
-		$canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
-		if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
-		if ($canreaduser || preg_match('/^specimen/i',$original_file))
+		$canreaduser = (!empty($fuser->admin) || $fuser->rights->user->user->{$lire});
+		if ($fuser->id == (int) $refname) { $canreaduser = 1; } // A user can always read its own card
+		if ($canreaduser || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->user->dir_output.'/'.$original_file;
+		$original_file = $conf->user->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->societe->multidir_output[$entity].'/'.$original_file;
+		$original_file = $conf->societe->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
 	}
 
@@ -2387,246 +2387,246 @@ 
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		if ($fuser->rights->societe->{$lire})
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->societe->multidir_output[$entity].'/contact/'.$original_file;
+		$original_file = $conf->societe->multidir_output[$entity].'/contact/'.$original_file;
 	}
 
 	// Wrapping for invoices
 	else if (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
+		$original_file = $conf->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping for mass actions
 	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
 	{
-		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_orders')
 	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_invoices')
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_expensereport')
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_interventions')
 	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
 	{
-		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_order')
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les deplacements et notes de frais
 	else if ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
 	{
-		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->deplacement->dir_output.'/'.$original_file;
+		$original_file = $conf->deplacement->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping pour les propales
 	else if (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))
 	{
-		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
+		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les commandes
 	else if (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
+		$original_file = $conf->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les projets
 	else if ($modulepart == 'project' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
+		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
+		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 
 	// Wrapping pour les commandes fournisseurs
 	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les factures fournisseurs
 	else if (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'supplier_payment')
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->payment->dir_output.'/'.$original_file;
+		$original_file = $conf->fournisseur->payment->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		if ($fuser->societe_id > 0) $original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+		else $original_file = $conf->facture->dir_output.'/payments/'.$original_file;
 	}
 
 	// Wrapping for accounting exports
 	else if ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
 	{
-		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->accounting->dir_output.'/'.$original_file;
+		$original_file = $conf->accounting->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les expedition
 	else if ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->expedition->dir_output."/sending/".$original_file;
+		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
 	}
 	// Wrapping pour les bons de livraison
 	else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->expedition->dir_output."/receipt/".$original_file;
+		$original_file = $conf->expedition->dir_output."/receipt/".$original_file;
 	}
 
 	// Wrapping pour les actions
 	else if ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
+		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les actions
 	else if ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
 	{
-		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_temp."/".$original_file;
 	}
@@ -2635,65 +2635,65 @@ 
 	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
 		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
+		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		if (!empty($conf->product->enabled)) $original_file = $conf->product->multidir_output[$entity].'/'.$original_file;
+		elseif (!empty($conf->service->enabled)) $original_file = $conf->service->multidir_output[$entity].'/'.$original_file;
 	}
 
 	// Wrapping pour les lots produits
 	else if ($modulepart == 'product_batch' || $modulepart == 'produitlot')
 	{
 		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i',$original_file))
+		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		if (! empty($conf->productbatch->enabled)) $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+		if (!empty($conf->productbatch->enabled)) $original_file = $conf->productbatch->multidir_output[$entity].'/'.$original_file;
 	}
 
 	// Wrapping pour les contrats
 	else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->contrat->dir_output.'/'.$original_file;
+		$original_file = $conf->contrat->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
 	}
 
 	// Wrapping pour les dons
 	else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
 	{
-		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->don->dir_output.'/'.$original_file;
+		$original_file = $conf->don->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les dons
 	else if ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
 	{
-		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->resource->dir_output.'/'.$original_file;
+		$original_file = $conf->resource->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les remises de cheques
 	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
 	{
-		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
 
-		$original_file=$conf->bank->dir_output.'/checkdeposits/'.$original_file;		// original_file should contains relative path so include the get_exdir result
+		$original_file = $conf->bank->dir_output.'/checkdeposits/'.$original_file; // original_file should contains relative path so include the get_exdir result
 	}
 
 	// Wrapping for bank
@@ -2701,9 +2701,9 @@ 
 	{
 		if ($fuser->rights->banque->{$lire})
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->bank->dir_output.'/'.$original_file;
+		$original_file = $conf->bank->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for export module
@@ -2711,62 +2711,62 @@ 
 	{
 		// Aucun test necessaire car on force le rep de download sur
 		// le rep export qui est propre a l'utilisateur
-		$accessallowed=1;
-		$original_file=$conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 
 	// Wrapping for import module
 	else if ($modulepart == 'import' && !empty($conf->import->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->import->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->import->dir_temp.'/'.$original_file;
 	}
 
 	// Wrapping pour l'editeur wysiwyg
 	else if ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_output.'/'.$original_file;
+		if ($fuser->admin) $accessallowed = 1;
+		$original_file = $conf->admin->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for upload file test
 	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_temp.'/'.$original_file;
+		if ($fuser->admin) $accessallowed = 1;
+		$original_file = $conf->admin->dir_temp.'/'.$original_file;
 	}
 
 	// Wrapping pour BitTorrent
 	else if ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
 	{
-		$accessallowed=1;
-		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
-		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
+		$accessallowed = 1;
+		$dir = 'files';
+		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir = 'torrents';
+		$original_file = $conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	}
 
 	// Wrapping pour Foundation module
 	else if ($modulepart == 'member' && !empty($conf->adherent->dir_output))
 	{
-		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
+		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for Scanner
 	else if ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 
 	// GENERIC Wrapping
@@ -2776,89 +2776,89 @@ 
 	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
 	else
 	{
-		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-		if ($fuser->admin) $accessallowed=1;    // If user is admin
+		if (preg_match('/^specimen/i', $original_file))	$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.
+		if ($fuser->admin) $accessallowed = 1; // If user is admin
 
 		// Define $accessallowed
-		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
+		if (preg_match('/^([a-z]+)_user_temp$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
 		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		else if (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$original_file;
 		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		else if (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			$original_file = $conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
 		}
 		else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))
 			{
-				$accessallowed=1;
+				$accessallowed = 1;
 			}
-			$original_file=$conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+			$original_file = $conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 		}
 		else
 		{
 			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
 
-			$perm=GETPOST('perm');
-			$subperm=GETPOST('subperm');
+			$perm = GETPOST('perm');
+			$subperm = GETPOST('subperm');
 			if ($perm || $subperm)
 			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+				if (($perm && !$subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed = 1;
+				$original_file = $conf->$modulepart->dir_output.'/'.$original_file;
 			}
 			else
 			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed = 1;
+				$original_file = $conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
 
 		// For modules who wants to manage different levels of permissions for documents
 		$subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';
-		if (! empty($conf->global->$subPermCategoryConstName))
+		if (!empty($conf->global->$subPermCategoryConstName))
 		{
 			$subPermCategory = $conf->global->$subPermCategoryConstName;
-			if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
+			if (!empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
 			{
-				$accessallowed=1;
+				$accessallowed = 1;
 			}
 		}
 
 		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
 		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+		if (!empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
 		{
 			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
@@ -2884,8 +2884,8 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-	if (! dol_is_dir($directory)) dol_mkdir($directory);
-	$cachefile = $directory . $filename;
+	if (!dol_is_dir($directory)) dol_mkdir($directory);
+	$cachefile = $directory.$filename;
 	file_put_contents($cachefile, serialize($object), LOCK_EX);
 	@chmod($cachefile, 0644);
 }
@@ -2901,8 +2901,8 @@ 
 function dol_cache_refresh($directory, $filename, $cachetime)
 {
 	$now = dol_now();
-	$cachefile = $directory . $filename;
-	$refresh = !file_exists($cachefile) || ($now-$cachetime) > dol_filemtime($cachefile);
+	$cachefile = $directory.$filename;
+	$refresh = !file_exists($cachefile) || ($now - $cachetime) > dol_filemtime($cachefile);
 	return $refresh;
 }
 
@@ -2915,7 +2915,7 @@ 
  */
 function dol_readcachefile($directory, $filename)
 {
-	$cachefile = $directory . $filename;
+	$cachefile = $directory.$filename;
 	$object = unserialize(file_get_contents($cachefile));
 	return $object;
 }

Braces +512 added lines, -266 removed lines

@@ -98,16 +98,21 @@ 
 	// $hookmanager->resArray may contain array stacked by other modules
 	if (empty($reshook))
 	{
-		if (! is_dir($newpath)) return array();
+		if (! is_dir($newpath)) {
+		    return array();
+		}
 
 		if ($dir = opendir($newpath))
 		{
 			$filedate='';
 			$filesize='';
 
-			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
+			while (false !== ($file = readdir($dir))) {
+			    // $file is always a basename (into directory $newpath)
 			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
+				if (! utf8_check($file)) $file=utf8_encode($file);
+			}
+			// To be sure data is stored in utf8 in memory
 				$fullpathfile=($newpath?$newpath.'/':'').$file;
 
 				$qualified=1;
@@ -117,8 +122,9 @@ 
 				if (is_array($excludefilter))
 				{
 					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+				} else if ($excludefilter) {
+				    $excludefilterarray[]=$excludefilter;
 				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
 				// Check if file is qualified
 				foreach($excludefilterarray as $filt)
 				{
@@ -137,12 +143,18 @@ 
 						// Add entry into file_list array
 						if (($types=="directories") || ($types=="all"))
 						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+							if ($loaddate || $sortcriteria == 'date') {
+							    $filedate=dol_filemtime($path."/".$file);
+							}
+							if ($loadsize || $sortcriteria == 'size') {
+							    $filesize=dol_filesize($path."/".$file);
+							}
 
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+							if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+							    // We do not search key $filter into all $path, only into $file part
 							{
 								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+							}
 								$level1name=(isset($reg[1])?$reg[1]:'');
 								$file_list[] = array(
 										"name" => $file,
@@ -166,16 +178,21 @@ 
 								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file, $donotfollowsymlinks));
 							}
 						}
-					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
+					} else if (! $isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+						if ($loaddate || $sortcriteria == 'date') {
+						    $filedate=dol_filemtime($path."/".$file);
+						}
+						if ($loadsize || $sortcriteria == 'size') {
+						    $filesize=dol_filesize($path."/".$file);
+						}
 
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+						if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+						    // We do not search key $filter into $path, only into $file
 						{
 							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+						}
 							$level1name=(isset($reg[1])?$reg[1]:'');
 							$file_list[] = array(
 									"name" => $file,
@@ -202,12 +219,16 @@ 
 					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
 				}
 				// Sort the data
-				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+				if ($sortorder) {
+				    array_multisort($myarray, $sortorder, $file_list);
+				}
 			}
 		}
 	}
 
-	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) {
+	    $file_list = array_merge($file_list, $hookmanager->resArray);
+	}
 
 	return $file_list;
 }
@@ -232,7 +253,9 @@ 
 
 	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
 	$sql.=" acl, position, share";
-	if ($mode) $sql.=", description";
+	if ($mode) {
+	    $sql.=", description";
+	}
 	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql.=" WHERE filepath = '".$db->escape($path)."'";
 	$sql.=" AND entity = ".$conf->entity;
@@ -280,12 +303,13 @@ 
 				$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
 			}
 			// Sort the data
-			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+			if ($sortorder) {
+			    array_multisort($myarray, $sortorder, $file_list);
+			}
 		}
 
 		return $file_list;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 		return array();
@@ -313,8 +337,11 @@ 
 		global $object;
 		if (! empty($object->id))
 		{
-			if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-			else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			if (! empty($conf->product->enabled)) {
+			    $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			} else {
+			    $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			}
 
 			$relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dirold);
 			$relativedirold = preg_replace('/^[\\/]/','',$relativedirold);
@@ -347,16 +374,21 @@ 
 			}
 		}
 
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+		if (! $found) {
+		    // This happen in transition toward version 6, or if files were added manually into os dir.
 		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
+			$filearray[$key]['position']='999999';
+		}
+		// File not indexed are at end. So if we add a file, it will not replace an existing position
 			$filearray[$key]['cover']=0;
 			$filearray[$key]['acl']='';
 
 			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+			    // If not a tmp file
 			{
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
+			}
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 				$ecmfile=new EcmFiles($db);
 
@@ -377,13 +409,11 @@ 
 				if ($result < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else
+				} else
 				{
 					$filearray[$key]['rowid']=$result;
 				}
-			}
-			else
+			} else
 			{
 				$filearray[$key]['rowid']=0;     // Should not happened
 			}
@@ -408,22 +438,27 @@ 
 
 	$sortorder=strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
+	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; } else { $retup=1; $retdown=-1; }
 
 	if ($sortfield == 'name')
 	{
-		if ($a->name == $b->name) return 0;
+		if ($a->name == $b->name) {
+		    return 0;
+		}
 		return ($a->name < $b->name) ? $retup : $retdown;
 	}
 	if ($sortfield == 'date')
 	{
-		if ($a->date == $b->date) return 0;
+		if ($a->date == $b->date) {
+		    return 0;
+		}
 		return ($a->date < $b->date) ? $retup : $retdown;
 	}
 	if ($sortfield == 'size')
 	{
-		if ($a->size == $b->size) return 0;
+		if ($a->size == $b->size) {
+		    return 0;
+		}
 		return ($a->size < $b->size) ? $retup : $retdown;
 	}
 }
@@ -438,9 +473,12 @@ 
 function dol_is_dir($folder)
 {
 	$newfolder=dol_osencode($folder);
-	if (is_dir($newfolder)) return true;
-	else return false;
-}
+	if (is_dir($newfolder)) {
+	    return true;
+	} else {
+	    return false;
+	}
+	}
 
 /**
  * Return if path is a file
@@ -477,7 +515,9 @@ 
 	$tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
 	foreach($tmpprot as $prot)
 	{
-		if (preg_match('/^'.$prot.':/i',$url)) return true;
+		if (preg_match('/^'.$prot.':/i',$url)) {
+		    return true;
+		}
 	}
 	return false;
 }
@@ -499,15 +539,21 @@ 
 		{
 			$name_array[] = $name;
 		}
-		foreach($name_array as $temp) $folder_content .= $temp;
+		foreach($name_array as $temp) {
+		    $folder_content .= $temp;
+		}
 
 		closedir($handle);
 
-		if ($folder_content == "...") return true;
-		else return false;
+		if ($folder_content == "...") {
+		    return true;
+		} else {
+		    return false;
+		}
+	} else {
+		return true;
 	}
-	else
-	return true; // Dir does not exists
+	// Dir does not exists
 }
 
 /**
@@ -530,11 +576,12 @@ 
 		{
 			$line=fgets($fp);
 			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
+			if (! $line === false) {
+			    $nb++;
+			}
 		}
 		fclose($fp);
-	}
-	else
+	} else
 	{
 		$nb=-1;
 	}
@@ -584,11 +631,17 @@ 
 
 	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
-	if (empty($srcfile)) return -1;
-	if (empty($destfile)) $destfile=$srcfile;
+	if (empty($srcfile)) {
+	    return -1;
+	}
+	if (empty($destfile)) {
+	    $destfile=$srcfile;
+	}
 
 	$destexists=dol_is_file($destfile);
-	if (($destfile != $srcfile) && $destexists) return 0;
+	if (($destfile != $srcfile) && $destexists) {
+	    return 0;
+	}
 
 	$tmpdestfile=$destfile.'.tmp';
 
@@ -625,10 +678,14 @@ 
 		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+	    $newmask=$conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {
+	    // This should no happen
 	{
 		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+	}
 		$newmask='0664';
 	}
 
@@ -669,10 +726,14 @@ 
 
 	dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+	    return -1;
+	}
 
 	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	if (! $overwriteifexists && $destexists) {
+	    return 0;
+	}
 
 	$newpathofsrcfile=dol_osencode($srcfile);
 	$newpathofdestfile=dol_osencode($destfile);
@@ -696,10 +757,14 @@ 
 		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+	    $newmask=$conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {
+	    // This should no happen
 	{
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
+	}
 		$newmask='0664';
 	}
 
@@ -727,7 +792,9 @@ 
 
 	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+	    return -1;
+	}
 
 	$destexists=dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
@@ -737,7 +804,9 @@ 
 		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
 		umask(0);
 		$dirmaskdec=octdec($newmask);
-		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+		    $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+		}
 		$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
 		dol_mkdir($destfile, '', decoct($dirmaskdec));
 	}
@@ -757,8 +826,7 @@ 
 				{
 					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
 					$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
-				}
-				else
+				} else
 				{
 					$newfile = $file;
 					// Replace destination filename with a new one
@@ -775,17 +843,17 @@ 
 				if ($result > 0 && $tmpresult >= 0)
 				{
 					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-				}
-				else
+				} else
 				{
 					$result=$tmpresult;
 				}
-				if ($result < 0) break;
+				if ($result < 0) {
+				    break;
+				}
 			}
 		}
 		closedir($dir_handle);
-	}
-	else
+	} else
 	{
 		// Source directory does not exists
 		$result = -2;
@@ -852,8 +920,9 @@ 
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
 				$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+			} else {
+			    dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 			}
-			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 		}
 
 		// Move ok
@@ -862,9 +931,11 @@ 
 			// Rename entry into ecm database
 			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
 			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+			    // If not a tmp file
 			{
 				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
+			}
 				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
 				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
 
@@ -873,16 +944,20 @@ 
 
 				$ecmfiletarget=new EcmFiles($db);
 				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
-				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+				if ($resultecmtarget > 0) {
+				    // An entry for target name already exists for target, we delete it, a new one will be created.
 				{
 					$ecmfiletarget->delete($user);
 				}
+				}
 
 				$ecmfile=new EcmFiles($db);
 				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
+				if ($resultecm > 0) {
+				    // If an entry was found for src file, we use it to move entry
 				{
 					$filename = basename($rel_filetorenameafter);
+				}
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -890,10 +965,11 @@ 
 					$ecmfile->filepath = $rel_dir;
 					$ecmfile->filename = $filename;
 					$resultecm = $ecmfile->update($user);
-				}
-				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+				} elseif ($resultecm == 0) {
+				    // If no entry were found for src files, create/update target file
 				{
 					$filename = basename($rel_filetorenameafter);
+				}
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -910,18 +986,22 @@ 
 					{
 						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 					}
-				}
-				elseif ($resultecm < 0)
+				} elseif ($resultecm < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
 
-				if ($resultecm > 0) $result=true;
-				else $result = false;
+				if ($resultecm > 0) {
+				    $result=true;
+				} else {
+				    $result = false;
+				}
 			}
 		}
 
-		if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+		if (empty($newmask)) {
+		    $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+		}
 		$newmaskdec=octdec($newmask);
 		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
 		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
@@ -965,9 +1045,11 @@ 
 		}
 		$antivir=new AntiVir($db);
 		$result = $antivir->dol_avscan_file($src_file);
-		if ($result < 0)	// If virus or error, we stop here
+		if ($result < 0) {
+		    // If virus or error, we stop here
 		{
 			$reterrors=$antivir->errors;
+		}
 			return $reterrors;
 		}
 	}
@@ -1075,13 +1157,17 @@ 
 		}
 	}
 
-	if ($reshook < 0)	// At least one blocking error returned by one hook
+	if ($reshook < 0) {
+	    // At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
-		return $errmsg;
 	}
-	elseif (empty($reshook))
+		if (empty($errmsg)) {
+		    $errmsg = 'ErrorReturnedBySomeHooks';
+		}
+		// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		return $errmsg;
+	} elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
 		$src_file_osencoded=dol_osencode($src_file);
@@ -1108,11 +1194,12 @@ 
 		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
 		if ($return)
 		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+			    @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			}
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return 1;	// Success
-		}
-		else
+		} else
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
 			return -3;	// Unknown error
@@ -1167,12 +1254,13 @@ 
 		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
-	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
+	if (empty($nohook) && $reshook != 0) {
+	    // reshook = 0 to do standard actions, 1 = ok, -1 = ko
 	{
 		if ($reshook < 0) return false;
-		return true;
 	}
-	else
+		return true;
+	} else
 	{
 		$error=0;
 
@@ -1188,21 +1276,28 @@ 
 			{
 				foreach ($listofdir as $filename)
 				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
+					if ($nophperrors) {
+					    $ok=@unlink($filename);
+					} else {
+					    $ok=unlink($filename);
+					}
 					if ($ok)
 					{
 						dol_syslog("Removed file ".$filename, LOG_DEBUG);
 
 						// Delete entry into ecm database
 						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete)) {
+						    // If not a tmp file
 						{
 							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
+						}
 
-							if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
+							if (is_object($db) && $indexdatabase) {
+							    // $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
 							{
 								dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
+							}
 								include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 								$ecmfile=new EcmFiles($db);
 								$result = $ecmfile->fetch(0, '', $rel_filetodelete);
@@ -1216,21 +1311,28 @@ 
 								}
 							}
 						}
+					} else {
+					    dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					}
-					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					// TODO Failure to remove can be because file was already removed or because of permission
 					// If error because it does not exists, we should return true, and we should return false if this is a permission problem
 				}
+			} else {
+			    dol_syslog("No files to delete found", LOG_DEBUG);
 			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else
+		} else
 		{
 			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
-			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			if ($nophperrors) {
+			    $ok=@unlink($file_osencoded);
+			} else {
+			    $ok=unlink($file_osencoded);
+			}
+			if ($ok) {
+			    dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
+			} else {
+			    dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			}
 		}
 
 		return $ok;
@@ -1280,19 +1382,23 @@ 
 		{
 			while (false !== ($item = readdir($handle)))
 			{
-				if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+				if (! utf8_check($item)) {
+				    $item=utf8_encode($item);
+				}
+				// should be useless
 
 				if ($item != "." && $item != "..")
 				{
 					if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
 					{
 						$count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-					}
-					else
+					} else
 					{
 						$result=dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
-						if ($result) $countdeleted++;
+						if ($result) {
+						    $countdeleted++;
+						}
 						//else print 'Error on '.$item."\n";
 					}
 				}
@@ -1303,7 +1409,9 @@ 
 			{
 				$result=dol_delete_dir($dir, $nophperrors);
 				$count++;
-				if ($result) $countdeleted++;
+				if ($result) {
+				    $countdeleted++;
+				}
 				//else print 'Error on '.$dir."\n";
 			}
 		}
@@ -1328,15 +1436,25 @@ 
 	// Define parent dir of elements
 	$element = $object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+	    $dir = $conf->fournisseur->commande->dir_output;
+	} elseif ($object->element == 'invoice_supplier') {
+	    $dir = $conf->fournisseur->facture->dir_output;
+	} elseif ($object->element == 'project') {
+	    $dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+	    $dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+	    $dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+	    $dir = $conf->ficheinter->dir_output;
+	} else {
+	    $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	}
 
-	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
+	if (empty($dir)) {
+	    return 'ErrorObjectNoSupportedByFunction';
+	}
 
 	$refsan = dol_sanitizeFileName($object->ref);
 	$dir = $dir . "/" . $refsan ;
@@ -1369,8 +1487,7 @@ 
 			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
 			return 0;
 		}
-	}
-	else
+	} else
 	{
 		$multiple = $filepreviewold . ".";
 		for ($i = 0; $i < 20; $i++)
@@ -1404,18 +1521,29 @@ 
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) {
+	    return 0;
+	}
+	// By default, no metafile.
 
 	// Define parent dir of elements
 	$element=$object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+	    $dir = $conf->fournisseur->dir_output.'/commande';
+	} elseif ($object->element == 'invoice_supplier') {
+	    $dir = $conf->fournisseur->dir_output.'/facture';
+	} elseif ($object->element == 'project') {
+	    $dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+	    $dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+	    $dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+	    $dir = $conf->ficheinter->dir_output;
+	} else {
+	    $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	}
 
 	if ($dir)
 	{
@@ -1455,12 +1583,12 @@ 
 		$fp = fopen($file,"w");
 		fputs($fp,$meta);
 		fclose($fp);
-		if (! empty($conf->global->MAIN_UMASK))
-		@chmod($file, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+				@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		return 1;
-	}
-	else
+	} else
 	{
 		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
 	}
@@ -1522,9 +1650,11 @@ 
 
 	$res = 0;
 
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+	if (! empty($_FILES[$varfiles])) {
+	    // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
+	}
 		if (dol_mkdir($upload_dir) >= 0)
 		{
 			$TFile = $_FILES[$varfiles];
@@ -1558,9 +1688,11 @@ 
 
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
 
-				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
+				if (is_numeric($resupload) && $resupload > 0) {
+				    // $resupload can be 'ErrorFileAlreadyExists'
 				{
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+				}
 
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
@@ -1600,19 +1732,20 @@ 
 					}
 
 					$nbok++;
-				}
-				else
+				} else
 				{
 					$langs->load("errors");
-					if ($resupload < 0)	// Unknown error
+					if ($resupload < 0) {
+					    // Unknown error
 					{
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 					}
-					else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+					} else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) {
+					    // Files infected by a virus
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 					}
-					else	// Known error
+					} else	// Known error
 					{
 						setEventMessages($langs->trans($resupload), null, 'errors');
 					}
@@ -1639,8 +1772,7 @@ 
 		} else {
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
@@ -1671,16 +1803,27 @@ 
 	$listofnames=array();
 	$listofmimes=array();
 	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+	    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+	    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+	    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
 	if ($keytodelete >= 0)
 	{
 		$pathtodelete=$listofpaths[$keytodelete];
 		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
+		if (empty($donotdeletefile)) {
+		    $result = dol_delete_file($pathtodelete,1);
+		}
+		// The delete of ecm database is inside the function dol_delete_file
+		else {
+		    $result=0;
+		}
 		if ($result >= 0)
 		{
 			if (empty($donotdeletefile))
@@ -1720,9 +1863,11 @@ 
 
 	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
 
-	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+	    // If not a tmp dir
 	{
 		$filename = basename($file);
+	}
 		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -1785,8 +1930,12 @@ 
 		$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
 		$sql.= ' WHERE entity = '.$conf->entity;
 		$sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
-		if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
-		if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		if ($file) {
+		    $sql.= " AND filename = '" . $db->escape($file) . "'";
+		}
+		if ($mode) {
+		    $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		}
 
 		$resql = $db->query($sql);
 		if (!$resql)
@@ -1834,32 +1983,33 @@ 
 			$ret = $image->setImageFormat($ext);
 			if ($ret)
 			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+				if (empty($fileoutput)) {
+				    $fileoutput=$fileinput.".".$ext;
+				}
 
 				$count = $image->getNumberImages();
 
 				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
 				{
 					$ret = $image->writeImages($fileoutput, true);
-				}
-				else
+				} else
 				{
 					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
 				}
-				if ($ret) return $count;
-				else return -3;
-			}
-			else
+				if ($ret) {
+				    return $count;
+				} else {
+				    return -3;
+				}
+			} else
 			{
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			return -1;
 		}
-	}
-	else
+	} else
 	{
 		return 0;
 	}
@@ -1881,9 +2031,7 @@ 
 	try
 	{
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); } elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); } elseif ($mode == 'zip')
 		{
 			if (defined('ODTPHP_PATHTOPCLZIP'))
 			{
@@ -1903,14 +2051,12 @@ 
 			fwrite($fp, $compressdata);
 			fclose($fp);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
 			return -2;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -1938,8 +2084,9 @@ 
 		$archive = new PclZip($inputfile);
 		$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
 		//var_dump($result);
-		if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else
+		if (! is_array($result) && $result <= 0) {
+		    return array('error'=>$archive->errorInfo(true));
+		} else
 		{
 			$ok=1; $errmsg='';
 			// Loop on each file to check result for unzipping file
@@ -1954,8 +2101,11 @@ 
 				}
 			}
 
-			if ($ok) return array();
-			else return array('error'=>$errmsg);
+			if ($ok) {
+			    return array();
+			} else {
+			    return array('error'=>$errmsg);
+			}
 		}
 	}
 
@@ -1969,8 +2119,7 @@ 
 			$zip->extractTo($outputdir.'/');
 			$zip->close();
 			return array();
-		}
-		else
+		} else
 		{
 			return array('error'=>'ErrUnzipFails');
 		}
@@ -2004,9 +2153,7 @@ 
 
 	try
 	{
-		if ($mode == 'gz')     { $foundhandler=0; }
-		elseif ($mode == 'bz') { $foundhandler=0; }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz')     { $foundhandler=0; } elseif ($mode == 'bz') { $foundhandler=0; } elseif ($mode == 'zip')
 		{
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
             {
@@ -2059,13 +2206,11 @@ 
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
 			return -2;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2111,16 +2256,25 @@ 
 	global $conf, $db, $user;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
 
-	if (! is_object($fuser)) $fuser=$user;
+	if (! is_object($fuser)) {
+	    $fuser=$user;
+	}
 
-	if (empty($modulepart)) return 'ErrorBadParameter';
+	if (empty($modulepart)) {
+	    return 'ErrorBadParameter';
+	}
 	if (empty($entity))
 	{
-		if (empty($conf->multicompany->enabled)) $entity=1;
-		else $entity=0;
+		if (empty($conf->multicompany->enabled)) {
+		    $entity=1;
+		} else {
+		    $entity=0;
+		}
 	}
 	// Fix modulepart
-	if ($modulepart == 'users') $modulepart='user';
+	if ($modulepart == 'users') {
+	    $modulepart='user';
+	}
 
 	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
 	// We define $accessallowed and $sqlprotectagainstexternals
@@ -2129,7 +2283,9 @@ 
 	$ret=array();
 
 	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
+	if (empty($refname)) {
+	    $refname=basename(dirname($original_file)."/");
+	}
 
 	$relative_original_file = $original_file;
 
@@ -2143,7 +2299,9 @@ 
 	// Wrapping for miscellaneous medias files
 	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
-		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		$accessallowed=1;
 		$original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
 	}
@@ -2184,132 +2342,176 @@ 
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
+		if ($fuser->rights->ficheinter->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
+		if ($fuser->rights->contrat->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
+		if ($fuser->rights->supplier_proposal->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
-		if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+		if ($fuser->rights->expensereport->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->propal->multidir_temp[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
+		if ($fuser->rights->expedition->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
+		if ($fuser->rights->deplacement->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
+		if ($fuser->rights->adherent->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
+		if ($fuser->rights->tax->charges->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
+		if ($fuser->rights->agenda->myactions->{$read}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
-		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
+		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if ($fuser->rights->categorie->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
@@ -2372,7 +2574,9 @@ 
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
@@ -2384,7 +2588,9 @@ 
 	// Wrapping for contact
 	else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
 	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if ($fuser->rights->societe->{$lire})
 		{
 			$accessallowed=1;
@@ -2410,64 +2616,56 @@ 
 			$accessallowed=1;
 		}
 		$original_file=$conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_orders')
+	} else if ($modulepart == 'massfilesarea_orders')
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_invoices')
+	} else if ($modulepart == 'massfilesarea_invoices')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_expensereport')
+	} else if ($modulepart == 'massfilesarea_expensereport')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_interventions')
+	} else if ($modulepart == 'massfilesarea_interventions')
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
+	} else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_order')
+	} else if ($modulepart == 'massfilesarea_supplier_order')
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_invoice')
+	} else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+	} else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2528,8 +2726,7 @@ 
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+	} else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2578,8 +2775,11 @@ 
 		{
 			$accessallowed=1;
 		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		if ($fuser->societe_id > 0) {
+		    $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+		} else {
+		    $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		}
 	}
 
 	// Wrapping for accounting exports
@@ -2634,24 +2834,33 @@ 
 	// Wrapping pour les produits et services
 	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
-		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		if (! empty($conf->product->enabled)) {
+		    $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
+		} elseif (! empty($conf->service->enabled)) {
+		    $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		}
 	}
 
 	// Wrapping pour les lots produits
 	else if ($modulepart == 'product_batch' || $modulepart == 'produitlot')
 	{
-		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		if (! empty($conf->productbatch->enabled)) $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+		if (! empty($conf->productbatch->enabled)) {
+		    $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+		}
 	}
 
 	// Wrapping pour les contrats
@@ -2732,14 +2941,18 @@ 
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for upload file test
 	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_temp.'/'.$original_file;
 	}
 
@@ -2748,7 +2961,9 @@ 
 	{
 		$accessallowed=1;
 		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
+		if (dol_mimetype($original_file) == 'application/x-bittorrent') {
+		    $dir='torrents';
+		}
 		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	}
 
@@ -2776,45 +2991,62 @@ 
 	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
 	else
 	{
-		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-		if ($fuser->admin) $accessallowed=1;    // If user is admin
+		if (preg_match('/^specimen/i',$original_file)) {
+		    $accessallowed=1;
+		}
+		// If link to a file called specimen. Test must be done before changing $original_file int full path.
+		if ($fuser->admin) {
+		    $accessallowed=1;
+		}
+		// If user is admin
 
 		// Define $accessallowed
 		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+			    $accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+			    $accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_output)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+			    $accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
+		} else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_output)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2822,12 +3054,13 @@ 
 				$accessallowed=1;
 			}
 			$original_file=$conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-		}
-		else
+		} else
 		{
-			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
+			if (empty($conf->$modulepart->dir_output)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
 
@@ -2835,12 +3068,15 @@ 
 			$subperm=GETPOST('subperm');
 			if ($perm || $subperm)
 			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
+				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) {
+				    $accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-			else
+			} else
 			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) {
+				    $accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
@@ -2858,11 +3094,13 @@ 
 
 		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
 		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+		if (! empty($conf->global->$sqlProtectConstName)) {
+		    // If module want to define its own $sqlprotectagainstexternals
 		{
 			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
 		}
+		}
 	}
 
 	$ret = array(
@@ -2884,7 +3122,9 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-	if (! dol_is_dir($directory)) dol_mkdir($directory);
+	if (! dol_is_dir($directory)) {
+	    dol_mkdir($directory);
+	}
 	$cachefile = $directory . $filename;
 	file_put_contents($cachefile, serialize($object), LOCK_EX);
 	@chmod($cachefile, 0644);
@@ -2938,9 +3178,11 @@ 
 
 	$exclude = 'install';
 
-	foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
+	foreach ($dir->md5file as $file) {
+	    // $file is a simpleXMLElement
 	{
 		$filename = $path.$file['name'];
+	}
 		$file_list['insignature'][] = $filename;
 		$expectedmd5 = (string) $file;
 
@@ -2949,27 +3191,31 @@ 
 		if (!file_exists($pathref.'/'.$filename))
 		{
 			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5);
-		}
-		else
+		} else
 		{
 			$md5_local = md5_file($pathref.'/'.$filename);
 
-			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
+			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php') {
+			    // For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
 			{
 				$checksumconcat[] = $expectedmd5;
 			}
-			else
+			} else
 			{
-				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+				if ($md5_local != $expectedmd5) {
+				    $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+				}
 				$checksumconcat[] = $md5_local;
 			}
 		}
 	}
 
-	foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example
+	foreach ($dir->dir as $subdir) {
+	    // $subdir['name'] is  '' or '/accountancy/admin' for example
 	{
 		getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/', $pathref, $checksumconcat);
 	}
+	}
 
 	return $file_list;
 }

dolibarr/htdocs/core/lib/expedition.lib.php

Indentation +86 added lines, -86 removed lines

@@ -34,29 +34,29 @@ 
  */
 function expedition_prepare_head(Expedition $object)
 {
-	global $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
-	$langs->load("orders");
+    global $langs, $conf, $user;
+    if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+    $langs->load("orders");
 
-	$h = 0;
-	$head = array();
-	$h = 0;
-	
-	$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
-	$head[$h][1] = $langs->trans("Setup");
-	$h++;
-	
-	$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-	$head[$h][1] = $langs->trans("Shipment");
-	$hselected=$h;
-	$h++;
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
-		$head[$h][1] = $langs->trans("Receivings");
-		$h++;
-	}
+    $h = 0;
+    $head = array();
+    $h = 0;
+	
+    $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
+    $head[$h][1] = $langs->trans("Setup");
+    $h++;
+	
+    $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
+    $head[$h][1] = $langs->trans("Shipment");
+    $hselected=$h;
+    $h++;
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+        $head[$h][1] = $langs->trans("Receivings");
+        $h++;
+    }
 	
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
@@ -71,72 +71,72 @@ 
  */
 function expedition_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-	$langs->load("sendings");
+    global $langs, $conf, $user;
+    $langs->load("sendings");
 
-	$h = 0;
-	$head = array();
-	
-	$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
-	$head[$h][1] = $langs->trans("Setup");
-	$head[$h][2] = 'general';
-	$h++;
-	
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-		$head[$h][1] = $langs->trans("Shipment");
-		$head[$h][2] = 'shipment';
-		$h++;
-	}
-	
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes_shipment';
-	$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-	$head[$h][2] = 'attributeslines_shipment';
-	$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
-		$head[$h][1] = $langs->trans("Receivings");
-		$head[$h][2] = 'receivings';
-		$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
-		$head[$h][1] = $langs->trans("ExtraFields");
-		$head[$h][2] = 'attributes_receivings';
-		$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
-		$head[$h][1] = $langs->trans("ExtraFieldsLines");
-		$head[$h][2] = 'attributeslines_receivings';
-		$h++;
-	}
-	
-	
-	
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expedition_admin','remove');
+    $h = 0;
+    $head = array();
+	
+    $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
+    $head[$h][1] = $langs->trans("Setup");
+    $head[$h][2] = 'general';
+    $h++;
+	
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
+        $head[$h][1] = $langs->trans("Shipment");
+        $head[$h][2] = 'shipment';
+        $h++;
+    }
+	
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes_shipment';
+    $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][2] = 'attributeslines_shipment';
+    $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+        $head[$h][1] = $langs->trans("Receivings");
+        $head[$h][2] = 'receivings';
+        $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
+        $head[$h][1] = $langs->trans("ExtraFields");
+        $head[$h][2] = 'attributes_receivings';
+        $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
+        $head[$h][1] = $langs->trans("ExtraFieldsLines");
+        $head[$h][2] = 'attributeslines_receivings';
+        $h++;
+    }
+	
+	
+	
+    complete_head_from_modules($conf,$langs,null,$head,$h,'expedition_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,7 @@ 
 function expedition_prepare_head(Expedition $object)
 {
 	global $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (!empty($conf->expedition->enabled)) $langs->load("sendings");
 	$langs->load("orders");
 
 	$h = 0;
@@ -48,10 +48,10 @@ 
 	
 	$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
 	$head[$h][1] = $langs->trans("Shipment");
-	$hselected=$h;
+	$hselected = $h;
 	$h++;
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
 		$head[$h][1] = $langs->trans("Receivings");
@@ -59,7 +59,7 @@ 
 	}
 	
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
 
     return $head;
 }
@@ -83,7 +83,7 @@ 
 	$h++;
 	
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
 		$head[$h][1] = $langs->trans("Shipment");
@@ -92,7 +92,7 @@ 
 	}
 	
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 	{
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -100,7 +100,7 @@ 
 	$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 	{
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
@@ -108,7 +108,7 @@ 
 	$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
 		$head[$h][1] = $langs->trans("Receivings");
@@ -116,7 +116,7 @@ 
 		$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFields");
@@ -124,7 +124,7 @@ 
 		$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFieldsLines");
@@ -134,7 +134,7 @@ 
 	
 	
 	
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expedition_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expedition_admin', 'remove');
 
 	return $head;
 }

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 function expedition_prepare_head(Expedition $object)
 {
 	global $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (! empty($conf->expedition->enabled)) {
+	    $langs->load("sendings");
+	}
 	$langs->load("orders");
 
 	$h = 0;

dolibarr/htdocs/core/lib/fourn.lib.php

Indentation +129 added lines, -129 removed lines

@@ -33,25 +33,25 @@ 
  */
 function facturefourn_prepare_head($object)
 {
-	global $db, $langs, $conf;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'card';
-	$h++;
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
+    global $db, $langs, $conf;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id;
+    $head[$h][1] = $langs->trans('Card');
+    $head[$h][2] = 'card';
+    $h++;
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -61,31 +61,31 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
-    	$nbNote = 0;
+        $nbNote = 0;
         if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
+        $head[$h][1] = $langs->trans('Notes');
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
     }
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$object->ref;
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$object->ref;
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/info.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/info.php?facid='.$object->id;
+    $head[$h][1] = $langs->trans('Info');
+    $head[$h][2] = 'info';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_invoice','remove');
 
@@ -101,36 +101,36 @@ 
  */
 function ordersupplier_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("OrderCard");
-	$head[$h][2] = 'card';
-	$h++;
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
-
-	if (! empty($conf->stock->enabled) && (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
-	{
-		$langs->load("stocks");
-		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("OrderDispatch");
-		$head[$h][2] = 'dispatch';
-		$h++;
-	}
-
-	// Show more tabs from modules
+    global $db, $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("OrderCard");
+    $head[$h][2] = 'card';
+    $h++;
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
+
+    if (! empty($conf->stock->enabled) && (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
+    {
+        $langs->load("stocks");
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("OrderDispatch");
+        $head[$h][2] = 'dispatch';
+        $h++;
+    }
+
+    // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
@@ -138,38 +138,38 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
-    	$nbNote = 0;
+        $nbNote = 0;
         if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Notes");
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
     }
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/info.php?id='.$object->id;
-	$head[$h][1].= $langs->trans("Events");
-	if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
-	{
-	    $head[$h][1].= '/';
-	    $head[$h][1].= $langs->trans("Agenda");
-	}
-	$head[$h][2] = 'info';
-	$h++;
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_order', 'remove');
-	return $head;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/info.php?id='.$object->id;
+    $head[$h][1].= $langs->trans("Events");
+    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    {
+        $head[$h][1].= '/';
+        $head[$h][1].= $langs->trans("Agenda");
+    }
+    $head[$h][2] = 'info';
+    $h++;
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_order', 'remove');
+    return $head;
 }
 
 /**
@@ -179,53 +179,53 @@ 
  */
 function supplierorder_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/supplier_order.php";
-	$head[$h][1] = $langs->trans("SupplierOrder");
-	$head[$h][2] = 'order';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/supplier_order.php";
+    $head[$h][1] = $langs->trans("SupplierOrder");
+    $head[$h][2] = 'order';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/supplier_invoice.php";
-	$head[$h][1] = $langs->trans("SuppliersInvoice");
-	$head[$h][2] = 'invoice';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/supplier_invoice.php";
+    $head[$h][1] = $langs->trans("SuppliersInvoice");
+    $head[$h][2] = 'invoice';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/supplier_payment.php";
-	$head[$h][1] = $langs->trans("SuppliersPayment");
-	$head[$h][2] = 'supplierpayment';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/supplier_payment.php";
+    $head[$h][1] = $langs->trans("SuppliersPayment");
+    $head[$h][2] = 'supplierpayment';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierorder_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierOrders");
-	$head[$h][2] = 'supplierorder';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/supplierorder_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsSupplierOrders");
+    $head[$h][2] = 'supplierorder';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierorderdet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierOrdersLines");
-	$head[$h][2] = 'supplierorderdet';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/supplierorderdet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsSupplierOrdersLines");
+    $head[$h][2] = 'supplierorderdet';
+    $h++;
 
 
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoice_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoices");
-	$head[$h][2] = 'supplierinvoice';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoice_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoices");
+    $head[$h][2] = 'supplierinvoice';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoicedet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoicesLines");
-	$head[$h][2] = 'supplierinvoicedet';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoicedet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoicesLines");
+    $head[$h][2] = 'supplierinvoicedet';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 

Spacing +29 added lines, -29 removed lines

@@ -45,10 +45,10 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -57,28 +57,28 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_invoice');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice');
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
     	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
     	$head[$h][2] = 'note';
     	$h++;
     }
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$object->ref;
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$object->ref;
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -87,7 +87,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_invoice','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'remove');
 
     return $head;
 }
@@ -113,15 +113,15 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
 
-	if (! empty($conf->stock->enabled) && (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
+	if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
 	{
 		$langs->load("stocks");
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
@@ -134,41 +134,41 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_order');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order');
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
     	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
     	$head[$h][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
     	$head[$h][2] = 'note';
     	$h++;
     }
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->fournisseur->dir_output."/commande/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/info.php?id='.$object->id;
-	$head[$h][1].= $langs->trans("Events");
-	if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+	$head[$h][1] .= $langs->trans("Events");
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
-	    $head[$h][1].= '/';
-	    $head[$h][1].= $langs->trans("Agenda");
+	    $head[$h][1] .= '/';
+	    $head[$h][1] .= $langs->trans("Agenda");
 	}
 	$head[$h][2] = 'info';
 	$h++;
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_order', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order', 'remove');
 	return $head;
 }
 
@@ -199,7 +199,7 @@ 
 	$head[$h][2] = 'supplierpayment';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'supplierorder_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierorder_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsSupplierOrders");
@@ -223,7 +223,7 @@ 
 	$head[$h][2] = 'supplierinvoicedet';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'supplierorder_admin', 'remove');
 
 	return $head;
 }

Braces +30 added lines, -10 removed lines

@@ -48,7 +48,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -62,11 +64,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
     	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -78,7 +86,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -116,7 +126,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -139,11 +151,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
     	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
     	$head[$h][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -155,7 +173,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 

dolibarr/htdocs/core/lib/parsemd.lib.php

Spacing +3 added lines, -3 removed lines

@@ -29,15 +29,15 @@
  * @param   string    $replaceimagepath     Replace path to image with another path. Exemple: ('doc/'=>'xxx/aaa/')
  * @return	string                          Parsed content
  */
-function dolMd2Html($content, $parser='parsedown',$replaceimagepath=null)
+function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
 {
     if (is_array($replaceimagepath))
     {
-        foreach($replaceimagepath as $key => $val)
+        foreach ($replaceimagepath as $key => $val)
         {
             $keytoreplace = ']('.$key;
             $valafter = ']('.$val;
-            $content = preg_replace('/'.preg_quote($keytoreplace,'/').'/m', $valafter, $content);
+            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
         }
     }
     if ($parser == 'parsedown')

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
         include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
         $Parsedown = new Parsedown();
         $content = $Parsedown->text($content);
-    }
-    else
+    } else
     {
         $content = nl2br($content);
     }

dolibarr/htdocs/core/lib/pdf.lib.php

Indentation +1604 added lines, -1604 removed lines

@@ -41,34 +41,34 @@ 
  */
 function pdf_getFormat(Translate $outputlangs = null)
 {
-	global $conf,$db;
-
-	// Default value if setup was not done and/or entry into c_paper_format not defined
-	$width=210; $height=297; $unit='mm';
-
-	if (empty($conf->global->MAIN_PDF_FORMAT))
-	{
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$pdfformat=dol_getDefaultFormat($outputlangs);
-	}
-	else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
-
-	$sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
-	$sql.=" WHERE code = '".$pdfformat."'";
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$obj=$db->fetch_object($resql);
-		if ($obj)
-		{
-			$width=(int) $obj->width;
-			$height=(int) $obj->height;
-			$unit=$obj->unit;
-		}
-	}
-
-	//print "pdfformat=".$pdfformat." width=".$width." height=".$height." unit=".$unit;
-	return array('width'=>$width,'height'=>$height,'unit'=>$unit);
+    global $conf,$db;
+
+    // Default value if setup was not done and/or entry into c_paper_format not defined
+    $width=210; $height=297; $unit='mm';
+
+    if (empty($conf->global->MAIN_PDF_FORMAT))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $pdfformat=dol_getDefaultFormat($outputlangs);
+    }
+    else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
+
+    $sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
+    $sql.=" WHERE code = '".$pdfformat."'";
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $obj=$db->fetch_object($resql);
+        if ($obj)
+        {
+            $width=(int) $obj->width;
+            $height=(int) $obj->height;
+            $unit=$obj->unit;
+        }
+    }
+
+    //print "pdfformat=".$pdfformat." width=".$width." height=".$height." unit=".$unit;
+    return array('width'=>$width,'height'=>$height,'unit'=>$unit);
 }
 
 /**
@@ -81,64 +81,64 @@ 
  */
 function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 {
-	global $conf;
-
-	// Define constant for TCPDF
-	if (! defined('K_TCPDF_EXTERNAL_CONFIG'))
-	{
-		define('K_TCPDF_EXTERNAL_CONFIG',1);	// this avoid using tcpdf_config file
-		define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
-		define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
-		dol_mkdir(K_PATH_CACHE);
-		define('K_BLANK_IMAGE', '_blank.png');
-		define('PDF_PAGE_FORMAT', 'A4');
-		define('PDF_PAGE_ORIENTATION', 'P');
-		define('PDF_CREATOR', 'TCPDF');
-		define('PDF_AUTHOR', 'TCPDF');
-		define('PDF_HEADER_TITLE', 'TCPDF Example');
-		define('PDF_HEADER_STRING', "by Dolibarr ERP CRM");
-		define('PDF_UNIT', 'mm');
-		define('PDF_MARGIN_HEADER', 5);
-		define('PDF_MARGIN_FOOTER', 10);
-		define('PDF_MARGIN_TOP', 27);
-		define('PDF_MARGIN_BOTTOM', 25);
-		define('PDF_MARGIN_LEFT', 15);
-		define('PDF_MARGIN_RIGHT', 15);
-		define('PDF_FONT_NAME_MAIN', 'helvetica');
-		define('PDF_FONT_SIZE_MAIN', 10);
-		define('PDF_FONT_NAME_DATA', 'helvetica');
-		define('PDF_FONT_SIZE_DATA', 8);
-		define('PDF_FONT_MONOSPACED', 'courier');
-		define('PDF_IMAGE_SCALE_RATIO', 1.25);
-		define('HEAD_MAGNIFICATION', 1.1);
-		define('K_CELL_HEIGHT_RATIO', 1.25);
-		define('K_TITLE_MAGNIFICATION', 1.3);
-		define('K_SMALL_RATIO', 2/3);
-		define('K_THAI_TOPCHARS', true);
-		define('K_TCPDF_CALLS_IN_HTML', true);
-		define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
-	}
-
-	// Load TCPDF
-	require_once TCPDF_PATH.'tcpdf.php';
-
-	// We need to instantiate tcpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
-	if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
-
-	//$arrayformat=pdf_getFormat();
-	//$format=array($arrayformat['width'],$arrayformat['height']);
-	//$metric=$arrayformat['unit'];
-
-	$pdfa=false;											// PDF-1.3
-	if (! empty($conf->global->PDF_USE_1A)) $pdfa=true;		// PDF1/A
-
-	if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
-	else $pdf = new TCPDF($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
-
-	// Protection and encryption of pdf
-	if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
-	{
-		/* Permission supported by TCPDF
+    global $conf;
+
+    // Define constant for TCPDF
+    if (! defined('K_TCPDF_EXTERNAL_CONFIG'))
+    {
+        define('K_TCPDF_EXTERNAL_CONFIG',1);	// this avoid using tcpdf_config file
+        define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
+        define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
+        dol_mkdir(K_PATH_CACHE);
+        define('K_BLANK_IMAGE', '_blank.png');
+        define('PDF_PAGE_FORMAT', 'A4');
+        define('PDF_PAGE_ORIENTATION', 'P');
+        define('PDF_CREATOR', 'TCPDF');
+        define('PDF_AUTHOR', 'TCPDF');
+        define('PDF_HEADER_TITLE', 'TCPDF Example');
+        define('PDF_HEADER_STRING', "by Dolibarr ERP CRM");
+        define('PDF_UNIT', 'mm');
+        define('PDF_MARGIN_HEADER', 5);
+        define('PDF_MARGIN_FOOTER', 10);
+        define('PDF_MARGIN_TOP', 27);
+        define('PDF_MARGIN_BOTTOM', 25);
+        define('PDF_MARGIN_LEFT', 15);
+        define('PDF_MARGIN_RIGHT', 15);
+        define('PDF_FONT_NAME_MAIN', 'helvetica');
+        define('PDF_FONT_SIZE_MAIN', 10);
+        define('PDF_FONT_NAME_DATA', 'helvetica');
+        define('PDF_FONT_SIZE_DATA', 8);
+        define('PDF_FONT_MONOSPACED', 'courier');
+        define('PDF_IMAGE_SCALE_RATIO', 1.25);
+        define('HEAD_MAGNIFICATION', 1.1);
+        define('K_CELL_HEIGHT_RATIO', 1.25);
+        define('K_TITLE_MAGNIFICATION', 1.3);
+        define('K_SMALL_RATIO', 2/3);
+        define('K_THAI_TOPCHARS', true);
+        define('K_TCPDF_CALLS_IN_HTML', true);
+        define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
+    }
+
+    // Load TCPDF
+    require_once TCPDF_PATH.'tcpdf.php';
+
+    // We need to instantiate tcpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
+    if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
+
+    //$arrayformat=pdf_getFormat();
+    //$format=array($arrayformat['width'],$arrayformat['height']);
+    //$metric=$arrayformat['unit'];
+
+    $pdfa=false;											// PDF-1.3
+    if (! empty($conf->global->PDF_USE_1A)) $pdfa=true;		// PDF1/A
+
+    if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+    else $pdf = new TCPDF($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+
+    // Protection and encryption of pdf
+    if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
+    {
+        /* Permission supported by TCPDF
 		- print : Print the document;
 		- modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';
 		- copy : Copy or otherwise extract text and graphics from the document;
@@ -150,26 +150,26 @@ 
 		- owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.
 		*/
 
-		// For TCPDF, we specify permission we want to block
-		$pdfrights = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true):array('modify','copy')); // Json format in llx_const
+        // For TCPDF, we specify permission we want to block
+        $pdfrights = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true):array('modify','copy')); // Json format in llx_const
 
-		// Password for the end user
-		$pdfuserpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_USERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_USERPASS:'');
+        // Password for the end user
+        $pdfuserpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_USERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_USERPASS:'');
 
-		// Password of the owner, created randomly if not defined
-		$pdfownerpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS:null);
+        // Password of the owner, created randomly if not defined
+        $pdfownerpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS:null);
 
-		// For encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit
-		$encstrength = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH)?$conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH:0);
+        // For encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit
+        $encstrength = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH)?$conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH:0);
 
-		// Array of recipients containing public-key certificates ('c') and permissions ('p').
-		// For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
-		$pubkeys = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true):null); // Json format in llx_const
+        // Array of recipients containing public-key certificates ('c') and permissions ('p').
+        // For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
+        $pubkeys = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true):null); // Json format in llx_const
 
-		$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass,$encstrength,$pubkeys);
-	}
+        $pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass,$encstrength,$pubkeys);
+    }
 
-	return $pdf;
+    return $pdf;
 }
 
 /**
@@ -181,15 +181,15 @@ 
  */
 function pdf_getEncryption(&$pdf, $pathoffile)
 {
-	$isencrypted = false;
+    $isencrypted = false;
 
-	$pdfparser = $pdf->_getPdfParser($pathoffile);
-	$data = $pdfparser->getParsedData();
-	if (isset($data[0]['trailer'][1]['/Encrypt'])) {
-		$isencrypted = true;
-	}
+    $pdfparser = $pdf->_getPdfParser($pathoffile);
+    $data = $pdfparser->getParsedData();
+    if (isset($data[0]['trailer'][1]['/Encrypt'])) {
+        $isencrypted = true;
+    }
 
-	return $isencrypted;
+    return $isencrypted;
 }
 
 /**
@@ -200,19 +200,19 @@ 
  */
 function pdf_getPDFFont($outputlangs)
 {
-	global $conf;
-
-	if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
-
-	$font='Helvetica'; // By default, for FPDI, or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
-	{
-		if ($outputlangs->trans('FONTFORPDF')!='FONTFORPDF')
-		{
-			$font=$outputlangs->trans('FONTFORPDF');
-		}
-	}
-	return $font;
+    global $conf;
+
+    if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
+
+    $font='Helvetica'; // By default, for FPDI, or ISO language on TCPDF
+    if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
+    {
+        if ($outputlangs->trans('FONTFORPDF')!='FONTFORPDF')
+        {
+            $font=$outputlangs->trans('FONTFORPDF');
+        }
+    }
+    return $font;
 }
 
 /**
@@ -223,15 +223,15 @@ 
  */
 function pdf_getPDFFontSize($outputlangs)
 {
-	$size=10;                   // By default, for FPDI or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
-	{
-		if ($outputlangs->trans('FONTSIZEFORPDF')!='FONTSIZEFORPDF')
-		{
-			$size = (int) $outputlangs->trans('FONTSIZEFORPDF');
-		}
-	}
-	return $size;
+    $size=10;                   // By default, for FPDI or ISO language on TCPDF
+    if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
+    {
+        if ($outputlangs->trans('FONTSIZEFORPDF')!='FONTSIZEFORPDF')
+        {
+            $size = (int) $outputlangs->trans('FONTSIZEFORPDF');
+        }
+    }
+    return $size;
 }
 
 
@@ -244,18 +244,18 @@ 
  */
 function pdf_getHeightForLogo($logo, $url = false)
 {
-	global $conf;
-	$height=(empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT)?22:$conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
-	$maxwidth=130;
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-	$tmp=dol_getImageSize($logo, $url);
-	if ($tmp['height'])
-	{
-		$width=round($height*$tmp['width']/$tmp['height']);
-		if ($width > $maxwidth) $height=$height*$maxwidth/$width;
-	}
-	//print $tmp['width'].' '.$tmp['height'].' '.$width; exit;
-	return $height;
+    global $conf;
+    $height=(empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT)?22:$conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
+    $maxwidth=130;
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+    $tmp=dol_getImageSize($logo, $url);
+    if ($tmp['height'])
+    {
+        $width=round($height*$tmp['width']/$tmp['height']);
+        if ($width > $maxwidth) $height=$height*$maxwidth/$width;
+    }
+    //print $tmp['width'].' '.$tmp['height'].' '.$width; exit;
+    return $height;
 }
 
 /**
@@ -287,22 +287,22 @@ 
     else
     {
         for ($page=$start_page; $page <= $end_page; ++$page) {
-        	$pdf->setPage($page);
-        	$tmpm=$pdf->getMargins();
-        	$tMargin = $tmpm['top'];
-        	if ($page == $start_page) {
-        		// first page
-        		$height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();
-        	} elseif ($page == $end_page) {
-        		// last page
-        		$height = $end_y - $tMargin;
-        	} else {
-        		$height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();
-        	}
+            $pdf->setPage($page);
+            $tmpm=$pdf->getMargins();
+            $tMargin = $tmpm['top'];
+            if ($page == $start_page) {
+                // first page
+                $height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();
+            } elseif ($page == $end_page) {
+                // last page
+                $height = $end_y - $tMargin;
+            } else {
+                $height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();
+            }
         }
-	}
-	// restore previous object
-	$pdf = $pdf->rollbackTransaction();
+    }
+    // restore previous object
+    $pdf = $pdf->rollbackTransaction();
 
     return $height;
 }
@@ -320,21 +320,21 @@ 
 {
     global $conf;
 
-	// Recipient name
-	$socname = '';
-
-	if ($thirdparty instanceof Societe) {
-		$socname .= $thirdparty->name;
-		if (($includealias || ! empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
-		    $socname .= "\n".$thirdparty->name_alias;
-		}
-	} elseif ($thirdparty instanceof Contact) {
-		$socname = $thirdparty->socname;
-	} else {
-		throw new InvalidArgumentException('Parameter 1 $thirdparty is not a Societe nor Contact');
-	}
-
-	return $outputlangs->convToOutputCharset($socname);
+    // Recipient name
+    $socname = '';
+
+    if ($thirdparty instanceof Societe) {
+        $socname .= $thirdparty->name;
+        if (($includealias || ! empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
+            $socname .= "\n".$thirdparty->name_alias;
+        }
+    } elseif ($thirdparty instanceof Contact) {
+        $socname = $thirdparty->socname;
+    } else {
+        throw new InvalidArgumentException('Parameter 1 $thirdparty is not a Societe nor Contact');
+    }
+
+    return $outputlangs->convToOutputCharset($socname);
 }
 
 
@@ -352,240 +352,240 @@ 
  */
 function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$targetcontact='',$usecontact=0,$mode='source',$object=null)
 {
-	global $conf, $hookmanager;
-
-	if ($mode == 'source' && ! is_object($sourcecompany)) return -1;
-	if ($mode == 'target' && ! is_object($targetcompany)) return -1;
-
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO deprecated
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state))       $sourcecompany->state=getState($sourcecompany->state_id);
-	if (! empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id))   $sourcecompany->departement_id=getState($sourcecompany->state_id,'2');
-	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id); //TODO deprecated
-	if (! empty($targetcompany->state_id) && empty($targetcompany->state))       $targetcompany->state=getState($targetcompany->state_id);
-	if (! empty($targetcompany->state_id) && !isset($targetcompany->departement_id))   $targetcompany->departement_id=getState($targetcompany->state_id,'2');
-
-	$reshook=0;
-	$stringaddress = '';
-	if (is_object($hookmanager))
-	{
-		$parameters = array('sourcecompany'=>&$sourcecompany,'targetcompany'=>&$targetcompany,'targetcontact'=>$targetcontact,'outputlangs'=>$outputlangs,'mode'=>$mode,'usecontact'=>$usecontact);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_build_address',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$stringaddress.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-    	if ($mode == 'source')
-    	{
-    		$withCountry = 0;
-    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
-
-    		$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
-
-    		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
-    		{
-    			// Phone
-    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
-    			// Fax
-    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
-    			// EMail
-    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
-    			// Web
-    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
-    		}
-    		// Intra VAT
-    		if (! empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
-    		{
-    			if ($sourcecompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
-    		}
-    		// Professionnal Ids
-    		if (! empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof1))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId1",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof2))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId2",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof3))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId3",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof4))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId4",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof5))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId5",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof6))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId6",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
-    		}
-    	}
-
-    	if ($mode == 'target' || preg_match('/targetwithdetails/',$mode))
-    	{
-    		if ($usecontact)
-    		{
-    			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1));
-
-    			if (!empty($targetcontact->address)) {
-    				$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
-    			} else {
-    				$companytouseforaddress = $targetcompany;
-
-					// Contact on a thirdparty that is a different thirdparty than the thirdparty of object
-					if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)
-					{
-						$targetcontact->fetch_thirdparty();
-						$companytouseforaddress = $targetcontact->thirdparty;
-					}
-
-					$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
-				}
-    			// Country
-    			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
-    				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
-    			}
-    			else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
-    				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
-    			}
-
-    			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
-    			{
-    				// Phone
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
-    			    {
-        				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-        				if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-        				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-        				if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
-    			    }
-    				// Fax
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
-    			    {
+    global $conf, $hookmanager;
+
+    if ($mode == 'source' && ! is_object($sourcecompany)) return -1;
+    if ($mode == 'target' && ! is_object($targetcompany)) return -1;
+
+    if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO deprecated
+    if (! empty($sourcecompany->state_id) && empty($sourcecompany->state))       $sourcecompany->state=getState($sourcecompany->state_id);
+    if (! empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id))   $sourcecompany->departement_id=getState($sourcecompany->state_id,'2');
+    if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id); //TODO deprecated
+    if (! empty($targetcompany->state_id) && empty($targetcompany->state))       $targetcompany->state=getState($targetcompany->state_id);
+    if (! empty($targetcompany->state_id) && !isset($targetcompany->departement_id))   $targetcompany->departement_id=getState($targetcompany->state_id,'2');
+
+    $reshook=0;
+    $stringaddress = '';
+    if (is_object($hookmanager))
+    {
+        $parameters = array('sourcecompany'=>&$sourcecompany,'targetcompany'=>&$targetcompany,'targetcontact'=>$targetcontact,'outputlangs'=>$outputlangs,'mode'=>$mode,'usecontact'=>$usecontact);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_build_address',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        $stringaddress.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if ($mode == 'source')
+        {
+            $withCountry = 0;
+            if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
+
+            $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
+
+            if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
+            {
+                // Phone
+                if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+                // Fax
+                if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+                // EMail
+                if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+                // Web
+                if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+            }
+            // Intra VAT
+            if (! empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
+            {
+                if ($sourcecompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+            }
+            // Professionnal Ids
+            if (! empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof1))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId1",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
+            }
+            if (! empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof2))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId2",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
+            }
+            if (! empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof3))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId3",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
+            }
+            if (! empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof4))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId4",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
+            }
+            if (! empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof5))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId5",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
+            }
+            if (! empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof6))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId6",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
+            }
+        }
+
+        if ($mode == 'target' || preg_match('/targetwithdetails/',$mode))
+        {
+            if ($usecontact)
+            {
+                $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1));
+
+                if (!empty($targetcontact->address)) {
+                    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
+                } else {
+                    $companytouseforaddress = $targetcompany;
+
+                    // Contact on a thirdparty that is a different thirdparty than the thirdparty of object
+                    if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)
+                    {
+                        $targetcontact->fetch_thirdparty();
+                        $companytouseforaddress = $targetcontact->thirdparty;
+                    }
+
+                    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
+                }
+                // Country
+                if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
+                    $stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
+                }
+                else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+                    $stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+                }
+
+                if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
+                {
+                    // Phone
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
+                    {
+                        if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+                        if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+                        if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
+                        if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+                    }
+                    // Fax
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
+                    {
                         if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
-    			    }
-    				// EMail
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
-    			    {
+                    }
+                    // EMail
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
+                    {
                         if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
-    			    }
-    				// Web
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
-    			    {
+                    }
+                    // Web
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
+                    {
                         if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
-    			    }
-    			}
-    		}
-    		else
-    		{
-    			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
-    			// Country
-    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
-
-    			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
-    			{
-    				// Phone
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
-    			    {
-    			    	if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-	    				if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-    					if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-    					if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
-    			    }
-    				// Fax
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
-    			    {
-    			    	if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
-    			    }
-    				// EMail
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
-    			    {
-    			    	if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
-    			    }
-    				// Web
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
-    			    {
-    			    	if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
-    			    }
-    			}
-    		}
-
-    		// Intra VAT
-    		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
-    		{
-    			if ($targetcompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
-    		}
-
-    		// Professionnal Ids
-    		if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && ! empty($targetcompany->idprof5))
-    		{
-    		    $tmp=$outputlangs->transcountrynoentities("ProfId5",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && ! empty($targetcompany->idprof6))
-    		{
-    		    $tmp=$outputlangs->transcountrynoentities("ProfId6",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
-    		}
-
-    		// Public note
-    		if (! empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
-    		{
-    		    if ($mode == 'source' && ! empty($sourcecompany->note_public))
-        		{
-        		    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($sourcecompany->note_public);
-        		}
-        		if (($mode == 'target' || preg_match('/targetwithdetails/',$mode)) && ! empty($targetcompany->note_public))
-        		{
-        		    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($targetcompany->note_public);
-        		}
-    		}
-    	}
-	}
-
-	return $stringaddress;
+                    }
+                }
+            }
+            else
+            {
+                $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
+                // Country
+                if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+
+                if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
+                {
+                    // Phone
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
+                    {
+                        if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+                        if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+                        if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
+                        if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+                    }
+                    // Fax
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
+                    {
+                        if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+                    }
+                    // EMail
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
+                    {
+                        if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+                    }
+                    // Web
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
+                    {
+                        if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+                    }
+                }
+            }
+
+            // Intra VAT
+            if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
+            {
+                if ($targetcompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+            }
+
+            // Professionnal Ids
+            if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
+            }
+            if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
+            }
+            if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
+            }
+            if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
+            }
+            if (! empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && ! empty($targetcompany->idprof5))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId5",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
+            }
+            if (! empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && ! empty($targetcompany->idprof6))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId6",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
+            }
+
+            // Public note
+            if (! empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
+            {
+                if ($mode == 'source' && ! empty($sourcecompany->note_public))
+                {
+                    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($sourcecompany->note_public);
+                }
+                if (($mode == 'target' || preg_match('/targetwithdetails/',$mode)) && ! empty($targetcompany->note_public))
+                {
+                    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($targetcompany->note_public);
+                }
+            }
+        }
+    }
+
+    return $stringaddress;
 }
 
 
@@ -599,15 +599,15 @@ 
  */
 function pdf_pagehead(&$pdf,$outputlangs,$page_height)
 {
-	global $conf;
-
-	// Add a background image on document
-	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
-	{
-		$pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
-		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
-		$pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
-	}
+    global $conf;
+
+    // Add a background image on document
+    if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
+    {
+        $pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
+        $pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
+        $pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
+    }
 }
 
 
@@ -642,38 +642,38 @@ 
  */
 function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 {
-	global $langs, $mysoc, $user;
-
-	// Print Draft Watermark
-	if ($unit=='pt') $k=1;
-	elseif ($unit=='mm') $k=72/25.4;
-	elseif ($unit=='cm') $k=72/2.54;
-	elseif ($unit=='in') $k=72;
-
-	// Make substitution
-	$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, null);
-	complete_substitutions_array($substitutionarray, $outputlangs, null);
-	$text=make_substitutions($text, $substitutionarray, $outputlangs);
-	$text=$outputlangs->convToOutputCharset($text);
-
-	$savx=$pdf->getX(); $savy=$pdf->getY();
-
-	$watermark_angle=atan($h/$w)/2;
-	$watermark_x_pos=0;
-	$watermark_y_pos=$h/3;
-	$watermark_x=$w/2;
-	$watermark_y=$h/3;
-	$pdf->SetFont('','B',40);
-	$pdf->SetTextColor(255,192,203);
-	//rotate
-	$pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm',cos($watermark_angle),sin($watermark_angle),-sin($watermark_angle),cos($watermark_angle),$watermark_x*$k,($h-$watermark_y)*$k,-$watermark_x*$k,-($h-$watermark_y)*$k));
-	//print watermark
-	$pdf->SetXY($watermark_x_pos,$watermark_y_pos);
-	$pdf->Cell($w-20,25,$outputlangs->convToOutputCharset($text),"",2,"C",0);
-	//antirotate
-	$pdf->_out('Q');
-
-	$pdf->SetXY($savx,$savy);
+    global $langs, $mysoc, $user;
+
+    // Print Draft Watermark
+    if ($unit=='pt') $k=1;
+    elseif ($unit=='mm') $k=72/25.4;
+    elseif ($unit=='cm') $k=72/2.54;
+    elseif ($unit=='in') $k=72;
+
+    // Make substitution
+    $substitutionarray=pdf_getSubstitutionArray($outputlangs, null, null);
+    complete_substitutions_array($substitutionarray, $outputlangs, null);
+    $text=make_substitutions($text, $substitutionarray, $outputlangs);
+    $text=$outputlangs->convToOutputCharset($text);
+
+    $savx=$pdf->getX(); $savy=$pdf->getY();
+
+    $watermark_angle=atan($h/$w)/2;
+    $watermark_x_pos=0;
+    $watermark_y_pos=$h/3;
+    $watermark_x=$w/2;
+    $watermark_y=$h/3;
+    $pdf->SetFont('','B',40);
+    $pdf->SetTextColor(255,192,203);
+    //rotate
+    $pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm',cos($watermark_angle),sin($watermark_angle),-sin($watermark_angle),cos($watermark_angle),$watermark_x*$k,($h-$watermark_y)*$k,-$watermark_x*$k,-($h-$watermark_y)*$k));
+    //print watermark
+    $pdf->SetXY($watermark_x_pos,$watermark_y_pos);
+    $pdf->Cell($w-20,25,$outputlangs->convToOutputCharset($text),"",2,"C",0);
+    //antirotate
+    $pdf->_out('Q');
+
+    $pdf->SetXY($savx,$savy);
 }
 
 
@@ -691,167 +691,167 @@ 
  */
 function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default_font_size=10)
 {
-	global $mysoc, $conf;
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
-
-	$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-	$diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT);
-	$pdf->SetXY($curx, $cury);
-
-	if (empty($onlynumber))
-	{
-		$pdf->SetFont('','B',$default_font_size - $diffsizetitle);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
-		$cury+=4;
-	}
-
-	$outputlangs->load("banks");
-
-	// Use correct name of bank id according to country
-	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
-
-	// Get format of bank account according to its country
-	$usedetailedbban=$account->useDetailedBBAN();
-
-	//$onlynumber=0; $usedetailedbban=1; // For tests
-	if ($usedetailedbban)
-	{
-		$savcurx=$curx;
-
-		if (empty($onlynumber))
-		{
-			$pdf->SetFont('','',$default_font_size - $diffsizecontent);
-			$pdf->SetXY($curx, $cury);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
-			$cury+=3;
-		}
-
-		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
-		{
-		    // Note:
-		    // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
-		    // desk = code guichet (FR), used only when $usedetailedbban = 1
-		    // number = account number
-		    // key = check control key used only when $usedetailedbban = 1
-    		if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+6);
-
-
-			foreach ($account->getFieldsToShow() as $val)
-			{
-				$pdf->SetXY($curx, $cury+4);
-				$pdf->SetFont('','',$default_font_size - 3);
-
-				if ($val == 'BankCode') {
-					// Bank code
-					$tmplength = 18;
-					$content = $account->code_banque;
-				} elseif ($val == 'DeskCode') {
-					// Desk
-					$tmplength = 18;
-					$content = $account->code_guichet;
-				} elseif ($val == 'BankAccountNumber') {
-					// Number
-					$tmplength = 24;
-					$content = $account->number;
-				} elseif ($val == 'BankAccountNumberKey') {
-					// Key
-					$tmplength = 15;
-					$content = $account->cle_rib;
-				}elseif ($val == 'IBAN' || $val == 'BIC') {
-					// Key
-					$tmplength = 0;
-					$content = '';
-				} else {
-					dol_print_error($account->db, 'Unexpected value for getFieldsToShow: '.$val);
-					break;
-				}
-
-				$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($content), 0, 'C', 0);
-				$pdf->SetXY($curx, $cury + 1);
-				$curx += $tmplength;
-				$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
-				$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities($val), 0, 'C', 0);
-				if (empty($onlynumber)) {
-					$pdf->line($curx, $cury + 1, $curx, $cury + 7);
-				}
-    		}
-
-    		$curx=$savcurx;
-    		$cury+=8;
-		}
-	}
-	else
-	{
-		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
-		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
-		$cury+=3;
-
-		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
-		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
-		$cury+=3;
-
-		if ($diffsizecontent <= 2) $cury+=1;
-	}
-
-	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
-
-	if (empty($onlynumber) && ! empty($account->domiciliation))
-	{
-		$pdf->SetXY($curx, $cury);
-		$val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation);
-		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
-		//$nboflines=dol_nboflines_bis($val,120);
-		//$cury+=($nboflines*3)+2;
-		$tmpy=$pdf->getStringHeight(100, $val);
-		$cury+=$tmpy;
-	}
-
-	if (! empty($account->proprio))
-	{
-		$pdf->SetXY($curx, $cury);
-		$val=$outputlangs->transnoentities("BankAccountOwner").': ' . $outputlangs->convToOutputCharset($account->proprio);
-		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
-		$tmpy=$pdf->getStringHeight(100, $val);
-		$cury+=$tmpy;
-		$cur+=1;
-	}
-
-	else if (! $usedetailedbban) $cury+=1;
-
-	// Use correct name of bank id according to country
-	$ibankey = FormBank::getIBANLabel($account);
-
-	if (! empty($account->iban))
-	{
-		//Remove whitespaces to ensure we are dealing with the format we expect
-		$ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban));
-		$ibanDisplay = "";
-
-		$nbIbanDisplay_temp = dol_strlen($ibanDisplay_temp);
-		for ($i = 0; $i < $nbIbanDisplay_temp; $i++)
-		{
-			$ibanDisplay .= $ibanDisplay_temp[$i];
-			if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
-		}
-
-		$pdf->SetFont('','B',$default_font_size - 3);
-		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
-		$cury+=3;
-	}
-
-	if (! empty($account->bic))
-	{
-		$pdf->SetFont('','B',$default_font_size - 3);
-		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
-	}
-
-	return $pdf->getY();
+    global $mysoc, $conf;
+
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
+
+    $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
+    $diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT);
+    $pdf->SetXY($curx, $cury);
+
+    if (empty($onlynumber))
+    {
+        $pdf->SetFont('','B',$default_font_size - $diffsizetitle);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
+        $cury+=4;
+    }
+
+    $outputlangs->load("banks");
+
+    // Use correct name of bank id according to country
+    $bickey="BICNumber";
+    if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+
+    // Get format of bank account according to its country
+    $usedetailedbban=$account->useDetailedBBAN();
+
+    //$onlynumber=0; $usedetailedbban=1; // For tests
+    if ($usedetailedbban)
+    {
+        $savcurx=$curx;
+
+        if (empty($onlynumber))
+        {
+            $pdf->SetFont('','',$default_font_size - $diffsizecontent);
+            $pdf->SetXY($curx, $cury);
+            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+            $cury+=3;
+        }
+
+        if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
+        {
+            // Note:
+            // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
+            // desk = code guichet (FR), used only when $usedetailedbban = 1
+            // number = account number
+            // key = check control key used only when $usedetailedbban = 1
+            if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+6);
+
+
+            foreach ($account->getFieldsToShow() as $val)
+            {
+                $pdf->SetXY($curx, $cury+4);
+                $pdf->SetFont('','',$default_font_size - 3);
+
+                if ($val == 'BankCode') {
+                    // Bank code
+                    $tmplength = 18;
+                    $content = $account->code_banque;
+                } elseif ($val == 'DeskCode') {
+                    // Desk
+                    $tmplength = 18;
+                    $content = $account->code_guichet;
+                } elseif ($val == 'BankAccountNumber') {
+                    // Number
+                    $tmplength = 24;
+                    $content = $account->number;
+                } elseif ($val == 'BankAccountNumberKey') {
+                    // Key
+                    $tmplength = 15;
+                    $content = $account->cle_rib;
+                }elseif ($val == 'IBAN' || $val == 'BIC') {
+                    // Key
+                    $tmplength = 0;
+                    $content = '';
+                } else {
+                    dol_print_error($account->db, 'Unexpected value for getFieldsToShow: '.$val);
+                    break;
+                }
+
+                $pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($content), 0, 'C', 0);
+                $pdf->SetXY($curx, $cury + 1);
+                $curx += $tmplength;
+                $pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
+                $pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities($val), 0, 'C', 0);
+                if (empty($onlynumber)) {
+                    $pdf->line($curx, $cury + 1, $curx, $cury + 7);
+                }
+            }
+
+            $curx=$savcurx;
+            $cury+=8;
+        }
+    }
+    else
+    {
+        $pdf->SetFont('','B',$default_font_size - $diffsizecontent);
+        $pdf->SetXY($curx, $cury);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+        $cury+=3;
+
+        $pdf->SetFont('','B',$default_font_size - $diffsizecontent);
+        $pdf->SetXY($curx, $cury);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
+        $cury+=3;
+
+        if ($diffsizecontent <= 2) $cury+=1;
+    }
+
+    $pdf->SetFont('','',$default_font_size - $diffsizecontent);
+
+    if (empty($onlynumber) && ! empty($account->domiciliation))
+    {
+        $pdf->SetXY($curx, $cury);
+        $val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation);
+        $pdf->MultiCell(100, 3, $val, 0, 'L', 0);
+        //$nboflines=dol_nboflines_bis($val,120);
+        //$cury+=($nboflines*3)+2;
+        $tmpy=$pdf->getStringHeight(100, $val);
+        $cury+=$tmpy;
+    }
+
+    if (! empty($account->proprio))
+    {
+        $pdf->SetXY($curx, $cury);
+        $val=$outputlangs->transnoentities("BankAccountOwner").': ' . $outputlangs->convToOutputCharset($account->proprio);
+        $pdf->MultiCell(100, 3, $val, 0, 'L', 0);
+        $tmpy=$pdf->getStringHeight(100, $val);
+        $cury+=$tmpy;
+        $cur+=1;
+    }
+
+    else if (! $usedetailedbban) $cury+=1;
+
+    // Use correct name of bank id according to country
+    $ibankey = FormBank::getIBANLabel($account);
+
+    if (! empty($account->iban))
+    {
+        //Remove whitespaces to ensure we are dealing with the format we expect
+        $ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban));
+        $ibanDisplay = "";
+
+        $nbIbanDisplay_temp = dol_strlen($ibanDisplay_temp);
+        for ($i = 0; $i < $nbIbanDisplay_temp; $i++)
+        {
+            $ibanDisplay .= $ibanDisplay_temp[$i];
+            if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
+        }
+
+        $pdf->SetFont('','B',$default_font_size - 3);
+        $pdf->SetXY($curx, $cury);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
+        $cury+=3;
+    }
+
+    if (! empty($account->bic))
+    {
+        $pdf->SetFont('','B',$default_font_size - 3);
+        $pdf->SetXY($curx, $cury);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
+    }
+
+    return $pdf->getY();
 }
 
 /**
@@ -871,235 +871,235 @@ 
  */
 function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_basse,$marge_gauche,$page_hauteur,$object,$showdetails=0,$hidefreetext=0)
 {
-	global $conf,$user,$mysoc;
-
-	$outputlangs->load("dict");
-	$line='';
-
-	$dims=$pdf->getPageDimensions();
-
-	// Line of free text
-	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
-	{
-		$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
-		// More substitution keys
-		$substitutionarray['__FROM_NAME__']=$fromcompany->name;
-		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
-		complete_substitutions_array($substitutionarray, $outputlangs, $object);
-		$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
-
-		// Make a change into HTML code to allow to include images from medias directory.
-		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-		// become
-		// <img alt="" src="'.DOL_DATA_ROOT.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-		$newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
-
-		$line.=$outputlangs->convToOutputCharset($newfreetext);
-	}
-
-	// First line of company infos
-	$line1=""; $line2=""; $line3=""; $line4="";
-
-		if ($showdetails == 1 || $showdetails == 3)
-	{
-		// Company name
-		if ($fromcompany->name)
-		{
-			$line1.=($line1?" - ":"").$outputlangs->transnoentities("RegisteredOffice").": ".$fromcompany->name;
-		}
-		// Address
-		if ($fromcompany->address)
-		{
-			$line1.=($line1?" - ":"").str_replace("\n", ", ", $fromcompany->address);
-		}
-		// Zip code
-		if ($fromcompany->zip)
-		{
-			$line1.=($line1?" - ":"").$fromcompany->zip;
-		}
-		// Town
-		if ($fromcompany->town)
-		{
-			$line1.=($line1?" ":"").$fromcompany->town;
-		}
-		// Phone
-		if ($fromcompany->phone)
-		{
-			$line2.=($line2?" - ":"").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone;
-		}
-		// Fax
-		if ($fromcompany->fax)
-		{
-			$line2.=($line2?" - ":"").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
-		}
-
-		// URL
-		if ($fromcompany->url)
-		{
-			$line2.=($line2?" - ":"").$fromcompany->url;
-		}
-		// Email
-		if ($fromcompany->email)
-		{
-			$line2.=($line2?" - ":"").$fromcompany->email;
-		}
-	}
-	if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE'))
-	{
-		// Managers
-		if ($fromcompany->managers)
-		{
-			$line2.=($line2?" - ":"").$fromcompany->managers;
-		}
-	}
-
-	// Line 3 of company infos
-	// Juridical status
-	if ($fromcompany->forme_juridique_code)
-	{
-		$line3.=($line3?" - ":"").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
-	}
-	// Capital
-	if ($fromcompany->capital)
-	{
-		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
-		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
-		else $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
-	}
-	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
-	}
-	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
-	}
-
-	// Line 4 of company infos
-	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
-	}
-	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
-	}
-	// Prof Id 5
-	if ($fromcompany->idprof5)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId5",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
-	}
-	// Prof Id 6
-	if ($fromcompany->idprof6)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId6",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
-	}
-	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
-		$line4.=($line4?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
-	}
-
-	$pdf->SetFont('','',7);
-	$pdf->SetDrawColor(224,224,224);
-
-	// The start of the bottom of this page footer is positioned according to # of lines
-	$freetextheight=0;
-	if ($line)	// Free text
-	{
-		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
-	    if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
-		{
-			$width=20000; $align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
-    		if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
-    			$width=200; $align='C';
-    		}
-		    $freetextheight=$pdf->getStringHeight($width,$line);
-		}
-		else
-		{
+    global $conf,$user,$mysoc;
+
+    $outputlangs->load("dict");
+    $line='';
+
+    $dims=$pdf->getPageDimensions();
+
+    // Line of free text
+    if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
+    {
+        $substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+        // More substitution keys
+        $substitutionarray['__FROM_NAME__']=$fromcompany->name;
+        $substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
+        complete_substitutions_array($substitutionarray, $outputlangs, $object);
+        $newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
+
+        // Make a change into HTML code to allow to include images from medias directory.
+        // <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+        // become
+        // <img alt="" src="'.DOL_DATA_ROOT.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+        $newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
+
+        $line.=$outputlangs->convToOutputCharset($newfreetext);
+    }
+
+    // First line of company infos
+    $line1=""; $line2=""; $line3=""; $line4="";
+
+        if ($showdetails == 1 || $showdetails == 3)
+    {
+        // Company name
+        if ($fromcompany->name)
+        {
+            $line1.=($line1?" - ":"").$outputlangs->transnoentities("RegisteredOffice").": ".$fromcompany->name;
+        }
+        // Address
+        if ($fromcompany->address)
+        {
+            $line1.=($line1?" - ":"").str_replace("\n", ", ", $fromcompany->address);
+        }
+        // Zip code
+        if ($fromcompany->zip)
+        {
+            $line1.=($line1?" - ":"").$fromcompany->zip;
+        }
+        // Town
+        if ($fromcompany->town)
+        {
+            $line1.=($line1?" ":"").$fromcompany->town;
+        }
+        // Phone
+        if ($fromcompany->phone)
+        {
+            $line2.=($line2?" - ":"").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone;
+        }
+        // Fax
+        if ($fromcompany->fax)
+        {
+            $line2.=($line2?" - ":"").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
+        }
+
+        // URL
+        if ($fromcompany->url)
+        {
+            $line2.=($line2?" - ":"").$fromcompany->url;
+        }
+        // Email
+        if ($fromcompany->email)
+        {
+            $line2.=($line2?" - ":"").$fromcompany->email;
+        }
+    }
+    if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE'))
+    {
+        // Managers
+        if ($fromcompany->managers)
+        {
+            $line2.=($line2?" - ":"").$fromcompany->managers;
+        }
+    }
+
+    // Line 3 of company infos
+    // Juridical status
+    if ($fromcompany->forme_juridique_code)
+    {
+        $line3.=($line3?" - ":"").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
+    }
+    // Capital
+    if ($fromcompany->capital)
+    {
+        $tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
+        if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
+        else $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
+    }
+    // Prof Id 1
+    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId1",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
+    }
+    // Prof Id 2
+    if ($fromcompany->idprof2)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId2",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
+    }
+
+    // Line 4 of company infos
+    // Prof Id 3
+    if ($fromcompany->idprof3)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId3",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
+    }
+    // Prof Id 4
+    if ($fromcompany->idprof4)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId4",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
+    }
+    // Prof Id 5
+    if ($fromcompany->idprof5)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId5",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
+    }
+    // Prof Id 6
+    if ($fromcompany->idprof6)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId6",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
+    }
+    // IntraCommunautary VAT
+    if ($fromcompany->tva_intra != '')
+    {
+        $line4.=($line4?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
+    }
+
+    $pdf->SetFont('','',7);
+    $pdf->SetDrawColor(224,224,224);
+
+    // The start of the bottom of this page footer is positioned according to # of lines
+    $freetextheight=0;
+    if ($line)	// Free text
+    {
+        //$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
+        if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
+        {
+            $width=20000; $align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
+            if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
+                $width=200; $align='C';
+            }
+            $freetextheight=$pdf->getStringHeight($width,$line);
+        }
+        else
+        {
             $freetextheight=pdfGetHeightForHtmlContent($pdf,dol_htmlentitiesbr($line, 1, 'UTF-8', 0));      // New method (works for HTML content)
             //print '<br>'.$freetextheight;exit;
-		}
-	}
+        }
+    }
 
-	$marginwithfooter=$marge_basse + $freetextheight + (! empty($line1)?3:0) + (! empty($line2)?3:0) + (! empty($line3)?3:0) + (! empty($line4)?3:0);
-	$posy=$marginwithfooter+0;
+    $marginwithfooter=$marge_basse + $freetextheight + (! empty($line1)?3:0) + (! empty($line2)?3:0) + (! empty($line3)?3:0) + (! empty($line4)?3:0);
+    $posy=$marginwithfooter+0;
 
-	if ($line)	// Free text
-	{
-		$pdf->SetXY($dims['lm'],-$posy);
-		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
-		{
+    if ($line)	// Free text
+    {
+        $pdf->SetXY($dims['lm'],-$posy);
+        if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
+        {
             $pdf->MultiCell(0, 3, $line, 0, $align, 0);
-		}
-		else
-		{
+        }
+        else
+        {
             $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk']-$marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
-		}
-		$posy-=$freetextheight;
-	}
-
-	$pdf->SetY(-$posy);
-	$pdf->line($dims['lm'], $dims['hk']-$posy, $dims['wk']-$dims['rm'], $dims['hk']-$posy);
-	$posy--;
-
-	if (! empty($line1))
-	{
-		$pdf->SetFont('','B',7);
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line1, 0, 'C', 0);
-		$posy-=3;
-		$pdf->SetFont('','',7);
-	}
-
-	if (! empty($line2))
-	{
-		$pdf->SetFont('','B',7);
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line2, 0, 'C', 0);
-		$posy-=3;
-		$pdf->SetFont('','',7);
-	}
-
-	if (! empty($line3))
-	{
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line3, 0, 'C', 0);
-	}
-
-	if (! empty($line4))
-	{
-		$posy-=3;
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line4, 0, 'C', 0);
-	}
-
-	// Show page nb only on iso languages (so default Helvetica font)
-	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica')
-	{
-		$pdf->SetXY($dims['wk']-$dims['rm']-15, -$posy);
-		//print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
-		$pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
-	}
-
-	return $marginwithfooter;
+        }
+        $posy-=$freetextheight;
+    }
+
+    $pdf->SetY(-$posy);
+    $pdf->line($dims['lm'], $dims['hk']-$posy, $dims['wk']-$dims['rm'], $dims['hk']-$posy);
+    $posy--;
+
+    if (! empty($line1))
+    {
+        $pdf->SetFont('','B',7);
+        $pdf->SetXY($dims['lm'],-$posy);
+        $pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line1, 0, 'C', 0);
+        $posy-=3;
+        $pdf->SetFont('','',7);
+    }
+
+    if (! empty($line2))
+    {
+        $pdf->SetFont('','B',7);
+        $pdf->SetXY($dims['lm'],-$posy);
+        $pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line2, 0, 'C', 0);
+        $posy-=3;
+        $pdf->SetFont('','',7);
+    }
+
+    if (! empty($line3))
+    {
+        $pdf->SetXY($dims['lm'],-$posy);
+        $pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line3, 0, 'C', 0);
+    }
+
+    if (! empty($line4))
+    {
+        $posy-=3;
+        $pdf->SetXY($dims['lm'],-$posy);
+        $pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line4, 0, 'C', 0);
+    }
+
+    // Show page nb only on iso languages (so default Helvetica font)
+    if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica')
+    {
+        $pdf->SetXY($dims['wk']-$dims['rm']-15, -$posy);
+        //print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
+        $pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+    }
+
+    return $marginwithfooter;
 }
 
 /**
@@ -1118,25 +1118,25 @@ 
  */
 function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$align,$default_font_size)
 {
-	$linkedobjects = pdf_getLinkedObjects($object,$outputlangs);
-	if (! empty($linkedobjects))
-	{
-		foreach($linkedobjects as $linkedobject)
-		{
-		    $reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
-		    if (! empty($linkedobject["date_value"]))
-		    {
-		        $reftoshow .= ' / '.$linkedobject["date_value"];
-		    }
-
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->MultiCell($w, $h, $reftoshow, '', $align);
-		}
-	}
-
-	return $pdf->getY();
+    $linkedobjects = pdf_getLinkedObjects($object,$outputlangs);
+    if (! empty($linkedobjects))
+    {
+        foreach($linkedobjects as $linkedobject)
+        {
+            $reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
+            if (! empty($linkedobject["date_value"]))
+            {
+                $reftoshow .= ' / '.$linkedobject["date_value"];
+            }
+
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->MultiCell($w, $h, $reftoshow, '', $align);
+        }
+    }
+
+    return $pdf->getY();
 }
 
 /**
@@ -1157,29 +1157,29 @@ 
  */
 function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hideref=0,$hidedesc=0,$issupplierline=0)
 {
-	global $db, $conf, $langs, $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
-		$action='';
-		$reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		$labelproductservice=pdf_getlinedesc($object,$i,$outputlangs,$hideref,$hidedesc,$issupplierline);
-		// Description
-		$pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J',true);
-		$result.=$labelproductservice;
-	}
-	return $result;
+    global $db, $conf, $langs, $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
+        $action='';
+        $reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        $labelproductservice=pdf_getlinedesc($object,$i,$outputlangs,$hideref,$hidedesc,$issupplierline);
+        // Description
+        $pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J',true);
+        $result.=$labelproductservice;
+    }
+    return $result;
 }
 
 /**
@@ -1195,222 +1195,222 @@ 
  */
 function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issupplierline=0)
 {
-	global $db, $conf, $langs;
-
-	$idprod=(! empty($object->lines[$i]->fk_product)?$object->lines[$i]->fk_product:false);
-	$label=(! empty($object->lines[$i]->label)?$object->lines[$i]->label:(! empty($object->lines[$i]->product_label)?$object->lines[$i]->product_label:''));
-	$desc=(! empty($object->lines[$i]->desc)?$object->lines[$i]->desc:(! empty($object->lines[$i]->description)?$object->lines[$i]->description:''));
-	$ref_supplier=(! empty($object->lines[$i]->ref_supplier)?$object->lines[$i]->ref_supplier:(! empty($object->lines[$i]->ref_fourn)?$object->lines[$i]->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
-	$note=(! empty($object->lines[$i]->note)?$object->lines[$i]->note:'');
-	$dbatch=(! empty($object->lines[$i]->detail_batch)?$object->lines[$i]->detail_batch:false);
-
-	if ($issupplierline)
-	{
-		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-		$prodser = new ProductFournisseur($db);
-	}
-	else
-	{
-		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$prodser = new Product($db);
-	}
-
-	if ($idprod)
-	{
-		$prodser->fetch($idprod);
-		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
-		{
-			$translatealsoifmodified=(! empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED));	// By default if value was modified manually, we keep it (no translation because we don't have it)
-
-			// TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation
-			// ($textwasmodified is replaced with $textwasmodifiedorcompleted and we add completion).
-
-			// Set label
-			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
-			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
-			$textwasmodified=($label == $prodser->label);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
-
-			// Set desc
-			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
-			$textwasmodified=false;
-			if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
-				$textwasmodified=(strpos(dol_html_entity_decode($desc,ENT_QUOTES | ENT_HTML401),dol_html_entity_decode($prodser->description,ENT_QUOTES | ENT_HTML401))!==false);
-			} else {
-				$textwasmodified=($desc == $prodser->description);
-			}
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
-
-			// Set note
-			$textwasmodified=($note == $prodser->note);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
-		}
-	}
-
-	// Description short of product line
-	$libelleproduitservice=$label;
-
-	// Description long of product line
-	if (! empty($desc) && ($desc != $label))
-	{
-		if ($libelleproduitservice && empty($hidedesc))
-		{
-			$libelleproduitservice.='__N__';
-		}
-
-		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref);
-			// Add date of deposit
-			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
-		}
-		if ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
-		}
-		else
-		{
-			if ($idprod)
-			{
-				if (empty($hidedesc))
-				{
-					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
-					{
-						$libelleproduitservice=$desc."\n".$libelleproduitservice;
-					}
-					else
-					{
-						$libelleproduitservice.=$desc;
-					}
-				}
-			}
-			else
-			{
-				$libelleproduitservice.=$desc;
-			}
-		}
-	}
-
-	// We add ref of product (and supplier ref if defined)
-	$prefix_prodserv = "";
-	$ref_prodserv = "";
-	if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
-	{
-		if ($prodser->isService())
-		{
-			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-		}
-		else
-		{
-			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
-		}
-	}
-
-	if (empty($hideref))
-	{
-		if ($issupplierline)
-		{
-			if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
-				$ref_prodserv = $ref_supplier;
-			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
-				$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
-			else	// Common case
-			{
-				$ref_prodserv = $prodser->ref; // Show local ref
-				if ($ref_supplier) $ref_prodserv.= ($prodser->ref?' (':'').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref?')':'');
-			}
-		}
-		else
-		{
-			$ref_prodserv = $prodser->ref; // Show local ref only
-		}
-
-		if (! empty($libelleproduitservice) && ! empty($ref_prodserv)) $ref_prodserv .= " - ";
-	}
-
-	if(!empty($ref_prodserv) && !empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){ $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }
-	$libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
-
-	// Add an additional description for the category products
-	if (! empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && ! empty($conf->categorie->enabled))
-	{
-		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$categstatic=new Categorie($db);
-		// recovering the list of all the categories linked to product
-		$tblcateg=$categstatic->containing($idprod, Categorie::TYPE_PRODUCT);
-		foreach ($tblcateg as $cate)
-		{
-			// Adding the descriptions if they are filled
-			$desccateg=$cate->add_description;
-			if ($desccateg)
-				$libelleproduitservice.='__N__'.$desccateg;
-		}
-	}
-
-	if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end))
-	{
-		$format='day';
-		// Show duration if exists
-		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs),dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
-		}
-		if ($object->lines[$i]->date_start && ! $object->lines[$i]->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs)).')';
-		}
-		if (! $object->lines[$i]->date_start && $object->lines[$i]->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
-		}
-		//print '>'.$outputlangs->charset_output.','.$period;
-		if(!empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){
-		    $libelleproduitservice.= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
-		}else{
-		$libelleproduitservice.="__N__".$period;
-		}
-		//print $libelleproduitservice;
-	}
-
-	if ($dbatch)
-	{
-		$format='day';
-		foreach ($dbatch as $detail)
-		{
-			$dte=array();
-			if ($detail->eatby) $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
-			if ($detail->sellby) $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
-			if ($detail->batch) $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
-			$dte[]=$outputlangs->transnoentitiesnoconv('printQty',$detail->qty);
-			$libelleproduitservice.= "__N__  ".implode(" - ", $dte);
-		}
-	}
-
-	// Now we convert \n into br
-	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
-	else $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
-	$libelleproduitservice=dol_htmlentitiesbr($libelleproduitservice,1);
-
-	return $libelleproduitservice;
+    global $db, $conf, $langs;
+
+    $idprod=(! empty($object->lines[$i]->fk_product)?$object->lines[$i]->fk_product:false);
+    $label=(! empty($object->lines[$i]->label)?$object->lines[$i]->label:(! empty($object->lines[$i]->product_label)?$object->lines[$i]->product_label:''));
+    $desc=(! empty($object->lines[$i]->desc)?$object->lines[$i]->desc:(! empty($object->lines[$i]->description)?$object->lines[$i]->description:''));
+    $ref_supplier=(! empty($object->lines[$i]->ref_supplier)?$object->lines[$i]->ref_supplier:(! empty($object->lines[$i]->ref_fourn)?$object->lines[$i]->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
+    $note=(! empty($object->lines[$i]->note)?$object->lines[$i]->note:'');
+    $dbatch=(! empty($object->lines[$i]->detail_batch)?$object->lines[$i]->detail_batch:false);
+
+    if ($issupplierline)
+    {
+        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+        $prodser = new ProductFournisseur($db);
+    }
+    else
+    {
+        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+        $prodser = new Product($db);
+    }
+
+    if ($idprod)
+    {
+        $prodser->fetch($idprod);
+        // If a predefined product and multilang and on other lang, we renamed label with label translated
+        if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
+        {
+            $translatealsoifmodified=(! empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED));	// By default if value was modified manually, we keep it (no translation because we don't have it)
+
+            // TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation
+            // ($textwasmodified is replaced with $textwasmodifiedorcompleted and we add completion).
+
+            // Set label
+            // If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
+            //var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
+            $textwasmodified=($label == $prodser->label);
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+
+            // Set desc
+            // Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
+            $textwasmodified=false;
+            if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
+                $textwasmodified=(strpos(dol_html_entity_decode($desc,ENT_QUOTES | ENT_HTML401),dol_html_entity_decode($prodser->description,ENT_QUOTES | ENT_HTML401))!==false);
+            } else {
+                $textwasmodified=($desc == $prodser->description);
+            }
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+
+            // Set note
+            $textwasmodified=($note == $prodser->note);
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+        }
+    }
+
+    // Description short of product line
+    $libelleproduitservice=$label;
+
+    // Description long of product line
+    if (! empty($desc) && ($desc != $label))
+    {
+        if ($libelleproduitservice && empty($hidedesc))
+        {
+            $libelleproduitservice.='__N__';
+        }
+
+        if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($object->lines[$i]->fk_remise_except);
+            $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
+        }
+        elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($object->lines[$i]->fk_remise_except);
+            $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref);
+            // Add date of deposit
+            if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+        }
+        if ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($object->lines[$i]->fk_remise_except);
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
+        }
+        elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($object->lines[$i]->fk_remise_except);
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
+        }
+        else
+        {
+            if ($idprod)
+            {
+                if (empty($hidedesc))
+                {
+                    if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
+                    {
+                        $libelleproduitservice=$desc."\n".$libelleproduitservice;
+                    }
+                    else
+                    {
+                        $libelleproduitservice.=$desc;
+                    }
+                }
+            }
+            else
+            {
+                $libelleproduitservice.=$desc;
+            }
+        }
+    }
+
+    // We add ref of product (and supplier ref if defined)
+    $prefix_prodserv = "";
+    $ref_prodserv = "";
+    if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
+    {
+        if ($prodser->isService())
+        {
+            $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
+        }
+        else
+        {
+            $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
+        }
+    }
+
+    if (empty($hideref))
+    {
+        if ($issupplierline)
+        {
+            if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
+                $ref_prodserv = $ref_supplier;
+            elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
+                $ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
+            else	// Common case
+            {
+                $ref_prodserv = $prodser->ref; // Show local ref
+                if ($ref_supplier) $ref_prodserv.= ($prodser->ref?' (':'').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref?')':'');
+            }
+        }
+        else
+        {
+            $ref_prodserv = $prodser->ref; // Show local ref only
+        }
+
+        if (! empty($libelleproduitservice) && ! empty($ref_prodserv)) $ref_prodserv .= " - ";
+    }
+
+    if(!empty($ref_prodserv) && !empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){ $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }
+    $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
+
+    // Add an additional description for the category products
+    if (! empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && ! empty($conf->categorie->enabled))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+        $categstatic=new Categorie($db);
+        // recovering the list of all the categories linked to product
+        $tblcateg=$categstatic->containing($idprod, Categorie::TYPE_PRODUCT);
+        foreach ($tblcateg as $cate)
+        {
+            // Adding the descriptions if they are filled
+            $desccateg=$cate->add_description;
+            if ($desccateg)
+                $libelleproduitservice.='__N__'.$desccateg;
+        }
+    }
+
+    if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end))
+    {
+        $format='day';
+        // Show duration if exists
+        if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs),dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
+        }
+        if ($object->lines[$i]->date_start && ! $object->lines[$i]->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs)).')';
+        }
+        if (! $object->lines[$i]->date_start && $object->lines[$i]->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
+        }
+        //print '>'.$outputlangs->charset_output.','.$period;
+        if(!empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){
+            $libelleproduitservice.= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
+        }else{
+        $libelleproduitservice.="__N__".$period;
+        }
+        //print $libelleproduitservice;
+    }
+
+    if ($dbatch)
+    {
+        $format='day';
+        foreach ($dbatch as $detail)
+        {
+            $dte=array();
+            if ($detail->eatby) $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
+            if ($detail->sellby) $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
+            if ($detail->batch) $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
+            $dte[]=$outputlangs->transnoentitiesnoconv('printQty',$detail->qty);
+            $libelleproduitservice.= "__N__  ".implode(" - ", $dte);
+        }
+    }
+
+    // Now we convert \n into br
+    if (dol_textishtml($libelleproduitservice)) $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
+    else $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
+    $libelleproduitservice=dol_htmlentitiesbr($libelleproduitservice,1);
+
+    return $libelleproduitservice;
 }
 
 /**
@@ -1424,25 +1424,25 @@ 
  */
 function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		$result.=dol_htmlentitiesbr($object->lines[$i]->num);
-	}
-	return $result;
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        $result.=dol_htmlentitiesbr($object->lines[$i]->num);
+    }
+    return $result;
 }
 
 
@@ -1457,25 +1457,25 @@ 
  */
 function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		$result.=dol_htmlentitiesbr($object->lines[$i]->product_ref);
-	}
-	return $result;
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        $result.=dol_htmlentitiesbr($object->lines[$i]->product_ref);
+    }
+    return $result;
 }
 
 /**
@@ -1489,25 +1489,25 @@ 
  */
 function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		$result.=dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
-	}
-	return $result;
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        $result.=dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
+    }
+    return $result;
 }
 
 /**
@@ -1521,52 +1521,52 @@ 
  */
 function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails=0)
 {
-	global $conf, $hookmanager, $mysoc;
-
-	$result='';
-	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1)
-		{
-			$tmpresult='';
-
-			$tmpresult.=vatrate($object->lines[$i]->tva_tx, 0, $object->lines[$i]->info_bits, -1);
-			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX))
-			{
-				if ($object->lines[$i]->total_localtax1 != 0)
-				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
-					$tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx), 0);
-				}
-			}
-			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX))
-			{
-				if ($object->lines[$i]->total_localtax2 != 0)
-				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
-					$tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx), 0);
-				}
-			}
-			$tmpresult.= '%';
-
-			$result.=$tmpresult;
-		}
-	}
-	return $result;
+    global $conf, $hookmanager, $mysoc;
+
+    $result='';
+    $reshook=0;
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if (empty($hidedetails) || $hidedetails > 1)
+        {
+            $tmpresult='';
+
+            $tmpresult.=vatrate($object->lines[$i]->tva_tx, 0, $object->lines[$i]->info_bits, -1);
+            if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX))
+            {
+                if ($object->lines[$i]->total_localtax1 != 0)
+                {
+                    if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
+                    else $tmpresult='';
+                    $tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx), 0);
+                }
+            }
+            if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX))
+            {
+                if ($object->lines[$i]->total_localtax2 != 0)
+                {
+                    if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
+                    else $tmpresult='';
+                    $tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx), 0);
+                }
+            }
+            $tmpresult.= '%';
+
+            $result.=$tmpresult;
+        }
+    }
+    return $result;
 }
 
 /**
@@ -1580,33 +1580,33 @@ 
  */
 function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $conf, $hookmanager;
-
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-	$result='';
-	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1)
-		{
-			$subprice = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
-			$result.=price($sign * $subprice, 0, $outputlangs);
-		}
-	}
-	return $result;
+    global $conf, $hookmanager;
+
+    $sign=1;
+    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+
+    $result='';
+    $reshook=0;
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if (empty($hidedetails) || $hidedetails > 1)
+        {
+            $subprice = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
+            $result.=price($sign * $subprice, 0, $outputlangs);
+        }
+    }
+    return $result;
 }
 
 /**
@@ -1620,29 +1620,29 @@ 
  */
 function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager,$conf;
-
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-	$result='';
-	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100), 0, $outputlangs);
-	}
-	return $result;
+    global $hookmanager,$conf;
+
+    $sign=1;
+    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+
+    $result='';
+    $reshook=0;
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100), 0, $outputlangs);
+    }
+    return $result;
 }
 
 /**
@@ -1656,27 +1656,27 @@ 
  */
 function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$result='';
-	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result=$hookmanager->resPrint;
-	}
+    global $hookmanager;
+
+    $result='';
+    $reshook=0;
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result=$hookmanager->resPrint;
+    }
     if (empty($reshook))
-	{
-	   if ($object->lines[$i]->special_code == 3) return '';
-	   if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty;
-	}
-	return $result;
+    {
+        if ($object->lines[$i]->special_code == 3) return '';
+        if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty;
+    }
+    return $result;
 }
 
 /**
@@ -1690,27 +1690,27 @@ 
  */
 function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
         if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_asked;
-	}
-	return $result;
+    }
+    return $result;
 }
 
 /**
@@ -1724,27 +1724,27 @@ 
  */
 function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_shipped;
-	}
-	return $result;
+        if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_shipped;
+    }
+    return $result;
 }
 
 /**
@@ -1758,27 +1758,27 @@ 
  */
 function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
+    global $hookmanager;
 
-	$reshook=0;
+    $reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
-	}
-	return $result;
+        if (empty($hidedetails) || $hidedetails > 1) $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+    }
+    return $result;
 }
 
 /**
@@ -1793,34 +1793,34 @@ 
  */
 function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = false)
 {
-	global $langs;
+    global $langs;
 
-	$reshook=0;
+    $reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		}
-		$parameters = array(
-			'i' => $i,
-			'outputlangs' => $outputlangs,
-			'hidedetails' => $hidedetails,
-			'special_code' => $special_code
-		);
-		$action = '';
-		$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (!empty($object->lines[$i]->fk_parent_line)) {
+            $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        }
+        $parameters = array(
+            'i' => $i,
+            'outputlangs' => $outputlangs,
+            'hidedetails' => $hidedetails,
+            'special_code' => $special_code
+        );
+        $action = '';
+        $reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
-	}
-	return $result;
+        if (empty($hidedetails) || $hidedetails > 1) $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+    }
+    return $result;
 }
 
 
@@ -1835,29 +1835,29 @@ 
  */
 function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    global $hookmanager;
+
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
-	}
-	return $result;
+        if (empty($hidedetails) || $hidedetails > 1) $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+    }
+    return $result;
 }
 
 /**
@@ -1872,41 +1872,41 @@ 
  */
 function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)
 {
-	if (empty($hookmanager)) global $hookmanager;
-	global $conf;
+    if (empty($hookmanager)) global $hookmanager;
+    global $conf;
 
-	$reshook=0;
+    $reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
-		$action = '';
-		$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-        	if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1)
-		{
-			if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
-			{
-				$prev_progress = 0;
-				if (method_exists($object, 'get_prev_progress'))
-				{
-			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-				}
-			 	$result = ($object->lines[$i]->situation_percent - $prev_progress) . '%';
-			}
-			else
-				$result = $object->lines[$i]->situation_percent . '%';
-	  	}
-	}
-	return $result;
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
+        $action = '';
+        $reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+            if ($object->lines[$i]->special_code == 3) return '';
+        if (empty($hidedetails) || $hidedetails > 1)
+        {
+            if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
+            {
+                $prev_progress = 0;
+                if (method_exists($object, 'get_prev_progress'))
+                {
+                        $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+                }
+                    $result = ($object->lines[$i]->situation_percent - $prev_progress) . '%';
+            }
+            else
+                $result = $object->lines[$i]->situation_percent . '%';
+            }
+    }
+    return $result;
 }
 
 /**
@@ -1920,49 +1920,49 @@ 
  */
 function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $conf, $hookmanager;
-
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code, 'sign'=>$sign);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
+    global $conf, $hookmanager;
+
+    $sign=1;
+    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code, 'sign'=>$sign);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
     if (empty($reshook))
     {
-	    if ($object->lines[$i]->special_code == 3)
-    	{
-    		return $outputlangs->transnoentities("Option");
-    	}
+        if ($object->lines[$i]->special_code == 3)
+        {
+            return $outputlangs->transnoentities("Option");
+        }
         if (empty($hidedetails) || $hidedetails > 1)
         {
-        	$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
-        	if ($object->lines[$i]->situation_percent > 0)
-        	{
-        		$prev_progress = 0;
-        		$progress = 1;
-        		if (method_exists($object->lines[$i], 'get_prev_progress'))
-        		{
-					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
-        		}
-				$result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
-        	}
-        	else
-			$result.=price($sign * $total_ht, 0, $outputlangs);
-	}
-    }
-	return $result;
+            $total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
+            if ($object->lines[$i]->situation_percent > 0)
+            {
+                $prev_progress = 0;
+                $progress = 1;
+                if (method_exists($object->lines[$i], 'get_prev_progress'))
+                {
+                    $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+                    $progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
+                }
+                $result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
+            }
+            else
+            $result.=price($sign * $total_ht, 0, $outputlangs);
+    }
+    }
+    return $result;
 }
 
 /**
@@ -1976,33 +1976,33 @@ 
  */
 function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager,$conf;
-
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if ($object->lines[$i]->special_code == 3)
-    	{
-    		$result.=$outputlangs->transnoentities("Option");
-    	}
-		elseif (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
-	}
-	return $result;
+    global $hookmanager,$conf;
+
+    $sign=1;
+    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if ($object->lines[$i]->special_code == 3)
+        {
+            $result.=$outputlangs->transnoentities("Option");
+        }
+        elseif (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+    }
+    return $result;
 }
 
 /**
@@ -2016,41 +2016,41 @@ 
  */
 function pdf_getTotalQty($object,$type,$outputlangs)
 {
-	global $hookmanager;
-
-	$total=0;
-	$nblignes=count($object->lines);
-
-	// Loop on each lines
-	for ($i = 0 ; $i < $nblignes ; $i++)
-	{
-		if ($object->lines[$i]->special_code != 3)
-		{
-			if ($type=='all')
-			{
-				$total += $object->lines[$i]->qty;
-			}
-			else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
-			{
-				$special_code = $object->lines[$i]->special_code;
-				if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-				$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-				$action='';
-				$reshook = $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-				return $hookmanager->resPrint;
-			}
-			else if ($type==0 && $object->lines[$i]->product_type == 0)
-			{
-				$total += $object->lines[$i]->qty;
-			}
-			else if ($type==1 && $object->lines[$i]->product_type == 1)
-			{
-				$total += $object->lines[$i]->qty;
-			}
-		}
-	}
-
-	return $total;
+    global $hookmanager;
+
+    $total=0;
+    $nblignes=count($object->lines);
+
+    // Loop on each lines
+    for ($i = 0 ; $i < $nblignes ; $i++)
+    {
+        if ($object->lines[$i]->special_code != 3)
+        {
+            if ($type=='all')
+            {
+                $total += $object->lines[$i]->qty;
+            }
+            else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+            {
+                $special_code = $object->lines[$i]->special_code;
+                if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+                $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+                $action='';
+                $reshook = $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+                return $hookmanager->resPrint;
+            }
+            else if ($type==0 && $object->lines[$i]->product_type == 0)
+            {
+                $total += $object->lines[$i]->qty;
+            }
+            else if ($type==1 && $object->lines[$i]->product_type == 1)
+            {
+                $total += $object->lines[$i]->qty;
+            }
+        }
+    }
+
+    return $total;
 }
 
 /**
@@ -2063,97 +2063,97 @@ 
  */
 function pdf_getLinkedObjects($object,$outputlangs)
 {
-	global $hookmanager;
-
-	$linkedobjects=array();
-
-	$object->fetchObjectLinked();
-
-	foreach($object->linkedObjects as $objecttype => $objects)
-	{
-	    if ($objecttype == 'facture')
-	    {
-	       // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
-	    }
-	    elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
-		{
-			$outputlangs->load('propal');
-
-			foreach($objects as $elementobject)
-			{
-				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
-				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
-			}
-		}
-		else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
-		{
-			$outputlangs->load('orders');
-			foreach($objects as $elementobject)
-			{
-				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref) . ($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '') . ($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');
-				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
-			}
-		}
-		else if ($objecttype == 'contrat')
-		{
-			$outputlangs->load('contracts');
-			foreach($objects as $elementobject)
-			{
-				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
-				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat,'day','',$outputlangs);
-			}
-		}
-		else if ($objecttype == 'shipping')
-		{
-			$outputlangs->loadLangs(array("orders", "sendings"));
-
-			foreach($objects as $x => $elementobject)
-			{
-			    $order=null;
-			    // We concat this record info into fields xxx_value. title is overwrote.
-			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
-			    {
-			        $elementobject->fetchObjectLinked();
-			        if (! empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);
-			    }
-			    if (! is_object($order))
-			    {
-			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-			        if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
-			        $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
-			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
-			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-			    }
-			    else
-			    {
-			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
-			        $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
-			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-			        //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
-			    }
-			}
-		}
-	}
-
-	// For add external linked objects
-	if (is_object($hookmanager))
-	{
-		$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
-		$action='';
-		$hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		if (! empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
-	}
-
-	return $linkedobjects;
+    global $hookmanager;
+
+    $linkedobjects=array();
+
+    $object->fetchObjectLinked();
+
+    foreach($object->linkedObjects as $objecttype => $objects)
+    {
+        if ($objecttype == 'facture')
+        {
+            // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
+        }
+        elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
+        {
+            $outputlangs->load('propal');
+
+            foreach($objects as $elementobject)
+            {
+                $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal");
+                $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
+                $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
+                $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
+            }
+        }
+        else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
+        {
+            $outputlangs->load('orders');
+            foreach($objects as $elementobject)
+            {
+                $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
+                $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref) . ($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '') . ($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');
+                $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
+                $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
+            }
+        }
+        else if ($objecttype == 'contrat')
+        {
+            $outputlangs->load('contracts');
+            foreach($objects as $elementobject)
+            {
+                $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
+                $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
+                $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
+                $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat,'day','',$outputlangs);
+            }
+        }
+        else if ($objecttype == 'shipping')
+        {
+            $outputlangs->loadLangs(array("orders", "sendings"));
+
+            foreach($objects as $x => $elementobject)
+            {
+                $order=null;
+                // We concat this record info into fields xxx_value. title is overwrote.
+                if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
+                {
+                    $elementobject->fetchObjectLinked();
+                    if (! empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);
+                }
+                if (! is_object($order))
+                {
+                    $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+                    if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
+                    $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
+                    //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
+                    //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
+                    //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+                }
+                else
+                {
+                    $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
+                    if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+                    $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
+                    //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
+                    //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+                    //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
+                }
+            }
+        }
+    }
+
+    // For add external linked objects
+    if (is_object($hookmanager))
+    {
+        $parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
+        $action='';
+        $hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        if (! empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
+    }
+
+    return $linkedobjects;
 }
 
 /**
@@ -2165,24 +2165,24 @@ 
  */
 function pdf_getSizeForImage($realpath)
 {
-	global $conf;
-
-	$maxwidth=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
-	$maxheight=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT)?32:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-	$tmp=dol_getImageSize($realpath);
-	if ($tmp['height'])
-	{
-		$width=(int) round($maxheight*$tmp['width']/$tmp['height']);	// I try to use maxheight
-		if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth
-		{
-			$width=$maxwidth;
-			$height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
-		}
-		else	// No pb with maxheight
-		{
-			$height=$maxheight;
-		}
-	}
-	return array('width'=>$width,'height'=>$height);
+    global $conf;
+
+    $maxwidth=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
+    $maxheight=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT)?32:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+    $tmp=dol_getImageSize($realpath);
+    if ($tmp['height'])
+    {
+        $width=(int) round($maxheight*$tmp['width']/$tmp['height']);	// I try to use maxheight
+        if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth
+        {
+            $width=$maxwidth;
+            $height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
+        }
+        else	// No pb with maxheight
+        {
+            $height=$maxheight;
+        }
+    }
+    return array('width'=>$width,'height'=>$height);
 }

Spacing +576 added lines, -576 removed lines

@@ -41,34 +41,34 @@ 
  */
 function pdf_getFormat(Translate $outputlangs = null)
 {
-	global $conf,$db;
+	global $conf, $db;
 
 	// Default value if setup was not done and/or entry into c_paper_format not defined
-	$width=210; $height=297; $unit='mm';
+	$width = 210; $height = 297; $unit = 'mm';
 
 	if (empty($conf->global->MAIN_PDF_FORMAT))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$pdfformat=dol_getDefaultFormat($outputlangs);
+		$pdfformat = dol_getDefaultFormat($outputlangs);
 	}
-	else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
+	else $pdfformat = $conf->global->MAIN_PDF_FORMAT;
 
-	$sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
-	$sql.=" WHERE code = '".$pdfformat."'";
-	$resql=$db->query($sql);
+	$sql = "SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
+	$sql .= " WHERE code = '".$pdfformat."'";
+	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$obj=$db->fetch_object($resql);
+		$obj = $db->fetch_object($resql);
 		if ($obj)
 		{
-			$width=(int) $obj->width;
-			$height=(int) $obj->height;
-			$unit=$obj->unit;
+			$width = (int) $obj->width;
+			$height = (int) $obj->height;
+			$unit = $obj->unit;
 		}
 	}
 
 	//print "pdfformat=".$pdfformat." width=".$width." height=".$height." unit=".$unit;
-	return array('width'=>$width,'height'=>$height,'unit'=>$unit);
+	return array('width'=>$width, 'height'=>$height, 'unit'=>$unit);
 }
 
 /**
@@ -79,14 +79,14 @@ 
  *      @param  string		$pagetype       'P' or 'l'
  *      @return TCPDF						PDF object
  */
-function pdf_getInstance($format='',$metric='mm',$pagetype='P')
+function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 {
 	global $conf;
 
 	// Define constant for TCPDF
-	if (! defined('K_TCPDF_EXTERNAL_CONFIG'))
+	if (!defined('K_TCPDF_EXTERNAL_CONFIG'))
 	{
-		define('K_TCPDF_EXTERNAL_CONFIG',1);	// this avoid using tcpdf_config file
+		define('K_TCPDF_EXTERNAL_CONFIG', 1); // this avoid using tcpdf_config file
 		define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
 		define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
 		dol_mkdir(K_PATH_CACHE);
@@ -113,7 +113,7 @@ 
 		define('HEAD_MAGNIFICATION', 1.1);
 		define('K_CELL_HEIGHT_RATIO', 1.25);
 		define('K_TITLE_MAGNIFICATION', 1.3);
-		define('K_SMALL_RATIO', 2/3);
+		define('K_SMALL_RATIO', 2 / 3);
 		define('K_THAI_TOPCHARS', true);
 		define('K_TCPDF_CALLS_IN_HTML', true);
 		define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
@@ -129,14 +129,14 @@ 
 	//$format=array($arrayformat['width'],$arrayformat['height']);
 	//$metric=$arrayformat['unit'];
 
-	$pdfa=false;											// PDF-1.3
-	if (! empty($conf->global->PDF_USE_1A)) $pdfa=true;		// PDF1/A
+	$pdfa = false; // PDF-1.3
+	if (!empty($conf->global->PDF_USE_1A)) $pdfa = true; // PDF1/A
 
-	if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
-	else $pdf = new TCPDF($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+	if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);
+	else $pdf = new TCPDF($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);
 
 	// Protection and encryption of pdf
-	if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
+	if (!empty($conf->global->PDF_SECURITY_ENCRYPTION))
 	{
 		/* Permission supported by TCPDF
 		- print : Print the document;
@@ -151,22 +151,22 @@ 
 		*/
 
 		// For TCPDF, we specify permission we want to block
-		$pdfrights = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true):array('modify','copy')); // Json format in llx_const
+		$pdfrights = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS) ?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true) : array('modify', 'copy')); // Json format in llx_const
 
 		// Password for the end user
-		$pdfuserpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_USERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_USERPASS:'');
+		$pdfuserpass = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_USERPASS) ? $conf->global->PDF_SECURITY_ENCRYPTION_USERPASS : '');
 
 		// Password of the owner, created randomly if not defined
-		$pdfownerpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS:null);
+		$pdfownerpass = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS) ? $conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS : null);
 
 		// For encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit
-		$encstrength = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH)?$conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH:0);
+		$encstrength = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH) ? $conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH : 0);
 
 		// Array of recipients containing public-key certificates ('c') and permissions ('p').
 		// For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
-		$pubkeys = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true):null); // Json format in llx_const
+		$pubkeys = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS) ?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true) : null); // Json format in llx_const
 
-		$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass,$encstrength,$pubkeys);
+		$pdf->SetProtection($pdfrights, $pdfuserpass, $pdfownerpass, $encstrength, $pubkeys);
 	}
 
 	return $pdf;
@@ -202,14 +202,14 @@ 
 {
 	global $conf;
 
-	if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
+	if (!empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
 
-	$font='Helvetica'; // By default, for FPDI, or ISO language on TCPDF
+	$font = 'Helvetica'; // By default, for FPDI, or ISO language on TCPDF
 	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
 	{
-		if ($outputlangs->trans('FONTFORPDF')!='FONTFORPDF')
+		if ($outputlangs->trans('FONTFORPDF') != 'FONTFORPDF')
 		{
-			$font=$outputlangs->trans('FONTFORPDF');
+			$font = $outputlangs->trans('FONTFORPDF');
 		}
 	}
 	return $font;
@@ -223,10 +223,10 @@ 
  */
 function pdf_getPDFFontSize($outputlangs)
 {
-	$size=10;                   // By default, for FPDI or ISO language on TCPDF
+	$size = 10; // By default, for FPDI or ISO language on TCPDF
 	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
 	{
-		if ($outputlangs->trans('FONTSIZEFORPDF')!='FONTSIZEFORPDF')
+		if ($outputlangs->trans('FONTSIZEFORPDF') != 'FONTSIZEFORPDF')
 		{
 			$size = (int) $outputlangs->trans('FONTSIZEFORPDF');
 		}
@@ -245,14 +245,14 @@ 
 function pdf_getHeightForLogo($logo, $url = false)
 {
 	global $conf;
-	$height=(empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT)?22:$conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
-	$maxwidth=130;
+	$height = (empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? 22 : $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
+	$maxwidth = 130;
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-	$tmp=dol_getImageSize($logo, $url);
+	$tmp = dol_getImageSize($logo, $url);
 	if ($tmp['height'])
 	{
-		$width=round($height*$tmp['width']/$tmp['height']);
-		if ($width > $maxwidth) $height=$height*$maxwidth/$width;
+		$width = round($height * $tmp['width'] / $tmp['height']);
+		if ($width > $maxwidth) $height = $height * $maxwidth / $width;
 	}
 	//print $tmp['width'].' '.$tmp['height'].' '.$width; exit;
 	return $height;
@@ -275,7 +275,7 @@ 
     //var_dump($start_y);
     $start_page = $pdf->getPage();
     // call printing functions with content
-    $pdf->writeHTMLCell(0, 0, 0, $start_y, $htmlcontent, 0, 1, false, true, 'J',true);
+    $pdf->writeHTMLCell(0, 0, 0, $start_y, $htmlcontent, 0, 1, false, true, 'J', true);
     // get the new Y
     $end_y = $pdf->GetY();
     $end_page = $pdf->getPage();
@@ -286,9 +286,9 @@ 
     }
     else
     {
-        for ($page=$start_page; $page <= $end_page; ++$page) {
+        for ($page = $start_page; $page <= $end_page; ++$page) {
         	$pdf->setPage($page);
-        	$tmpm=$pdf->getMargins();
+        	$tmpm = $pdf->getMargins();
         	$tMargin = $tmpm['top'];
         	if ($page == $start_page) {
         		// first page
@@ -316,7 +316,7 @@ 
  * @param   int                 $includealias   1=Include alias name after name
  * @return  string                              String with name of thirdparty (+ alias if requested)
  */
-function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includealias=0)
+function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includealias = 0)
 {
     global $conf;
 
@@ -325,7 +325,7 @@ 
 
 	if ($thirdparty instanceof Societe) {
 		$socname .= $thirdparty->name;
-		if (($includealias || ! empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
+		if (($includealias || !empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
 		    $socname .= "\n".$thirdparty->name_alias;
 		}
 	} elseif ($thirdparty instanceof Contact) {
@@ -350,28 +350,28 @@ 
  *      @param  Object      $object             Object we want to build document for
  * 		@return	string							String with full address
  */
-function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$targetcontact='',$usecontact=0,$mode='source',$object=null)
+function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $targetcontact = '', $usecontact = 0, $mode = 'source', $object = null)
 {
 	global $conf, $hookmanager;
 
-	if ($mode == 'source' && ! is_object($sourcecompany)) return -1;
-	if ($mode == 'target' && ! is_object($targetcompany)) return -1;
+	if ($mode == 'source' && !is_object($sourcecompany)) return -1;
+	if ($mode == 'target' && !is_object($targetcompany)) return -1;
 
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO deprecated
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state))       $sourcecompany->state=getState($sourcecompany->state_id);
-	if (! empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id))   $sourcecompany->departement_id=getState($sourcecompany->state_id,'2');
-	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id); //TODO deprecated
-	if (! empty($targetcompany->state_id) && empty($targetcompany->state))       $targetcompany->state=getState($targetcompany->state_id);
-	if (! empty($targetcompany->state_id) && !isset($targetcompany->departement_id))   $targetcompany->departement_id=getState($targetcompany->state_id,'2');
+	if (!empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement = getState($sourcecompany->state_id); //TODO deprecated
+	if (!empty($sourcecompany->state_id) && empty($sourcecompany->state))       $sourcecompany->state = getState($sourcecompany->state_id);
+	if (!empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id))   $sourcecompany->departement_id = getState($sourcecompany->state_id, '2');
+	if (!empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement = getState($targetcompany->state_id); //TODO deprecated
+	if (!empty($targetcompany->state_id) && empty($targetcompany->state))       $targetcompany->state = getState($targetcompany->state_id);
+	if (!empty($targetcompany->state_id) && !isset($targetcompany->departement_id))   $targetcompany->departement_id = getState($targetcompany->state_id, '2');
 
-	$reshook=0;
+	$reshook = 0;
 	$stringaddress = '';
 	if (is_object($hookmanager))
 	{
-		$parameters = array('sourcecompany'=>&$sourcecompany,'targetcompany'=>&$targetcompany,'targetcontact'=>$targetcontact,'outputlangs'=>$outputlangs,'mode'=>$mode,'usecontact'=>$usecontact);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_build_address',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$stringaddress.=$hookmanager->resPrint;
+		$parameters = array('sourcecompany'=>&$sourcecompany, 'targetcompany'=>&$targetcompany, 'targetcontact'=>$targetcontact, 'outputlangs'=>$outputlangs, 'mode'=>$mode, 'usecontact'=>$usecontact);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_build_address', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		$stringaddress .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
@@ -380,71 +380,71 @@ 
     		$withCountry = 0;
     		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
 
-    		$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
+    		$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
 
     		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
     		{
     			// Phone
-    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
     			// Fax
-    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
     			// EMail
-    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
     			// Web
-    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
     		}
     		// Intra VAT
-    		if (! empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
+    		if (!empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
     		{
-    			if ($sourcecompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+    			if ($sourcecompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
     		}
     		// Professionnal Ids
-    		if (! empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof1))
+    		if (!empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof1))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId1",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
     		}
-    		if (! empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof2))
+    		if (!empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof2))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId2",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId2", $sourcecompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
     		}
-    		if (! empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof3))
+    		if (!empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof3))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId3",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId3", $sourcecompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
     		}
-    		if (! empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof4))
+    		if (!empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof4))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId4",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId4", $sourcecompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
     		}
-    		if (! empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof5))
+    		if (!empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof5))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId5",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId5", $sourcecompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
     		}
-    		if (! empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof6))
+    		if (!empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof6))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId6",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId6", $sourcecompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
     		}
     	}
 
-    	if ($mode == 'target' || preg_match('/targetwithdetails/',$mode))
+    	if ($mode == 'target' || preg_match('/targetwithdetails/', $mode))
     	{
     		if ($usecontact)
     		{
-    			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1));
+    			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));
 
     			if (!empty($targetcontact->address)) {
-    				$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
+    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
     			} else {
     				$companytouseforaddress = $targetcompany;
 
@@ -455,73 +455,73 @@ 
 						$companytouseforaddress = $targetcontact->thirdparty;
 					}
 
-					$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
 				}
     			// Country
     			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
-    				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
+    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
     			}
     			else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
-    				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
     			}
 
-    			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
+    			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
     			{
     				// Phone
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
     			    {
-        				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-        				if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-        				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-        				if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+        				if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+        				if (!empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+        				if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
+        				if (!empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
     			    }
     				// Fax
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
     			    {
-                        if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+                        if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
     			    }
     				// EMail
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
     			    {
-                        if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+                        if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
     			    }
     				// Web
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
     			    {
-                        if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+                        if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
     			    }
     			}
     		}
     		else
     		{
-    			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
+    			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
     			// Country
-    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
 
-    			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
+    			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
     			{
     				// Phone
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
     			    {
-    			    	if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-	    				if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-    					if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-    					if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+    			    	if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+	    				if (!empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+    					if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
+    					if (!empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
     			    }
     				// Fax
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
     			    {
-    			    	if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+    			    	if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
     			    }
     				// EMail
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
     			    {
-    			    	if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+    			    	if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
     			    }
     				// Web
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
     			    {
-    			    	if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+    			    	if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
     			    }
     			}
     		}
@@ -529,57 +529,57 @@ 
     		// Intra VAT
     		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
     		{
-    			if ($targetcompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+    			if ($targetcompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
     		}
 
     		// Professionnal Ids
-    		if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
+    		if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
     		}
-    		if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
+    		if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
     		}
-    		if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
+    		if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
     		}
-    		if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
+    		if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4))
     		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
+    			$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);
+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
     		}
-    		if (! empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && ! empty($targetcompany->idprof5))
+    		if (!empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && !empty($targetcompany->idprof5))
     		{
-    		    $tmp=$outputlangs->transcountrynoentities("ProfId5",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
+    		    $tmp = $outputlangs->transcountrynoentities("ProfId5", $targetcompany->country_code);
+    		    if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    		    $stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
     		}
-    		if (! empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && ! empty($targetcompany->idprof6))
+    		if (!empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && !empty($targetcompany->idprof6))
     		{
-    		    $tmp=$outputlangs->transcountrynoentities("ProfId6",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
+    		    $tmp = $outputlangs->transcountrynoentities("ProfId6", $targetcompany->country_code);
+    		    if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+    		    $stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
     		}
 
     		// Public note
-    		if (! empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
+    		if (!empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
     		{
-    		    if ($mode == 'source' && ! empty($sourcecompany->note_public))
+    		    if ($mode == 'source' && !empty($sourcecompany->note_public))
         		{
-        		    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($sourcecompany->note_public);
+        		    $stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($sourcecompany->note_public);
         		}
-        		if (($mode == 'target' || preg_match('/targetwithdetails/',$mode)) && ! empty($targetcompany->note_public))
+        		if (($mode == 'target' || preg_match('/targetwithdetails/', $mode)) && !empty($targetcompany->note_public))
         		{
-        		    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($targetcompany->note_public);
+        		    $stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($targetcompany->note_public);
         		}
     		}
     	}
@@ -597,16 +597,16 @@ 
  * 		@param		int			$page_height	Height of page
  *      @return	void
  */
-function pdf_pagehead(&$pdf,$outputlangs,$page_height)
+function pdf_pagehead(&$pdf, $outputlangs, $page_height)
 {
 	global $conf;
 
 	// Add a background image on document
-	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
+	if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
 	{
-		$pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
-		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
-		$pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
+		$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
+		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);
+		$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
 	}
 }
 
@@ -620,11 +620,11 @@ 
  *	@param	int         $onlykey       1=Do not calculate some heavy values of keys (performance enhancement when we need only the keys), 2=Values are truncated and html sanitized (to use for help tooltip)
  *	@return	array						Array of substitutions
  */
-function pdf_getSubstitutionArray($outputlangs, $exclude=null, $object=null, $onlykey=0)
+function pdf_getSubstitutionArray($outputlangs, $exclude = null, $object = null, $onlykey = 0)
 {
     $substitutionarray = getCommonSubstitutionArray($outputlangs, $onlykey, $exclude, $object);
-    $substitutionarray['__FROM_NAME__']='__FROM_NAME__';
-    $substitutionarray['__FROM_EMAIL__']='__FROM_EMAIL__';
+    $substitutionarray['__FROM_NAME__'] = '__FROM_NAME__';
+    $substitutionarray['__FROM_EMAIL__'] = '__FROM_EMAIL__';
     return $substitutionarray;
 }
 
@@ -645,35 +645,35 @@ 
 	global $langs, $mysoc, $user;
 
 	// Print Draft Watermark
-	if ($unit=='pt') $k=1;
-	elseif ($unit=='mm') $k=72/25.4;
-	elseif ($unit=='cm') $k=72/2.54;
-	elseif ($unit=='in') $k=72;
+	if ($unit == 'pt') $k = 1;
+	elseif ($unit == 'mm') $k = 72 / 25.4;
+	elseif ($unit == 'cm') $k = 72 / 2.54;
+	elseif ($unit == 'in') $k = 72;
 
 	// Make substitution
-	$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, null);
+	$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, null);
 	complete_substitutions_array($substitutionarray, $outputlangs, null);
-	$text=make_substitutions($text, $substitutionarray, $outputlangs);
-	$text=$outputlangs->convToOutputCharset($text);
-
-	$savx=$pdf->getX(); $savy=$pdf->getY();
-
-	$watermark_angle=atan($h/$w)/2;
-	$watermark_x_pos=0;
-	$watermark_y_pos=$h/3;
-	$watermark_x=$w/2;
-	$watermark_y=$h/3;
-	$pdf->SetFont('','B',40);
-	$pdf->SetTextColor(255,192,203);
+	$text = make_substitutions($text, $substitutionarray, $outputlangs);
+	$text = $outputlangs->convToOutputCharset($text);
+
+	$savx = $pdf->getX(); $savy = $pdf->getY();
+
+	$watermark_angle = atan($h / $w) / 2;
+	$watermark_x_pos = 0;
+	$watermark_y_pos = $h / 3;
+	$watermark_x = $w / 2;
+	$watermark_y = $h / 3;
+	$pdf->SetFont('', 'B', 40);
+	$pdf->SetTextColor(255, 192, 203);
 	//rotate
-	$pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm',cos($watermark_angle),sin($watermark_angle),-sin($watermark_angle),cos($watermark_angle),$watermark_x*$k,($h-$watermark_y)*$k,-$watermark_x*$k,-($h-$watermark_y)*$k));
+	$pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm', cos($watermark_angle), sin($watermark_angle), -sin($watermark_angle), cos($watermark_angle), $watermark_x * $k, ($h - $watermark_y) * $k, -$watermark_x * $k, -($h - $watermark_y) * $k));
 	//print watermark
-	$pdf->SetXY($watermark_x_pos,$watermark_y_pos);
-	$pdf->Cell($w-20,25,$outputlangs->convToOutputCharset($text),"",2,"C",0);
+	$pdf->SetXY($watermark_x_pos, $watermark_y_pos);
+	$pdf->Cell($w - 20, 25, $outputlangs->convToOutputCharset($text), "", 2, "C", 0);
 	//antirotate
 	$pdf->_out('Q');
 
-	$pdf->SetXY($savx,$savy);
+	$pdf->SetXY($savx, $savy);
 }
 
 
@@ -689,43 +689,43 @@ 
  *  @param	int			$default_font_size		Default font size
  *  @return	float                               The Y PDF position
  */
-function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default_font_size=10)
+function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0, $default_font_size = 10)
 {
 	global $mysoc, $conf;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
 
-	$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-	$diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT);
+	$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+	$diffsizecontent = (empty($conf->global->PDF_DIFFSIZE_CONTENT) ? 4 : $conf->global->PDF_DIFFSIZE_CONTENT);
 	$pdf->SetXY($curx, $cury);
 
 	if (empty($onlynumber))
 	{
-		$pdf->SetFont('','B',$default_font_size - $diffsizetitle);
+		$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
-		$cury+=4;
+		$cury += 4;
 	}
 
 	$outputlangs->load("banks");
 
 	// Use correct name of bank id according to country
-	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+	$bickey = "BICNumber";
+	if ($account->getCountryCode() == 'IN') $bickey = "SWIFT";
 
 	// Get format of bank account according to its country
-	$usedetailedbban=$account->useDetailedBBAN();
+	$usedetailedbban = $account->useDetailedBBAN();
 
 	//$onlynumber=0; $usedetailedbban=1; // For tests
 	if ($usedetailedbban)
 	{
-		$savcurx=$curx;
+		$savcurx = $curx;
 
 		if (empty($onlynumber))
 		{
-			$pdf->SetFont('','',$default_font_size - $diffsizecontent);
+			$pdf->SetFont('', '', $default_font_size - $diffsizecontent);
 			$pdf->SetXY($curx, $cury);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
-			$cury+=3;
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+			$cury += 3;
 		}
 
 		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
@@ -735,13 +735,13 @@ 
 		    // desk = code guichet (FR), used only when $usedetailedbban = 1
 		    // number = account number
 		    // key = check control key used only when $usedetailedbban = 1
-    		if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+6);
+    		if (empty($onlynumber)) $pdf->line($curx + 1, $cury + 1, $curx + 1, $cury + 6);
 
 
 			foreach ($account->getFieldsToShow() as $val)
 			{
-				$pdf->SetXY($curx, $cury+4);
-				$pdf->SetFont('','',$default_font_size - 3);
+				$pdf->SetXY($curx, $cury + 4);
+				$pdf->SetFont('', '', $default_font_size - 3);
 
 				if ($val == 'BankCode') {
 					// Bank code
@@ -778,54 +778,54 @@ 
 				}
     		}
 
-    		$curx=$savcurx;
-    		$cury+=8;
+    		$curx = $savcurx;
+    		$cury += 8;
 		}
 	}
 	else
 	{
-		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
+		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
-		$cury+=3;
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+		$cury += 3;
 
-		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
+		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
-		$cury+=3;
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': '.$outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
+		$cury += 3;
 
-		if ($diffsizecontent <= 2) $cury+=1;
+		if ($diffsizecontent <= 2) $cury += 1;
 	}
 
-	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
+	$pdf->SetFont('', '', $default_font_size - $diffsizecontent);
 
-	if (empty($onlynumber) && ! empty($account->domiciliation))
+	if (empty($onlynumber) && !empty($account->domiciliation))
 	{
 		$pdf->SetXY($curx, $cury);
-		$val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation);
+		$val = $outputlangs->transnoentities("Residence").': '.$outputlangs->convToOutputCharset($account->domiciliation);
 		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
 		//$nboflines=dol_nboflines_bis($val,120);
 		//$cury+=($nboflines*3)+2;
-		$tmpy=$pdf->getStringHeight(100, $val);
-		$cury+=$tmpy;
+		$tmpy = $pdf->getStringHeight(100, $val);
+		$cury += $tmpy;
 	}
 
-	if (! empty($account->proprio))
+	if (!empty($account->proprio))
 	{
 		$pdf->SetXY($curx, $cury);
-		$val=$outputlangs->transnoentities("BankAccountOwner").': ' . $outputlangs->convToOutputCharset($account->proprio);
+		$val = $outputlangs->transnoentities("BankAccountOwner").': '.$outputlangs->convToOutputCharset($account->proprio);
 		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
-		$tmpy=$pdf->getStringHeight(100, $val);
-		$cury+=$tmpy;
-		$cur+=1;
+		$tmpy = $pdf->getStringHeight(100, $val);
+		$cury += $tmpy;
+		$cur += 1;
 	}
 
-	else if (! $usedetailedbban) $cury+=1;
+	else if (!$usedetailedbban) $cury += 1;
 
 	// Use correct name of bank id according to country
 	$ibankey = FormBank::getIBANLabel($account);
 
-	if (! empty($account->iban))
+	if (!empty($account->iban))
 	{
 		//Remove whitespaces to ensure we are dealing with the format we expect
 		$ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban));
@@ -835,20 +835,20 @@ 
 		for ($i = 0; $i < $nbIbanDisplay_temp; $i++)
 		{
 			$ibanDisplay .= $ibanDisplay_temp[$i];
-			if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
+			if ($i % 4 == 3 && $i > 0)	$ibanDisplay .= " ";
 		}
 
-		$pdf->SetFont('','B',$default_font_size - 3);
+		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
-		$cury+=3;
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': '.$ibanDisplay, 0, 'L', 0);
+		$cury += 3;
 	}
 
-	if (! empty($account->bic))
+	if (!empty($account->bic))
 	{
-		$pdf->SetFont('','B',$default_font_size - 3);
+		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': '.$outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
 	}
 
 	return $pdf->getY();
@@ -869,79 +869,79 @@ 
  *  @param	int			$hidefreetext	1=Hide free text, 0=Show free text
  * 	@return	int							Return height of bottom margin including footer text
  */
-function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_basse,$marge_gauche,$page_hauteur,$object,$showdetails=0,$hidefreetext=0)
+function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_basse, $marge_gauche, $page_hauteur, $object, $showdetails = 0, $hidefreetext = 0)
 {
-	global $conf,$user,$mysoc;
+	global $conf, $user, $mysoc;
 
 	$outputlangs->load("dict");
-	$line='';
+	$line = '';
 
-	$dims=$pdf->getPageDimensions();
+	$dims = $pdf->getPageDimensions();
 
 	// Line of free text
-	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
+	if (empty($hidefreetext) && !empty($conf->global->$paramfreetext))
 	{
-		$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+		$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 		// More substitution keys
-		$substitutionarray['__FROM_NAME__']=$fromcompany->name;
-		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
+		$substitutionarray['__FROM_NAME__'] = $fromcompany->name;
+		$substitutionarray['__FROM_EMAIL__'] = $fromcompany->email;
 		complete_substitutions_array($substitutionarray, $outputlangs, $object);
-		$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
+		$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
 
 		// Make a change into HTML code to allow to include images from medias directory.
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		// become
 		// <img alt="" src="'.DOL_DATA_ROOT.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-		$newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
+		$newfreetext = preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
 
-		$line.=$outputlangs->convToOutputCharset($newfreetext);
+		$line .= $outputlangs->convToOutputCharset($newfreetext);
 	}
 
 	// First line of company infos
-	$line1=""; $line2=""; $line3=""; $line4="";
+	$line1 = ""; $line2 = ""; $line3 = ""; $line4 = "";
 
 		if ($showdetails == 1 || $showdetails == 3)
 	{
 		// Company name
 		if ($fromcompany->name)
 		{
-			$line1.=($line1?" - ":"").$outputlangs->transnoentities("RegisteredOffice").": ".$fromcompany->name;
+			$line1 .= ($line1 ? " - " : "").$outputlangs->transnoentities("RegisteredOffice").": ".$fromcompany->name;
 		}
 		// Address
 		if ($fromcompany->address)
 		{
-			$line1.=($line1?" - ":"").str_replace("\n", ", ", $fromcompany->address);
+			$line1 .= ($line1 ? " - " : "").str_replace("\n", ", ", $fromcompany->address);
 		}
 		// Zip code
 		if ($fromcompany->zip)
 		{
-			$line1.=($line1?" - ":"").$fromcompany->zip;
+			$line1 .= ($line1 ? " - " : "").$fromcompany->zip;
 		}
 		// Town
 		if ($fromcompany->town)
 		{
-			$line1.=($line1?" ":"").$fromcompany->town;
+			$line1 .= ($line1 ? " " : "").$fromcompany->town;
 		}
 		// Phone
 		if ($fromcompany->phone)
 		{
-			$line2.=($line2?" - ":"").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone;
+			$line2 .= ($line2 ? " - " : "").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone;
 		}
 		// Fax
 		if ($fromcompany->fax)
 		{
-			$line2.=($line2?" - ":"").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
+			$line2 .= ($line2 ? " - " : "").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
 		}
 
 		// URL
 		if ($fromcompany->url)
 		{
-			$line2.=($line2?" - ":"").$fromcompany->url;
+			$line2 .= ($line2 ? " - " : "").$fromcompany->url;
 		}
 		// Email
 		if ($fromcompany->email)
 		{
-			$line2.=($line2?" - ":"").$fromcompany->email;
+			$line2 .= ($line2 ? " - " : "").$fromcompany->email;
 		}
 	}
 	if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE'))
@@ -949,7 +949,7 @@ 
 		// Managers
 		if ($fromcompany->managers)
 		{
-			$line2.=($line2?" - ":"").$fromcompany->managers;
+			$line2 .= ($line2 ? " - " : "").$fromcompany->managers;
 		}
 	}
 
@@ -957,144 +957,144 @@ 
 	// Juridical status
 	if ($fromcompany->forme_juridique_code)
 	{
-		$line3.=($line3?" - ":"").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
+		$line3 .= ($line3 ? " - " : "").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
 	}
 	// Capital
 	if ($fromcompany->capital)
 	{
 		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
-		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
-		else $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
+		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
+		else $line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", $tmpamounttoshow, $outputlangs);
 	}
 	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
+		$field = $outputlangs->transcountrynoentities("ProfId1", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line3 .= ($line3 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
 	}
 	// Prof Id 2
 	if ($fromcompany->idprof2)
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
+		$field = $outputlangs->transcountrynoentities("ProfId2", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line3 .= ($line3 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
 	}
 
 	// Line 4 of company infos
 	// Prof Id 3
 	if ($fromcompany->idprof3)
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
+		$field = $outputlangs->transcountrynoentities("ProfId3", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
 	}
 	// Prof Id 4
 	if ($fromcompany->idprof4)
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
+		$field = $outputlangs->transcountrynoentities("ProfId4", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
 	}
 	// Prof Id 5
 	if ($fromcompany->idprof5)
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId5",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
+		$field = $outputlangs->transcountrynoentities("ProfId5", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
 	}
 	// Prof Id 6
 	if ($fromcompany->idprof6)
 	{
-		$field=$outputlangs->transcountrynoentities("ProfId6",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
+		$field = $outputlangs->transcountrynoentities("ProfId6", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
 	}
 	// IntraCommunautary VAT
 	if ($fromcompany->tva_intra != '')
 	{
-		$line4.=($line4?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
+		$line4 .= ($line4 ? " - " : "").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
 	}
 
-	$pdf->SetFont('','',7);
-	$pdf->SetDrawColor(224,224,224);
+	$pdf->SetFont('', '', 7);
+	$pdf->SetDrawColor(224, 224, 224);
 
 	// The start of the bottom of this page footer is positioned according to # of lines
-	$freetextheight=0;
+	$freetextheight = 0;
 	if ($line)	// Free text
 	{
 		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
 	    if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 		{
-			$width=20000; $align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
-    		if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
-    			$width=200; $align='C';
+			$width = 20000; $align = 'L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
+    		if (!empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
+    			$width = 200; $align = 'C';
     		}
-		    $freetextheight=$pdf->getStringHeight($width,$line);
+		    $freetextheight = $pdf->getStringHeight($width, $line);
 		}
 		else
 		{
-            $freetextheight=pdfGetHeightForHtmlContent($pdf,dol_htmlentitiesbr($line, 1, 'UTF-8', 0));      // New method (works for HTML content)
+            $freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
             //print '<br>'.$freetextheight;exit;
 		}
 	}
 
-	$marginwithfooter=$marge_basse + $freetextheight + (! empty($line1)?3:0) + (! empty($line2)?3:0) + (! empty($line3)?3:0) + (! empty($line4)?3:0);
-	$posy=$marginwithfooter+0;
+	$marginwithfooter = $marge_basse + $freetextheight + (!empty($line1) ? 3 : 0) + (!empty($line2) ? 3 : 0) + (!empty($line3) ? 3 : 0) + (!empty($line4) ? 3 : 0);
+	$posy = $marginwithfooter + 0;
 
 	if ($line)	// Free text
 	{
-		$pdf->SetXY($dims['lm'],-$posy);
+		$pdf->SetXY($dims['lm'], -$posy);
 		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
 		{
             $pdf->MultiCell(0, 3, $line, 0, $align, 0);
 		}
 		else
 		{
-            $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk']-$marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
+            $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 		}
-		$posy-=$freetextheight;
+		$posy -= $freetextheight;
 	}
 
 	$pdf->SetY(-$posy);
-	$pdf->line($dims['lm'], $dims['hk']-$posy, $dims['wk']-$dims['rm'], $dims['hk']-$posy);
+	$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);
 	$posy--;
 
-	if (! empty($line1))
+	if (!empty($line1))
 	{
-		$pdf->SetFont('','B',7);
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line1, 0, 'C', 0);
-		$posy-=3;
-		$pdf->SetFont('','',7);
+		$pdf->SetFont('', 'B', 7);
+		$pdf->SetXY($dims['lm'], -$posy);
+		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line1, 0, 'C', 0);
+		$posy -= 3;
+		$pdf->SetFont('', '', 7);
 	}
 
-	if (! empty($line2))
+	if (!empty($line2))
 	{
-		$pdf->SetFont('','B',7);
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line2, 0, 'C', 0);
-		$posy-=3;
-		$pdf->SetFont('','',7);
+		$pdf->SetFont('', 'B', 7);
+		$pdf->SetXY($dims['lm'], -$posy);
+		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line2, 0, 'C', 0);
+		$posy -= 3;
+		$pdf->SetFont('', '', 7);
 	}
 
-	if (! empty($line3))
+	if (!empty($line3))
 	{
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line3, 0, 'C', 0);
+		$pdf->SetXY($dims['lm'], -$posy);
+		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line3, 0, 'C', 0);
 	}
 
-	if (! empty($line4))
+	if (!empty($line4))
 	{
-		$posy-=3;
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line4, 0, 'C', 0);
+		$posy -= 3;
+		$pdf->SetXY($dims['lm'], -$posy);
+		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line4, 0, 'C', 0);
 	}
 
 	// Show page nb only on iso languages (so default Helvetica font)
 	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica')
 	{
-		$pdf->SetXY($dims['wk']-$dims['rm']-15, -$posy);
+		$pdf->SetXY($dims['wk'] - $dims['rm'] - 15, -$posy);
 		//print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
 		$pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
 	}
@@ -1116,22 +1116,22 @@ 
  *	@param	string		$default_font_size	Font size
  *	@return	float                           The Y PDF position
  */
-function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$align,$default_font_size)
+function pdf_writeLinkedObjects(&$pdf, $object, $outputlangs, $posx, $posy, $w, $h, $align, $default_font_size)
 {
-	$linkedobjects = pdf_getLinkedObjects($object,$outputlangs);
-	if (! empty($linkedobjects))
+	$linkedobjects = pdf_getLinkedObjects($object, $outputlangs);
+	if (!empty($linkedobjects))
 	{
-		foreach($linkedobjects as $linkedobject)
+		foreach ($linkedobjects as $linkedobject)
 		{
 		    $reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
-		    if (! empty($linkedobject["date_value"]))
+		    if (!empty($linkedobject["date_value"]))
 		    {
 		        $reftoshow .= ' / '.$linkedobject["date_value"];
 		    }
 
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFont('','', $default_font_size - 2);
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->MultiCell($w, $h, $reftoshow, '', $align);
 		}
 	}
@@ -1155,29 +1155,29 @@ 
  * 	@param	int				$issupplierline		Is it a line for a supplier object ?
  * 	@return	string
  */
-function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hideref=0,$hidedesc=0,$issupplierline=0)
+function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $posy, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
 {
 	global $db, $conf, $langs, $hookmanager;
 
-	$reshook=0;
-	$result='';
+	$reshook = 0;
+	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
-		$action='';
-		$reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('pdf'=>$pdf, 'i'=>$i, 'outputlangs'=>$outputlangs, 'w'=>$w, 'h'=>$h, 'posx'=>$posx, 'posy'=>$posy, 'hideref'=>$hideref, 'hidedesc'=>$hidedesc, 'issupplierline'=>$issupplierline, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_writelinedesc', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		$labelproductservice=pdf_getlinedesc($object,$i,$outputlangs,$hideref,$hidedesc,$issupplierline);
+		$labelproductservice = pdf_getlinedesc($object, $i, $outputlangs, $hideref, $hidedesc, $issupplierline);
 		// Description
-		$pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J',true);
-		$result.=$labelproductservice;
+		$pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J', true);
+		$result .= $labelproductservice;
 	}
 	return $result;
 }
@@ -1193,16 +1193,16 @@ 
  *  @param  int			$issupplierline      Is it a line for a supplier object ?
  *  @return string       				     String with line
  */
-function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issupplierline=0)
+function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
 {
 	global $db, $conf, $langs;
 
-	$idprod=(! empty($object->lines[$i]->fk_product)?$object->lines[$i]->fk_product:false);
-	$label=(! empty($object->lines[$i]->label)?$object->lines[$i]->label:(! empty($object->lines[$i]->product_label)?$object->lines[$i]->product_label:''));
-	$desc=(! empty($object->lines[$i]->desc)?$object->lines[$i]->desc:(! empty($object->lines[$i]->description)?$object->lines[$i]->description:''));
-	$ref_supplier=(! empty($object->lines[$i]->ref_supplier)?$object->lines[$i]->ref_supplier:(! empty($object->lines[$i]->ref_fourn)?$object->lines[$i]->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
-	$note=(! empty($object->lines[$i]->note)?$object->lines[$i]->note:'');
-	$dbatch=(! empty($object->lines[$i]->detail_batch)?$object->lines[$i]->detail_batch:false);
+	$idprod = (!empty($object->lines[$i]->fk_product) ? $object->lines[$i]->fk_product : false);
+	$label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : (!empty($object->lines[$i]->product_label) ? $object->lines[$i]->product_label : ''));
+	$desc = (!empty($object->lines[$i]->desc) ? $object->lines[$i]->desc : (!empty($object->lines[$i]->description) ? $object->lines[$i]->description : ''));
+	$ref_supplier = (!empty($object->lines[$i]->ref_supplier) ? $object->lines[$i]->ref_supplier : (!empty($object->lines[$i]->ref_fourn) ? $object->lines[$i]->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders
+	$note = (!empty($object->lines[$i]->note) ? $object->lines[$i]->note : '');
+	$dbatch = (!empty($object->lines[$i]->detail_batch) ? $object->lines[$i]->detail_batch : false);
 
 	if ($issupplierline)
 	{
@@ -1219,9 +1219,9 @@ 
 	{
 		$prodser->fetch($idprod);
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
+		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
 		{
-			$translatealsoifmodified=(! empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED));	// By default if value was modified manually, we keep it (no translation because we don't have it)
+			$translatealsoifmodified = (!empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED)); // By default if value was modified manually, we keep it (no translation because we don't have it)
 
 			// TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation
 			// ($textwasmodified is replaced with $textwasmodifiedorcompleted and we add completion).
@@ -1229,63 +1229,63 @@ 
 			// Set label
 			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
 			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
-			$textwasmodified=($label == $prodser->label);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+			$textwasmodified = ($label == $prodser->label);
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
 
 			// Set desc
 			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
-			$textwasmodified=false;
+			$textwasmodified = false;
 			if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
-				$textwasmodified=(strpos(dol_html_entity_decode($desc,ENT_QUOTES | ENT_HTML401),dol_html_entity_decode($prodser->description,ENT_QUOTES | ENT_HTML401))!==false);
+				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML401), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML401)) !== false);
 			} else {
-				$textwasmodified=($desc == $prodser->description);
+				$textwasmodified = ($desc == $prodser->description);
 			}
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
 
 			// Set note
-			$textwasmodified=($note == $prodser->note);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+			$textwasmodified = ($note == $prodser->note);
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
 		}
 	}
 
 	// Description short of product line
-	$libelleproduitservice=$label;
+	$libelleproduitservice = $label;
 
 	// Description long of product line
-	if (! empty($desc) && ($desc != $label))
+	if (!empty($desc) && ($desc != $label))
 	{
 		if ($libelleproduitservice && empty($hidedesc))
 		{
-			$libelleproduitservice.='__N__';
+			$libelleproduitservice .= '__N__';
 		}
 
 		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)
 		{
-			$discount=new DiscountAbsolute($db);
+			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
 		}
 		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
 		{
-			$discount=new DiscountAbsolute($db);
+			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref);
+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
-			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
 		}
 		if ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
 		{
-			$discount=new DiscountAbsolute($db);
+			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
 		}
 		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
 		{
-			$discount=new DiscountAbsolute($db);
+			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
 		}
 		else
 		{
@@ -1295,17 +1295,17 @@ 
 				{
 					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
 					{
-						$libelleproduitservice=$desc."\n".$libelleproduitservice;
+						$libelleproduitservice = $desc."\n".$libelleproduitservice;
 					}
 					else
 					{
-						$libelleproduitservice.=$desc;
+						$libelleproduitservice .= $desc;
 					}
 				}
 			}
 			else
 			{
-				$libelleproduitservice.=$desc;
+				$libelleproduitservice .= $desc;
 			}
 		}
 	}
@@ -1313,7 +1313,7 @@ 
 	// We add ref of product (and supplier ref if defined)
 	$prefix_prodserv = "";
 	$ref_prodserv = "";
-	if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
+	if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
 	{
 		if ($prodser->isService())
 		{
@@ -1332,11 +1332,11 @@ 
 			if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
 				$ref_prodserv = $ref_supplier;
 			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
-				$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
+				$ref_prodserv = $ref_supplier.' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
 			else	// Common case
 			{
 				$ref_prodserv = $prodser->ref; // Show local ref
-				if ($ref_supplier) $ref_prodserv.= ($prodser->ref?' (':'').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref?')':'');
+				if ($ref_supplier) $ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');
 			}
 		}
 		else
@@ -1344,71 +1344,71 @@ 
 			$ref_prodserv = $prodser->ref; // Show local ref only
 		}
 
-		if (! empty($libelleproduitservice) && ! empty($ref_prodserv)) $ref_prodserv .= " - ";
+		if (!empty($libelleproduitservice) && !empty($ref_prodserv)) $ref_prodserv .= " - ";
 	}
 
-	if(!empty($ref_prodserv) && !empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){ $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }
-	$libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
+	if (!empty($ref_prodserv) && !empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)) { $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }
+	$libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;
 
 	// Add an additional description for the category products
-	if (! empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && ! empty($conf->categorie->enabled))
+	if (!empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && !empty($conf->categorie->enabled))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$categstatic=new Categorie($db);
+		$categstatic = new Categorie($db);
 		// recovering the list of all the categories linked to product
-		$tblcateg=$categstatic->containing($idprod, Categorie::TYPE_PRODUCT);
+		$tblcateg = $categstatic->containing($idprod, Categorie::TYPE_PRODUCT);
 		foreach ($tblcateg as $cate)
 		{
 			// Adding the descriptions if they are filled
-			$desccateg=$cate->add_description;
+			$desccateg = $cate->add_description;
 			if ($desccateg)
-				$libelleproduitservice.='__N__'.$desccateg;
+				$libelleproduitservice .= '__N__'.$desccateg;
 		}
 	}
 
-	if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end))
+	if (!empty($object->lines[$i]->date_start) || !empty($object->lines[$i]->date_end))
 	{
-		$format='day';
+		$format = 'day';
 		// Show duration if exists
 		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
 		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs),dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
+			$period = '('.$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs), dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
 		}
-		if ($object->lines[$i]->date_start && ! $object->lines[$i]->date_end)
+		if ($object->lines[$i]->date_start && !$object->lines[$i]->date_end)
 		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs)).')';
+			$period = '('.$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs)).')';
 		}
-		if (! $object->lines[$i]->date_start && $object->lines[$i]->date_end)
+		if (!$object->lines[$i]->date_start && $object->lines[$i]->date_end)
 		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
+			$period = '('.$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
 		}
 		//print '>'.$outputlangs->charset_output.','.$period;
-		if(!empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){
-		    $libelleproduitservice.= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
-		}else{
-		$libelleproduitservice.="__N__".$period;
+		if (!empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)) {
+		    $libelleproduitservice .= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
+		} else {
+		$libelleproduitservice .= "__N__".$period;
 		}
 		//print $libelleproduitservice;
 	}
 
 	if ($dbatch)
 	{
-		$format='day';
+		$format = 'day';
 		foreach ($dbatch as $detail)
 		{
-			$dte=array();
-			if ($detail->eatby) $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
-			if ($detail->sellby) $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
-			if ($detail->batch) $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
-			$dte[]=$outputlangs->transnoentitiesnoconv('printQty',$detail->qty);
-			$libelleproduitservice.= "__N__  ".implode(" - ", $dte);
+			$dte = array();
+			if ($detail->eatby) $dte[] = $outputlangs->transnoentitiesnoconv('printEatby', dol_print_date($detail->eatby, $format, false, $outputlangs));
+			if ($detail->sellby) $dte[] = $outputlangs->transnoentitiesnoconv('printSellby', dol_print_date($detail->sellby, $format, false, $outputlangs));
+			if ($detail->batch) $dte[] = $outputlangs->transnoentitiesnoconv('printBatch', $detail->batch);
+			$dte[] = $outputlangs->transnoentitiesnoconv('printQty', $detail->qty);
+			$libelleproduitservice .= "__N__  ".implode(" - ", $dte);
 		}
 	}
 
 	// Now we convert \n into br
-	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
-	else $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
-	$libelleproduitservice=dol_htmlentitiesbr($libelleproduitservice,1);
+	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice = preg_replace('/__N__/', '<br>', $libelleproduitservice);
+	else $libelleproduitservice = preg_replace('/__N__/', "\n", $libelleproduitservice);
+	$libelleproduitservice = dol_htmlentitiesbr($libelleproduitservice, 1);
 
 	return $libelleproduitservice;
 }
@@ -1422,25 +1422,25 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlinenum($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	$reshook=0;
-	$result='';
+	$reshook = 0;
+	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$result.=$hookmanager->resPrint;
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlinenum', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		$result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		$result.=dol_htmlentitiesbr($object->lines[$i]->num);
+		$result .= dol_htmlentitiesbr($object->lines[$i]->num);
 	}
 	return $result;
 }
@@ -1455,25 +1455,25 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineref($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	$reshook=0;
-	$result='';
+	$reshook = 0;
+	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$result.=$hookmanager->resPrint;
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineref', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		$result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		$result.=dol_htmlentitiesbr($object->lines[$i]->product_ref);
+		$result .= dol_htmlentitiesbr($object->lines[$i]->product_ref);
 	}
 	return $result;
 }
@@ -1487,25 +1487,25 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineref_supplier($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	$reshook=0;
-	$result='';
+	$reshook = 0;
+	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$result.=$hookmanager->resPrint;
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		$result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		$result.=dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
+		$result .= dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
 	}
 	return $result;
 }
@@ -1519,51 +1519,51 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails=0)
+function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $conf, $hookmanager, $mysoc;
 
-	$result='';
-	$reshook=0;
+	$result = '';
+	$reshook = 0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
 		if (empty($hidedetails) || $hidedetails > 1)
 		{
-			$tmpresult='';
+			$tmpresult = '';
 
-			$tmpresult.=vatrate($object->lines[$i]->tva_tx, 0, $object->lines[$i]->info_bits, -1);
+			$tmpresult .= vatrate($object->lines[$i]->tva_tx, 0, $object->lines[$i]->info_bits, -1);
 			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX))
 			{
 				if ($object->lines[$i]->total_localtax1 != 0)
 				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
-					$tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx), 0);
+					if (preg_replace('/[\s0%]/', '', $tmpresult)) $tmpresult .= '/';
+					else $tmpresult = '';
+					$tmpresult .= vatrate(abs($object->lines[$i]->localtax1_tx), 0);
 				}
 			}
 			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX))
 			{
 				if ($object->lines[$i]->total_localtax2 != 0)
 				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
-					$tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx), 0);
+					if (preg_replace('/[\s0%]/', '', $tmpresult)) $tmpresult .= '/';
+					else $tmpresult = '';
+					$tmpresult .= vatrate(abs($object->lines[$i]->localtax2_tx), 0);
 				}
 			}
-			$tmpresult.= '%';
+			$tmpresult .= '%';
 
-			$result.=$tmpresult;
+			$result .= $tmpresult;
 		}
 	}
 	return $result;
@@ -1578,32 +1578,32 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $conf, $hookmanager;
 
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	$sign = 1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
-	$result='';
-	$reshook=0;
+	$result = '';
+	$reshook = 0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
 		if (empty($hidedetails) || $hidedetails > 1)
 		{
 			$subprice = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
-			$result.=price($sign * $subprice, 0, $outputlangs);
+			$result .= price($sign * $subprice, 0, $outputlangs);
 		}
 	}
 	return $result;
@@ -1618,29 +1618,29 @@ 
  *  @param	int			$hidedetails		Hide value (0 = no,	1 = yes, 2 = just special lines)
  *  @return	string
  */
-function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineupwithtax($object, $i, $outputlangs, $hidedetails = 0)
 {
-	global $hookmanager,$conf;
+	global $hookmanager, $conf;
 
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	$sign = 1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
-	$result='';
-	$reshook=0;
+	$result = '';
+	$reshook = 0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100), 0, $outputlangs);
+		if (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice) * ($object->lines[$i]->tva_tx) / 100), 0, $outputlangs);
 	}
 	return $result;
 }
@@ -1654,27 +1654,27 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  *  @return	string
  */
-function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineqty($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	$result='';
-	$reshook=0;
+	$result = '';
+	$reshook = 0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineqty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result = $hookmanager->resPrint;
 	}
     if (empty($reshook))
 	{
 	   if ($object->lines[$i]->special_code == 3) return '';
-	   if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty;
+	   if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty;
 	}
 	return $result;
 }
@@ -1688,27 +1688,27 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineqty_asked($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	$reshook=0;
-	$result='';
+	$reshook = 0;
+	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-        if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_asked;
+        if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_asked;
 	}
 	return $result;
 }
@@ -1722,27 +1722,27 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineqty_shipped($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	$reshook=0;
-	$result='';
+	$reshook = 0;
+	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_shipped;
+	    if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_shipped;
 	}
 	return $result;
 }
@@ -1756,27 +1756,27 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
-	$reshook=0;
-    $result='';
+	$reshook = 0;
+    $result = '';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+		if (empty($hidedetails) || $hidedetails > 1) $result .= ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
 	}
 	return $result;
 }
@@ -1795,8 +1795,8 @@ 
 {
 	global $langs;
 
-	$reshook=0;
-    $result='';
+	$reshook = 0;
+    $result = '';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
@@ -1811,14 +1811,14 @@ 
 			'special_code' => $special_code
 		);
 		$action = '';
-		$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+	    if (empty($hidedetails) || $hidedetails > 1) $result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
 	}
 	return $result;
 }
@@ -1833,29 +1833,29 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
-function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $hookmanager;
 
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-	$reshook=0;
-	$result='';
+	$reshook = 0;
+	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+	    if (empty($hidedetails) || $hidedetails > 1) $result .= dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);
 	}
 	return $result;
 }
@@ -1875,8 +1875,8 @@ 
 	if (empty($hookmanager)) global $hookmanager;
 	global $conf;
 
-	$reshook=0;
-    $result='';
+	$reshook = 0;
+    $result = '';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
@@ -1884,9 +1884,9 @@ 
 		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
-		$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
@@ -1900,10 +1900,10 @@ 
 				{
 			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 				}
-			 	$result = ($object->lines[$i]->situation_percent - $prev_progress) . '%';
+			 	$result = ($object->lines[$i]->situation_percent - $prev_progress).'%';
 			}
 			else
-				$result = $object->lines[$i]->situation_percent . '%';
+				$result = $object->lines[$i]->situation_percent.'%';
 	  	}
 	}
 	return $result;
@@ -1918,25 +1918,25 @@ 
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string							Return total of line excl tax
  */
-function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $conf, $hookmanager;
 
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	$sign = 1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
-	$reshook=0;
-	$result='';
+	$reshook = 0;
+	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code, 'sign'=>$sign);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code, 'sign'=>$sign);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
     if (empty($reshook))
     {
@@ -1956,10 +1956,10 @@ 
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
         		}
-				$result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
+				$result .= price($sign * ($total_ht / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
         	}
         	else
-			$result.=price($sign * $total_ht, 0, $outputlangs);
+			$result .= price($sign * $total_ht, 0, $outputlangs);
 	}
     }
 	return $result;
@@ -1974,33 +1974,33 @@ 
  *  @param	int			$hidedetails		Hide value (0 = no, 1 = yes, 2 = just special lines)
  *  @return	string							Return total of line incl tax
  */
-function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
+function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 {
-	global $hookmanager,$conf;
+	global $hookmanager, $conf;
 
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	$sign = 1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
-	$reshook=0;
-	$result='';
+	$reshook = 0;
+	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
 		if ($object->lines[$i]->special_code == 3)
     	{
-    		$result.=$outputlangs->transnoentities("Option");
+    		$result .= $outputlangs->transnoentities("Option");
     	}
-		elseif (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+		elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
 	}
 	return $result;
 }
@@ -2014,36 +2014,36 @@ 
  * 	@return	integer
  *  @deprecated Not used by Dolibarr core, so will be removed.
  */
-function pdf_getTotalQty($object,$type,$outputlangs)
+function pdf_getTotalQty($object, $type, $outputlangs)
 {
 	global $hookmanager;
 
-	$total=0;
-	$nblignes=count($object->lines);
+	$total = 0;
+	$nblignes = count($object->lines);
 
 	// Loop on each lines
-	for ($i = 0 ; $i < $nblignes ; $i++)
+	for ($i = 0; $i < $nblignes; $i++)
 	{
 		if ($object->lines[$i]->special_code != 3)
 		{
-			if ($type=='all')
+			if ($type == 'all')
 			{
 				$total += $object->lines[$i]->qty;
 			}
-			else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+			else if ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 			{
 				$special_code = $object->lines[$i]->special_code;
-				if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-				$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-				$action='';
-				$reshook = $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+				$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+				$action = '';
+				$reshook = $hookmanager->executeHooks('pdf_getTotalQty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				return $hookmanager->resPrint;
 			}
-			else if ($type==0 && $object->lines[$i]->product_type == 0)
+			else if ($type == 0 && $object->lines[$i]->product_type == 0)
 			{
 				$total += $object->lines[$i]->qty;
 			}
-			else if ($type==1 && $object->lines[$i]->product_type == 1)
+			else if ($type == 1 && $object->lines[$i]->product_type == 1)
 			{
 				$total += $object->lines[$i]->qty;
 			}
@@ -2061,15 +2061,15 @@ 
  * 	@param	Translate	$outputlangs	Object lang for output
  * 	@return	array                       Linked objects
  */
-function pdf_getLinkedObjects($object,$outputlangs)
+function pdf_getLinkedObjects($object, $outputlangs)
 {
 	global $hookmanager;
 
-	$linkedobjects=array();
+	$linkedobjects = array();
 
 	$object->fetchObjectLinked();
 
-	foreach($object->linkedObjects as $objecttype => $objects)
+	foreach ($object->linkedObjects as $objecttype => $objects)
 	{
 	    if ($objecttype == 'facture')
 	    {
@@ -2079,63 +2079,63 @@ 
 		{
 			$outputlangs->load('propal');
 
-			foreach($objects as $elementobject)
+			foreach ($objects as $elementobject)
 			{
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal");
 				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
+				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
 		}
 		else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
 		{
 			$outputlangs->load('orders');
-			foreach($objects as $elementobject)
+			foreach ($objects as $elementobject)
 			{
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref) . ($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '') . ($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');
+				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
+				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
 		}
 		else if ($objecttype == 'contrat')
 		{
 			$outputlangs->load('contracts');
-			foreach($objects as $elementobject)
+			foreach ($objects as $elementobject)
 			{
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
 				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat,'day','',$outputlangs);
+				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs);
 			}
 		}
 		else if ($objecttype == 'shipping')
 		{
 			$outputlangs->loadLangs(array("orders", "sendings"));
 
-			foreach($objects as $x => $elementobject)
+			foreach ($objects as $x => $elementobject)
 			{
-			    $order=null;
+			    $order = null;
 			    // We concat this record info into fields xxx_value. title is overwrote.
 			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
 			    {
 			        $elementobject->fetchObjectLinked();
-			        if (! empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);
+			        if (!empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);
 			    }
-			    if (! is_object($order))
+			    if (!is_object($order))
 			    {
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-			        if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
-			        $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
+			        if (!empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
+			        $linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
 			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
 			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
 			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
 			    }
 			    else
 			    {
-			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
-			        $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
+			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
+			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
+			        $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
 			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
 			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
 			        //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
@@ -2148,9 +2148,9 @@ 
 	if (is_object($hookmanager))
 	{
 		$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
-		$action='';
-		$hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		if (! empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
+		$action = '';
+		$hookmanager->executeHooks('pdf_getLinkedObjects', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		if (!empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
 	}
 
 	return $linkedobjects;
@@ -2167,22 +2167,22 @@ 
 {
 	global $conf;
 
-	$maxwidth=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
-	$maxheight=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT)?32:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
+	$maxwidth = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
+	$maxheight = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT) ? 32 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-	$tmp=dol_getImageSize($realpath);
+	$tmp = dol_getImageSize($realpath);
 	if ($tmp['height'])
 	{
-		$width=(int) round($maxheight*$tmp['width']/$tmp['height']);	// I try to use maxheight
+		$width = (int) round($maxheight * $tmp['width'] / $tmp['height']); // I try to use maxheight
 		if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth
 		{
-			$width=$maxwidth;
-			$height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
+			$width = $maxwidth;
+			$height = (int) round($maxwidth * $tmp['height'] / $tmp['width']);
 		}
 		else	// No pb with maxheight
 		{
-			$height=$maxheight;
+			$height = $maxheight;
 		}
 	}
-	return array('width'=>$width,'height'=>$height);
+	return array('width'=>$width, 'height'=>$height);
 }

Braces +510 added lines, -221 removed lines

@@ -50,8 +50,9 @@ 
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$pdfformat=dol_getDefaultFormat($outputlangs);
+	} else {
+	    $pdfformat=$conf->global->MAIN_PDF_FORMAT;
 	}
-	else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
 
 	$sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
 	$sql.=" WHERE code = '".$pdfformat."'";
@@ -123,17 +124,25 @@ 
 	require_once TCPDF_PATH.'tcpdf.php';
 
 	// We need to instantiate tcpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
-	if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
+	if (empty($conf->global->MAIN_DISABLE_TCPDI)) {
+	    require_once TCPDI_PATH.'tcpdi.php';
+	}
 
 	//$arrayformat=pdf_getFormat();
 	//$format=array($arrayformat['width'],$arrayformat['height']);
 	//$metric=$arrayformat['unit'];
 
 	$pdfa=false;											// PDF-1.3
-	if (! empty($conf->global->PDF_USE_1A)) $pdfa=true;		// PDF1/A
+	if (! empty($conf->global->PDF_USE_1A)) {
+	    $pdfa=true;
+	}
+	// PDF1/A
 
-	if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
-	else $pdf = new TCPDF($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+	if (class_exists('TCPDI')) {
+	    $pdf = new TCPDI($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+	} else {
+	    $pdf = new TCPDF($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+	}
 
 	// Protection and encryption of pdf
 	if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
@@ -202,14 +211,18 @@ 
 {
 	global $conf;
 
-	if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
+	if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) {
+	    return $conf->global->MAIN_PDF_FORCE_FONT;
+	}
 
 	$font='Helvetica'; // By default, for FPDI, or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
+	if (class_exists('TCPDF')) {
+	    // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
 	{
 		if ($outputlangs->trans('FONTFORPDF')!='FONTFORPDF')
 		{
 			$font=$outputlangs->trans('FONTFORPDF');
+	}
 		}
 	}
 	return $font;
@@ -224,11 +237,13 @@ 
 function pdf_getPDFFontSize($outputlangs)
 {
 	$size=10;                   // By default, for FPDI or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
+	if (class_exists('TCPDF')) {
+	    // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
 	{
 		if ($outputlangs->trans('FONTSIZEFORPDF')!='FONTSIZEFORPDF')
 		{
 			$size = (int) $outputlangs->trans('FONTSIZEFORPDF');
+	}
 		}
 	}
 	return $size;
@@ -252,7 +267,9 @@ 
 	if ($tmp['height'])
 	{
 		$width=round($height*$tmp['width']/$tmp['height']);
-		if ($width > $maxwidth) $height=$height*$maxwidth/$width;
+		if ($width > $maxwidth) {
+		    $height=$height*$maxwidth/$width;
+		}
 	}
 	//print $tmp['width'].' '.$tmp['height'].' '.$width; exit;
 	return $height;
@@ -283,8 +300,7 @@ 
     $height = 0;
     if ($end_page == $start_page) {
         $height = $end_y - $start_y;
-    }
-    else
+    } else
     {
         for ($page=$start_page; $page <= $end_page; ++$page) {
         	$pdf->setPage($page);
@@ -354,15 +370,33 @@ 
 {
 	global $conf, $hookmanager;
 
-	if ($mode == 'source' && ! is_object($sourcecompany)) return -1;
-	if ($mode == 'target' && ! is_object($targetcompany)) return -1;
+	if ($mode == 'source' && ! is_object($sourcecompany)) {
+	    return -1;
+	}
+	if ($mode == 'target' && ! is_object($targetcompany)) {
+	    return -1;
+	}
 
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO deprecated
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state))       $sourcecompany->state=getState($sourcecompany->state_id);
-	if (! empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id))   $sourcecompany->departement_id=getState($sourcecompany->state_id,'2');
-	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id); //TODO deprecated
-	if (! empty($targetcompany->state_id) && empty($targetcompany->state))       $targetcompany->state=getState($targetcompany->state_id);
-	if (! empty($targetcompany->state_id) && !isset($targetcompany->departement_id))   $targetcompany->departement_id=getState($targetcompany->state_id,'2');
+	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) {
+	    $sourcecompany->departement=getState($sourcecompany->state_id);
+	}
+	//TODO deprecated
+	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state)) {
+	    $sourcecompany->state=getState($sourcecompany->state_id);
+	}
+	if (! empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id)) {
+	    $sourcecompany->departement_id=getState($sourcecompany->state_id,'2');
+	}
+	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) {
+	    $targetcompany->departement=getState($targetcompany->state_id);
+	}
+	//TODO deprecated
+	if (! empty($targetcompany->state_id) && empty($targetcompany->state)) {
+	    $targetcompany->state=getState($targetcompany->state_id);
+	}
+	if (! empty($targetcompany->state_id) && !isset($targetcompany->departement_id)) {
+	    $targetcompany->departement_id=getState($targetcompany->state_id,'2');
+	}
 
 	$reshook=0;
 	$stringaddress = '';
@@ -378,61 +412,85 @@ 
     	if ($mode == 'source')
     	{
     		$withCountry = 0;
-    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
+    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+    		    $withCountry = 1;
+    		}
 
     		$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
 
     		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
     		{
     			// Phone
-    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+    			if ($sourcecompany->phone) {
+    			    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+    			}
     			// Fax
-    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+    			if ($sourcecompany->fax) {
+    			    $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+    			}
     			// EMail
-    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+    			if ($sourcecompany->email) {
+    			    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+    			}
     			// Web
-    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+    			if ($sourcecompany->url) {
+    			    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+    			}
     		}
     		// Intra VAT
     		if (! empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
     		{
-    			if ($sourcecompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+    			if ($sourcecompany->tva_intra) {
+    			    $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+    			}
     		}
     		// Professionnal Ids
     		if (! empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof1))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId1",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
     		}
     		if (! empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof2))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId2",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
     		}
     		if (! empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof3))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId3",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
     		}
     		if (! empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof4))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId4",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
     		}
     		if (! empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof5))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId5",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
     		}
     		if (! empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof6))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId6",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
     		}
     	}
@@ -460,8 +518,7 @@ 
     			// Country
     			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
     				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
-    			}
-    			else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+    			} else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
     				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
     			}
 
@@ -470,58 +527,87 @@ 
     				// Phone
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
     			    {
-        				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-        				if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-        				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-        				if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+        				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) {
+        				    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+        				}
+        				if (! empty($targetcontact->phone_pro)) {
+        				    $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+        				}
+        				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) {
+        				    $stringaddress .= " / ";
+        				}
+        				if (! empty($targetcontact->phone_mobile)) {
+        				    $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+        				}
     			    }
     				// Fax
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
     			    {
-                        if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+                        if ($targetcontact->fax) {
+                            $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+                        }
     			    }
     				// EMail
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
     			    {
-                        if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+                        if ($targetcontact->email) {
+                            $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+                        }
     			    }
     				// Web
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
     			    {
-                        if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+                        if ($targetcontact->url) {
+                            $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+                        }
     			    }
     			}
-    		}
-    		else
+    		} else
     		{
     			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
     			// Country
-    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) {
+    			    $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+    			}
 
     			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
     			{
     				// Phone
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
     			    {
-    			    	if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-	    				if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-    					if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-    					if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+    			    	if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) {
+    			    	    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+    			    	}
+	    				if (! empty($targetcompany->phone)) {
+	    				    $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+	    				}
+    					if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) {
+    					    $stringaddress .= " / ";
+    					}
+    					if (! empty($targetcompany->phone_mobile)) {
+    					    $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+    					}
     			    }
     				// Fax
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
     			    {
-    			    	if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+    			    	if ($targetcompany->fax) {
+    			    	    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+    			    	}
     			    }
     				// EMail
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
     			    {
-    			    	if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+    			    	if ($targetcompany->email) {
+    			    	    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+    			    	}
     			    }
     				// Web
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
     			    {
-    			    	if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+    			    	if ($targetcompany->url) {
+    			    	    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+    			    	}
     			    }
     			}
     		}
@@ -529,44 +615,58 @@ 
     		// Intra VAT
     		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
     		{
-    			if ($targetcompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+    			if ($targetcompany->tva_intra) {
+    			    $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+    			}
     		}
 
     		// Professionnal Ids
     		if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
     		}
     		if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
     		}
     		if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
     		}
     		if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
     		}
     		if (! empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && ! empty($targetcompany->idprof5))
     		{
     		    $tmp=$outputlangs->transcountrynoentities("ProfId5",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    		        $tmp=$reg[1];
+    		    }
     		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
     		}
     		if (! empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && ! empty($targetcompany->idprof6))
     		{
     		    $tmp=$outputlangs->transcountrynoentities("ProfId6",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    		        $tmp=$reg[1];
+    		    }
     		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
     		}
 
@@ -602,9 +702,12 @@ 
 	global $conf;
 
 	// Add a background image on document
-	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
+	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) {
+	    // Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
 	{
-		$pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
+		$pdf->SetAutoPageBreak(0,0);
+	}
+	// Disable auto pagebreak before adding image
 		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
 		$pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
 	}
@@ -645,10 +748,15 @@ 
 	global $langs, $mysoc, $user;
 
 	// Print Draft Watermark
-	if ($unit=='pt') $k=1;
-	elseif ($unit=='mm') $k=72/25.4;
-	elseif ($unit=='cm') $k=72/2.54;
-	elseif ($unit=='in') $k=72;
+	if ($unit=='pt') {
+	    $k=1;
+	} elseif ($unit=='mm') {
+	    $k=72/25.4;
+	} elseif ($unit=='cm') {
+	    $k=72/2.54;
+	} elseif ($unit=='in') {
+	    $k=72;
+	}
 
 	// Make substitution
 	$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, null);
@@ -710,7 +818,9 @@ 
 
 	// Use correct name of bank id according to country
 	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+	if ($account->getCountryCode() == 'IN') {
+	    $bickey="SWIFT";
+	}
 
 	// Get format of bank account according to its country
 	$usedetailedbban=$account->useDetailedBBAN();
@@ -728,7 +838,8 @@ 
 			$cury+=3;
 		}
 
-		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
+		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN)) {
+		    // Note that some countries still need bank number, BIC/IBAN not enougth for them
 		{
 		    // Note:
 		    // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
@@ -736,6 +847,7 @@ 
 		    // number = account number
 		    // key = check control key used only when $usedetailedbban = 1
     		if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+6);
+		}
 
 
 			foreach ($account->getFieldsToShow() as $val)
@@ -759,7 +871,7 @@ 
 					// Key
 					$tmplength = 15;
 					$content = $account->cle_rib;
-				}elseif ($val == 'IBAN' || $val == 'BIC') {
+				} elseif ($val == 'IBAN' || $val == 'BIC') {
 					// Key
 					$tmplength = 0;
 					$content = '';
@@ -781,8 +893,7 @@ 
     		$curx=$savcurx;
     		$cury+=8;
 		}
-	}
-	else
+	} else
 	{
 		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
@@ -794,7 +905,9 @@ 
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
 		$cury+=3;
 
-		if ($diffsizecontent <= 2) $cury+=1;
+		if ($diffsizecontent <= 2) {
+		    $cury+=1;
+		}
 	}
 
 	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
@@ -818,10 +931,10 @@ 
 		$tmpy=$pdf->getStringHeight(100, $val);
 		$cury+=$tmpy;
 		$cur+=1;
+	} else if (! $usedetailedbban) {
+	    $cury+=1;
 	}
 
-	else if (! $usedetailedbban) $cury+=1;
-
 	// Use correct name of bank id according to country
 	$ibankey = FormBank::getIBANLabel($account);
 
@@ -835,7 +948,9 @@ 
 		for ($i = 0; $i < $nbIbanDisplay_temp; $i++)
 		{
 			$ibanDisplay .= $ibanDisplay_temp[$i];
-			if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
+			if($i%4 == 3 && $i > 0) {
+			    $ibanDisplay .= " ";
+			}
 		}
 
 		$pdf->SetFont('','B',$default_font_size - 3);
@@ -963,21 +1078,28 @@ 
 	if ($fromcompany->capital)
 	{
 		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
-		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
-		else $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
+		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) {
+		    $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
+		} else {
+		    $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
+		}
 	}
 	// Prof Id 1
 	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
 	}
 	// Prof Id 2
 	if ($fromcompany->idprof2)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
 	}
 
@@ -986,28 +1108,36 @@ 
 	if ($fromcompany->idprof3)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
 	}
 	// Prof Id 4
 	if ($fromcompany->idprof4)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
 	}
 	// Prof Id 5
 	if ($fromcompany->idprof5)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId5",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
 	}
 	// Prof Id 6
 	if ($fromcompany->idprof6)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId6",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
 	}
 	// IntraCommunautary VAT
@@ -1021,18 +1151,20 @@ 
 
 	// The start of the bottom of this page footer is positioned according to # of lines
 	$freetextheight=0;
-	if ($line)	// Free text
+	if ($line) {
+	    // Free text
 	{
 		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
 	    if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 		{
-			$width=20000; $align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
+			$width=20000;
+	}
+	$align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
     		if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
     			$width=200; $align='C';
     		}
 		    $freetextheight=$pdf->getStringHeight($width,$line);
-		}
-		else
+		} else
 		{
             $freetextheight=pdfGetHeightForHtmlContent($pdf,dol_htmlentitiesbr($line, 1, 'UTF-8', 0));      // New method (works for HTML content)
             //print '<br>'.$freetextheight;exit;
@@ -1042,14 +1174,17 @@ 
 	$marginwithfooter=$marge_basse + $freetextheight + (! empty($line1)?3:0) + (! empty($line2)?3:0) + (! empty($line3)?3:0) + (! empty($line4)?3:0);
 	$posy=$marginwithfooter+0;
 
-	if ($line)	// Free text
+	if ($line) {
+	    // Free text
 	{
 		$pdf->SetXY($dims['lm'],-$posy);
-		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
+	}
+		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+		    // by default
 		{
             $pdf->MultiCell(0, 3, $line, 0, $align, 0);
 		}
-		else
+		} else
 		{
             $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk']-$marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 		}
@@ -1162,15 +1297,21 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
 		$action='';
 		$reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
@@ -1208,8 +1349,7 @@ 
 	{
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$prodser = new ProductFournisseur($db);
-	}
-	else
+	} else
 	{
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
@@ -1230,7 +1370,9 @@ 
 			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
 			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
 			$textwasmodified=($label == $prodser->label);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified)) {
+			    $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+			}
 
 			// Set desc
 			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
@@ -1240,11 +1382,15 @@ 
 			} else {
 				$textwasmodified=($desc == $prodser->description);
 			}
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified)) {
+			    $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+			}
 
 			// Set note
 			$textwasmodified=($note == $prodser->note);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified)) {
+			    $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+			}
 		}
 	}
 
@@ -1265,29 +1411,28 @@ 
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref);
 			// Add date of deposit
-			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+			    echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+			}
 		}
 		if ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
-		}
-		else
+		} else
 		{
 			if ($idprod)
 			{
@@ -1296,14 +1441,12 @@ 
 					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
 					{
 						$libelleproduitservice=$desc."\n".$libelleproduitservice;
-					}
-					else
+					} else
 					{
 						$libelleproduitservice.=$desc;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$libelleproduitservice.=$desc;
 			}
@@ -1313,13 +1456,14 @@ 
 	// We add ref of product (and supplier ref if defined)
 	$prefix_prodserv = "";
 	$ref_prodserv = "";
-	if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
+	if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) {
+	    // In standard mode, we do not show this
 	{
 		if ($prodser->isService())
 		{
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-		}
-		else
+	}
+		} else
 		{
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 		}
@@ -1329,22 +1473,25 @@ 
 	{
 		if ($issupplierline)
 		{
-			if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
-				$ref_prodserv = $ref_supplier;
-			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
-				$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
-			else	// Common case
+			if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1) {
+							$ref_prodserv = $ref_supplier;
+			} elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2) {
+							$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
+			} else	// Common case
 			{
 				$ref_prodserv = $prodser->ref; // Show local ref
-				if ($ref_supplier) $ref_prodserv.= ($prodser->ref?' (':'').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref?')':'');
+				if ($ref_supplier) {
+				    $ref_prodserv.= ($prodser->ref?' (':'').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref?')':'');
+				}
 			}
-		}
-		else
+		} else
 		{
 			$ref_prodserv = $prodser->ref; // Show local ref only
 		}
 
-		if (! empty($libelleproduitservice) && ! empty($ref_prodserv)) $ref_prodserv .= " - ";
+		if (! empty($libelleproduitservice) && ! empty($ref_prodserv)) {
+		    $ref_prodserv .= " - ";
+		}
 	}
 
 	if(!empty($ref_prodserv) && !empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){ $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }
@@ -1361,8 +1508,9 @@ 
 		{
 			// Adding the descriptions if they are filled
 			$desccateg=$cate->add_description;
-			if ($desccateg)
-				$libelleproduitservice.='__N__'.$desccateg;
+			if ($desccateg) {
+							$libelleproduitservice.='__N__'.$desccateg;
+			}
 		}
 	}
 
@@ -1385,7 +1533,7 @@ 
 		//print '>'.$outputlangs->charset_output.','.$period;
 		if(!empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){
 		    $libelleproduitservice.= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
-		}else{
+		} else{
 		$libelleproduitservice.="__N__".$period;
 		}
 		//print $libelleproduitservice;
@@ -1397,17 +1545,26 @@ 
 		foreach ($dbatch as $detail)
 		{
 			$dte=array();
-			if ($detail->eatby) $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
-			if ($detail->sellby) $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
-			if ($detail->batch) $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
+			if ($detail->eatby) {
+			    $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
+			}
+			if ($detail->sellby) {
+			    $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
+			}
+			if ($detail->batch) {
+			    $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
+			}
 			$dte[]=$outputlangs->transnoentitiesnoconv('printQty',$detail->qty);
 			$libelleproduitservice.= "__N__  ".implode(" - ", $dte);
 		}
 	}
 
 	// Now we convert \n into br
-	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
-	else $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
+	if (dol_textishtml($libelleproduitservice)) {
+	    $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
+	} else {
+	    $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
+	}
 	$libelleproduitservice=dol_htmlentitiesbr($libelleproduitservice,1);
 
 	return $libelleproduitservice;
@@ -1429,10 +1586,14 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1462,10 +1623,14 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1494,10 +1659,14 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1526,15 +1695,21 @@ 
 	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
@@ -1547,8 +1722,11 @@ 
 			{
 				if ($object->lines[$i]->total_localtax1 != 0)
 				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
+					if (preg_replace('/[\s0%]/','',$tmpresult)) {
+					    $tmpresult.='/';
+					} else {
+					    $tmpresult='';
+					}
 					$tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx), 0);
 				}
 			}
@@ -1556,8 +1734,11 @@ 
 			{
 				if ($object->lines[$i]->total_localtax2 != 0)
 				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
+					if (preg_replace('/[\s0%]/','',$tmpresult)) {
+					    $tmpresult.='/';
+					} else {
+					    $tmpresult='';
+					}
 					$tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx), 0);
 				}
 			}
@@ -1583,20 +1764,28 @@ 
 	global $conf, $hookmanager;
 
 	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	    $sign=-1;
+	}
 
 	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
@@ -1623,24 +1812,34 @@ 
 	global $hookmanager,$conf;
 
 	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	    $sign=-1;
+	}
 
 	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-		if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100), 0, $outputlangs);
+		if (empty($hidedetails) || $hidedetails > 1) {
+		    $result.=price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100), 0, $outputlangs);
+		}
 	}
 	return $result;
 }
@@ -1661,20 +1860,30 @@ 
 	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result=$hookmanager->resPrint;
+		}
 	}
     if (empty($reshook))
 	{
-	   if ($object->lines[$i]->special_code == 3) return '';
-	   if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty;
+	   if ($object->lines[$i]->special_code == 3) {
+	       return '';
+	   }
+	   if (empty($hidedetails) || $hidedetails > 1) {
+	       $result.=$object->lines[$i]->qty;
+	   }
 	}
 	return $result;
 }
@@ -1695,20 +1904,30 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-        if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_asked;
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+        if (empty($hidedetails) || $hidedetails > 1) {
+            $result.=$object->lines[$i]->qty_asked;
+        }
 	}
 	return $result;
 }
@@ -1729,20 +1948,30 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_shipped;
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+	    if (empty($hidedetails) || $hidedetails > 1) {
+	        $result.=$object->lines[$i]->qty_shipped;
+	    }
 	}
 	return $result;
 }
@@ -1763,20 +1992,30 @@ 
 	$reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+		if (empty($hidedetails) || $hidedetails > 1) {
+		    $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+		}
 	}
 	return $result;
 }
@@ -1798,9 +2037,11 @@ 
 	$reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
+	}
 		if (!empty($object->lines[$i]->fk_parent_line)) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
@@ -1813,12 +2054,18 @@ 
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+	    if (empty($hidedetails) || $hidedetails > 1) {
+	        $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+	    }
 	}
 	return $result;
 }
@@ -1842,20 +2089,30 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+	    if (empty($hidedetails) || $hidedetails > 1) {
+	        $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+	    }
 	}
 	return $result;
 }
@@ -1872,25 +2129,35 @@ 
  */
 function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)
 {
-	if (empty($hookmanager)) global $hookmanager;
+	if (empty($hookmanager)) {
+	    global $hookmanager;
+	}
 	global $conf;
 
 	$reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    return $hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        	if ($object->lines[$i]->special_code == 3) return '';
+        	if ($object->lines[$i]->special_code == 3) {
+        	    return '';
+        	}
 		if (empty($hidedetails) || $hidedetails > 1)
 		{
 			if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
@@ -1901,9 +2168,9 @@ 
 			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 				}
 			 	$result = ($object->lines[$i]->situation_percent - $prev_progress) . '%';
+			} else {
+							$result = $object->lines[$i]->situation_percent . '%';
 			}
-			else
-				$result = $object->lines[$i]->situation_percent . '%';
 	  	}
 	}
 	return $result;
@@ -1923,20 +2190,28 @@ 
 	global $conf, $hookmanager;
 
 	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	    $sign=-1;
+	}
 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code, 'sign'=>$sign);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
     if (empty($reshook))
     {
@@ -1957,9 +2232,9 @@ 
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
         		}
 				$result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
+        	} else {
+        				$result.=price($sign * $total_ht, 0, $outputlangs);
         	}
-        	else
-			$result.=price($sign * $total_ht, 0, $outputlangs);
 	}
     }
 	return $result;
@@ -1979,28 +2254,37 @@ 
 	global $hookmanager,$conf;
 
 	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	    $sign=-1;
+	}
 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
 		if ($object->lines[$i]->special_code == 3)
     	{
     		$result.=$outputlangs->transnoentities("Option");
-    	}
-		elseif (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+    	} elseif (empty($hidedetails) || $hidedetails > 1) {
+		    $result.=price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+		}
 	}
 	return $result;
 }
@@ -2029,21 +2313,20 @@ 
 			if ($type=='all')
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+			} else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
 			{
 				$special_code = $object->lines[$i]->special_code;
-				if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+				if (! empty($object->lines[$i]->fk_parent_line)) {
+				    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+				}
 				$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 				$action='';
 				$reshook = $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 				return $hookmanager->resPrint;
-			}
-			else if ($type==0 && $object->lines[$i]->product_type == 0)
+			} else if ($type==0 && $object->lines[$i]->product_type == 0)
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			else if ($type==1 && $object->lines[$i]->product_type == 1)
+			} else if ($type==1 && $object->lines[$i]->product_type == 1)
 			{
 				$total += $object->lines[$i]->qty;
 			}
@@ -2074,8 +2357,7 @@ 
 	    if ($objecttype == 'facture')
 	    {
 	       // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
-	    }
-	    elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
+	    } elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
 		{
 			$outputlangs->load('propal');
 
@@ -2086,8 +2368,7 @@ 
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
 			}
-		}
-		else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
+		} else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
 		{
 			$outputlangs->load('orders');
 			foreach($objects as $elementobject)
@@ -2097,8 +2378,7 @@ 
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
 			}
-		}
-		else if ($objecttype == 'contrat')
+		} else if ($objecttype == 'contrat')
 		{
 			$outputlangs->load('contracts');
 			foreach($objects as $elementobject)
@@ -2108,8 +2388,7 @@ 
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat,'day','',$outputlangs);
 			}
-		}
-		else if ($objecttype == 'shipping')
+		} else if ($objecttype == 'shipping')
 		{
 			$outputlangs->loadLangs(array("orders", "sendings"));
 
@@ -2117,24 +2396,31 @@ 
 			{
 			    $order=null;
 			    // We concat this record info into fields xxx_value. title is overwrote.
-			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
+			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {
+			        // There is not already a link to order and object is not the order, so we show also info with order
 			    {
 			        $elementobject->fetchObjectLinked();
-			        if (! empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);
+			    }
+			        if (! empty($elementobject->linkedObjects['commande'])) {
+			            $order = reset($elementobject->linkedObjects['commande']);
+			        }
 			    }
 			    if (! is_object($order))
 			    {
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-			        if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
+			        if (! empty($linkedobjects[$objecttype]['ref_value'])) {
+			            $linkedobjects[$objecttype]['ref_value'].=' / ';
+			        }
 			        $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
 			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
 			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
 			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-			    }
-			    else
+			    } else
 			    {
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+			        if (empty($linkedobjects[$objecttype]['ref_value'])) {
+			            $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+			        }
 			        $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
 			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
 			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
@@ -2150,7 +2436,9 @@ 
 		$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
 		$action='';
 		$hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		if (! empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
+		if (! empty($hookmanager->resArray)) {
+		    $linkedobjects = $hookmanager->resArray;
+		}
 	}
 
 	return $linkedobjects;
@@ -2174,12 +2462,13 @@ 
 	if ($tmp['height'])
 	{
 		$width=(int) round($maxheight*$tmp['width']/$tmp['height']);	// I try to use maxheight
-		if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth
+		if ($width > $maxwidth) {
+		    // Pb with maxheight, so i use maxwidth
 		{
 			$width=$maxwidth;
-			$height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
 		}
-		else	// No pb with maxheight
+			$height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
+		} else	// No pb with maxheight
 		{
 			$height=$maxheight;
 		}

dolibarr/htdocs/core/lib/price.lib.php

Indentation +248 added lines, -248 removed lines

@@ -84,330 +84,330 @@
  */
 function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array='', $progress=100, $multicurrency_tx=1, $pu_devise=0)
 {
-	global $conf,$mysoc,$db;
-
-	$result=array();
-
-	// Clean parameters
-	if (empty($info_bits)) $info_bits=0;
-	if (empty($txtva)) $txtva=0;
-	if (empty($seller) || ! is_object($seller))
-	{
-		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
-		if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
-		{
-			$mysoc=new Societe($db);
-			$mysoc->setMysoc($conf);
-		}
-		$seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
-		//var_dump($seller->country_id);exit;
-	}
-	if (empty($localtaxes_array) || ! is_array($localtaxes_array))
-	{
-		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
-	}
-	// Too verbose. Enable for debug only
-	//dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
-
-	$countryid=$seller->country_id;
-
-	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
-	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
-
-	if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
-
-	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
-	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
+    global $conf,$mysoc,$db;
+
+    $result=array();
+
+    // Clean parameters
+    if (empty($info_bits)) $info_bits=0;
+    if (empty($txtva)) $txtva=0;
+    if (empty($seller) || ! is_object($seller))
+    {
+        dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
+        if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
+        {
+            $mysoc=new Societe($db);
+            $mysoc->setMysoc($conf);
+        }
+        $seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
+        //var_dump($seller->country_id);exit;
+    }
+    if (empty($localtaxes_array) || ! is_array($localtaxes_array))
+    {
+        dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
+    }
+    // Too verbose. Enable for debug only
+    //dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
+
+    $countryid=$seller->country_id;
+
+    if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
+    if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
+
+    if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
+    if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
+
+    //var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
+    dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
 
     // Now we search localtaxes information ourself (rates and types).
-	$localtax1_type=0;
-	$localtax2_type=0;
-
-	if (is_array($localtaxes_array))
-	{
-		$localtax1_type = $localtaxes_array[0];
-		$localtax1_rate = $localtaxes_array[1];
-		$localtax2_type = $localtaxes_array[2];
-		$localtax2_rate = $localtaxes_array[3];
-	}
-	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
-	{
-		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
-		$sql.= " WHERE cv.taux = ".$txtva;
-		$sql.= " AND cv.fk_pays = ".$countryid;
-		dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				$localtax1_rate=$obj->localtax1;
-				$localtax2_rate=$obj->localtax2;
-				$localtax1_type=$obj->localtax1_type;
-				$localtax2_type=$obj->localtax2_type;
-				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
-			}
-		}
-		else dol_print_error($db);
-	}
-
-	// pu calculation from pu_devise if pu empty
-	if (empty($pu) && !empty($pu_devise)) {
-		if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else
-		{
-			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
-			return array();
-		}
-	}
-	if ($pu === '') $pu=0;
-	// pu_devise calculation from pu
-	if (empty($pu_devise) && !empty($multicurrency_tx)) {
-		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else
-		{
-			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
-			return array();
-		}
-	}
-
-	// initialize total (may be HT or TTC depending on price_base_type)
-	$tot_sans_remise = $pu * $qty * $progress / 100;
-	$tot_avec_remise_ligne = $tot_sans_remise       * (1 - ($remise_percent_ligne / 100));
-	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
-
-	// initialize result array
-	for ($i=0; $i <= 15; $i++) $result[$i] = 0;
-
-	// if there's some localtax including vat, we calculate localtaxes (we will add later)
+    $localtax1_type=0;
+    $localtax2_type=0;
+
+    if (is_array($localtaxes_array))
+    {
+        $localtax1_type = $localtaxes_array[0];
+        $localtax1_rate = $localtaxes_array[1];
+        $localtax2_type = $localtaxes_array[2];
+        $localtax2_rate = $localtaxes_array[3];
+    }
+    else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
+    {
+        $sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
+        $sql.= " WHERE cv.taux = ".$txtva;
+        $sql.= " AND cv.fk_pays = ".$countryid;
+        dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj)
+            {
+                $localtax1_rate=$obj->localtax1;
+                $localtax2_rate=$obj->localtax2;
+                $localtax1_type=$obj->localtax1_type;
+                $localtax2_type=$obj->localtax2_type;
+                //var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
+            }
+        }
+        else dol_print_error($db);
+    }
+
+    // pu calculation from pu_devise if pu empty
+    if (empty($pu) && !empty($pu_devise)) {
+        if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
+        else
+        {
+            dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
+            return array();
+        }
+    }
+    if ($pu === '') $pu=0;
+    // pu_devise calculation from pu
+    if (empty($pu_devise) && !empty($multicurrency_tx)) {
+        if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
+        else
+        {
+            dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
+            return array();
+        }
+    }
+
+    // initialize total (may be HT or TTC depending on price_base_type)
+    $tot_sans_remise = $pu * $qty * $progress / 100;
+    $tot_avec_remise_ligne = $tot_sans_remise       * (1 - ($remise_percent_ligne / 100));
+    $tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
+
+    // initialize result array
+    for ($i=0; $i <= 15; $i++) $result[$i] = 0;
+
+    // if there's some localtax including vat, we calculate localtaxes (we will add later)
 
     //If input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
     if ($price_base_type != 'TTC')
     {
-    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
-    	$pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
+        $tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
+        $tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
+        $pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
     }
     else
     {
-    	$tot_sans_remise_wt = $tot_sans_remise;
-    	$tot_avec_remise_wt = $tot_avec_remise;
-    	$pu_wt = $pu;
+        $tot_sans_remise_wt = $tot_sans_remise;
+        $tot_avec_remise_wt = $tot_avec_remise;
+        $pu_wt = $pu;
     }
 
-	//print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
+    //print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
 
     $localtaxes = array(0,0,0);
     $apply_tax = false;
-  	switch($localtax1_type) {
-      case '2':     // localtax on product or service
+        switch($localtax1_type) {
+        case '2':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '4':     // localtax on product
+        case '4':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '6':     // localtax on service
+        case '6':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
 
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
-  		$localtaxes[0] += $result[14];
+            $result[14] = price2num(($tot_sans_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
+            $localtaxes[0] += $result[14];
 
-  		$result[9] = price2num(($tot_avec_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
-  		$localtaxes[1] += $result[9];
+            $result[9] = price2num(($tot_avec_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
+            $localtaxes[1] += $result[9];
 
-  		$result[11] = price2num(($pu_wt * (1 + ( $localtax1_rate / 100))) - $pu_wt, 'MU');
-  		$localtaxes[2] += $result[11];
+            $result[11] = price2num(($pu_wt * (1 + ( $localtax1_rate / 100))) - $pu_wt, 'MU');
+            $localtaxes[2] += $result[11];
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
-      case '2':     // localtax on product or service
+        switch($localtax2_type) {
+        case '2':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '4':     // localtax on product
+        case '4':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '6':     // localtax on service
+        case '6':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
-  		$localtaxes[0] += $result[15];
+            $result[15] = price2num(($tot_sans_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
+            $localtaxes[0] += $result[15];
+
+            $result[10] = price2num(($tot_avec_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
+            $localtaxes[1] += $result[10];
 
-  		$result[10] = price2num(($tot_avec_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
-  		$localtaxes[1] += $result[10];
+            $result[12] = price2num(($pu_wt * (1 + ( $localtax2_rate / 100))) - $pu_wt, 'MU');
+            $localtaxes[2] += $result[12];
+    }
 
-  		$result[12] = price2num(($pu_wt * (1 + ( $localtax2_rate / 100))) - $pu_wt, 'MU');
-  		$localtaxes[2] += $result[12];
+    //dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
+    if ($price_base_type == 'HT')
+    {
+        // We work to define prices using the price without tax
+        $result[6] = price2num($tot_sans_remise, 'MT');
+        $result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[0], 'MT');	// Selon TVA NPR ou non
+        $result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)) + $localtaxes[0], 'MT');	// Si TVA consideree normale (non NPR)
+        $result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
+
+        $result[0] = price2num($tot_avec_remise, 'MT');
+        $result[2] = price2num($tot_avec_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[1], 'MT');	// Selon TVA NPR ou non
+        $result2bis= price2num($tot_avec_remise * (1 + ( $txtva / 100)) + $localtaxes[1], 'MT');	// Si TVA consideree normale (non NPR)
+        $result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+
+        $result[3] = price2num($pu, 'MU');
+        $result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
+        $result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
+        $result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
+    }
+    else
+    {
+        // We work to define prices using the price with tax
+        $result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
+        $result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
+        $result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
+        $result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
+
+        $result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
+        $result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
+        $result0bis= price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
+        $result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+
+        $result[5] = price2num($pu + $localtaxes[2], 'MU');
+        $result[3] = price2num($pu / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU');	// Selon TVA NPR ou non
+        $result3bis= price2num($pu / (1 + ($txtva / 100)), 'MU');	// Si TVA consideree normale (non NPR)
+        $result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
     }
 
-	//dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
-	if ($price_base_type == 'HT')
-	{
-		// We work to define prices using the price without tax
-		$result[6] = price2num($tot_sans_remise, 'MT');
-		$result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[0], 'MT');	// Selon TVA NPR ou non
-		$result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)) + $localtaxes[0], 'MT');	// Si TVA consideree normale (non NPR)
-		$result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
-
-		$result[0] = price2num($tot_avec_remise, 'MT');
-		$result[2] = price2num($tot_avec_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[1], 'MT');	// Selon TVA NPR ou non
-		$result2bis= price2num($tot_avec_remise * (1 + ( $txtva / 100)) + $localtaxes[1], 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
-
-		$result[3] = price2num($pu, 'MU');
-		$result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
-		$result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
-		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
-	}
-	else
-	{
-		// We work to define prices using the price with tax
-		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
-		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
-		$result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
-
-		$result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
-		$result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result0bis= price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
-
-		$result[5] = price2num($pu + $localtaxes[2], 'MU');
-		$result[3] = price2num($pu / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU');	// Selon TVA NPR ou non
-		$result3bis= price2num($pu / (1 + ($txtva / 100)), 'MU');	// Si TVA consideree normale (non NPR)
-		$result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
-	}
-
-	// if there's some localtax without vat, we calculate localtaxes (we will add them at end)
+    // if there's some localtax without vat, we calculate localtaxes (we will add them at end)
 
     //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
     if ($price_base_type == 'TTC')
     {
-    	$tot_sans_remise= price2num($tot_sans_remise / (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise= price2num($tot_avec_remise / (1 + ($txtva / 100)),'MU');
-    	$pu = price2num($pu / (1 + ($txtva / 100)),'MU');
+        $tot_sans_remise= price2num($tot_sans_remise / (1 + ($txtva / 100)),'MU');
+        $tot_avec_remise= price2num($tot_avec_remise / (1 + ($txtva / 100)),'MU');
+        $pu = price2num($pu / (1 + ($txtva / 100)),'MU');
     }
 
-	$apply_tax = false;
+    $apply_tax = false;
     switch($localtax1_type) {
-      case '1':     // localtax on product or service
+        case '1':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '3':     // localtax on product
+        case '3':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '5':     // localtax on service
+        case '5':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax1 for total_ht_without_discount
-  		$result[8] += $result[14];																				// total_ttc_without_discount + tax1
+            $result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax1 for total_ht_without_discount
+            $result[8] += $result[14];																				// total_ttc_without_discount + tax1
 
-  		$result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax1 for total_ht
-  		$result[2] += $result[9];																				// total_ttc + tax1
+            $result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax1 for total_ht
+            $result[2] += $result[9];																				// total_ttc + tax1
 
-  		$result[11] = price2num(($pu * (1 + ( $localtax1_rate / 100))) - $pu, 'MU');							// amount tax1 for pu_ht
-  		$result[5] += $result[11];																				// pu_ht + tax1
+            $result[11] = price2num(($pu * (1 + ( $localtax1_rate / 100))) - $pu, 'MU');							// amount tax1 for pu_ht
+            $result[5] += $result[11];																				// pu_ht + tax1
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
-      case '1':     // localtax on product or service
+        switch($localtax2_type) {
+        case '1':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '3':     // localtax on product
+        case '3':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '5':     // localtax on service
+        case '5':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax2 for total_ht_without_discount
-  		$result[8] += $result[15];																				// total_ttc_without_discount + tax2
+            $result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax2 for total_ht_without_discount
+            $result[8] += $result[15];																				// total_ttc_without_discount + tax2
 
-  		$result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax2 for total_ht
-  		$result[2] += $result[10];																				// total_ttc + tax2
+            $result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax2 for total_ht
+            $result[2] += $result[10];																				// total_ttc + tax2
 
-  		$result[12] = price2num(($pu * (1 + ( $localtax2_rate / 100))) - $pu, 'MU');							// amount tax2 for pu_ht
-  		$result[5] += $result[12];																				// pu_ht + tax2
+            $result[12] = price2num(($pu * (1 + ( $localtax2_rate / 100))) - $pu, 'MU');							// amount tax2 for pu_ht
+            $result[5] += $result[12];																				// pu_ht + tax2
     }
 
-	// If rounding is not using base 10 (rare)
-	if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
-	{
-		if ($price_base_type == 'HT')
-		{
-			$result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=price2num($result[0]+$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-		else
-		{
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[0]=price2num($result[2]-$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-	}
-
-	// Multicurrency
-	if ($multicurrency_tx != 1)
-	{
-		// Recal function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.
-		$newresult = calcul_price_total($qty, $pu_devise, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller, $localtaxes_array, $progress, 1, 0);
-
-		$result[16] = $newresult[0];
-		$result[17] = $newresult[1];
-		$result[18] = $newresult[2];
-		$result[19] = $newresult[3];
-		$result[20] = $newresult[4];
-		$result[21] = $newresult[5];
-		$result[22] = $newresult[6];
-		$result[23] = $newresult[7];
-		$result[24] = $newresult[8];
-		$result[25] = $newresult[9];
-		$result[26] = $newresult[10];
-		/*
+    // If rounding is not using base 10 (rare)
+    if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
+    {
+        if ($price_base_type == 'HT')
+        {
+            $result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[2]=price2num($result[0]+$result[1], 'MT');
+            $result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+        }
+        else
+        {
+            $result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[0]=price2num($result[2]-$result[1], 'MT');
+            $result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+        }
+    }
+
+    // Multicurrency
+    if ($multicurrency_tx != 1)
+    {
+        // Recal function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.
+        $newresult = calcul_price_total($qty, $pu_devise, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller, $localtaxes_array, $progress, 1, 0);
+
+        $result[16] = $newresult[0];
+        $result[17] = $newresult[1];
+        $result[18] = $newresult[2];
+        $result[19] = $newresult[3];
+        $result[20] = $newresult[4];
+        $result[21] = $newresult[5];
+        $result[22] = $newresult[6];
+        $result[23] = $newresult[7];
+        $result[24] = $newresult[8];
+        $result[25] = $newresult[9];
+        $result[26] = $newresult[10];
+        /*
 		$result[16] = price2num($result[0] * $multicurrency_tx, 'MT');
 		$result[17] = price2num($result[1] * $multicurrency_tx, 'MT');
 		$result[18] = price2num($result[2] * $multicurrency_tx, 'MT');
 		$result[19] = price2num($pu_devise, 'MU');
 		*/
-	}
-	else
-	{
-		$result[16] = $result[0];
-		$result[17] = $result[1];
-		$result[18] = $result[2];
-		$result[19] = $result[3];
-		$result[20] = $result[4];
-		$result[21] = $result[5];
-		$result[22] = $result[6];
-		$result[23] = $result[7];
-		$result[24] = $result[8];
-		$result[25] = $result[9];
-		$result[26] = $result[10];
-	}
-
-	//var_dump($result);
-	// initialize result array
-	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
-
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
-
-	return $result;
+    }
+    else
+    {
+        $result[16] = $result[0];
+        $result[17] = $result[1];
+        $result[18] = $result[2];
+        $result[19] = $result[3];
+        $result[20] = $result[4];
+        $result[21] = $result[5];
+        $result[22] = $result[6];
+        $result[23] = $result[7];
+        $result[24] = $result[8];
+        $result[25] = $result[9];
+        $result[26] = $result[10];
+    }
+
+    //var_dump($result);
+    // initialize result array
+    //for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
+
+    dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
+
+    return $result;
 }
 

Spacing +82 added lines, -82 removed lines

@@ -82,47 +82,47 @@ 
  * 						25=multicurrency_total_tax1 for total_ht
  *                      26=multicurrency_total_tax2 for total_ht
  */
-function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array='', $progress=100, $multicurrency_tx=1, $pu_devise=0)
+function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array = '', $progress = 100, $multicurrency_tx = 1, $pu_devise = 0)
 {
-	global $conf,$mysoc,$db;
+	global $conf, $mysoc, $db;
 
-	$result=array();
+	$result = array();
 
 	// Clean parameters
-	if (empty($info_bits)) $info_bits=0;
-	if (empty($txtva)) $txtva=0;
-	if (empty($seller) || ! is_object($seller))
+	if (empty($info_bits)) $info_bits = 0;
+	if (empty($txtva)) $txtva = 0;
+	if (empty($seller) || !is_object($seller))
 	{
 		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
-		if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
+		if (!is_object($mysoc))	// mysoc may be not defined (during migration process)
 		{
-			$mysoc=new Societe($db);
+			$mysoc = new Societe($db);
 			$mysoc->setMysoc($conf);
 		}
-		$seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
+		$seller = $mysoc; // If sell is done to a customer, $seller is not provided, we use $mysoc
 		//var_dump($seller->country_id);exit;
 	}
-	if (empty($localtaxes_array) || ! is_array($localtaxes_array))
+	if (empty($localtaxes_array) || !is_array($localtaxes_array))
 	{
 		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
 	}
 	// Too verbose. Enable for debug only
 	//dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
 
-	$countryid=$seller->country_id;
+	$countryid = $seller->country_id;
 
-	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
-	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
+	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate = (float) $uselocaltax1_rate;
+	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate = (float) $uselocaltax2_rate;
 
-	if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
+	if ($uselocaltax1_rate < 0) $uselocaltax1_rate = $seller->localtax1_assuj;
+	if ($uselocaltax2_rate < 0) $uselocaltax2_rate = $seller->localtax2_assuj;
 
 	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
 	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
 
     // Now we search localtaxes information ourself (rates and types).
-	$localtax1_type=0;
-	$localtax2_type=0;
+	$localtax1_type = 0;
+	$localtax2_type = 0;
 
 	if (is_array($localtaxes_array))
 	{
@@ -134,9 +134,9 @@ 
 	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
 	{
 		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
-		$sql.= " WHERE cv.taux = ".$txtva;
-		$sql.= " AND cv.fk_pays = ".$countryid;
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
+		$sql .= " WHERE cv.taux = ".$txtva;
+		$sql .= " AND cv.fk_pays = ".$countryid;
 		dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
 		$resql = $db->query($sql);
 		if ($resql)
@@ -144,10 +144,10 @@ 
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				$localtax1_rate=$obj->localtax1;
-				$localtax2_rate=$obj->localtax2;
-				$localtax1_type=$obj->localtax1_type;
-				$localtax2_type=$obj->localtax2_type;
+				$localtax1_rate = $obj->localtax1;
+				$localtax2_rate = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
 			}
 		}
@@ -156,14 +156,14 @@ 
 
 	// pu calculation from pu_devise if pu empty
 	if (empty($pu) && !empty($pu_devise)) {
-		if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
+		if (!empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
 		else
 		{
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
 			return array();
 		}
 	}
-	if ($pu === '') $pu=0;
+	if ($pu === '') $pu = 0;
 	// pu_devise calculation from pu
 	if (empty($pu_devise) && !empty($multicurrency_tx)) {
 		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
@@ -176,20 +176,20 @@ 
 
 	// initialize total (may be HT or TTC depending on price_base_type)
 	$tot_sans_remise = $pu * $qty * $progress / 100;
-	$tot_avec_remise_ligne = $tot_sans_remise       * (1 - ($remise_percent_ligne / 100));
+	$tot_avec_remise_ligne = $tot_sans_remise * (1 - ($remise_percent_ligne / 100));
 	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
 
 	// initialize result array
-	for ($i=0; $i <= 15; $i++) $result[$i] = 0;
+	for ($i = 0; $i <= 15; $i++) $result[$i] = 0;
 
 	// if there's some localtax including vat, we calculate localtaxes (we will add later)
 
     //If input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
     if ($price_base_type != 'TTC')
     {
-    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
-    	$pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
+    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
+    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
+    	$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
     }
     else
     {
@@ -200,9 +200,9 @@ 
 
 	//print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
 
-    $localtaxes = array(0,0,0);
+    $localtaxes = array(0, 0, 0);
     $apply_tax = false;
-  	switch($localtax1_type) {
+  	switch ($localtax1_type) {
       case '2':     // localtax on product or service
         $apply_tax = true;
         break;
@@ -215,18 +215,18 @@ 
     }
 
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
+  		$result[14] = price2num(($tot_sans_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
   		$localtaxes[0] += $result[14];
 
-  		$result[9] = price2num(($tot_avec_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
+  		$result[9] = price2num(($tot_avec_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
   		$localtaxes[1] += $result[9];
 
-  		$result[11] = price2num(($pu_wt * (1 + ( $localtax1_rate / 100))) - $pu_wt, 'MU');
+  		$result[11] = price2num(($pu_wt * (1 + ($localtax1_rate / 100))) - $pu_wt, 'MU');
   		$localtaxes[2] += $result[11];
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
+  	switch ($localtax2_type) {
       case '2':     // localtax on product or service
         $apply_tax = true;
         break;
@@ -238,13 +238,13 @@ 
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
+  		$result[15] = price2num(($tot_sans_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
   		$localtaxes[0] += $result[15];
 
-  		$result[10] = price2num(($tot_avec_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
+  		$result[10] = price2num(($tot_avec_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
   		$localtaxes[1] += $result[10];
 
-  		$result[12] = price2num(($pu_wt * (1 + ( $localtax2_rate / 100))) - $pu_wt, 'MU');
+  		$result[12] = price2num(($pu_wt * (1 + ($localtax2_rate / 100))) - $pu_wt, 'MU');
   		$localtaxes[2] += $result[12];
     }
 
@@ -253,36 +253,36 @@ 
 	{
 		// We work to define prices using the price without tax
 		$result[6] = price2num($tot_sans_remise, 'MT');
-		$result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[0], 'MT');	// Selon TVA NPR ou non
-		$result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)) + $localtaxes[0], 'MT');	// Si TVA consideree normale (non NPR)
+		$result[8] = price2num($tot_sans_remise * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[0], 'MT'); // Selon TVA NPR ou non
+		$result8bis = price2num($tot_sans_remise * (1 + ($txtva / 100)) + $localtaxes[0], 'MT'); // Si TVA consideree normale (non NPR)
 		$result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
 
 		$result[0] = price2num($tot_avec_remise, 'MT');
-		$result[2] = price2num($tot_avec_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[1], 'MT');	// Selon TVA NPR ou non
-		$result2bis= price2num($tot_avec_remise * (1 + ( $txtva / 100)) + $localtaxes[1], 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+		$result[2] = price2num($tot_avec_remise * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[1], 'MT'); // Selon TVA NPR ou non
+		$result2bis = price2num($tot_avec_remise * (1 + ($txtva / 100)) + $localtaxes[1], 'MT'); // Si TVA consideree normale (non NPR)
+		$result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT'); // Total VAT = TTC - (HT + localtax)
 
 		$result[3] = price2num($pu, 'MU');
-		$result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
-		$result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
+		$result[5] = price2num($pu * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[2], 'MU'); // Selon TVA NPR ou non
+		$result5bis = price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU'); // Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
 	}
 	else
 	{
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
-		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
+		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
+		$result6bis = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
 		$result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
 
 		$result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
-		$result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result0bis= price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+		$result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
+		$result0bis = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
+		$result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT'); // Total VAT = TTC - (HT + localtax)
 
 		$result[5] = price2num($pu + $localtaxes[2], 'MU');
-		$result[3] = price2num($pu / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU');	// Selon TVA NPR ou non
-		$result3bis= price2num($pu / (1 + ($txtva / 100)), 'MU');	// Si TVA consideree normale (non NPR)
+		$result[3] = price2num($pu / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MU'); // Selon TVA NPR ou non
+		$result3bis = price2num($pu / (1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
 	}
 
@@ -291,13 +291,13 @@ 
     //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
     if ($price_base_type == 'TTC')
     {
-    	$tot_sans_remise= price2num($tot_sans_remise / (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise= price2num($tot_avec_remise / (1 + ($txtva / 100)),'MU');
-    	$pu = price2num($pu / (1 + ($txtva / 100)),'MU');
+    	$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');
+    	$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');
+    	$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');
     }
 
 	$apply_tax = false;
-    switch($localtax1_type) {
+    switch ($localtax1_type) {
       case '1':     // localtax on product or service
         $apply_tax = true;
         break;
@@ -309,18 +309,18 @@ 
         break;
     }
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax1 for total_ht_without_discount
-  		$result[8] += $result[14];																				// total_ttc_without_discount + tax1
+  		$result[14] = price2num(($tot_sans_remise * (1 + ($localtax1_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax1 for total_ht_without_discount
+  		$result[8] += $result[14]; // total_ttc_without_discount + tax1
 
-  		$result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax1 for total_ht
-  		$result[2] += $result[9];																				// total_ttc + tax1
+  		$result[9] = price2num(($tot_avec_remise * (1 + ($localtax1_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax1 for total_ht
+  		$result[2] += $result[9]; // total_ttc + tax1
 
-  		$result[11] = price2num(($pu * (1 + ( $localtax1_rate / 100))) - $pu, 'MU');							// amount tax1 for pu_ht
-  		$result[5] += $result[11];																				// pu_ht + tax1
+  		$result[11] = price2num(($pu * (1 + ($localtax1_rate / 100))) - $pu, 'MU'); // amount tax1 for pu_ht
+  		$result[5] += $result[11]; // pu_ht + tax1
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
+  	switch ($localtax2_type) {
       case '1':     // localtax on product or service
         $apply_tax = true;
         break;
@@ -332,34 +332,34 @@ 
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax2 for total_ht_without_discount
-  		$result[8] += $result[15];																				// total_ttc_without_discount + tax2
+  		$result[15] = price2num(($tot_sans_remise * (1 + ($localtax2_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax2 for total_ht_without_discount
+  		$result[8] += $result[15]; // total_ttc_without_discount + tax2
 
-  		$result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax2 for total_ht
-  		$result[2] += $result[10];																				// total_ttc + tax2
+  		$result[10] = price2num(($tot_avec_remise * (1 + ($localtax2_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax2 for total_ht
+  		$result[2] += $result[10]; // total_ttc + tax2
 
-  		$result[12] = price2num(($pu * (1 + ( $localtax2_rate / 100))) - $pu, 'MU');							// amount tax2 for pu_ht
-  		$result[5] += $result[12];																				// pu_ht + tax2
+  		$result[12] = price2num(($pu * (1 + ($localtax2_rate / 100))) - $pu, 'MU'); // amount tax2 for pu_ht
+  		$result[5] += $result[12]; // pu_ht + tax2
     }
 
 	// If rounding is not using base 10 (rare)
-	if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
+	if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT))
 	{
 		if ($price_base_type == 'HT')
 		{
-			$result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=price2num($result[0]+$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[0] = round($result[0] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[2] = price2num($result[0] + $result[1], 'MT');
+			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 		}
 		else
 		{
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[0]=price2num($result[2]-$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[2] = round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[0] = price2num($result[2] - $result[1], 'MT');
+			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 		}
 	}
 

Braces +64 added lines, -32 removed lines

@@ -89,14 +89,20 @@ 
 	$result=array();
 
 	// Clean parameters
-	if (empty($info_bits)) $info_bits=0;
-	if (empty($txtva)) $txtva=0;
+	if (empty($info_bits)) {
+	    $info_bits=0;
+	}
+	if (empty($txtva)) {
+	    $txtva=0;
+	}
 	if (empty($seller) || ! is_object($seller))
 	{
 		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
-		if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
+		if (! is_object($mysoc)) {
+		    // mysoc may be not defined (during migration process)
 		{
 			$mysoc=new Societe($db);
+		}
 			$mysoc->setMysoc($conf);
 		}
 		$seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
@@ -111,11 +117,19 @@ 
 
 	$countryid=$seller->country_id;
 
-	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
-	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
+	if (is_numeric($uselocaltax1_rate)) {
+	    $uselocaltax1_rate=(float) $uselocaltax1_rate;
+	}
+	if (is_numeric($uselocaltax2_rate)) {
+	    $uselocaltax2_rate=(float) $uselocaltax2_rate;
+	}
 
-	if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
+	if ($uselocaltax1_rate < 0) {
+	    $uselocaltax1_rate=$seller->localtax1_assuj;
+	}
+	if ($uselocaltax2_rate < 0) {
+	    $uselocaltax2_rate=$seller->localtax2_assuj;
+	}
 
 	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
 	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
@@ -130,8 +144,7 @@ 
 		$localtax1_rate = $localtaxes_array[1];
 		$localtax2_type = $localtaxes_array[2];
 		$localtax2_rate = $localtaxes_array[3];
-	}
-	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
+	} else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
 	{
 		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
@@ -150,24 +163,29 @@ 
 				$localtax2_type=$obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
 			}
+		} else {
+		    dol_print_error($db);
 		}
-		else dol_print_error($db);
 	}
 
 	// pu calculation from pu_devise if pu empty
 	if (empty($pu) && !empty($pu_devise)) {
-		if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else
+		if (! empty($multicurrency_tx)) {
+		    $pu = $pu_devise / $multicurrency_tx;
+		} else
 		{
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
 			return array();
 		}
 	}
-	if ($pu === '') $pu=0;
+	if ($pu === '') {
+	    $pu=0;
+	}
 	// pu_devise calculation from pu
 	if (empty($pu_devise) && !empty($multicurrency_tx)) {
-		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else
+		if (is_numeric($pu) && is_numeric($multicurrency_tx)) {
+		    $pu_devise = $pu * $multicurrency_tx;
+		} else
 		{
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
 			return array();
@@ -180,7 +198,9 @@ 
 	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
 
 	// initialize result array
-	for ($i=0; $i <= 15; $i++) $result[$i] = 0;
+	for ($i=0; $i <= 15; $i++) {
+	    $result[$i] = 0;
+	}
 
 	// if there's some localtax including vat, we calculate localtaxes (we will add later)
 
@@ -190,8 +210,7 @@ 
     	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
     	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
     	$pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
-    }
-    else
+    } else
     {
     	$tot_sans_remise_wt = $tot_sans_remise;
     	$tot_avec_remise_wt = $tot_avec_remise;
@@ -207,10 +226,14 @@ 
         $apply_tax = true;
         break;
       case '4':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '6':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
 
@@ -231,10 +254,14 @@ 
         $apply_tax = true;
         break;
       case '4':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '6':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
@@ -266,8 +293,7 @@ 
 		$result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
 		$result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
-	}
-	else
+	} else
 	{
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
@@ -302,10 +328,14 @@ 
         $apply_tax = true;
         break;
       case '3':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '5':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
     if ($uselocaltax1_rate && $apply_tax) {
@@ -325,10 +355,14 @@ 
         $apply_tax = true;
         break;
       case '3':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '5':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
@@ -352,8 +386,7 @@ 
 			$result[2]=price2num($result[0]+$result[1], 'MT');
 			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-		else
+		} else
 		{
 			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
@@ -386,8 +419,7 @@ 
 		$result[18] = price2num($result[2] * $multicurrency_tx, 'MT');
 		$result[19] = price2num($pu_devise, 'MU');
 		*/
-	}
-	else
+	} else
 	{
 		$result[16] = $result[0];
 		$result[17] = $result[1];

dolibarr/htdocs/core/lib/ldap.lib.php

Indentation +122 added lines, -122 removed lines

@@ -30,66 +30,66 @@ 
  */
 function ldap_prepare_head()
 {
-	global $langs, $conf, $user;
-
-	$langs->load("ldap");
-
-	// Onglets
-	$head=array();
-	$h = 0;
-
-	$head[$h][0] = DOL_URL_ROOT."/admin/ldap.php";
-	$head[$h][1] = $langs->trans("LDAPGlobalParameters");
-	$head[$h][2] = 'ldap';
-	$h++;
-
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
-		$head[$h][1] = $langs->trans("LDAPUsersSynchro");
-		$head[$h][2] = 'users';
-		$h++;
-	}
-
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
-		$head[$h][1] = $langs->trans("LDAPGroupsSynchro");
-		$head[$h][2] = 'groups';
-		$h++;
-	}
-
-	if (! empty($conf->societe->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
-		$head[$h][1] = $langs->trans("LDAPContactsSynchro");
-		$head[$h][2] = 'contacts';
-		$h++;
-	}
-
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
-		$head[$h][1] = $langs->trans("LDAPMembersSynchro");
-		$head[$h][2] = 'members';
-		$h++;
-	}
-
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
-		$head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
-		$head[$h][2] = 'memberstypes';
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,'',$head,$h,'ldap');
-
-	return $head;
+    global $langs, $conf, $user;
+
+    $langs->load("ldap");
+
+    // Onglets
+    $head=array();
+    $h = 0;
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/ldap.php";
+    $head[$h][1] = $langs->trans("LDAPGlobalParameters");
+    $head[$h][2] = 'ldap';
+    $h++;
+
+    if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
+        $head[$h][1] = $langs->trans("LDAPUsersSynchro");
+        $head[$h][2] = 'users';
+        $h++;
+    }
+
+    if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
+        $head[$h][1] = $langs->trans("LDAPGroupsSynchro");
+        $head[$h][2] = 'groups';
+        $h++;
+    }
+
+    if (! empty($conf->societe->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
+        $head[$h][1] = $langs->trans("LDAPContactsSynchro");
+        $head[$h][2] = 'contacts';
+        $h++;
+    }
+
+    if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
+        $head[$h][1] = $langs->trans("LDAPMembersSynchro");
+        $head[$h][2] = 'members';
+        $h++;
+    }
+
+    if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
+        $head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
+        $head[$h][2] = 'memberstypes';
+        $h++;
+    }
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,'',$head,$h,'ldap');
+
+    return $head;
 }
 
 
@@ -105,28 +105,28 @@ 
  */
 function show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass)
 {
-	global $langs, $conf, $user;
-	//print 'key='.$key.' dn='.$dn.' objectclass='.$objectclass;
-
-	print '<br>';
-	if (! function_exists("ldap_connect"))
-	{
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	}
-	else if (empty($conf->global->LDAP_SERVER_HOST))
-	{
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else if (empty($key) || empty($dn) || empty($objectclass))
-	{
-		$langs->load("errors");
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else
-	{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
-	}
-	print '<br><br>';
+    global $langs, $conf, $user;
+    //print 'key='.$key.' dn='.$dn.' objectclass='.$objectclass;
+
+    print '<br>';
+    if (! function_exists("ldap_connect"))
+    {
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
+    }
+    else if (empty($conf->global->LDAP_SERVER_HOST))
+    {
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
+    }
+    else if (empty($key) || empty($dn) || empty($objectclass))
+    {
+        $langs->load("errors");
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
+    }
+    else
+    {
+        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
+    }
+    print '<br><br>';
 }
 
 
@@ -143,45 +143,45 @@ 
  */
 function show_ldap_content($result,$level,$count,$var,$hide=0,$subcount=0)
 {
-	global $bc, $conf;
-
-	$count--;
-	if ($count == 0) return -1;	// To stop loop
-	if (! is_array($result)) return -1;
-
-	foreach($result as $key => $val)
-	{
-		if ("$key" == "objectclass") continue;
-		if ("$key" == "count") continue;
-		if ("$key" == "dn") continue;
-		if ("$val" == "objectclass") continue;
-
-		$lastkey[$level]=$key;
-
-		if (is_array($val))
-		{
-			$hide=0;
-			if (! is_numeric($key))
-			{
-
-				print '<tr '.$bc[$var].' valign="top">';
-				print '<td>';
-				print $key;
-				print '</td><td>';
-				if (strtolower($key) == 'userpassword') $hide=1;
-			}
-			show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
-		}
-		else if ($subcount)
-		{
-			$subcount--;
-			$newstring=dol_htmlentitiesbr($val);
-			if ($hide) print preg_replace('/./i','*',$newstring);
-			else print $newstring;
-			print '<br>';
-		}
-		if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
-	}
-	return 1;
+    global $bc, $conf;
+
+    $count--;
+    if ($count == 0) return -1;	// To stop loop
+    if (! is_array($result)) return -1;
+
+    foreach($result as $key => $val)
+    {
+        if ("$key" == "objectclass") continue;
+        if ("$key" == "count") continue;
+        if ("$key" == "dn") continue;
+        if ("$val" == "objectclass") continue;
+
+        $lastkey[$level]=$key;
+
+        if (is_array($val))
+        {
+            $hide=0;
+            if (! is_numeric($key))
+            {
+
+                print '<tr '.$bc[$var].' valign="top">';
+                print '<td>';
+                print $key;
+                print '</td><td>';
+                if (strtolower($key) == 'userpassword') $hide=1;
+            }
+            show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
+        }
+        else if ($subcount)
+        {
+            $subcount--;
+            $newstring=dol_htmlentitiesbr($val);
+            if ($hide) print preg_replace('/./i','*',$newstring);
+            else print $newstring;
+            print '<br>';
+        }
+        if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
+    }
+    return 1;
 }
 

Spacing +20 added lines, -20 removed lines

@@ -35,7 +35,7 @@ 
 	$langs->load("ldap");
 
 	// Onglets
-	$head=array();
+	$head = array();
 	$h = 0;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/ldap.php";
@@ -43,7 +43,7 @@ 
 	$head[$h][2] = 'ldap';
 	$h++;
 
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
 		$head[$h][1] = $langs->trans("LDAPUsersSynchro");
@@ -51,7 +51,7 @@ 
 		$h++;
 	}
 
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
 		$head[$h][1] = $langs->trans("LDAPGroupsSynchro");
@@ -59,7 +59,7 @@ 
 		$h++;
 	}
 
-	if (! empty($conf->societe->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
+	if (!empty($conf->societe->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
 		$head[$h][1] = $langs->trans("LDAPContactsSynchro");
@@ -67,7 +67,7 @@ 
 		$h++;
 	}
 
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
+	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
 		$head[$h][1] = $langs->trans("LDAPMembersSynchro");
@@ -75,7 +75,7 @@ 
 		$h++;
 	}
 
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
 		$head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
@@ -87,7 +87,7 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,'',$head,$h,'ldap');
+	complete_head_from_modules($conf, $langs, '', $head, $h, 'ldap');
 
 	return $head;
 }
@@ -103,13 +103,13 @@ 
  *  @param	string	$objectclass	Class
  *  @return	void
  */
-function show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass)
+function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 {
 	global $langs, $conf, $user;
 	//print 'key='.$key.' dn='.$dn.' objectclass='.$objectclass;
 
 	print '<br>';
-	if (! function_exists("ldap_connect"))
+	if (!function_exists("ldap_connect"))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
 	}
@@ -141,42 +141,42 @@ 
  * @param   int		$subcount	Subcount
  * @return  int
  */
-function show_ldap_content($result,$level,$count,$var,$hide=0,$subcount=0)
+function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount = 0)
 {
 	global $bc, $conf;
 
 	$count--;
-	if ($count == 0) return -1;	// To stop loop
-	if (! is_array($result)) return -1;
+	if ($count == 0) return -1; // To stop loop
+	if (!is_array($result)) return -1;
 
-	foreach($result as $key => $val)
+	foreach ($result as $key => $val)
 	{
 		if ("$key" == "objectclass") continue;
 		if ("$key" == "count") continue;
 		if ("$key" == "dn") continue;
 		if ("$val" == "objectclass") continue;
 
-		$lastkey[$level]=$key;
+		$lastkey[$level] = $key;
 
 		if (is_array($val))
 		{
-			$hide=0;
-			if (! is_numeric($key))
+			$hide = 0;
+			if (!is_numeric($key))
 			{
 
 				print '<tr '.$bc[$var].' valign="top">';
 				print '<td>';
 				print $key;
 				print '</td><td>';
-				if (strtolower($key) == 'userpassword') $hide=1;
+				if (strtolower($key) == 'userpassword') $hide = 1;
 			}
-			show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
+			show_ldap_content($val, $level + 1, $count, $var, $hide, $val["count"]);
 		}
 		else if ($subcount)
 		{
 			$subcount--;
-			$newstring=dol_htmlentitiesbr($val);
-			if ($hide) print preg_replace('/./i','*',$newstring);
+			$newstring = dol_htmlentitiesbr($val);
+			if ($hide) print preg_replace('/./i', '*', $newstring);
 			else print $newstring;
 			print '<br>';
 		}

Braces +34 added lines, -18 removed lines

@@ -112,17 +112,14 @@ 
 	if (! function_exists("ldap_connect"))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	}
-	else if (empty($conf->global->LDAP_SERVER_HOST))
+	} else if (empty($conf->global->LDAP_SERVER_HOST))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else if (empty($key) || empty($dn) || empty($objectclass))
+	} else if (empty($key) || empty($dn) || empty($objectclass))
 	{
 		$langs->load("errors");
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else
+	} else
 	{
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
 	}
@@ -146,15 +143,28 @@ 
 	global $bc, $conf;
 
 	$count--;
-	if ($count == 0) return -1;	// To stop loop
-	if (! is_array($result)) return -1;
+	if ($count == 0) {
+	    return -1;
+	}
+	// To stop loop
+	if (! is_array($result)) {
+	    return -1;
+	}
 
 	foreach($result as $key => $val)
 	{
-		if ("$key" == "objectclass") continue;
-		if ("$key" == "count") continue;
-		if ("$key" == "dn") continue;
-		if ("$val" == "objectclass") continue;
+		if ("$key" == "objectclass") {
+		    continue;
+		}
+		if ("$key" == "count") {
+		    continue;
+		}
+		if ("$key" == "dn") {
+		    continue;
+		}
+		if ("$val" == "objectclass") {
+		    continue;
+		}
 
 		$lastkey[$level]=$key;
 
@@ -168,19 +178,25 @@ 
 				print '<td>';
 				print $key;
 				print '</td><td>';
-				if (strtolower($key) == 'userpassword') $hide=1;
+				if (strtolower($key) == 'userpassword') {
+				    $hide=1;
+				}
 			}
 			show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
-		}
-		else if ($subcount)
+		} else if ($subcount)
 		{
 			$subcount--;
 			$newstring=dol_htmlentitiesbr($val);
-			if ($hide) print preg_replace('/./i','*',$newstring);
-			else print $newstring;
+			if ($hide) {
+			    print preg_replace('/./i','*',$newstring);
+			} else {
+			    print $newstring;
+			}
 			print '<br>';
 		}
-		if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
+		if ("$val" != $lastkey[$level] && !$subcount) {
+		    print '</td></tr>';
+		}
 	}
 	return 1;
 }

dolibarr/htdocs/core/lib/security.lib.php

Indentation +550 added lines, -550 removed lines

@@ -36,29 +36,29 @@ 
  */
 function dol_encode($chain, $key='1')
 {
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
-	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
-		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
-		}
-		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
-	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
-		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain,$i,1))+(ord($keychar)-65));
-		}
-		$chain=$result;
-	}
-
-	return base64_encode($chain);
+    if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+    {
+        $output_tab=array();
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength; $i++)
+        {
+            $output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
+        }
+        $chain = implode("",$output_tab);
+    }
+    elseif ($key)
+    {
+        $result='';
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength; $i++)
+        {
+            $keychar = substr($key, ($i % strlen($key))-1, 1);
+            $result.= chr(ord(substr($chain,$i,1))+(ord($keychar)-65));
+        }
+        $chain=$result;
+    }
+
+    return base64_encode($chain);
 }
 
 /**
@@ -72,32 +72,32 @@ 
  */
 function dol_decode($chain, $key='1')
 {
-	$chain = base64_decode($chain);
-
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
-	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength;$i++)
-		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
-		}
-
-		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
-	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
-		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain, $i, 1))-(ord($keychar)-65));
-		}
-		$chain=$result;
-	}
-
-	return $chain;
+    $chain = base64_decode($chain);
+
+    if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+    {
+        $output_tab=array();
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength;$i++)
+        {
+            $output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
+        }
+
+        $chain = implode("",$output_tab);
+    }
+    elseif ($key)
+    {
+        $result='';
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength; $i++)
+        {
+            $keychar = substr($key, ($i % strlen($key))-1, 1);
+            $result.= chr(ord(substr($chain, $i, 1))-(ord($keychar)-65));
+        }
+        $chain=$result;
+    }
+
+    return $chain;
 }
 
 
@@ -113,27 +113,27 @@ 
  */
 function dol_hash($chain, $type='0')
 {
-	global $conf;
-
-	// No need to add salt for password_hash
-	if (($type == '0' || $type == 'auto') && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
-	{
-		return password_hash($chain, PASSWORD_DEFAULT);
-	}
-
-	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
-
-	if ($type == '1' || $type == 'sha1') return sha1($chain);
-	else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
-	else if ($type == '3' || $type == 'md5') return md5($chain);
-	else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	else if ($type == '5') return hash('sha256',$chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
-
-	// No particular encoding defined, use default
-	return md5($chain);
+    global $conf;
+
+    // No need to add salt for password_hash
+    if (($type == '0' || $type == 'auto') && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
+    {
+        return password_hash($chain, PASSWORD_DEFAULT);
+    }
+
+    // Salt value
+    if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+
+    if ($type == '1' || $type == 'sha1') return sha1($chain);
+    else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
+    else if ($type == '3' || $type == 'md5') return md5($chain);
+    else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
+    else if ($type == '5') return hash('sha256',$chain);
+    else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
+    else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+
+    // No particular encoding defined, use default
+    return md5($chain);
 }
 
 /**
@@ -149,17 +149,17 @@ 
  */
 function dol_verifyHash($chain, $hash, $type='0')
 {
-	global $conf;
+    global $conf;
 
-	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
-		if ($hash[0] == '$') return password_verify($chain, $hash);
-		else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
-		else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+    if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
+        if ($hash[0] == '$') return password_verify($chain, $hash);
+        else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
+        else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
 
-		return false;
-	}
+        return false;
+    }
 
-	return dol_hash($chain, $type) == $hash;
+    return dol_hash($chain, $type) == $hash;
 }
 
 
@@ -180,242 +180,242 @@ 
  */
 function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $isdraft=0)
 {
-	global $db, $conf;
-	global $hookmanager;
-
-	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename,$feature2,$dbt_socfield,$dbt_select");
-	//print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;
-	//print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
-	//print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
-
-	// Get more permissions checks from hooks
-	$parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
-	$reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
-	if (! empty($hookmanager->resArray['result'])) return true;
-	if ($reshook > 0) return false;
-
-	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
-
-	// Features/modules to check
-	$featuresarray = array($features);
-	if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
-	else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
-
-	// More subfeatures to check
-	if (! empty($feature2)) $feature2 = explode("|", $feature2);
-
-	// More parameters
-	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
-
-	$listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-
-	// Check read permission from module
-	$readok=1; $nbko=0;
-	foreach ($featuresarray as $feature)	// first we check nb of test ko
-	{
-		$featureforlistofmodule=$feature;
-		if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
-		if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
-		{
-			$readok=0; $nbko++;
-			continue;
-		}
-
-		if ($feature == 'societe')
-		{
-			if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'contact')
-		{
-			if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'produit|service')
-		{
-			if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'prelevement')
-		{
-			if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'cheque')
-		{
-			if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'projet')
-		{
-			if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
-		}
-		else if (! empty($feature2))	// This should be used for future changes
-		{
-			$tmpreadok=1;
-			foreach($feature2 as $subfeature)
-			{
-				if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
-				else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
-				else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
-			}
-			if (! $tmpreadok)	// We found a test on feature that is ko
-			{
-				$readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
-				$nbko++;
-			}
-		}
-		else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
-		{
-			if (empty($user->rights->$feature->lire)
-				&& empty($user->rights->$feature->read)
-				&& empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
-		}
-	}
-
-	// If a or and at least one ok
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
-
-	if (! $readok) accessforbidden();
-	//print "Read access is ok";
-
-	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
-	$createok=1; $nbko=0;
-	if (GETPOST('action','aZ09')  == 'create' || ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete'))
-	{
-		foreach ($featuresarray as $feature)
-		{
-			if ($feature == 'contact')
-			{
-				if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'produit|service')
-			{
-				if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'prelevement')
-			{
-				if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'commande_fournisseur')
-			{
-				if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'banque')
-			{
-				if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'cheque')
-			{
-				if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
-			}
-			else if (! empty($feature2))	// This should be used
-			{
-				foreach($feature2 as $subfeature)
-				{
-					if (empty($user->rights->$feature->$subfeature->creer)
-						&& empty($user->rights->$feature->$subfeature->write)
-						&& empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
-						else { $createok=1; break; } // Break to bypass second test if the first is ok
-				}
-			}
-			else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
-			{
-				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
-				if (empty($user->rights->$feature->creer)
-					&& empty($user->rights->$feature->write)
-					&& empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
-			}
-		}
-
-		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
-
-		if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
-		//print "Write access is ok";
-	}
-
-	// Check create user permission
-	$createuserok=1;
-	if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
-	{
-		if (! $user->rights->user->user->creer) $createuserok=0;
-
-		if (! $createuserok) accessforbidden();
-		//print "Create user access is ok";
-	}
-
-	// Check delete permission from module
-	$deleteok=1; $nbko=0;
-	if ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete')
-	{
-		foreach ($featuresarray as $feature)
-		{
-			if ($feature == 'contact')
-			{
-				if (! $user->rights->societe->contact->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'produit|service')
-			{
-				if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'commande_fournisseur')
-			{
-				if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'banque')
-			{
-				if (! $user->rights->banque->modifier) $deleteok=0;
-			}
-			else if ($feature == 'cheque')
-			{
-				if (! $user->rights->banque->cheque) $deleteok=0;
-			}
-			else if ($feature == 'ecm')
-			{
-				if (! $user->rights->ecm->upload) $deleteok=0;
-			}
-			else if ($feature == 'ftp')
-			{
-				if (! $user->rights->ftp->write) $deleteok=0;
-			}else if ($feature == 'salaries')
-			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if ($feature == 'salaries')
-			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if (! empty($feature2))	// This should be used for permissions on 2 levels
-			{
-				foreach($feature2 as $subfeature)
-				{
-					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
-					else { $deleteok=1; break; } // For bypass the second test if the first is ok
-				}
-			}
-			else if (! empty($feature))		// This is used for permissions on 1 level
-			{
-				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
-				if (empty($user->rights->$feature->supprimer)
-					&& empty($user->rights->$feature->delete)
-					&& empty($user->rights->$feature->run)) $deleteok=0;
-			}
-		}
-
-		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
-
-		if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
-		//print "Delete access is ok";
-	}
-
-	// If we have a particular object to check permissions on, we check this object
-	// is linked to a company allowed to $user.
-	if (! empty($objectid) && $objectid > 0)
-	{
-		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
-		return $ok ? 1 : accessforbidden();
-	}
-
-	return 1;
+    global $db, $conf;
+    global $hookmanager;
+
+    //dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename,$feature2,$dbt_socfield,$dbt_select");
+    //print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;
+    //print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
+    //print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
+
+    // Get more permissions checks from hooks
+    $parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
+    $reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
+    if (! empty($hookmanager->resArray['result'])) return true;
+    if ($reshook > 0) return false;
+
+    if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
+
+    // Features/modules to check
+    $featuresarray = array($features);
+    if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
+    else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
+
+    // More subfeatures to check
+    if (! empty($feature2)) $feature2 = explode("|", $feature2);
+
+    // More parameters
+    $params = explode('&', $tableandshare);
+    $dbtablename=(! empty($params[0]) ? $params[0] : '');
+    $sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+
+    $listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+
+    // Check read permission from module
+    $readok=1; $nbko=0;
+    foreach ($featuresarray as $feature)	// first we check nb of test ko
+    {
+        $featureforlistofmodule=$feature;
+        if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
+        if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+        {
+            $readok=0; $nbko++;
+            continue;
+        }
+
+        if ($feature == 'societe')
+        {
+            if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'contact')
+        {
+            if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'produit|service')
+        {
+            if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'prelevement')
+        {
+            if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'cheque')
+        {
+            if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'projet')
+        {
+            if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
+        }
+        else if (! empty($feature2))	// This should be used for future changes
+        {
+            $tmpreadok=1;
+            foreach($feature2 as $subfeature)
+            {
+                if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
+                else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
+                else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+            }
+            if (! $tmpreadok)	// We found a test on feature that is ko
+            {
+                $readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
+                $nbko++;
+            }
+        }
+        else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
+        {
+            if (empty($user->rights->$feature->lire)
+                && empty($user->rights->$feature->read)
+                && empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
+        }
+    }
+
+    // If a or and at least one ok
+    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
+
+    if (! $readok) accessforbidden();
+    //print "Read access is ok";
+
+    // Check write permission from module (we need to know write permission to create but also to delete drafts record)
+    $createok=1; $nbko=0;
+    if (GETPOST('action','aZ09')  == 'create' || ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete'))
+    {
+        foreach ($featuresarray as $feature)
+        {
+            if ($feature == 'contact')
+            {
+                if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'produit|service')
+            {
+                if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'prelevement')
+            {
+                if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'commande_fournisseur')
+            {
+                if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'banque')
+            {
+                if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'cheque')
+            {
+                if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
+            }
+            else if (! empty($feature2))	// This should be used
+            {
+                foreach($feature2 as $subfeature)
+                {
+                    if (empty($user->rights->$feature->$subfeature->creer)
+                        && empty($user->rights->$feature->$subfeature->write)
+                        && empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
+                        else { $createok=1; break; } // Break to bypass second test if the first is ok
+                }
+            }
+            else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
+            {
+                //print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
+                if (empty($user->rights->$feature->creer)
+                    && empty($user->rights->$feature->write)
+                    && empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
+            }
+        }
+
+        // If a or and at least one ok
+        if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
+
+        if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
+        //print "Write access is ok";
+    }
+
+    // Check create user permission
+    $createuserok=1;
+    if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
+    {
+        if (! $user->rights->user->user->creer) $createuserok=0;
+
+        if (! $createuserok) accessforbidden();
+        //print "Create user access is ok";
+    }
+
+    // Check delete permission from module
+    $deleteok=1; $nbko=0;
+    if ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete')
+    {
+        foreach ($featuresarray as $feature)
+        {
+            if ($feature == 'contact')
+            {
+                if (! $user->rights->societe->contact->supprimer) $deleteok=0;
+            }
+            else if ($feature == 'produit|service')
+            {
+                if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
+            }
+            else if ($feature == 'commande_fournisseur')
+            {
+                if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
+            }
+            else if ($feature == 'banque')
+            {
+                if (! $user->rights->banque->modifier) $deleteok=0;
+            }
+            else if ($feature == 'cheque')
+            {
+                if (! $user->rights->banque->cheque) $deleteok=0;
+            }
+            else if ($feature == 'ecm')
+            {
+                if (! $user->rights->ecm->upload) $deleteok=0;
+            }
+            else if ($feature == 'ftp')
+            {
+                if (! $user->rights->ftp->write) $deleteok=0;
+            }else if ($feature == 'salaries')
+            {
+                if (! $user->rights->salaries->delete) $deleteok=0;
+            }
+            else if ($feature == 'salaries')
+            {
+                if (! $user->rights->salaries->delete) $deleteok=0;
+            }
+            else if (! empty($feature2))	// This should be used for permissions on 2 levels
+            {
+                foreach($feature2 as $subfeature)
+                {
+                    if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
+                    else { $deleteok=1; break; } // For bypass the second test if the first is ok
+                }
+            }
+            else if (! empty($feature))		// This is used for permissions on 1 level
+            {
+                //print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
+                if (empty($user->rights->$feature->supprimer)
+                    && empty($user->rights->$feature->delete)
+                    && empty($user->rights->$feature->run)) $deleteok=0;
+            }
+        }
+
+        // If a or and at least one ok
+        if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
+
+        if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
+        //print "Delete access is ok";
+    }
+
+    // If we have a particular object to check permissions on, we check this object
+    // is linked to a company allowed to $user.
+    if (! empty($objectid) && $objectid > 0)
+    {
+        $ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
+        return $ok ? 1 : accessforbidden();
+    }
+
+    return 1;
 }
 
 /**
@@ -434,216 +434,216 @@ 
  */
 function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='', $dbt_select='rowid')
 {
-	global $db, $conf;
-
-	// More parameters
-	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
-
-	foreach ($featuresarray as $feature)
-	{
-		$sql='';
-
-		// For backward compatibility
-		if ($feature == 'member')  $feature='adherent';
-		if ($feature == 'project') $feature='projet';
-		if ($feature == 'task')    $feature='projet_task';
-
-		$check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
-		$checksoc = array('societe');	 // Test for societe object
-		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
-		$checkproject = array('projet','project'); // Test for project object
-		$checktask = array('projet_task');
-		$nocheck = array('barcode','stock');	// No test
-		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
-
-		// If dbtablename not defined, we use same name for table than module name
-		if (empty($dbtablename))
-		{
-			$dbtablename = $feature;
-			$sharedelement = (! empty($params[1]) ? $params[1] : $dbtablename);		// We change dbtablename, so we set sharedelement too.
-		}
-
-		// Check permission for object with entity
-		if (in_array($feature,$check))
-		{
-			$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-			$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-			if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled))
-			{
-				if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-				{
-					if ($conf->entity == 1 && $user->admin && ! $user->entity)
-					{
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND dbt.entity IS NOT NULL";
-					}
-					else
-					{
-						$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND (ug.fk_user = dbt.rowid";
-						$sql.= " AND ug.entity IN (".getEntity('user')."))";
-						$sql.= " OR dbt.entity = 0"; // Show always superadmin
-					}
-				}
-				else {
-					$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-					$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-				}
-			}
-			else
-			{
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checksoc))	// We check feature = checksoc
-		{
-			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
-				if ($user->socid <> $objectid) return false;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
-			{
-				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
-				$sql.= " WHERE sc.fk_soc IN (".$objectid.")";
-				$sql.= " AND sc.fk_user = ".$user->id;
-				$sql.= " AND sc.fk_soc = s.rowid";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
-			{
-				$sql = "SELECT COUNT(s.rowid) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-				$sql.= " WHERE s.rowid IN (".$objectid.")";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
-		{
-			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.fk_soc = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checkproject))
-		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($objectid,$tmparray)) return false;
-			}
-			else
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checktask))
-		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
-			{
-				$task = new Task($db);
-				$task->fetch($objectid);
-
-				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($task->fk_project,$tmparray)) return false;
-			}
-			else
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
-		{
-			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
-				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.rowid IN (".$objectid.")";
-				$sql.= " AND dbt.".$dbt_keyfield." = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
-			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
-				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
-				$sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-				$sql.= " AND sc.fk_user = ".$user->id;
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-
-		if ($sql)
-		{
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$obj = $db->fetch_object($resql);
-				if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
-			}
-			else
-			{
-				return false;
-			}
-		}
-	}
-	return true;
+    global $db, $conf;
+
+    // More parameters
+    $params = explode('&', $tableandshare);
+    $dbtablename=(! empty($params[0]) ? $params[0] : '');
+    $sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+
+    foreach ($featuresarray as $feature)
+    {
+        $sql='';
+
+        // For backward compatibility
+        if ($feature == 'member')  $feature='adherent';
+        if ($feature == 'project') $feature='projet';
+        if ($feature == 'task')    $feature='projet_task';
+
+        $check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
+        $checksoc = array('societe');	 // Test for societe object
+        $checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
+        $checkproject = array('projet','project'); // Test for project object
+        $checktask = array('projet_task');
+        $nocheck = array('barcode','stock');	// No test
+        $checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
+
+        // If dbtablename not defined, we use same name for table than module name
+        if (empty($dbtablename))
+        {
+            $dbtablename = $feature;
+            $sharedelement = (! empty($params[1]) ? $params[1] : $dbtablename);		// We change dbtablename, so we set sharedelement too.
+        }
+
+        // Check permission for object with entity
+        if (in_array($feature,$check))
+        {
+            $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+            $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+            if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled))
+            {
+                if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+                {
+                    if ($conf->entity == 1 && $user->admin && ! $user->entity)
+                    {
+                        $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                        $sql.= " AND dbt.entity IS NOT NULL";
+                    }
+                    else
+                    {
+                        $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+                        $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                        $sql.= " AND (ug.fk_user = dbt.rowid";
+                        $sql.= " AND ug.entity IN (".getEntity('user')."))";
+                        $sql.= " OR dbt.entity = 0"; // Show always superadmin
+                    }
+                }
+                else {
+                    $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                    $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+                }
+            }
+            else
+            {
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checksoc))	// We check feature = checksoc
+        {
+            // If external user: Check permission for external users
+            if ($user->socid > 0)
+            {
+                if ($user->socid <> $objectid) return false;
+            }
+            // If internal user: Check permission for internal users that are restricted on their objects
+            else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+            {
+                $sql = "SELECT COUNT(sc.fk_soc) as nb";
+                $sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
+                $sql.= ", ".MAIN_DB_PREFIX."societe as s)";
+                $sql.= " WHERE sc.fk_soc IN (".$objectid.")";
+                $sql.= " AND sc.fk_user = ".$user->id;
+                $sql.= " AND sc.fk_soc = s.rowid";
+                $sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+            }
+            // If multicompany and internal users with all permissions, check user is in correct entity
+            else if (! empty($conf->multicompany->enabled))
+            {
+                $sql = "SELECT COUNT(s.rowid) as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+                $sql.= " WHERE s.rowid IN (".$objectid.")";
+                $sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+        {
+            // If external user: Check permission for external users
+            if ($user->socid > 0)
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.fk_soc = ".$user->socid;
+            }
+            // If internal user: Check permission for internal users that are restricted on their objects
+            else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+            // If multicompany and internal users with all permissions, check user is in correct entity
+            else if (! empty($conf->multicompany->enabled))
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checkproject))
+        {
+            if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $projectstatic=new Project($db);
+                $tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
+                $tmparray=explode(',',$tmps);
+                if (! in_array($objectid,$tmparray)) return false;
+            }
+            else
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checktask))
+        {
+            if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+            {
+                $task = new Task($db);
+                $task->fetch($objectid);
+
+                include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $projectstatic=new Project($db);
+                $tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
+                $tmparray=explode(',',$tmps);
+                if (! in_array($task->fk_project,$tmparray)) return false;
+            }
+            else
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+        {
+            // If external user: Check permission for external users
+            if ($user->socid > 0)
+            {
+                if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+                $sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.rowid IN (".$objectid.")";
+                $sql.= " AND dbt.".$dbt_keyfield." = ".$user->socid;
+            }
+            // If internal user: Check permission for internal users that are restricted on their objects
+            else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+            {
+                if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+                $sql = "SELECT COUNT(sc.fk_soc) as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+                $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
+                $sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+                $sql.= " AND sc.fk_user = ".$user->id;
+            }
+            // If multicompany and internal users with all permissions, check user is in correct entity
+            else if (! empty($conf->multicompany->enabled))
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+
+        if ($sql)
+        {
+            $resql=$db->query($sql);
+            if ($resql)
+            {
+                $obj = $db->fetch_object($resql);
+                if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+    return true;
 }
 
 /**
@@ -666,30 +666,30 @@ 
         $langs->setDefaultLang();
     }
 
-	$langs->load("errors");
-
-	if ($printheader)
-	{
-		if (function_exists("llxHeader")) llxHeader('');
-		else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
-	}
-	print '<div class="error">';
-	if (! $message) print $langs->trans("ErrorForbidden");
-	else print $message;
-	print '</div>';
-	print '<br>';
-	if (empty($showonlymessage))
-	{
-		if ($user->login)
-		{
-			print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
-			print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
-		}
-		else
-		{
-			print $langs->trans("ErrorForbidden3");
-		}
-	}
-	if ($printfooter && function_exists("llxFooter")) llxFooter();
-	exit(0);
+    $langs->load("errors");
+
+    if ($printheader)
+    {
+        if (function_exists("llxHeader")) llxHeader('');
+        else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
+    }
+    print '<div class="error">';
+    if (! $message) print $langs->trans("ErrorForbidden");
+    else print $message;
+    print '</div>';
+    print '<br>';
+    if (empty($showonlymessage))
+    {
+        if ($user->login)
+        {
+            print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
+            print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
+        }
+        else
+        {
+            print $langs->trans("ErrorForbidden3");
+        }
+    }
+    if ($printfooter && function_exists("llxFooter")) llxFooter();
+    exit(0);
 }

Spacing +207 added lines, -207 removed lines

@@ -34,28 +34,28 @@ 
  *	@return  string					encoded string
  *  @see dol_decode
  */
-function dol_encode($chain, $key='1')
+function dol_encode($chain, $key = '1')
 {
 	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
 	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
+		$output_tab = array();
+		$strlength = dol_strlen($chain);
+		for ($i = 0; $i < $strlength; $i++)
 		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
+			$output_tab[$i] = chr(ord(substr($chain, $i, 1)) + 17);
 		}
-		$chain = implode("",$output_tab);
+		$chain = implode("", $output_tab);
 	}
 	elseif ($key)
 	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
+		$result = '';
+		$strlength = dol_strlen($chain);
+		for ($i = 0; $i < $strlength; $i++)
 		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain,$i,1))+(ord($keychar)-65));
+			$keychar = substr($key, ($i % strlen($key)) - 1, 1);
+			$result .= chr(ord(substr($chain, $i, 1)) + (ord($keychar) - 65));
 		}
-		$chain=$result;
+		$chain = $result;
 	}
 
 	return base64_encode($chain);
@@ -70,31 +70,31 @@ 
  *	@return  string					decoded string
  *  @see dol_encode
  */
-function dol_decode($chain, $key='1')
+function dol_decode($chain, $key = '1')
 {
 	$chain = base64_decode($chain);
 
 	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
 	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength;$i++)
+		$output_tab = array();
+		$strlength = dol_strlen($chain);
+		for ($i = 0; $i < $strlength; $i++)
 		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
+			$output_tab[$i] = chr(ord(substr($chain, $i, 1)) - 17);
 		}
 
-		$chain = implode("",$output_tab);
+		$chain = implode("", $output_tab);
 	}
 	elseif ($key)
 	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
+		$result = '';
+		$strlength = dol_strlen($chain);
+		for ($i = 0; $i < $strlength; $i++)
 		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain, $i, 1))-(ord($keychar)-65));
+			$keychar = substr($key, ($i % strlen($key)) - 1, 1);
+			$result .= chr(ord(substr($chain, $i, 1)) - (ord($keychar) - 65));
 		}
-		$chain=$result;
+		$chain = $result;
 	}
 
 	return $chain;
@@ -111,26 +111,26 @@ 
  * 	@return		string					Hash of string
  *  @getRandomPassword
  */
-function dol_hash($chain, $type='0')
+function dol_hash($chain, $type = '0')
 {
 	global $conf;
 
 	// No need to add salt for password_hash
-	if (($type == '0' || $type == 'auto') && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
+	if (($type == '0' || $type == 'auto') && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
 	{
 		return password_hash($chain, PASSWORD_DEFAULT);
 	}
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	if (!empty($conf->global->MAIN_SECURITY_SALT)) $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
 
 	if ($type == '1' || $type == 'sha1') return sha1($chain);
 	else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
 	else if ($type == '3' || $type == 'md5') return md5($chain);
-	else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	else if ($type == '5') return hash('sha256',$chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+	else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
+	else if ($type == '5') return hash('sha256', $chain);
+	else if (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
+	else if (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
 
 	// No particular encoding defined, use default
 	return md5($chain);
@@ -147,14 +147,14 @@ 
  * 	@param		string		$type		Type of hash ('0':auto, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
  * 	@return		bool					True if the computed hash is the same as the given one
  */
-function dol_verifyHash($chain, $hash, $type='0')
+function dol_verifyHash($chain, $hash, $type = '0')
 {
 	global $conf;
 
-	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
+	if ($type == '0' && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
 		if ($hash[0] == '$') return password_verify($chain, $hash);
-		else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
-		else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+		else if (strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
+		else if (strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
 
 		return false;
 	}
@@ -178,7 +178,7 @@ 
  * 	@return	int						Always 1, die process if not allowed
  *  @see dol_check_secure_access_document
  */
-function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $isdraft=0)
+function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0)
 {
 	global $db, $conf;
 	global $hookmanager;
@@ -189,9 +189,9 @@ 
 	//print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
 
 	// Get more permissions checks from hooks
-	$parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
-	$reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
-	if (! empty($hookmanager->resArray['result'])) return true;
+	$parameters = array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
+	$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
+	if (!empty($hookmanager->resArray['result'])) return true;
 	if ($reshook > 0) return false;
 
 	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
@@ -202,214 +202,214 @@ 
 	else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
 
 	// More subfeatures to check
-	if (! empty($feature2)) $feature2 = explode("|", $feature2);
+	if (!empty($feature2)) $feature2 = explode("|", $feature2);
 
 	// More parameters
 	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+	$dbtablename = (!empty($params[0]) ? $params[0] : '');
+	$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);
 
-	$listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
 
 	// Check read permission from module
-	$readok=1; $nbko=0;
+	$readok = 1; $nbko = 0;
 	foreach ($featuresarray as $feature)	// first we check nb of test ko
 	{
-		$featureforlistofmodule=$feature;
-		if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
-		if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+		$featureforlistofmodule = $feature;
+		if ($featureforlistofmodule == 'produit') $featureforlistofmodule = 'product';
+		if (!empty($user->societe_id) && !empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
 		{
-			$readok=0; $nbko++;
+			$readok = 0; $nbko++;
 			continue;
 		}
 
 		if ($feature == 'societe')
 		{
-			if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->societe->lire && !$user->rights->fournisseur->lire) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'contact')
 		{
-			if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->societe->contact->lire) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'produit|service')
 		{
-			if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->produit->lire && !$user->rights->service->lire) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'prelevement')
 		{
-			if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->prelevement->bons->lire) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'cheque')
 		{
-			if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
+			if (!$user->rights->banque->cheque) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'projet')
 		{
-			if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->projet->lire && !$user->rights->projet->all->lire) { $readok = 0; $nbko++; }
 		}
-		else if (! empty($feature2))	// This should be used for future changes
+		else if (!empty($feature2))	// This should be used for future changes
 		{
-			$tmpreadok=1;
-			foreach($feature2 as $subfeature)
+			$tmpreadok = 1;
+			foreach ($feature2 as $subfeature)
 			{
-				if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
-				else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
-				else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; }
+				else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; }
+				else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
 			}
-			if (! $tmpreadok)	// We found a test on feature that is ko
+			if (!$tmpreadok)	// We found a test on feature that is ko
 			{
-				$readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
+				$readok = 0; // All tests are ko (we manage here the and, the or will be managed later using $nbko).
 				$nbko++;
 			}
 		}
-		else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
+		else if (!empty($feature) && ($feature != 'user' && $feature != 'usergroup'))		// This is for old permissions
 		{
 			if (empty($user->rights->$feature->lire)
 				&& empty($user->rights->$feature->read)
-				&& empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
+				&& empty($user->rights->$feature->run)) { $readok = 0; $nbko++; }
 		}
 	}
 
 	// If a or and at least one ok
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
+	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok = 1;
 
-	if (! $readok) accessforbidden();
+	if (!$readok) accessforbidden();
 	//print "Read access is ok";
 
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
-	$createok=1; $nbko=0;
-	if (GETPOST('action','aZ09')  == 'create' || ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete'))
+	$createok = 1; $nbko = 0;
+	if (GETPOST('action', 'aZ09') == 'create' || ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete'))
 	{
 		foreach ($featuresarray as $feature)
 		{
 			if ($feature == 'contact')
 			{
-				if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
+				if (!$user->rights->societe->contact->creer) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'produit|service')
 			{
-				if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
+				if (!$user->rights->produit->creer && !$user->rights->service->creer) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'prelevement')
 			{
-				if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
+				if (!$user->rights->prelevement->bons->creer) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'commande_fournisseur')
 			{
-				if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
+				if (!$user->rights->fournisseur->commande->creer) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'banque')
 			{
-				if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
+				if (!$user->rights->banque->modifier) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'cheque')
 			{
-				if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
+				if (!$user->rights->banque->cheque) { $createok = 0; $nbko++; }
 			}
-			else if (! empty($feature2))	// This should be used
+			else if (!empty($feature2))	// This should be used
 			{
-				foreach($feature2 as $subfeature)
+				foreach ($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->creer)
 						&& empty($user->rights->$feature->$subfeature->write)
-						&& empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
-						else { $createok=1; break; } // Break to bypass second test if the first is ok
+						&& empty($user->rights->$feature->$subfeature->create)) { $createok = 0; $nbko++; }
+						else { $createok = 1; break; } // Break to bypass second test if the first is ok
 				}
 			}
-			else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
+			else if (!empty($feature))		// This is for old permissions ('creer' or 'write')
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
 				if (empty($user->rights->$feature->creer)
 					&& empty($user->rights->$feature->write)
-					&& empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
+					&& empty($user->rights->$feature->create)) { $createok = 0; $nbko++; }
 			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok = 1;
 
-		if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
+		if (GETPOST('action', 'aZ09') == 'create' && !$createok) accessforbidden();
 		//print "Write access is ok";
 	}
 
 	// Check create user permission
-	$createuserok=1;
-	if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
+	$createuserok = 1;
+	if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes')
 	{
-		if (! $user->rights->user->user->creer) $createuserok=0;
+		if (!$user->rights->user->user->creer) $createuserok = 0;
 
-		if (! $createuserok) accessforbidden();
+		if (!$createuserok) accessforbidden();
 		//print "Create user access is ok";
 	}
 
 	// Check delete permission from module
-	$deleteok=1; $nbko=0;
-	if ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete')
+	$deleteok = 1; $nbko = 0;
+	if ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete')
 	{
 		foreach ($featuresarray as $feature)
 		{
 			if ($feature == 'contact')
 			{
-				if (! $user->rights->societe->contact->supprimer) $deleteok=0;
+				if (!$user->rights->societe->contact->supprimer) $deleteok = 0;
 			}
 			else if ($feature == 'produit|service')
 			{
-				if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
+				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) $deleteok = 0;
 			}
 			else if ($feature == 'commande_fournisseur')
 			{
-				if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
+				if (!$user->rights->fournisseur->commande->supprimer) $deleteok = 0;
 			}
 			else if ($feature == 'banque')
 			{
-				if (! $user->rights->banque->modifier) $deleteok=0;
+				if (!$user->rights->banque->modifier) $deleteok = 0;
 			}
 			else if ($feature == 'cheque')
 			{
-				if (! $user->rights->banque->cheque) $deleteok=0;
+				if (!$user->rights->banque->cheque) $deleteok = 0;
 			}
 			else if ($feature == 'ecm')
 			{
-				if (! $user->rights->ecm->upload) $deleteok=0;
+				if (!$user->rights->ecm->upload) $deleteok = 0;
 			}
 			else if ($feature == 'ftp')
 			{
-				if (! $user->rights->ftp->write) $deleteok=0;
-			}else if ($feature == 'salaries')
+				if (!$user->rights->ftp->write) $deleteok = 0;
+			} else if ($feature == 'salaries')
 			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
+				if (!$user->rights->salaries->delete) $deleteok = 0;
 			}
 			else if ($feature == 'salaries')
 			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
+				if (!$user->rights->salaries->delete) $deleteok = 0;
 			}
-			else if (! empty($feature2))	// This should be used for permissions on 2 levels
+			else if (!empty($feature2))	// This should be used for permissions on 2 levels
 			{
-				foreach($feature2 as $subfeature)
+				foreach ($feature2 as $subfeature)
 				{
-					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
-					else { $deleteok=1; break; } // For bypass the second test if the first is ok
+					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok = 0;
+					else { $deleteok = 1; break; } // For bypass the second test if the first is ok
 				}
 			}
-			else if (! empty($feature))		// This is used for permissions on 1 level
+			else if (!empty($feature))		// This is used for permissions on 1 level
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
 				if (empty($user->rights->$feature->supprimer)
 					&& empty($user->rights->$feature->delete)
-					&& empty($user->rights->$feature->run)) $deleteok=0;
+					&& empty($user->rights->$feature->run)) $deleteok = 0;
 			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok = 1;
 
-		if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
+		if (!$deleteok && !($isdraft && $createok)) accessforbidden();
 		//print "Delete access is ok";
 	}
 
 	// If we have a particular object to check permissions on, we check this object
 	// is linked to a company allowed to $user.
-	if (! empty($objectid) && $objectid > 0)
+	if (!empty($objectid) && $objectid > 0)
 	{
 		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
 		return $ok ? 1 : accessforbidden();
@@ -432,74 +432,74 @@ 
  * @return	bool						True if user has access, False otherwise
  * @see restrictedArea
  */
-function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='', $dbt_select='rowid')
+function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid')
 {
 	global $db, $conf;
 
 	// More parameters
 	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+	$dbtablename = (!empty($params[0]) ? $params[0] : '');
+	$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);
 
 	foreach ($featuresarray as $feature)
 	{
-		$sql='';
+		$sql = '';
 
 		// For backward compatibility
-		if ($feature == 'member')  $feature='adherent';
-		if ($feature == 'project') $feature='projet';
-		if ($feature == 'task')    $feature='projet_task';
-
-		$check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
-		$checksoc = array('societe');	 // Test for societe object
-		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
-		$checkproject = array('projet','project'); // Test for project object
+		if ($feature == 'member')  $feature = 'adherent';
+		if ($feature == 'project') $feature = 'projet';
+		if ($feature == 'task')    $feature = 'projet_task';
+
+		$check = array('adherent', 'banque', 'don', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource'); // Test on entity only (Objects with no link to company)
+		$checksoc = array('societe'); // Test for societe object
+		$checkother = array('contact', 'agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
+		$checkproject = array('projet', 'project'); // Test for project object
 		$checktask = array('projet_task');
-		$nocheck = array('barcode','stock');	// No test
+		$nocheck = array('barcode', 'stock'); // No test
 		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
 
 		// If dbtablename not defined, we use same name for table than module name
 		if (empty($dbtablename))
 		{
 			$dbtablename = $feature;
-			$sharedelement = (! empty($params[1]) ? $params[1] : $dbtablename);		// We change dbtablename, so we set sharedelement too.
+			$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename); // We change dbtablename, so we set sharedelement too.
 		}
 
 		// Check permission for object with entity
-		if (in_array($feature,$check))
+		if (in_array($feature, $check))
 		{
 			$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-			$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-			if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled))
+			$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+			if (($feature == 'user' || $feature == 'usergroup') && !empty($conf->multicompany->enabled))
 			{
-				if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+				if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				{
-					if ($conf->entity == 1 && $user->admin && ! $user->entity)
+					if ($conf->entity == 1 && $user->admin && !$user->entity)
 					{
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND dbt.entity IS NOT NULL";
+						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+						$sql .= " AND dbt.entity IS NOT NULL";
 					}
 					else
 					{
-						$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND (ug.fk_user = dbt.rowid";
-						$sql.= " AND ug.entity IN (".getEntity('user')."))";
-						$sql.= " OR dbt.entity = 0"; // Show always superadmin
+						$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+						$sql .= " AND (ug.fk_user = dbt.rowid";
+						$sql .= " AND ug.entity IN (".getEntity('user')."))";
+						$sql .= " OR dbt.entity = 0"; // Show always superadmin
 					}
 				}
 				else {
-					$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-					$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+					$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
 			}
 			else
 			{
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checksoc))	// We check feature = checksoc
+		else if (in_array($feature, $checksoc))	// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -507,135 +507,135 @@ 
 				if ($user->socid <> $objectid) return false;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+			else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
-				$sql.= " WHERE sc.fk_soc IN (".$objectid.")";
-				$sql.= " AND sc.fk_user = ".$user->id;
-				$sql.= " AND sc.fk_soc = s.rowid";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ", ".MAIN_DB_PREFIX."societe as s)";
+				$sql .= " WHERE sc.fk_soc IN (".$objectid.")";
+				$sql .= " AND sc.fk_user = ".$user->id;
+				$sql .= " AND sc.fk_soc = s.rowid";
+				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
+			else if (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(s.rowid) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-				$sql.= " WHERE s.rowid IN (".$objectid.")";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+				$sql .= " WHERE s.rowid IN (".$objectid.")";
+				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		else if (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.fk_soc = ".$user->socid;
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.fk_soc = ".$user->socid;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+			else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
+			else if (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checkproject))
+		else if (in_array($feature, $checkproject))
 		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($objectid,$tmparray)) return false;
+				$projectstatic = new Project($db);
+				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
+				$tmparray = explode(',', $tmps);
+				if (!in_array($objectid, $tmparray)) return false;
 			}
 			else
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checktask))
+		else if (in_array($feature, $checktask))
 		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
 				$task = new Task($db);
 				$task->fetch($objectid);
 
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($task->fk_project,$tmparray)) return false;
+				$projectstatic = new Project($db);
+				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
+				$tmparray = explode(',', $tmps);
+				if (!in_array($task->fk_project, $tmparray)) return false;
 			}
 			else
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+		else if (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
 				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.rowid IN (".$objectid.")";
-				$sql.= " AND dbt.".$dbt_keyfield." = ".$user->socid;
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.rowid IN (".$objectid.")";
+				$sql .= " AND dbt.".$dbt_keyfield." = ".$user->socid;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+			else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
-				$sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-				$sql.= " AND sc.fk_user = ".$user->id;
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;
+				$sql .= " AND dbt.".$dbt_keyfield." = s.rowid";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " AND sc.fk_user = ".$user->id;
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
+			else if (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
 
 		if ($sql)
 		{
-			$resql=$db->query($sql);
+			$resql = $db->query($sql);
 			if ($resql)
 			{
 				$obj = $db->fetch_object($resql);
-				if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
+				if (!$obj || $obj->nb < count(explode(',', $objectid))) return false;
 			}
 			else
 			{
@@ -656,13 +656,13 @@ 
  *  @param  int		$showonlymessage     Show only message parameter. Otherwise add more information.
  *  @return	void
  */
-function accessforbidden($message='',$printheader=1,$printfooter=1,$showonlymessage=0)
+function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0)
 {
     global $conf, $db, $user, $langs;
-    if (! is_object($langs))
+    if (!is_object($langs))
     {
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-        $langs=new Translate('',$conf);
+        $langs = new Translate('', $conf);
         $langs->setDefaultLang();
     }
 
@@ -674,7 +674,7 @@ 
 		else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
 	}
 	print '<div class="error">';
-	if (! $message) print $langs->trans("ErrorForbidden");
+	if (!$message) print $langs->trans("ErrorForbidden");
 	else print $message;
 	print '</div>';
 	print '<br>';
@@ -683,7 +683,7 @@ 
 		if ($user->login)
 		{
 			print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
-			print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
+			print $langs->trans("ErrorForbidden2", $langs->trans("Home"), $langs->trans("Users"));
 		}
 		else
 		{

Braces +217 added lines, -137 removed lines

@@ -36,17 +36,18 @@ 
  */
 function dol_encode($chain, $key='1')
 {
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+	if (is_numeric($key) && $key == '1') {
+	    // rule 1 is offset of 17 for char
 	{
 		$output_tab=array();
+	}
 		$strlength=dol_strlen($chain);
 		for ($i=0; $i < $strlength; $i++)
 		{
 			$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
 		}
 		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result='';
 		$strlength=dol_strlen($chain);
@@ -74,9 +75,11 @@ 
 {
 	$chain = base64_decode($chain);
 
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+	if (is_numeric($key) && $key == '1') {
+	    // rule 1 is offset of 17 for char
 	{
 		$output_tab=array();
+	}
 		$strlength=dol_strlen($chain);
 		for ($i=0; $i < $strlength;$i++)
 		{
@@ -84,8 +87,7 @@ 
 		}
 
 		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result='';
 		$strlength=dol_strlen($chain);
@@ -122,15 +124,27 @@ 
 	}
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	if (! empty($conf->global->MAIN_SECURITY_SALT)) {
+	    $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	}
 
-	if ($type == '1' || $type == 'sha1') return sha1($chain);
-	else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
-	else if ($type == '3' || $type == 'md5') return md5($chain);
-	else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	else if ($type == '5') return hash('sha256',$chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+	if ($type == '1' || $type == 'sha1') {
+	    return sha1($chain);
+	} else if ($type == '2' || $type == 'sha1md5') {
+	    return sha1(md5($chain));
+	} else if ($type == '3' || $type == 'md5') {
+	    return md5($chain);
+	} else if ($type == '4' || $type == 'md5openldap') {
+	    return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain));
+	}
+	// For OpenLdap with md5 (based on an unencrypted password in base)
+	else if ($type == '5') {
+	    return hash('sha256',$chain);
+	} else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') {
+	    return sha1($chain);
+	} else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') {
+	    return sha1(md5($chain));
+	}
 
 	// No particular encoding defined, use default
 	return md5($chain);
@@ -152,9 +166,16 @@ 
 	global $conf;
 
 	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
-		if ($hash[0] == '$') return password_verify($chain, $hash);
-		else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
-		else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+		if ($hash[0] == '$') {
+		    return password_verify($chain, $hash);
+		} else if(strlen($hash) == 32) {
+		    return dol_verifyHash($chain, $hash, '3');
+		}
+		// md5
+		else if(strlen($hash) == 40) {
+		    return dol_verifyHash($chain, $hash, '2');
+		}
+		// sha1md5
 
 		return false;
 	}
@@ -191,18 +212,29 @@ 
 	// Get more permissions checks from hooks
 	$parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
 	$reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
-	if (! empty($hookmanager->resArray['result'])) return true;
-	if ($reshook > 0) return false;
+	if (! empty($hookmanager->resArray['result'])) {
+	    return true;
+	}
+	if ($reshook > 0) {
+	    return false;
+	}
 
-	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
+	if ($dbt_select != 'rowid' && $dbt_select != 'id') {
+	    $objectid = "'".$objectid."'";
+	}
 
 	// Features/modules to check
 	$featuresarray = array($features);
-	if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
-	else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
+	if (preg_match('/&/', $features)) {
+	    $featuresarray = explode("&", $features);
+	} else if (preg_match('/\|/', $features)) {
+	    $featuresarray = explode("|", $features);
+	}
 
 	// More subfeatures to check
-	if (! empty($feature2)) $feature2 = explode("|", $feature2);
+	if (! empty($feature2)) {
+	    $feature2 = explode("|", $feature2);
+	}
 
 	// More parameters
 	$params = explode('&', $tableandshare);
@@ -213,67 +245,77 @@ 
 
 	// Check read permission from module
 	$readok=1; $nbko=0;
-	foreach ($featuresarray as $feature)	// first we check nb of test ko
+	foreach ($featuresarray as $feature) {
+	    // first we check nb of test ko
 	{
 		$featureforlistofmodule=$feature;
-		if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
-		if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+	}
+		if ($featureforlistofmodule == 'produit') {
+		    $featureforlistofmodule='product';
+		}
+		if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules)) {
+		    // If limits on modules for external users, module must be into list of modules for external users
 		{
-			$readok=0; $nbko++;
+			$readok=0;
+		}
+		$nbko++;
 			continue;
 		}
 
 		if ($feature == 'societe')
 		{
 			if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'contact')
+		} else if ($feature == 'contact')
 		{
 			if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'produit|service')
+		} else if ($feature == 'produit|service')
 		{
 			if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'prelevement')
+		} else if ($feature == 'prelevement')
 		{
 			if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'cheque')
+		} else if ($feature == 'cheque')
 		{
 			if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'projet')
+		} else if ($feature == 'projet')
 		{
 			if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
-		}
-		else if (! empty($feature2))	// This should be used for future changes
+		} else if (! empty($feature2)) {
+		    // This should be used for future changes
 		{
 			$tmpreadok=1;
+		}
 			foreach($feature2 as $subfeature)
 			{
-				if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
-				else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
-				else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+				if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; } else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; } else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
 			}
-			if (! $tmpreadok)	// We found a test on feature that is ko
+			if (! $tmpreadok) {
+			    // We found a test on feature that is ko
 			{
-				$readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
+				$readok=0;
+			}
+			// All tests are ko (we manage here the and, the or will be managed later using $nbko).
 				$nbko++;
 			}
-		}
-		else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
+		} else if (! empty($feature) && ($feature!='user' && $feature!='usergroup')) {
+		    // This is for old permissions
 		{
 			if (empty($user->rights->$feature->lire)
 				&& empty($user->rights->$feature->read)
-				&& empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
+				&& empty($user->rights->$feature->run)) { $readok=0;
+		}
+		$nbko++; }
 		}
 	}
 
 	// If a or and at least one ok
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
+	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+	    $readok=1;
+	}
 
-	if (! $readok) accessforbidden();
+	if (! $readok) {
+	    accessforbidden();
+	}
 	//print "Read access is ok";
 
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
@@ -285,50 +327,52 @@ 
 			if ($feature == 'contact')
 			{
 				if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'produit|service')
+			} else if ($feature == 'produit|service')
 			{
 				if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'prelevement')
+			} else if ($feature == 'prelevement')
 			{
 				if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'commande_fournisseur')
+			} else if ($feature == 'commande_fournisseur')
 			{
 				if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'banque')
+			} else if ($feature == 'banque')
 			{
 				if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'cheque')
+			} else if ($feature == 'cheque')
 			{
 				if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
-			}
-			else if (! empty($feature2))	// This should be used
+			} else if (! empty($feature2)) {
+			    // This should be used
 			{
 				foreach($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->creer)
 						&& empty($user->rights->$feature->$subfeature->write)
-						&& empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
-						else { $createok=1; break; } // Break to bypass second test if the first is ok
-				}
+						&& empty($user->rights->$feature->$subfeature->create)) { $createok=0;
 			}
-			else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
+			$nbko++; } else { $createok=1; break; } // Break to bypass second test if the first is ok
+				}
+			} else if (! empty($feature)) {
+			    // This is for old permissions ('creer' or 'write')
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
 				if (empty($user->rights->$feature->creer)
 					&& empty($user->rights->$feature->write)
-					&& empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
+					&& empty($user->rights->$feature->create)) { $createok=0;
+			}
+			$nbko++; }
 			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+		    $createok=1;
+		}
 
-		if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
+		if (GETPOST('action','aZ09') == 'create' && ! $createok) {
+		    accessforbidden();
+		}
 		//print "Write access is ok";
 	}
 
@@ -336,9 +380,13 @@ 
 	$createuserok=1;
 	if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
 	{
-		if (! $user->rights->user->user->creer) $createuserok=0;
+		if (! $user->rights->user->user->creer) {
+		    $createuserok=0;
+		}
 
-		if (! $createuserok) accessforbidden();
+		if (! $createuserok) {
+		    accessforbidden();
+		}
 		//print "Create user access is ok";
 	}
 
@@ -350,60 +398,76 @@ 
 		{
 			if ($feature == 'contact')
 			{
-				if (! $user->rights->societe->contact->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'produit|service')
+				if (! $user->rights->societe->contact->supprimer) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'produit|service')
 			{
-				if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'commande_fournisseur')
+				if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'commande_fournisseur')
 			{
-				if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'banque')
+				if (! $user->rights->fournisseur->commande->supprimer) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'banque')
 			{
-				if (! $user->rights->banque->modifier) $deleteok=0;
-			}
-			else if ($feature == 'cheque')
+				if (! $user->rights->banque->modifier) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'cheque')
 			{
-				if (! $user->rights->banque->cheque) $deleteok=0;
-			}
-			else if ($feature == 'ecm')
+				if (! $user->rights->banque->cheque) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'ecm')
 			{
-				if (! $user->rights->ecm->upload) $deleteok=0;
-			}
-			else if ($feature == 'ftp')
+				if (! $user->rights->ecm->upload) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'ftp')
 			{
-				if (! $user->rights->ftp->write) $deleteok=0;
-			}else if ($feature == 'salaries')
+				if (! $user->rights->ftp->write) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'salaries')
 			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if ($feature == 'salaries')
+				if (! $user->rights->salaries->delete) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'salaries')
 			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if (! empty($feature2))	// This should be used for permissions on 2 levels
+				if (! $user->rights->salaries->delete) {
+				    $deleteok=0;
+				}
+			} else if (! empty($feature2)) {
+			    // This should be used for permissions on 2 levels
 			{
 				foreach($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
-					else { $deleteok=1; break; } // For bypass the second test if the first is ok
+			} else { $deleteok=1; break; } // For bypass the second test if the first is ok
 				}
-			}
-			else if (! empty($feature))		// This is used for permissions on 1 level
+			} else if (! empty($feature)) {
+			    // This is used for permissions on 1 level
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
 				if (empty($user->rights->$feature->supprimer)
 					&& empty($user->rights->$feature->delete)
 					&& empty($user->rights->$feature->run)) $deleteok=0;
 			}
+			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+		    $deleteok=1;
+		}
 
-		if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
+		if (! $deleteok && ! ($isdraft && $createok)) {
+		    accessforbidden();
+		}
 		//print "Delete access is ok";
 	}
 
@@ -446,9 +510,15 @@ 
 		$sql='';
 
 		// For backward compatibility
-		if ($feature == 'member')  $feature='adherent';
-		if ($feature == 'project') $feature='projet';
-		if ($feature == 'task')    $feature='projet_task';
+		if ($feature == 'member') {
+		    $feature='adherent';
+		}
+		if ($feature == 'project') {
+		    $feature='projet';
+		}
+		if ($feature == 'task') {
+		    $feature='projet_task';
+		}
 
 		$check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe');	 // Test for societe object
@@ -478,8 +548,7 @@ 
 					{
 						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql.= " AND dbt.entity IS NOT NULL";
-					}
-					else
+					} else
 					{
 						$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
@@ -487,24 +556,23 @@ 
 						$sql.= " AND ug.entity IN (".getEntity('user')."))";
 						$sql.= " OR dbt.entity = 0"; // Show always superadmin
 					}
-				}
-				else {
+				} else {
 					$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 					$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
-			}
-			else
+			} else
 			{
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checksoc))	// We check feature = checksoc
+		} else if (in_array($feature,$checksoc)) {
+		    // We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				if ($user->socid <> $objectid) return false;
+		}
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
 			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
@@ -525,13 +593,14 @@ 
 				$sql.= " WHERE s.rowid IN (".$objectid.")";
 				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		} else if (in_array($feature,$checkother)) {
+		    // Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+		}
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.fk_soc = ".$user->socid;
@@ -554,8 +623,7 @@ 
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checkproject))
+		} else if (in_array($feature,$checkproject))
 		{
 			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -563,17 +631,17 @@ 
 				$projectstatic=new Project($db);
 				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
 				$tmparray=explode(',',$tmps);
-				if (! in_array($objectid,$tmparray)) return false;
-			}
-			else
+				if (! in_array($objectid,$tmparray)) {
+				    return false;
+				}
+			} else
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checktask))
+		} else if (in_array($feature,$checktask))
 		{
 			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -584,22 +652,24 @@ 
 				$projectstatic=new Project($db);
 				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
 				$tmparray=explode(',',$tmps);
-				if (! in_array($task->fk_project,$tmparray)) return false;
-			}
-			else
+				if (! in_array($task->fk_project,$tmparray)) {
+				    return false;
+				}
+			} else
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+		} else if (! in_array($feature,$nocheck)) {
+		    // By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+		}
 				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.rowid IN (".$objectid.")";
@@ -608,7 +678,9 @@ 
 			// If internal user: Check permission for internal users that are restricted on their objects
 			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
 			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) {
+				    dol_print_error('','Param dbt_keyfield is required but not defined');
+				}
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -635,9 +707,10 @@ 
 			if ($resql)
 			{
 				$obj = $db->fetch_object($resql);
-				if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
-			}
-			else
+				if (! $obj || $obj->nb < count(explode(',', $objectid))) {
+				    return false;
+				}
+			} else
 			{
 				return false;
 			}
@@ -670,12 +743,18 @@ 
 
 	if ($printheader)
 	{
-		if (function_exists("llxHeader")) llxHeader('');
-		else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
+		if (function_exists("llxHeader")) {
+		    llxHeader('');
+		} else if (function_exists("llxHeaderVierge")) {
+		    llxHeaderVierge('');
+		}
 	}
 	print '<div class="error">';
-	if (! $message) print $langs->trans("ErrorForbidden");
-	else print $message;
+	if (! $message) {
+	    print $langs->trans("ErrorForbidden");
+	} else {
+	    print $message;
+	}
 	print '</div>';
 	print '<br>';
 	if (empty($showonlymessage))
@@ -684,12 +763,13 @@ 
 		{
 			print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
 			print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
-		}
-		else
+		} else
 		{
 			print $langs->trans("ErrorForbidden3");
 		}
 	}
-	if ($printfooter && function_exists("llxFooter")) llxFooter();
+	if ($printfooter && function_exists("llxFooter")) {
+	    llxFooter();
+	}
 	exit(0);
 }

dolibarr/htdocs/core/lib/functions2.lib.php

Indentation +400 added lines, -400 removed lines

@@ -126,7 +126,7 @@ 
 
     $selected='EUA4';
     if (!$outputlangs) {
-    	$outputlangs=$langs;
+        $outputlangs=$langs;
     }
 
     if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada
@@ -230,15 +230,15 @@ 
         else print ': ';
         if (is_object($object->user_creation))
         {
-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -266,15 +266,15 @@ 
         else print ': ';
         if (is_object($object->user_modification))
         {
-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -303,14 +303,14 @@ 
         if (is_object($object->user_validation))
         {
             if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -339,14 +339,14 @@ 
         if (is_object($object->user_approve))
         {
             if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -402,15 +402,15 @@ 
         else print ': ';
         if (is_object($object->user_cloture))
         {
-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_cloture);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -438,15 +438,15 @@ 
         else print ': ';
         if (is_object($object->user_rappro))
         {
-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_rappro);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -492,8 +492,8 @@ 
  */
 function dolAddEmailTrackId($email, $trackingid)
 {
-	$tmp=explode('@',$email);
-	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');
+    $tmp=explode('@',$email);
+    return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');
 }
 
 /**
@@ -619,33 +619,33 @@ 
  */
 function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
 {
-	if(!isValidEmail($mail))return '';
-	$tab = explode('@', $mail);
-	$tab2 = explode('.',$tab[1]);
-	$string_replace = '';
-	$mail_name = $tab[0];
-	$mail_domaine = $tab2[0];
-	$mail_tld = '';
-
-	$nbofelem = count($tab2);
-	for($i=1; $i < $nbofelem && $displaytld; $i++)
-	{
-		$mail_tld .= '.'.$tab2[$i];
-	}
-
-	for($i=0; $i < $nbreplace; $i++){
-		$string_replace .= $replace;
-	}
-
-	if(strlen($mail_name) > $nbdisplaymail){
-		$mail_name = substr($mail_name, 0, $nbdisplaymail);
-	}
-
-	if(strlen($mail_domaine) > $nbdisplaydomain){
-		$mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);
-	}
-
-	return $mail_name . $string_replace . $mail_domaine . $mail_tld;
+    if(!isValidEmail($mail))return '';
+    $tab = explode('@', $mail);
+    $tab2 = explode('.',$tab[1]);
+    $string_replace = '';
+    $mail_name = $tab[0];
+    $mail_domaine = $tab2[0];
+    $mail_tld = '';
+
+    $nbofelem = count($tab2);
+    for($i=1; $i < $nbofelem && $displaytld; $i++)
+    {
+        $mail_tld .= '.'.$tab2[$i];
+    }
+
+    for($i=0; $i < $nbreplace; $i++){
+        $string_replace .= $replace;
+    }
+
+    if(strlen($mail_name) > $nbdisplaymail){
+        $mail_name = substr($mail_name, 0, $nbdisplaymail);
+    }
+
+    if(strlen($mail_domaine) > $nbdisplaydomain){
+        $mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);
+    }
+
+    return $mail_name . $string_replace . $mail_domaine . $mail_tld;
 }
 
 
@@ -783,24 +783,24 @@ 
     }
     else
     {
-    	$masktype='';
-    	$masktype_value='';
+        $masktype='';
+        $masktype_value='';
     }
 
     // Extract value for user
     if (preg_match('/\{(u+)\}/i',$mask,$regType))
     {
-    	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-    	if (is_object($objuser)) $lastname = $objuser->lastname;
+        $lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
+        if (is_object($objuser)) $lastname = $objuser->lastname;
 
-    	$maskuser=$regType[1];
-    	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
-    	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
+        $maskuser=$regType[1];
+        $maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
+        $maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
     }
     else
     {
-    	$maskuser='';
-    	$maskuser_value='';
+        $maskuser='';
+        $maskuser_value='';
     }
 
     // Personalized field {XXX-1} à {XXX-9}
@@ -816,12 +816,12 @@ 
 
     if (strstr($mask,'user_extra_'))
     {
-			$start = "{user_extra_";
-			$end = "\}";
-			$extra= get_string_between($mask, "user_extra_", "}");
-			if(!empty($user->array_options['options_'.$extra])){
-				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
-			}
+            $start = "{user_extra_";
+            $end = "\}";
+            $extra= get_string_between($mask, "user_extra_", "}");
+            if(!empty($user->array_options['options_'.$extra])){
+                $mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
+            }
     }
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
@@ -882,7 +882,7 @@ 
         else // if reset is for a specific month in year, we need year
         {
             if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
+            else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
             else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }
             else return 'ErrorCantUseRazIfNoYearInMask';
         }
@@ -890,11 +890,11 @@ 
         $yearlen = $posy?dol_strlen($reg[$posy]):0;
         $monthlen = $posm?dol_strlen($reg[$posm]):0;
         // Define pos
-       	$yearpos = (dol_strlen($reg[1])+1);
+            $yearpos = (dol_strlen($reg[1])+1);
         $monthpos = ($yearpos+$yearlen);
         if ($posy == 3 && $posm == 2) {		// if month is before year
-          	$monthpos = (dol_strlen($reg[1])+1);
-           	$yearpos = ($monthpos+$monthlen);
+                $monthpos = (dol_strlen($reg[1])+1);
+                $yearpos = ($monthpos+$monthlen);
         }
         //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";
 
@@ -904,20 +904,20 @@ 
 
         if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
         {
-        	$currentyear=date("Y", $date);
-        	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
-        	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
-        	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
-        	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
-
-        	// If after or equal of current fiscal date
-        	if ($date >= $fiscaldate)
-        	{
-        		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
-        	}
-        	// If after or equal of current new year date
-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
+            $currentyear=date("Y", $date);
+            $fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
+            $newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
+            $nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
+            //echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
+
+            // If after or equal of current fiscal date
+            if ($date >= $fiscaldate)
+            {
+                // If before of next new year date
+                if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
+            }
+            // If after or equal of current new year date
+            else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
         }
         // For backward compatibility
         else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year
@@ -938,11 +938,11 @@ 
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
             $sqlwhere.=')';
         }
-		else if ($resetEveryMonth)
-		{
-			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
+        else if ($resetEveryMonth)
+        {
+            $sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
+        }
         else   // reset is done on january
         {
             $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
@@ -953,13 +953,13 @@ 
 
     // Define $sqlstring
     if (function_exists('mb_strrpos'))
-    	{
-    	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
-	}
-	else
-	{
-    	$posnumstart=strrpos($maskwithnocode,$maskcounter);
-	}	// Pos of counter in final string (from 0 to ...)
+        {
+        $posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
+    }
+    else
+    {
+        $posnumstart=strrpos($maskwithnocode,$maskcounter);
+    }	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';
 
@@ -978,7 +978,7 @@ 
     if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
     foreach($maskperso as $key => $val)
     {
-    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
+        $maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
     }
 
     // Get counter in database
@@ -986,11 +986,11 @@ 
     $sql = "SELECT MAX(".$sqlstring.") as val";
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
+    $sql.= " AND ".$field." NOT LIKE '(PROV%)'";
     if ($bentityon) // only if entity enable
-    	$sql.= " AND entity IN (".getEntity($sharetable).")";
+        $sql.= " AND entity IN (".getEntity($sharetable).")";
     else if (! empty($forceentity))
-    	$sql.= " AND entity IN (".$forceentity.")";
+        $sql.= " AND entity IN (".$forceentity.")";
     if ($where) $sql.=$where;
     if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 
@@ -1008,8 +1008,8 @@ 
     if (empty($counter)) $counter=$maskoffset;
     else if (preg_match('/[^0-9]/i',$counter))
     {
-    	$counter=0;
-    	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
+        $counter=0;
+        dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
     }
     else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;
 
@@ -1035,11 +1035,11 @@ 
         $sql = "SELECT ".$field." as ref";
         $sql.= " FROM ".MAIN_DB_PREFIX.$table;
         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-    	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
-    	if ($bentityon) // only if entity enable
-        	$sql.= " AND entity IN (".getEntity($sharetable).")";
+        $sql.= " AND ".$field." NOT LIKE '%PROV%'";
+        if ($bentityon) // only if entity enable
+            $sql.= " AND entity IN (".getEntity($sharetable).")";
         else if (! empty($forceentity))
-        	$sql.= " AND entity IN (".$forceentity.")";
+            $sql.= " AND entity IN (".$forceentity.")";
         if ($where) $sql.=$where;
         if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 
@@ -1061,7 +1061,7 @@ 
         // If value for $counter has a length higher than $maskcounter chars
         if ($counter >= pow(10, dol_strlen($maskcounter)))
         {
-        	$counter='ErrorMaxNumberReachForThisMask';
+            $counter='ErrorMaxNumberReachForThisMask';
         }
 
         if (! empty($maskrefclient_maskcounter))
@@ -1093,9 +1093,9 @@ 
             //$sql.= " WHERE ".$field." not like '(%'";
             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
             if ($bentityon) // only if entity enable
-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
+                $maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
             else if (! empty($forceentity))
-            	$sql.= " AND entity IN (".$forceentity.")";
+                $sql.= " AND entity IN (".$forceentity.")";
             if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
             if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
@@ -1110,25 +1110,25 @@ 
             else dol_print_error($db);
 
             if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
-			$maskrefclient_counter++;
+            $maskrefclient_counter++;
         }
 
         // Build numFinal
         $numFinal = $mask;
 
         // We replace special codes except refclient
-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
-		{
-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
-		}
-		else	// we want yyyy to be current year
-		{
-        	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);
-		}
+        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
+        {
+            $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
+            $numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
+            $numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
+        }
+        else	// we want yyyy to be current year
+        {
+            $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
+            $numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
+            $numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);
+        }
         $numFinal = preg_replace('/\{mm\}/i',  date("m",$date), $numFinal);
         $numFinal = preg_replace('/\{dd\}/i',  date("d",$date), $numFinal);
 
@@ -1158,9 +1158,9 @@ 
         // Now we replace the user
         if ($maskuser)
         {
-        	$maskuser_maskbefore='{'.$maskuser.'}';
-        	$maskuser_maskafter=$maskuser_value;
-        	$numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);
+            $maskuser_maskbefore='{'.$maskuser.'}';
+            $maskuser_maskafter=$maskuser_value;
+            $numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);
         }
     }
 
@@ -1179,11 +1179,11 @@ 
 function get_string_between($string, $start, $end)
 {
     $string = " ".$string;
-     $ini = strpos($string,$start);
-     if ($ini == 0) return "";
-     $ini += strlen($start);
-     $len = strpos($string,$end,$ini) - $ini;
-     return substr($string,$ini,$len);
+        $ini = strpos($string,$start);
+        if ($ini == 0) return "";
+        $ini += strlen($start);
+        $len = strpos($string,$end,$ini) - $ini;
+        return substr($string,$ini,$len);
 }
 
 /**
@@ -1531,7 +1531,7 @@ 
     }
     else
     {
-    	$string = vatrate($reduction,true);
+        $string = vatrate($reduction,true);
     }
 
     return $string;
@@ -1624,7 +1624,7 @@ 
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
                 $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
 
-		$listoffiles=array();
+        $listoffiles=array();
 
                 // Now we add models found in directories scanned
                 $listofdir=explode(',',$dirtoscan);
@@ -1635,8 +1635,8 @@ 
                     if (! $tmpdir) { unset($listofdir[$key]); continue; }
                     if (is_dir($tmpdir))
                     {
-			// all type of template is allowed
-			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
+            // all type of template is allowed
+            $tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
                         if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
                     }
                 }
@@ -1692,19 +1692,19 @@ 
  */
 function is_ip($ip)
 {
-	// First we test if it is a valid IPv4
-	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+    // First we test if it is a valid IPv4
+    if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 
-		// Then we test if it is a private range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+        // Then we test if it is a private range
+        if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
 
-		// Then we test if it is a reserved range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+        // Then we test if it is a reserved range
+        if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
 
-		return 1;
-	}
+        return 1;
+    }
 
-	return 0;
+    return 0;
 }
 
 /**
@@ -1744,25 +1744,25 @@ 
     if ($proxyuse)
     {
         $params=array('connection_timeout'=>$timeout,
-                      'response_timeout'=>$response_timeout,
-                      'proxy_use'      => 1,
-                      'proxy_host'     => $proxyhost,
-                      'proxy_port'     => $proxyport,
-                      'proxy_login'    => $proxyuser,
-                      'proxy_password' => $proxypass,
-                      'trace'		   => 1
+                        'response_timeout'=>$response_timeout,
+                        'proxy_use'      => 1,
+                        'proxy_host'     => $proxyhost,
+                        'proxy_port'     => $proxyport,
+                        'proxy_login'    => $proxyuser,
+                        'proxy_password' => $proxypass,
+                        'trace'		   => 1
         );
     }
     else
     {
         $params=array('connection_timeout'=>$timeout,
-                      'response_timeout'=>$response_timeout,
-                      'proxy_use'      => 0,
-                      'proxy_host'     => false,
-                      'proxy_port'     => false,
-                      'proxy_login'    => false,
-                      'proxy_password' => false,
-                      'trace'		   => 1
+                        'response_timeout'=>$response_timeout,
+                        'proxy_use'      => 0,
+                        'proxy_host'     => false,
+                        'proxy_port'     => false,
+                        'proxy_login'    => false,
+                        'proxy_password' => false,
+                        'trace'		   => 1
         );
     }
     return $params;
@@ -1780,118 +1780,118 @@ 
  */
 function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')
 {
-	global $db, $conf, $langs;
-
-	$ret='';
-
-	// Parse element/subelement (ex: project_task)
-	$module = $element = $subelement = $objecttype;
-	if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
-	{
-		$module = $element = $regs[1];
-		$subelement = $regs[2];
-	}
-
-	$classpath = $element.'/class';
-
-	// To work with non standard path
-	if ($objecttype == 'facture' || $objecttype == 'invoice') {
-		$classpath = 'compta/facture/class';
-		$module='facture';
-		$subelement='facture';
-	}
-	if ($objecttype == 'commande' || $objecttype == 'order') {
-		$classpath = 'commande/class';
-		$module='commande';
-		$subelement='commande';
-	}
-	if ($objecttype == 'propal')  {
-		$classpath = 'comm/propal/class';
-	}
-	if ($objecttype == 'supplier_proposal')  {
-		$classpath = 'supplier_proposal/class';
-	}
-	if ($objecttype == 'shipping') {
-		$classpath = 'expedition/class';
-		$subelement = 'expedition';
-		$module = 'expedition_bon';
-	}
-	if ($objecttype == 'delivery') {
-		$classpath = 'livraison/class';
-		$subelement = 'livraison';
-		$module = 'livraison_bon';
-	}
-	if ($objecttype == 'contract') {
-		$classpath = 'contrat/class';
-		$module='contrat';
-		$subelement='contrat';
-	}
-	if ($objecttype == 'member') {
-		$classpath = 'adherents/class';
-		$module='adherent';
-		$subelement='adherent';
-	}
-	if ($objecttype == 'cabinetmed_cons') {
-		$classpath = 'cabinetmed/class';
-		$module='cabinetmed';
-		$subelement='cabinetmedcons';
-	}
-	if ($objecttype == 'fichinter') {
-		$classpath = 'fichinter/class';
-		$module='ficheinter';
-		$subelement='fichinter';
-	}
-	if ($objecttype == 'task') {
-		$classpath = 'projet/class';
-		$module='projet';
-		$subelement='task';
-	}
-	if ($objecttype == 'stock') {
-		$classpath = 'product/stock/class';
-		$module='stock';
-		$subelement='stock';
-	}
-
-	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;
-
-	$classfile = strtolower($subelement); $classname = ucfirst($subelement);
-	if ($objecttype == 'invoice_supplier') {
-		$classfile = 'fournisseur.facture';
-		$classname='FactureFournisseur';
-		$classpath = 'fourn/class';
-		$module='fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier')   {
-		$classfile = 'fournisseur.commande';
-		$classname='CommandeFournisseur';
-		$classpath = 'fourn/class';
-		$module='fournisseur';
-	}
-	elseif ($objecttype == 'stock')   {
-		$classpath = 'product/stock/class';
-		$classfile='entrepot';
-		$classname='Entrepot';
-	}
-	if (! empty($conf->$module->enabled))
-	{
-		$res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
-		if ($res)
-		{
-			if (class_exists($classname))
-			{
-				$object = new $classname($db);
-				$res=$object->fetch($objectid);
-				if ($res > 0) {
-					$ret=$object->getNomUrl($withpicto,$option);
-				} elseif($res==0) {
-					$ret=$langs->trans('Deleted');
-				}
-				unset($object);
-			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
-		}
-	}
-	return $ret;
+    global $db, $conf, $langs;
+
+    $ret='';
+
+    // Parse element/subelement (ex: project_task)
+    $module = $element = $subelement = $objecttype;
+    if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
+    {
+        $module = $element = $regs[1];
+        $subelement = $regs[2];
+    }
+
+    $classpath = $element.'/class';
+
+    // To work with non standard path
+    if ($objecttype == 'facture' || $objecttype == 'invoice') {
+        $classpath = 'compta/facture/class';
+        $module='facture';
+        $subelement='facture';
+    }
+    if ($objecttype == 'commande' || $objecttype == 'order') {
+        $classpath = 'commande/class';
+        $module='commande';
+        $subelement='commande';
+    }
+    if ($objecttype == 'propal')  {
+        $classpath = 'comm/propal/class';
+    }
+    if ($objecttype == 'supplier_proposal')  {
+        $classpath = 'supplier_proposal/class';
+    }
+    if ($objecttype == 'shipping') {
+        $classpath = 'expedition/class';
+        $subelement = 'expedition';
+        $module = 'expedition_bon';
+    }
+    if ($objecttype == 'delivery') {
+        $classpath = 'livraison/class';
+        $subelement = 'livraison';
+        $module = 'livraison_bon';
+    }
+    if ($objecttype == 'contract') {
+        $classpath = 'contrat/class';
+        $module='contrat';
+        $subelement='contrat';
+    }
+    if ($objecttype == 'member') {
+        $classpath = 'adherents/class';
+        $module='adherent';
+        $subelement='adherent';
+    }
+    if ($objecttype == 'cabinetmed_cons') {
+        $classpath = 'cabinetmed/class';
+        $module='cabinetmed';
+        $subelement='cabinetmedcons';
+    }
+    if ($objecttype == 'fichinter') {
+        $classpath = 'fichinter/class';
+        $module='ficheinter';
+        $subelement='fichinter';
+    }
+    if ($objecttype == 'task') {
+        $classpath = 'projet/class';
+        $module='projet';
+        $subelement='task';
+    }
+    if ($objecttype == 'stock') {
+        $classpath = 'product/stock/class';
+        $module='stock';
+        $subelement='stock';
+    }
+
+    //print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;
+
+    $classfile = strtolower($subelement); $classname = ucfirst($subelement);
+    if ($objecttype == 'invoice_supplier') {
+        $classfile = 'fournisseur.facture';
+        $classname='FactureFournisseur';
+        $classpath = 'fourn/class';
+        $module='fournisseur';
+    }
+    elseif ($objecttype == 'order_supplier')   {
+        $classfile = 'fournisseur.commande';
+        $classname='CommandeFournisseur';
+        $classpath = 'fourn/class';
+        $module='fournisseur';
+    }
+    elseif ($objecttype == 'stock')   {
+        $classpath = 'product/stock/class';
+        $classfile='entrepot';
+        $classname='Entrepot';
+    }
+    if (! empty($conf->$module->enabled))
+    {
+        $res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
+        if ($res)
+        {
+            if (class_exists($classname))
+            {
+                $object = new $classname($db);
+                $res=$object->fetch($objectid);
+                if ($res > 0) {
+                    $ret=$object->getNomUrl($withpicto,$option);
+                } elseif($res==0) {
+                    $ret=$langs->trans('Deleted');
+                }
+                unset($object);
+            }
+            else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+        }
+    }
+    return $ret;
 }
 
 
@@ -1905,113 +1905,113 @@ 
  */
 function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 {
-	$totalnb=0;
-	$listofid=array();
-	$listofparentid=array();
-
-	// Get list of all id in array listofid and all parents in array listofparentid
-	$sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			$listofid[]=$obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
-			$i++;
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	if (count($listofid))
-	{
-		print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";
-
-		// Check loops on each other
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$nb=$db->affected_rows($sql);
-			if ($nb > 0)
-			{
-				print '<br>Some record that were parent of themself were cleaned.';
-			}
-
-			$totalnb+=$nb;
-		}
-		//else dol_print_error($db);
-
-		// Check other loops
-		$listofidtoclean=array();
-		foreach($listofparentid as $id => $pid)
-		{
-			// Check depth
-			//print 'Analyse record id='.$id.' with parent '.$pid.'<br>';
-
-			$cursor=$id; $arrayidparsed=array();	// We start from child $id
-			while ($cursor > 0)
-			{
-				$arrayidparsed[$cursor]=1;
-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
-				{
-					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
-					unset($arrayidparsed);
-					$listofidtoclean[$cursor]=$id;
-					break;
-				}
-				$cursor=$listofparentid[$cursor];
-			}
-
-			if (count($listofidtoclean)) break;
-		}
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$nb=$db->affected_rows($sql);
-			if ($nb > 0)
-			{
-				// Removed orphelins records
-				print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';
-				print join(',',$listofidtoclean);
-			}
-
-			$totalnb+=$nb;
-		}
-		//else dol_print_error($db);
-
-		// Check and clean orphelins
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$nb=$db->affected_rows($sql);
-			if ($nb > 0)
-			{
-				// Removed orphelins records
-				print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';
-				print join(',',$listofid);
-			}
-
-			$totalnb+=$nb;
-		}
-		//else dol_print_error($db);
-
-		print '<br>We fixed '.$totalnb.' record(s). Some records may still be corrupted. New check may be required.';
-		return $totalnb;
-	}
+    $totalnb=0;
+    $listofid=array();
+    $listofparentid=array();
+
+    // Get list of all id in array listofid and all parents in array listofparentid
+    $sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            $listofid[]=$obj->rowid;
+            if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
+            $i++;
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+    if (count($listofid))
+    {
+        print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";
+
+        // Check loops on each other
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $nb=$db->affected_rows($sql);
+            if ($nb > 0)
+            {
+                print '<br>Some record that were parent of themself were cleaned.';
+            }
+
+            $totalnb+=$nb;
+        }
+        //else dol_print_error($db);
+
+        // Check other loops
+        $listofidtoclean=array();
+        foreach($listofparentid as $id => $pid)
+        {
+            // Check depth
+            //print 'Analyse record id='.$id.' with parent '.$pid.'<br>';
+
+            $cursor=$id; $arrayidparsed=array();	// We start from child $id
+            while ($cursor > 0)
+            {
+                $arrayidparsed[$cursor]=1;
+                if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
+                {
+                    print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
+                    unset($arrayidparsed);
+                    $listofidtoclean[$cursor]=$id;
+                    break;
+                }
+                $cursor=$listofparentid[$cursor];
+            }
+
+            if (count($listofidtoclean)) break;
+        }
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
+        $sql.= " SET ".$fieldfkparent." = 0";
+        $sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $nb=$db->affected_rows($sql);
+            if ($nb > 0)
+            {
+                // Removed orphelins records
+                print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';
+                print join(',',$listofidtoclean);
+            }
+
+            $totalnb+=$nb;
+        }
+        //else dol_print_error($db);
+
+        // Check and clean orphelins
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
+        $sql.= " SET ".$fieldfkparent." = 0";
+        $sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $nb=$db->affected_rows($sql);
+            if ($nb > 0)
+            {
+                // Removed orphelins records
+                print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';
+                print join(',',$listofid);
+            }
+
+            $totalnb+=$nb;
+        }
+        //else dol_print_error($db);
+
+        print '<br>We fixed '.$totalnb.' record(s). Some records may still be corrupted. New check may be required.';
+        return $totalnb;
+    }
 }
 
 /**
@@ -2143,21 +2143,21 @@ 
 function fetchObjectByElement($element_id, $element_type, $element_ref='')
 {
     global $conf;
-	global $db,$conf;
+    global $db,$conf;
 
     $element_prop = getElementProperties($element_type);
     if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)
     {
         dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');
 
-		$objecttmp = new $element_prop['classname']($db);
-		$ret = $objecttmp->fetch($element_id, $element_ref);
-		if ($ret >= 0)
-		{
-			return $objecttmp;
-		}
-	}
-	return 0;
+        $objecttmp = new $element_prop['classname']($db);
+        $ret = $objecttmp->fetch($element_id, $element_ref);
+        if ($ret >= 0)
+        {
+            return $objecttmp;
+        }
+    }
+    return 0;
 }
 
 
@@ -2172,9 +2172,9 @@ 
  */
 function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 {
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	if (empty($arraycolor)) return $colorifnotfound;
-	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
+    if (! is_array($arraycolor)) return $colorifnotfound;
+    if (empty($arraycolor)) return $colorifnotfound;
+    return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
 }
 
 /**
@@ -2189,15 +2189,15 @@ 
  */
 function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
 {
-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
-	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
-	if (! $tmp)
-	{
-		$tmp=explode(',',$stringcolor);
-		if (count($tmp) < 3) return $colorifnotfound;
-		return $tmp;
-	}
-	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+    if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+    $tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
+    if (! $tmp)
+    {
+        $tmp=explode(',',$stringcolor);
+        if (count($tmp) < 3) return $colorifnotfound;
+        return $tmp;
+    }
+    return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
 }
 
 /**
@@ -2243,7 +2243,7 @@ 
     if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
 
     if ($module == 'contracts') {
-    	$moduledirforclass = 'contrat';
+        $moduledirforclass = 'contrat';
     }
     elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
         $moduledirforclass = 'api';
@@ -2270,7 +2270,7 @@ 
         $moduledirforclass = 'commande';
     }
     elseif ($module == 'shipments') {
-    	$moduledirforclass = 'expedition';
+        $moduledirforclass = 'expedition';
     }
     elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
         $moduledirforclass = 'compta/facture';
@@ -2288,7 +2288,7 @@ 
         $moduledirforclass = 'product/stock';
     }
     elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
-    	$moduledirforclass = 'supplier_proposal';
+        $moduledirforclass = 'supplier_proposal';
     }
     elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
         $moduledirforclass = 'fourn';
@@ -2300,10 +2300,10 @@ 
         $moduledirforclass = 'user';
     }
     elseif ($module == 'ficheinter' || $module == 'interventions') {
-    	$moduledirforclass = 'fichinter';
+        $moduledirforclass = 'fichinter';
     }
     elseif ($module == 'tickets') {
-    	$moduledirforclass = 'ticket';
+        $moduledirforclass = 'ticket';
     }
 
     return $moduledirforclass;

Spacing +548 added lines, -548 removed lines

@@ -52,7 +52,7 @@ 
                 $pos++;
                 $unicodeHexVal = substr($source, $pos, 4);
                 $unicode = hexdec($unicodeHexVal);
-                $entity = "&#". $unicode . ';';
+                $entity = "&#".$unicode.';';
                 $decodedStr .= utf8_encode($entity);
                 $pos += 4;
             }
@@ -78,32 +78,32 @@ 
  * @param	string	$subdir		Sub directory (Example: '/mailings')
  * @return	array				Array of directories that can contains module descriptors
  */
-function dolGetModulesDirs($subdir='')
+function dolGetModulesDirs($subdir = '')
 {
     global $conf;
 
-    $modulesdir=array();
+    $modulesdir = array();
 
     foreach ($conf->file->dol_document_root as $type => $dirroot)
     {
         // Default core/modules dir
         if ($type === 'main') {
-            $modulesdir[$dirroot . '/core/modules' . $subdir . '/'] = $dirroot . '/core/modules' . $subdir . '/';
+            $modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';
         }
 
         // Scan dir from external modules
-        $handle=@opendir($dirroot);
+        $handle = @opendir($dirroot);
         if (is_resource($handle))
         {
-            while (($file = readdir($handle))!==false)
+            while (($file = readdir($handle)) !== false)
             {
-                if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.
+                if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.
 
                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
                 {
-                    if (is_dir($dirroot . '/' . $file . '/core/modules'.$subdir.'/'))
+                    if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))
                     {
-                        $modulesdir[$dirroot . '/' . $file . '/core/modules'.$subdir.'/'] = $dirroot . '/' . $file . '/core/modules'.$subdir.'/';
+                        $modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';
                     }
                 }
             }
@@ -124,13 +124,13 @@ 
 {
     global $langs;
 
-    $selected='EUA4';
+    $selected = 'EUA4';
     if (!$outputlangs) {
-    	$outputlangs=$langs;
+    	$outputlangs = $langs;
     }
 
-    if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada
-    if ($outputlangs->defaultlang == 'en_US') $selected='USLetter';    // US
+    if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada
+    if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US
     return $selected;
 }
 
@@ -142,20 +142,20 @@ 
  *  @param  int			$searchalt      1=Search also in alternative languages
  *	@return	boolean						true if OK, false if KO
  */
-function dol_print_file($langs,$filename,$searchalt=0)
+function dol_print_file($langs, $filename, $searchalt = 0)
 {
     global $conf;
 
     // Test if file is in lang directory
-    foreach($langs->dir as $searchdir)
+    foreach ($langs->dir as $searchdir)
     {
-        $formfile=($searchdir."/langs/".$langs->defaultlang."/".$filename);
+        $formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);
         dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);
         if (is_readable($formfile))
         {
-            $content=file_get_contents($formfile);
-            $isutf8=utf8_check($content);
-            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
+            $content = file_get_contents($formfile);
+            $isutf8 = utf8_check($content);
+            if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
             elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
             else print $content;
             return true;
@@ -170,9 +170,9 @@ 
             //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
             if (is_readable($formfilealt))
             {
-                $content=file_get_contents($formfilealt);
-                $isutf8=utf8_check($content);
-                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
+                $content = file_get_contents($formfilealt);
+                $isutf8 = utf8_check($content);
+                if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
                 elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
                 else print $content;
                 return true;
@@ -192,7 +192,7 @@ 
  *  @param  int     $usetable       Output into a table
  *	@return	void
  */
-function dol_print_object_info($object, $usetable=0)
+function dol_print_object_info($object, $usetable = 0)
 {
     global $langs, $db;
 
@@ -201,16 +201,16 @@ 
 
     include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-    $deltadateforserver=getServerTimeZoneInt('now');
-    $deltadateforclient=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
+    $deltadateforserver = getServerTimeZoneInt('now');
+    $deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
     //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
-    $deltadateforuser=round($deltadateforclient-$deltadateforserver);
+    $deltadateforuser = round($deltadateforclient - $deltadateforserver);
     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
     if ($usetable) print '<table class="border centpercent">';
 
     // Import key
-    if (! empty($object->import_key))
+    if (!empty($object->import_key))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ImportedWithSet");
@@ -222,7 +222,7 @@ 
     }
 
     // User creation (old method using already loaded object and not id is kept for backward compatibility)
-    if (! empty($object->user_creation) || ! empty($object->user_creation_id))
+    if (!empty($object->user_creation) || !empty($object->user_creation_id))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("CreatedBy");
@@ -235,7 +235,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -245,20 +245,20 @@ 
     }
 
     // Date creation
-    if (! empty($object->date_creation))
+    if (!empty($object->date_creation))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateCreation");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_creation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User change (old method using already loaded object and not id is kept for backward compatibility)
-    if (! empty($object->user_modification) || ! empty($object->user_modification_id))
+    if (!empty($object->user_modification) || !empty($object->user_modification_id))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ModifiedBy");
@@ -271,7 +271,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -281,20 +281,20 @@ 
     }
 
     // Date change
-    if (! empty($object->date_modification))
+    if (!empty($object->date_modification))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateLastModification");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_modification, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User validation (old method using already loaded object and not id is kept for backward compatibility)
-    if (! empty($object->user_validation) || ! empty($object->user_validation_id))
+    if (!empty($object->user_validation) || !empty($object->user_validation_id))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ValidatedBy");
@@ -307,7 +307,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -317,20 +317,20 @@ 
     }
 
     // Date validation
-    if (! empty($object->date_validation))
+    if (!empty($object->date_validation))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateValidation");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_validation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User approve (old method using already loaded object and not id is kept for backward compatibility)
-    if (! empty($object->user_approve) || ! empty($object->user_approve_id))
+    if (!empty($object->user_approve) || !empty($object->user_approve_id))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ApprovedBy");
@@ -343,7 +343,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -353,26 +353,26 @@ 
     }
 
     // Date approve
-    if (! empty($object->date_approve))
+    if (!empty($object->date_approve))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateApprove");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_approve, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User approve
-    if (! empty($object->user_approve_id2))
+    if (!empty($object->user_approve_id2))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ApprovedBy");
         if ($usetable) print '</td><td>';
         else print ': ';
-        $userstatic=new User($db);
+        $userstatic = new User($db);
         $userstatic->fetch($object->user_approve_id2);
         if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         else print $langs->trans("Unknown");
@@ -381,20 +381,20 @@ 
     }
 
     // Date approve
-    if (! empty($object->date_approve2))
+    if (!empty($object->date_approve2))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateApprove2");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_approve2, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User close
-    if (! empty($object->user_cloture))
+    if (!empty($object->user_cloture))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ClosedBy");
@@ -407,7 +407,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_cloture);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -417,20 +417,20 @@ 
     }
 
     // Date close
-    if (! empty($object->date_cloture))
+    if (!empty($object->date_cloture))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateClosing");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_cloture, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User conciliate
-    if (! empty($object->user_rappro))
+    if (!empty($object->user_rappro))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ConciliatedBy");
@@ -443,7 +443,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_rappro);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -453,27 +453,27 @@ 
     }
 
     // Date conciliate
-    if (! empty($object->date_rappro))
+    if (!empty($object->date_rappro))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateConciliating");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_rappro, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // Date send
-    if (! empty($object->date_envoi))
+    if (!empty($object->date_envoi))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateLastSend");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_envoi, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
@@ -492,8 +492,8 @@ 
  */
 function dolAddEmailTrackId($email, $trackingid)
 {
-	$tmp=explode('@',$email);
-	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');
+	$tmp = explode('@', $email);
+	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1]) ? $tmp[1] : '');
 }
 
 /**
@@ -528,7 +528,7 @@ 
  *  @param  int		$anchor		1: verify anchor is provided, 0: not verify anchor
  *	@return int					1=Check is OK, 0=Check is KO
  */
-function isValidUrl($url,$http=0,$pass=0,$port=0,$path=0,$query=0,$anchor=0)
+function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0, $anchor = 0)
 {
     $ValidUrl = 0;
     $urlregex = '';
@@ -542,7 +542,7 @@ 
     // HOSTNAME OR IP
     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // x.x
-    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*";  // x ou x.xx (2 x ou plus)
+    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)
     //use only one of the above
 
     // PORT
@@ -571,33 +571,33 @@ 
  *	@param  integer	$http		1 = keep both http:// and https://, 0: remove http:// but not https://
  *	@return string				Cleaned url
  */
-function clean_url($url,$http=1)
+function clean_url($url, $http = 1)
 {
     // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
     // To include the minus sign in a char class, we must not escape it but put it at the end of the class
     // Also, there's no need of escape a dot sign in a class
-    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i',$url,$regs))
+    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))
     {
-        $proto=$regs[1];
-        $domain=$regs[2];
-        $port=isset($regs[3])?$regs[3]:'';
+        $proto = $regs[1];
+        $domain = $regs[2];
+        $port = isset($regs[3]) ? $regs[3] : '';
         //print $url." -> ".$proto." - ".$domain." - ".$port;
         //$url = dol_string_nospecial(trim($url));
         $url = trim($url);
 
         // Si http: defini on supprime le http (Si https on ne supprime pas)
-        $newproto=$proto;
-        if ($http==0)
+        $newproto = $proto;
+        if ($http == 0)
         {
-            if (preg_match('/^http:[\\/]+/i',$url))
+            if (preg_match('/^http:[\\/]+/i', $url))
             {
-                $url = preg_replace('/^http:[\\/]+/i','',$url);
+                $url = preg_replace('/^http:[\\/]+/i', '', $url);
                 $newproto = '';
             }
         }
 
         // On passe le nom de domaine en minuscule
-        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain,'/').'/i', $newproto.strtolower($domain), $url);
+        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
 
         return $CleanUrl;
     }
@@ -617,35 +617,35 @@ 
  * 	@param 		bool		$displaytld			Display tld (default: true)
  * 	@return		string							Return email with hidden parts or '';
  */
-function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
+function dolObfuscateEmail($mail, $replace = "*", $nbreplace = 8, $nbdisplaymail = 4, $nbdisplaydomain = 3, $displaytld = true)
 {
-	if(!isValidEmail($mail))return '';
+	if (!isValidEmail($mail))return '';
 	$tab = explode('@', $mail);
-	$tab2 = explode('.',$tab[1]);
+	$tab2 = explode('.', $tab[1]);
 	$string_replace = '';
 	$mail_name = $tab[0];
 	$mail_domaine = $tab2[0];
 	$mail_tld = '';
 
 	$nbofelem = count($tab2);
-	for($i=1; $i < $nbofelem && $displaytld; $i++)
+	for ($i = 1; $i < $nbofelem && $displaytld; $i++)
 	{
 		$mail_tld .= '.'.$tab2[$i];
 	}
 
-	for($i=0; $i < $nbreplace; $i++){
+	for ($i = 0; $i < $nbreplace; $i++) {
 		$string_replace .= $replace;
 	}
 
-	if(strlen($mail_name) > $nbdisplaymail){
+	if (strlen($mail_name) > $nbdisplaymail) {
 		$mail_name = substr($mail_name, 0, $nbdisplaymail);
 	}
 
-	if(strlen($mail_domaine) > $nbdisplaydomain){
-		$mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);
+	if (strlen($mail_domaine) > $nbdisplaydomain) {
+		$mail_domaine = substr($mail_domaine, strlen($mail_domaine) - $nbdisplaydomain);
 	}
 
-	return $mail_name . $string_replace . $mail_domaine . $mail_tld;
+	return $mail_name.$string_replace.$mail_domaine.$mail_tld;
 }
 
 
@@ -658,14 +658,14 @@ 
  * 	@param	string	$tdoptions	Options for td
  * 	@return	string
  */
-function array2tr($data,$troptions='',$tdoptions='')
+function array2tr($data, $troptions = '', $tdoptions = '')
 {
-    $text = '<tr '.$troptions.'>' ;
-    foreach($data as $key => $item){
-        $text.= '<td '.$tdoptions.'>'.$item.'</td>' ;
+    $text = '<tr '.$troptions.'>';
+    foreach ($data as $key => $item) {
+        $text .= '<td '.$tdoptions.'>'.$item.'</td>';
     }
-    $text.= '</tr>' ;
-    return $text ;
+    $text .= '</tr>';
+    return $text;
 }
 
 /**
@@ -678,22 +678,22 @@ 
  * 	@param	string	$tdoptions		Options for td
  * 	@return	string
  */
-function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdoptions='')
+function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '', $tdoptions = '')
 {
-    $text='' ;
-    if($tableMarkup) $text = '<table '.$tableoptions.'>' ;
-    foreach($data as $key => $item){
-        if(is_array($item)){
-            $text.=array2tr($item,$troptions,$tdoptions);
+    $text = '';
+    if ($tableMarkup) $text = '<table '.$tableoptions.'>';
+    foreach ($data as $key => $item) {
+        if (is_array($item)) {
+            $text .= array2tr($item, $troptions, $tdoptions);
         } else {
-            $text.= '<tr '.$troptions.'>' ;
-            $text.= '<td '.$tdoptions.'>'.$key.'</td>' ;
-            $text.= '<td '.$tdoptions.'>'.$item.'</td>' ;
-            $text.= '</tr>' ;
+            $text .= '<tr '.$troptions.'>';
+            $text .= '<td '.$tdoptions.'>'.$key.'</td>';
+            $text .= '<td '.$tdoptions.'>'.$item.'</td>';
+            $text .= '</tr>';
         }
     }
-    if($tableMarkup) $text.= '</table>' ;
-    return $text ;
+    if ($tableMarkup) $text .= '</table>';
+    return $text;
 }
 
 /**
@@ -712,19 +712,19 @@ 
  * @param	int			$forceentity	Entity id to force
  * @return 	string						New value (numeric) or error message
  */
-function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$mode='next', $bentityon=true, $objuser=null, $forceentity=null)
+function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $date = '', $mode = 'next', $bentityon = true, $objuser = null, $forceentity = null)
 {
-    global $conf,$user;
+    global $conf, $user;
 
-    if (! is_object($objsoc)) $valueforccc=$objsoc;
-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;
-    else $valueforccc=$objsoc->code_client;
+    if (!is_object($objsoc)) $valueforccc = $objsoc;
+    else if ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = $objsoc->code_fournisseur;
+    else $valueforccc = $objsoc->code_client;
 
     $sharetable = $table;
     if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
 
     // Clean parameters
-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers
+    if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers
     // but we should use local year and month of user
 
     // For debugging
@@ -734,132 +734,132 @@ 
     //$date=dol_mktime(12, 0, 0, 1, 1, 1900);
     //$date=dol_stringtotime('20130101');
 
-    $hasglobalcounter=false;
+    $hasglobalcounter = false;
     // Extract value for mask counter, mask raz and mask offset
-    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$mask,$reg))
+    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))
     {
-        $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');
-        $maskcounter=$reg[1];
-        $hasglobalcounter=true;
+        $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');
+        $maskcounter = $reg[1];
+        $hasglobalcounter = true;
     }
     else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
-        $masktri='00000';
-        $maskcounter='00000';
+        $masktri = '00000';
+        $maskcounter = '00000';
     }
 
-    $maskraz=-1;
-    $maskoffset=0;
-    $resetEveryMonth=false;
+    $maskraz = -1;
+    $maskoffset = 0;
+    $resetEveryMonth = false;
     if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
 
     // Extract value for third party mask counter
-    if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
     {
-        $maskrefclient=$regClientRef[1].$regClientRef[2];
-        $maskrefclient_maskclientcode=$regClientRef[1];
-        $maskrefclient_maskcounter=$regClientRef[2];
-        $maskrefclient_maskoffset=0; //default value of maskrefclient_counter offset
-        $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask
-        $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
-        $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
+        $maskrefclient = $regClientRef[1].$regClientRef[2];
+        $maskrefclient_maskclientcode = $regClientRef[1];
+        $maskrefclient_maskcounter = $regClientRef[2];
+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
+        $maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask
+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
     }
-    else $maskrefclient='';
+    else $maskrefclient = '';
 
     // fail if there is neither a global nor a third party counter
-    if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
     {
         return 'ErrorBadMask';
     }
 
     // Extract value for third party type
-    if (preg_match('/\{(t+)\}/i',$mask,$regType))
+    if (preg_match('/\{(t+)\}/i', $mask, $regType))
     {
-        $masktype=$regType[1];
-        $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)
-        $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
+        $masktype = $regType[1];
+        $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
+        $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
     }
     else
     {
-    	$masktype='';
-    	$masktype_value='';
+    	$masktype = '';
+    	$masktype_value = '';
     }
 
     // Extract value for user
-    if (preg_match('/\{(u+)\}/i',$mask,$regType))
+    if (preg_match('/\{(u+)\}/i', $mask, $regType))
     {
     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
     	if (is_object($objuser)) $lastname = $objuser->lastname;
 
-    	$maskuser=$regType[1];
-    	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
-    	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
+    	$maskuser = $regType[1];
+    	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
+    	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
     }
     else
     {
-    	$maskuser='';
-    	$maskuser_value='';
+    	$maskuser = '';
+    	$maskuser_value = '';
     }
 
     // Personalized field {XXX-1} à {XXX-9}
-    $maskperso=array();
-    $maskpersonew=array();
-    $tmpmask=$mask;
-    while (preg_match('/\{([A-Z]+)\-([1-9])\}/',$tmpmask,$regKey))
+    $maskperso = array();
+    $maskpersonew = array();
+    $tmpmask = $mask;
+    while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))
     {
-        $maskperso[$regKey[1]]='{'.$regKey[1].'-'.$regKey[2].'}';
-        $maskpersonew[$regKey[1]]=str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
-        $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
+        $maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
+        $maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
+        $tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
     }
 
-    if (strstr($mask,'user_extra_'))
+    if (strstr($mask, 'user_extra_'))
     {
 			$start = "{user_extra_";
 			$end = "\}";
-			$extra= get_string_between($mask, "user_extra_", "}");
-			if(!empty($user->array_options['options_'.$extra])){
-				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
+			$extra = get_string_between($mask, "user_extra_", "}");
+			if (!empty($user->array_options['options_'.$extra])) {
+				$mask = preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
 			}
     }
-    $maskwithonlyymcode=$mask;
-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(t+)\}/i',$masktype_value,$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(u+)\}/i',$maskuser_value,$maskwithonlyymcode);
-    foreach($maskperso as $key => $val)
+    $maskwithonlyymcode = $mask;
+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);
+    foreach ($maskperso as $key => $val)
     {
-        $maskwithonlyymcode=preg_replace('/'.preg_quote($val,'/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
+        $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
     }
-    $maskwithnocode=$maskwithonlyymcode;
-    $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);
+    $maskwithnocode = $maskwithonlyymcode;
+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
     // Now maskwithnocode = 0000ddmmyyyyccc for example
     // and maskcounter    = 0000 for example
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
     //var_dump($reg);
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
 
     // Define $sqlwhere
-    $sqlwhere='';
-    $yearoffset=0;	// Use year of current $date by default
-    $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
+    $sqlwhere = '';
+    $yearoffset = 0; // Use year of current $date by default
+    $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))	$yearoffsettype = preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))	$yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);
 
     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
     if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
-        $maskraz=$yearoffsettype; // For backward compatibility
-    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
+        $maskraz = $yearoffsettype; // For backward compatibility
+    else if ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
         $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
     //print "maskraz=".$maskraz;	// -1=no reset
 
@@ -873,79 +873,79 @@ 
         // Define posy, posm and reg
         if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
         {
-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
+            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
             else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
 
             if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
         }
         else // if reset is for a specific month in year, we need year
         {
-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }
+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
+        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
+            else if (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; }
             else return 'ErrorCantUseRazIfNoYearInMask';
         }
         // Define length
-        $yearlen = $posy?dol_strlen($reg[$posy]):0;
-        $monthlen = $posm?dol_strlen($reg[$posm]):0;
+        $yearlen = $posy ?dol_strlen($reg[$posy]) : 0;
+        $monthlen = $posm ?dol_strlen($reg[$posm]) : 0;
         // Define pos
-       	$yearpos = (dol_strlen($reg[1])+1);
-        $monthpos = ($yearpos+$yearlen);
+       	$yearpos = (dol_strlen($reg[1]) + 1);
+        $monthpos = ($yearpos + $yearlen);
         if ($posy == 3 && $posm == 2) {		// if month is before year
-          	$monthpos = (dol_strlen($reg[1])+1);
-           	$yearpos = ($monthpos+$monthlen);
+          	$monthpos = (dol_strlen($reg[1]) + 1);
+           	$yearpos = ($monthpos + $monthlen);
         }
         //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";
 
         // Define $yearcomp and $monthcomp (that will be use in the select where to search max number)
-        $monthcomp=$maskraz;
-        $yearcomp=0;
+        $monthcomp = $maskraz;
+        $yearcomp = 0;
 
-        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
+        if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
         {
-        	$currentyear=date("Y", $date);
-        	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
-        	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
-        	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
+        	$currentyear = date("Y", $date);
+        	$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);
+        	$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);
+        	$nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);
         	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
 
         	// If after or equal of current fiscal date
         	if ($date >= $fiscaldate)
         	{
         		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;
         	}
         	// If after or equal of current new year date
-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
+        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;
         }
         // For backward compatibility
-        else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year
+        else if (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year
 
-        if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
-        elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
-        elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
+        if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);
+        elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);
+        elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset;
         if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
         {
-            if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);
-            elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
-
-            $sqlwhere.="(";
-            $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-            $sqlwhere.=" OR";
-            $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
-            $sqlwhere.=')';
+            if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);
+            elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);
+
+            $sqlwhere .= "(";
+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
+            $sqlwhere .= " OR";
+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
+            $sqlwhere .= ')';
         }
 		else if ($resetEveryMonth)
 		{
-			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
+			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
 		}
         else   // reset is done on january
         {
-            $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
+            $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
         }
     }
     //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset
@@ -954,49 +954,49 @@ 
     // Define $sqlstring
     if (function_exists('mb_strrpos'))
     	{
-    	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
+    	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
 	}
 	else
 	{
-    	$posnumstart=strrpos($maskwithnocode,$maskcounter);
+    	$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
-    $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';
+    $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')';
 
     // Define $maskLike
     $maskLike = dol_string_nospecial($mask);
-    $maskLike = str_replace("%","_",$maskLike);
+    $maskLike = str_replace("%", "_", $maskLike);
     // Replace protected special codes with matching number of _ as wild card caracter
-    $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);
-    $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);
-    $maskLike = preg_replace('/\{y\}/i','_',$maskLike);
-    $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
-    $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
-    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);
-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
-    foreach($maskperso as $key => $val)
+    $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
+    $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
+    $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
+    $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
+    $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
+    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);
+    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
+    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
+    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
+    foreach ($maskperso as $key => $val)
     {
-    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
+    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike);
     }
 
     // Get counter in database
-    $counter=0;
+    $counter = 0;
     $sql = "SELECT MAX(".$sqlstring.") as val";
-    $sql.= " FROM ".MAIN_DB_PREFIX.$table;
-    $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
+    $sql .= " FROM ".MAIN_DB_PREFIX.$table;
+    $sql .= " WHERE ".$field." LIKE '".$maskLike."'";
+	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";
     if ($bentityon) // only if entity enable
-    	$sql.= " AND entity IN (".getEntity($sharetable).")";
-    else if (! empty($forceentity))
-    	$sql.= " AND entity IN (".$forceentity.")";
-    if ($where) $sql.=$where;
-    if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    	$sql .= " AND entity IN (".getEntity($sharetable).")";
+    else if (!empty($forceentity))
+    	$sql .= " AND entity IN (".$forceentity.")";
+    if ($where) $sql .= $where;
+    if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
 
     //print $sql.'<br>';
     dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
-    $resql=$db->query($sql);
+    $resql = $db->query($sql);
     if ($resql)
     {
         $obj = $db->fetch_object($resql);
@@ -1005,46 +1005,46 @@ 
     else dol_print_error($db);
 
     // Check if we must force counter to maskoffset
-    if (empty($counter)) $counter=$maskoffset;
-    else if (preg_match('/[^0-9]/i',$counter))
+    if (empty($counter)) $counter = $maskoffset;
+    else if (preg_match('/[^0-9]/i', $counter))
     {
-    	$counter=0;
+    	$counter = 0;
     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
     }
-    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;
+    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;
 
     if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
     {
-        $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+        $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
 
         // Define $maskLike
         $maskLike = dol_string_nospecial($mask);
-        $maskLike = str_replace("%","_",$maskLike);
+        $maskLike = str_replace("%", "_", $maskLike);
         // Replace protected special codes with matching number of _ as wild card caracter
-        $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);
-        $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);
-        $maskLike = preg_replace('/\{y\}/i','_',$maskLike);
-        $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
-        $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
-        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);
-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
-
-        $ref='';
+        $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
+        $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
+        $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
+        $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
+        $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
+        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);
+        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
+        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
+        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
+
+        $ref = '';
         $sql = "SELECT ".$field." as ref";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$table;
-        $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-    	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$table;
+        $sql .= " WHERE ".$field." LIKE '".$maskLike."'";
+    	$sql .= " AND ".$field." NOT LIKE '%PROV%'";
     	if ($bentityon) // only if entity enable
-        	$sql.= " AND entity IN (".getEntity($sharetable).")";
-        else if (! empty($forceentity))
-        	$sql.= " AND entity IN (".$forceentity.")";
-        if ($where) $sql.=$where;
-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+        	$sql .= " AND entity IN (".getEntity($sharetable).")";
+        else if (!empty($forceentity))
+        	$sql .= " AND entity IN (".$forceentity.")";
+        if ($where) $sql .= $where;
+        if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
 
         dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
@@ -1052,7 +1052,7 @@ 
         }
         else dol_print_error($db);
 
-        $numFinal=$ref;
+        $numFinal = $ref;
     }
     else if ($mode == 'next')
     {
@@ -1061,47 +1061,47 @@ 
         // If value for $counter has a length higher than $maskcounter chars
         if ($counter >= pow(10, dol_strlen($maskcounter)))
         {
-        	$counter='ErrorMaxNumberReachForThisMask';
+        	$counter = 'ErrorMaxNumberReachForThisMask';
         }
 
-        if (! empty($maskrefclient_maskcounter))
+        if (!empty($maskrefclient_maskcounter))
         {
             //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";
 
             // Define $sqlstring
-            $maskrefclient_posnumstart=strpos($maskwithnocode,$maskrefclient_maskcounter,strpos($maskwithnocode,$maskrefclient));	// Pos of counter in final string (from 0 to ...)
+            $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...)
             if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';
-            $maskrefclient_sqlstring='SUBSTRING('.$field.', '.($maskrefclient_posnumstart+1).', '.dol_strlen($maskrefclient_maskcounter).')';
+            $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')';
             //print "x".$sqlstring;
 
             // Define $maskrefclient_maskLike
             $maskrefclient_maskLike = dol_string_nospecial($mask);
-            $maskrefclient_maskLike = str_replace("%","_",$maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike);
             // Replace protected special codes with matching number of _ as wild card caracter
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'),'____',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'),'__',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'),'_',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'),'__',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'),'__',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),$maskrefclient_clientcode.str_pad("",dol_strlen($maskrefclient_maskcounter),"_"),$maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);
 
             // Get counter in database
-            $maskrefclient_counter=0;
+            $maskrefclient_counter = 0;
             $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";
-            $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;
+            $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;
             //$sql.= " WHERE ".$field." not like '(%'";
-            $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
+            $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
             if ($bentityon) // only if entity enable
-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
-            else if (! empty($forceentity))
-            	$sql.= " AND entity IN (".$forceentity.")";
-            if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
-            if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
-            $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
+            	$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";
+            else if (!empty($forceentity))
+            	$sql .= " AND entity IN (".$forceentity.")";
+            if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask
+            if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask
+            $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
 
             dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
-            $maskrefclient_resql=$db->query($maskrefclient_sql);
+            $maskrefclient_resql = $db->query($maskrefclient_sql);
             if ($maskrefclient_resql)
             {
                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
@@ -1109,7 +1109,7 @@ 
             }
             else dol_print_error($db);
 
-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;
 			$maskrefclient_counter++;
         }
 
@@ -1117,54 +1117,54 @@ 
         $numFinal = $mask;
 
         // We replace special codes except refclient
-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
+		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
 		{
-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
+	        $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);
+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);
+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);
 		}
 		else	// we want yyyy to be current year
 		{
-        	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);
+        	$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);
+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);
+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal);
 		}
-        $numFinal = preg_replace('/\{mm\}/i',  date("m",$date), $numFinal);
-        $numFinal = preg_replace('/\{dd\}/i',  date("d",$date), $numFinal);
+        $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal);
+        $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal);
 
         // Now we replace the counter
-        $maskbefore='{'.$masktri.'}';
-        $maskafter=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+        $maskbefore = '{'.$masktri.'}';
+        $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
         //print 'x'.$maskbefore.'-'.$maskafter.'y';
-        $numFinal = str_replace($maskbefore,$maskafter,$numFinal);
+        $numFinal = str_replace($maskbefore, $maskafter, $numFinal);
 
         // Now we replace the refclient
         if ($maskrefclient)
         {
             //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
-            $maskrefclient_maskbefore='{'.$maskrefclient.'}';
-            $maskrefclient_maskafter=$maskrefclient_clientcode.str_pad($maskrefclient_counter,dol_strlen($maskrefclient_maskcounter),"0",STR_PAD_LEFT);
-            $numFinal = str_replace($maskrefclient_maskbefore,$maskrefclient_maskafter,$numFinal);
+            $maskrefclient_maskbefore = '{'.$maskrefclient.'}';
+            $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);
+            $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);
         }
 
         // Now we replace the type
         if ($masktype)
         {
-            $masktype_maskbefore='{'.$masktype.'}';
-            $masktype_maskafter=$masktype_value;
-            $numFinal = str_replace($masktype_maskbefore,$masktype_maskafter,$numFinal);
+            $masktype_maskbefore = '{'.$masktype.'}';
+            $masktype_maskafter = $masktype_value;
+            $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);
         }
 
         // Now we replace the user
         if ($maskuser)
         {
-        	$maskuser_maskbefore='{'.$maskuser.'}';
-        	$maskuser_maskafter=$maskuser_value;
-        	$numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);
+        	$maskuser_maskbefore = '{'.$maskuser.'}';
+        	$maskuser_maskafter = $maskuser_value;
+        	$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);
         }
     }
 
-    dol_syslog("functions2::get_next_value return ".$numFinal,LOG_DEBUG);
+    dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG);
     return $numFinal;
 }
 
@@ -1179,11 +1179,11 @@ 
 function get_string_between($string, $start, $end)
 {
     $string = " ".$string;
-     $ini = strpos($string,$start);
+     $ini = strpos($string, $start);
      if ($ini == 0) return "";
      $ini += strlen($start);
-     $len = strpos($string,$end,$ini) - $ini;
-     return substr($string,$ini,$len);
+     $len = strpos($string, $end, $ini) - $ini;
+     return substr($string, $ini, $len);
 }
 
 /**
@@ -1193,78 +1193,78 @@ 
  * @param 	string	$value		Value
  * @return	int|string		    <0 or error string if KO, 0 if OK
  */
-function check_value($mask,$value)
+function check_value($mask, $value)
 {
-    $result=0;
+    $result = 0;
 
-    $hasglobalcounter=false;
+    $hasglobalcounter = false;
     // Extract value for mask counter, mask raz and mask offset
-    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
+    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
     {
-        $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');
-        $maskcounter=$reg[1];
-        $hasglobalcounter=true;
+        $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');
+        $maskcounter = $reg[1];
+        $hasglobalcounter = true;
     }
     else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
-        $masktri='00000';
-        $maskcounter='00000';
+        $masktri = '00000';
+        $maskcounter = '00000';
     }
 
-    $maskraz=-1;
-    $maskoffset=0;
+    $maskraz = -1;
+    $maskoffset = 0;
     if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
 
     // Extract value for third party mask counter
-    if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
     {
-        $maskrefclient=$regClientRef[1].$regClientRef[2];
-        $maskrefclient_maskclientcode=$regClientRef[1];
-        $maskrefclient_maskcounter=$regClientRef[2];
-        $maskrefclient_maskoffset=0; //default value of maskrefclient_counter offset
-        $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode
-        $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
-        $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
+        $maskrefclient = $regClientRef[1].$regClientRef[2];
+        $maskrefclient_maskclientcode = $regClientRef[1];
+        $maskrefclient_maskcounter = $regClientRef[2];
+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
+        $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode
+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
     }
-    else $maskrefclient='';
+    else $maskrefclient = '';
 
     // fail if there is neither a global nor a third party counter
-    if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
     {
         return 'ErrorBadMask';
     }
 
-    $maskwithonlyymcode=$mask;
-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$maskcounter,$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
-    $maskwithnocode=$maskwithonlyymcode;
-    $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);
+    $maskwithonlyymcode = $mask;
+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
+    $maskwithnocode = $maskwithonlyymcode;
+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
     // Now maskwithnocode = 0000ddmmyyyyccc for example
     // and maskcounter    = 0000 for example
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
 
     // Define $sqlwhere
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))  $maskraz=preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))  $maskraz=preg_replace('/^@/','',$reg[3]);
+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz = preg_replace('/^@/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz = preg_replace('/^@/', '', $reg[3]);
     if ($maskraz >= 0)
     {
         if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
 
         // Define reg
-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
+        if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+        if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';
         //print "x".$maskwithonlyymcode." ".$maskraz;
     }
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
@@ -1273,8 +1273,8 @@ 
     //
 
     // Check length
-    $len=dol_strlen($maskwithnocode);
-    if (dol_strlen($value) != $len) $result=-1;
+    $len = dol_strlen($maskwithnocode);
+    if (dol_strlen($value) != $len) $result = -1;
 
     // Define $maskLike
     /* seems not used
@@ -1290,7 +1290,7 @@ 
     if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",strlen($maskrefclient),"_"),$maskLike);
 	*/
 
-    dol_syslog("functions2::check_value result=".$result,LOG_DEBUG);
+    dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);
     return $result;
 }
 
@@ -1302,13 +1302,13 @@ 
  *	@param   boolean	$upper		Convert to tupper
  *	@return  string					x
  */
-function binhex($bin, $pad=false, $upper=false)
+function binhex($bin, $pad = false, $upper = false)
 {
-    $last = dol_strlen($bin)-1;
-    for($i=0; $i<=$last; $i++){ $x += $bin[$last-$i] * pow(2,$i); }
+    $last = dol_strlen($bin) - 1;
+    for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); }
     $x = dechex($x);
-    if($pad){ while(dol_strlen($x) < intval(dol_strlen($bin))/4){ $x = "0$x"; } }
-    if($upper){ $x = strtoupper($x); }
+    if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } }
+    if ($upper) { $x = strtoupper($x); }
     return $x;
 }
 
@@ -1320,11 +1320,11 @@ 
  */
 function hexbin($hexa)
 {
-    $bin='';
+    $bin = '';
     $strLength = dol_strlen($hexa);
-    for($i=0;$i<$strLength;$i++)
+    for ($i = 0; $i < $strLength; $i++)
     {
-        $bin.=str_pad(decbin(hexdec($hexa{$i})),4,'0',STR_PAD_LEFT);
+        $bin .= str_pad(decbin(hexdec($hexa{$i})), 4, '0', STR_PAD_LEFT);
     }
     return $bin;
 }
@@ -1337,9 +1337,9 @@ 
  */
 function numero_semaine($time)
 {
-    $stime = strftime('%Y-%m-%d',$time);
+    $stime = strftime('%Y-%m-%d', $time);
 
-    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i',$stime,$reg))
+    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg))
     {
         // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
         $annee = $reg[1];
@@ -1355,47 +1355,47 @@ 
      */
 
     // Definition du Jeudi de la semaine
-    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
+    if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche
+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;
+    else if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi
+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
+    else if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi
+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
     else // Jeudi
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);
 
     // Definition du premier Jeudi de l'annee
-    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche
+    if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi
+    else if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi
+    else if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
     }
     else // Jeudi
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));
     }
 
     // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
-    $numeroSemaine =     (
+    $numeroSemaine = (
     (
-    date("z",mktime(12,0,0,date("m",$jeudiSemaine),date("d",$jeudiSemaine),date("Y",$jeudiSemaine)))
+    date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))
     -
-    date("z",mktime(12,0,0,date("m",$premierJeudiAnnee),date("d",$premierJeudiAnnee),date("Y",$premierJeudiAnnee)))
+    date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))
     ) / 7
     ) + 1;
 
     // Cas particulier de la semaine 53
-    if ($numeroSemaine==53)
+    if ($numeroSemaine == 53)
     {
         // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53
-        if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))
+        if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))
         {
             $numeroSemaine = 53;
         }
@@ -1407,7 +1407,7 @@ 
 
     //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."<BR>";
 
-    return sprintf("%02d",$numeroSemaine);
+    return sprintf("%02d", $numeroSemaine);
 }
 
 /**
@@ -1418,26 +1418,26 @@ 
  *	@param  int		$to_unit   		Nouvelle unite  en puissance de 10
  *	@return float	        		Masse convertie
  */
-function weight_convert($weight,&$from_unit,$to_unit)
+function weight_convert($weight, &$from_unit, $to_unit)
 {
     /* Pour convertire 320 gr en Kg appeler
      *  $f = -3
      *  weigh_convert(320, $f, 0) retournera 0.32
      *
      */
-    while ($from_unit  <> $to_unit)
+    while ($from_unit <> $to_unit)
     {
         if ($from_unit > $to_unit)
         {
             $weight = $weight * 10;
             $from_unit = $from_unit - 1;
-            $weight = weight_convert($weight,$from_unit, $to_unit);
+            $weight = weight_convert($weight, $from_unit, $to_unit);
         }
         if ($from_unit < $to_unit)
         {
             $weight = $weight / 10;
             $from_unit = $from_unit + 1;
-            $weight = weight_convert($weight,$from_unit, $to_unit);
+            $weight = weight_convert($weight, $from_unit, $to_unit);
         }
     }
 
@@ -1464,21 +1464,21 @@ 
 
     // We remove old parameters for all keys in $tab
     $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
-    $sql.= " WHERE fk_user = ".$user->id;
-    $sql.= " AND entity = ".$conf->entity;
-    $sql.= " AND param in (";
-    $i=0;
+    $sql .= " WHERE fk_user = ".$user->id;
+    $sql .= " AND entity = ".$conf->entity;
+    $sql .= " AND param in (";
+    $i = 0;
     foreach ($tab as $key => $value)
     {
-        if ($i > 0) $sql.=',';
-        $sql.="'".$db->escape($key)."'";
+        if ($i > 0) $sql .= ',';
+        $sql .= "'".$db->escape($key)."'";
         $i++;
     }
-    $sql.= ")";
+    $sql .= ")";
     dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
 
-    $resql=$db->query($sql);
-    if (! $resql)
+    $resql = $db->query($sql);
+    if (!$resql)
     {
         dol_print_error($db);
         $db->rollback();
@@ -1491,12 +1491,12 @@ 
         if ($value)
         {
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
-            $sql.= " VALUES (".$user->id.",".$conf->entity.",";
-            $sql.= " '".$db->escape($key)."','".$db->escape($value)."')";
+            $sql .= " VALUES (".$user->id.",".$conf->entity.",";
+            $sql .= " '".$db->escape($key)."','".$db->escape($value)."')";
 
             dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
-            $result=$db->query($sql);
-            if (! $result)
+            $result = $db->query($sql);
+            if (!$result)
             {
                 dol_print_error($db);
                 $db->rollback();
@@ -1522,7 +1522,7 @@ 
  *	@param	Translate	$langs			Output language
  *	@return	string						Formated reduction
  */
-function dol_print_reduction($reduction,$langs)
+function dol_print_reduction($reduction, $langs)
 {
     $string = '';
     if ($reduction == 100)
@@ -1531,7 +1531,7 @@ 
     }
     else
     {
-    	$string = vatrate($reduction,true);
+    	$string = vatrate($reduction, true);
     }
 
     return $string;
@@ -1545,7 +1545,7 @@ 
  */
 function version_os()
 {
-    $osversion=php_uname();
+    $osversion = php_uname();
     return $osversion;
 }
 
@@ -1589,18 +1589,18 @@ 
  *  @param  int		    $maxfilenamelength  Max length of value to show
  * 	@return	mixed			    			0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".
  */
-function getListOfModels($db,$type,$maxfilenamelength=0)
+function getListOfModels($db, $type, $maxfilenamelength = 0)
 {
-    global $conf,$langs;
-    $liste=array();
-    $found=0;
-    $dirtoscan='';
+    global $conf, $langs;
+    $liste = array();
+    $found = 0;
+    $dirtoscan = '';
 
     $sql = "SELECT nom as id, nom as lib, libelle as label, description as description";
-    $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-    $sql.= " WHERE type = '".$type."'";
-    $sql.= " AND entity IN (0,".$conf->entity.")";
-    $sql.= " ORDER BY description DESC";
+    $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+    $sql .= " WHERE type = '".$type."'";
+    $sql .= " AND entity IN (0,".$conf->entity.")";
+    $sql .= " ORDER BY description DESC";
 
     dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
     $resql = $db->query($sql);
@@ -1610,48 +1610,48 @@ 
         $i = 0;
         while ($i < $num)
         {
-            $found=1;
+            $found = 1;
 
             $obj = $db->fetch_object($resql);
 
             // If this generation module needs to scan a directory, then description field is filled
             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
-            if (! empty($obj->description))	// A list of directories to scan is defined
+            if (!empty($obj->description))	// A list of directories to scan is defined
             {
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-                $const=$obj->description;
+                $const = $obj->description;
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
-                $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
+                $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const));
 
-		$listoffiles=array();
+		$listoffiles = array();
 
                 // Now we add models found in directories scanned
-                $listofdir=explode(',',$dirtoscan);
-                foreach($listofdir as $key=>$tmpdir)
+                $listofdir = explode(',', $dirtoscan);
+                foreach ($listofdir as $key=>$tmpdir)
                 {
-                    $tmpdir=trim($tmpdir);
-                    $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-                    if (! $tmpdir) { unset($listofdir[$key]); continue; }
+                    $tmpdir = trim($tmpdir);
+                    $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+                    if (!$tmpdir) { unset($listofdir[$key]); continue; }
                     if (is_dir($tmpdir))
                     {
 			// all type of template is allowed
-			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+			$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
+                        if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
                     }
                 }
 
                 if (count($listoffiles))
                 {
-                    foreach($listoffiles as $record)
+                    foreach ($listoffiles as $record)
                     {
-                        $max=($maxfilenamelength?$maxfilenamelength:28);
-                        $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');
+                        $max = ($maxfilenamelength ? $maxfilenamelength : 28);
+                        $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');
                     }
                 }
                 else
                 {
-                    $liste[0]=$obj->label.': '.$langs->trans("None");
+                    $liste[0] = $obj->label.': '.$langs->trans("None");
                 }
             }
             else
@@ -1660,14 +1660,14 @@ 
                 {
                     global $_Avery_Labels;
                     include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
-                    foreach($_Avery_Labels as $key => $val)
+                    foreach ($_Avery_Labels as $key => $val)
                     {
-                        $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];
+                        $liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->lib).' '.$val['name'];
                     }
                 }
                 else    // Common usage
                 {
-                    $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
+                    $liste[$obj->id] = $obj->label ? $obj->label : $obj->lib;
                 }
             }
             $i++;
@@ -1696,10 +1696,10 @@ 
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 
 		// Then we test if it is a private range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
 
 		// Then we test if it is a reserved range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
 
 		return 1;
 	}
@@ -1714,12 +1714,12 @@ 
  *  @param  string		$firstname		Firstname
  *	@return	string						Login
  */
-function dol_buildlogin($lastname,$firstname)
+function dol_buildlogin($lastname, $firstname)
 {
-    $login=strtolower(dol_string_unaccent($firstname));
-    $login.=($login?'.':'');
-    $login.=strtolower(dol_string_unaccent($lastname));
-    $login=dol_string_nospecial($login,''); // For special names
+    $login = strtolower(dol_string_unaccent($firstname));
+    $login .= ($login ? '.' : '');
+    $login .= strtolower(dol_string_unaccent($lastname));
+    $login = dol_string_nospecial($login, ''); // For special names
     return $login;
 }
 
@@ -1732,18 +1732,18 @@ 
 {
     global $conf;
 
-    $params=array();
-    $proxyuse =(empty($conf->global->MAIN_PROXY_USE)?false:true);
-    $proxyhost=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_HOST);
-    $proxyport=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_PORT);
-    $proxyuser=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_USER);
-    $proxypass=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_PASS);
-    $timeout  =(empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?10:$conf->global->MAIN_USE_CONNECT_TIMEOUT);               // Connection timeout
-    $response_timeout=(empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);    // Response timeout
+    $params = array();
+    $proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true);
+    $proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST);
+    $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT);
+    $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER);
+    $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS);
+    $timeout  = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout
+    $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout
     //print extension_loaded('soap');
     if ($proxyuse)
     {
-        $params=array('connection_timeout'=>$timeout,
+        $params = array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
                       'proxy_use'      => 1,
                       'proxy_host'     => $proxyhost,
@@ -1755,7 +1755,7 @@ 
     }
     else
     {
-        $params=array('connection_timeout'=>$timeout,
+        $params = array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
                       'proxy_use'      => 0,
                       'proxy_host'     => false,
@@ -1778,15 +1778,15 @@ 
  * @param 	string	$option			More options
  * @return	string					URL of link to object id/type
  */
-function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')
+function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 {
 	global $db, $conf, $langs;
 
-	$ret='';
+	$ret = '';
 
 	// Parse element/subelement (ex: project_task)
 	$module = $element = $subelement = $objecttype;
-	if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
+	if (preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 	{
 		$module = $element = $regs[1];
 		$subelement = $regs[2];
@@ -1797,18 +1797,18 @@ 
 	// To work with non standard path
 	if ($objecttype == 'facture' || $objecttype == 'invoice') {
 		$classpath = 'compta/facture/class';
-		$module='facture';
-		$subelement='facture';
+		$module = 'facture';
+		$subelement = 'facture';
 	}
 	if ($objecttype == 'commande' || $objecttype == 'order') {
 		$classpath = 'commande/class';
-		$module='commande';
-		$subelement='commande';
+		$module = 'commande';
+		$subelement = 'commande';
 	}
-	if ($objecttype == 'propal')  {
+	if ($objecttype == 'propal') {
 		$classpath = 'comm/propal/class';
 	}
-	if ($objecttype == 'supplier_proposal')  {
+	if ($objecttype == 'supplier_proposal') {
 		$classpath = 'supplier_proposal/class';
 	}
 	if ($objecttype == 'shipping') {
@@ -1823,33 +1823,33 @@ 
 	}
 	if ($objecttype == 'contract') {
 		$classpath = 'contrat/class';
-		$module='contrat';
-		$subelement='contrat';
+		$module = 'contrat';
+		$subelement = 'contrat';
 	}
 	if ($objecttype == 'member') {
 		$classpath = 'adherents/class';
-		$module='adherent';
-		$subelement='adherent';
+		$module = 'adherent';
+		$subelement = 'adherent';
 	}
 	if ($objecttype == 'cabinetmed_cons') {
 		$classpath = 'cabinetmed/class';
-		$module='cabinetmed';
-		$subelement='cabinetmedcons';
+		$module = 'cabinetmed';
+		$subelement = 'cabinetmedcons';
 	}
 	if ($objecttype == 'fichinter') {
 		$classpath = 'fichinter/class';
-		$module='ficheinter';
-		$subelement='fichinter';
+		$module = 'ficheinter';
+		$subelement = 'fichinter';
 	}
 	if ($objecttype == 'task') {
 		$classpath = 'projet/class';
-		$module='projet';
-		$subelement='task';
+		$module = 'projet';
+		$subelement = 'task';
 	}
 	if ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
-		$module='stock';
-		$subelement='stock';
+		$module = 'stock';
+		$subelement = 'stock';
 	}
 
 	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;
@@ -1857,34 +1857,34 @@ 
 	$classfile = strtolower($subelement); $classname = ucfirst($subelement);
 	if ($objecttype == 'invoice_supplier') {
 		$classfile = 'fournisseur.facture';
-		$classname='FactureFournisseur';
+		$classname = 'FactureFournisseur';
 		$classpath = 'fourn/class';
-		$module='fournisseur';
+		$module = 'fournisseur';
 	}
-	elseif ($objecttype == 'order_supplier')   {
+	elseif ($objecttype == 'order_supplier') {
 		$classfile = 'fournisseur.commande';
-		$classname='CommandeFournisseur';
+		$classname = 'CommandeFournisseur';
 		$classpath = 'fourn/class';
-		$module='fournisseur';
+		$module = 'fournisseur';
 	}
-	elseif ($objecttype == 'stock')   {
+	elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
-		$classfile='entrepot';
-		$classname='Entrepot';
+		$classfile = 'entrepot';
+		$classname = 'Entrepot';
 	}
-	if (! empty($conf->$module->enabled))
+	if (!empty($conf->$module->enabled))
 	{
-		$res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
+		$res = dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
 		if ($res)
 		{
 			if (class_exists($classname))
 			{
 				$object = new $classname($db);
-				$res=$object->fetch($objectid);
+				$res = $object->fetch($objectid);
 				if ($res > 0) {
-					$ret=$object->getNomUrl($withpicto,$option);
-				} elseif($res==0) {
-					$ret=$langs->trans('Deleted');
+					$ret = $object->getNomUrl($withpicto, $option);
+				} elseif ($res == 0) {
+					$ret = $langs->trans('Deleted');
 				}
 				unset($object);
 			}
@@ -1905,12 +1905,12 @@ 
  */
 function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 {
-	$totalnb=0;
-	$listofid=array();
-	$listofparentid=array();
+	$totalnb = 0;
+	$listofid = array();
+	$listofparentid = array();
 
 	// Get list of all id in array listofid and all parents in array listofparentid
-	$sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
+	$sql = 'SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
 	$resql = $db->query($sql);
 	if ($resql)
 	{
@@ -1919,8 +1919,8 @@ 
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
-			$listofid[]=$obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
+			$listofid[] = $obj->rowid;
+			if ($obj->parent_id > 0) $listofparentid[$obj->rowid] = $obj->parent_id;
 			$i++;
 		}
 	}
@@ -1934,78 +1934,78 @@ 
 		print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";
 
 		// Check loops on each other
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid"; // So we update only records linked to themself
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$nb=$db->affected_rows($sql);
+			$nb = $db->affected_rows($sql);
 			if ($nb > 0)
 			{
 				print '<br>Some record that were parent of themself were cleaned.';
 			}
 
-			$totalnb+=$nb;
+			$totalnb += $nb;
 		}
 		//else dol_print_error($db);
 
 		// Check other loops
-		$listofidtoclean=array();
-		foreach($listofparentid as $id => $pid)
+		$listofidtoclean = array();
+		foreach ($listofparentid as $id => $pid)
 		{
 			// Check depth
 			//print 'Analyse record id='.$id.' with parent '.$pid.'<br>';
 
-			$cursor=$id; $arrayidparsed=array();	// We start from child $id
+			$cursor = $id; $arrayidparsed = array(); // We start from child $id
 			while ($cursor > 0)
 			{
-				$arrayidparsed[$cursor]=1;
+				$arrayidparsed[$cursor] = 1;
 				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
 				{
 					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
 					unset($arrayidparsed);
-					$listofidtoclean[$cursor]=$id;
+					$listofidtoclean[$cursor] = $id;
 					break;
 				}
-				$cursor=$listofparentid[$cursor];
+				$cursor = $listofparentid[$cursor];
 			}
 
 			if (count($listofidtoclean)) break;
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong
+		$sql .= " SET ".$fieldfkparent." = 0";
+		$sql .= " WHERE rowid IN (".join(',', $listofidtoclean).")"; // So we update only records detected wrong
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$nb=$db->affected_rows($sql);
+			$nb = $db->affected_rows($sql);
 			if ($nb > 0)
 			{
 				// Removed orphelins records
 				print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';
-				print join(',',$listofidtoclean);
+				print join(',', $listofidtoclean);
 			}
 
-			$totalnb+=$nb;
+			$totalnb += $nb;
 		}
 		//else dol_print_error($db);
 
 		// Check and clean orphelins
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent
+		$sql .= " SET ".$fieldfkparent." = 0";
+		$sql .= " WHERE ".$fieldfkparent." NOT IN (".join(',', $listofid).")"; // So we update only records linked to a non existing parent
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$nb=$db->affected_rows($sql);
+			$nb = $db->affected_rows($sql);
 			if ($nb > 0)
 			{
 				// Removed orphelins records
 				print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';
-				print join(',',$listofid);
+				print join(',', $listofid);
 			}
 
-			$totalnb+=$nb;
+			$totalnb += $nb;
 		}
 		//else dol_print_error($db);
 
@@ -2026,21 +2026,21 @@ 
     $module = $element = $subelement = $element_type;
 
     // If we ask an resource form external module (instead of default path)
-    if (preg_match('/^([^@]+)@([^@]+)$/i',$element_type,$regs))
+    if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs))
     {
         $element = $subelement = $regs[1];
         $module 	= $regs[2];
     }
 
     //print '<br>1. element : '.$element.' - module : '.$module .'<br>';
-    if ( preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+    if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
     {
         $module = $element = $regs[1];
         $subelement = $regs[2];
     }
 
     // For compat
-    if($element_type == "action") {
+    if ($element_type == "action") {
         $classpath = 'comm/action/class';
         $subelement = 'Actioncomm';
         $module = 'agenda';
@@ -2049,18 +2049,18 @@ 
     // To work with non standard path
     if ($element_type == 'facture' || $element_type == 'invoice') {
         $classpath = 'compta/facture/class';
-        $module='facture';
-        $subelement='facture';
+        $module = 'facture';
+        $subelement = 'facture';
     }
     if ($element_type == 'commande' || $element_type == 'order') {
         $classpath = 'commande/class';
-        $module='commande';
-        $subelement='commande';
+        $module = 'commande';
+        $subelement = 'commande';
     }
-    if ($element_type == 'propal')  {
+    if ($element_type == 'propal') {
         $classpath = 'comm/propal/class';
     }
-    if ($element_type == 'supplier_proposal')  {
+    if ($element_type == 'supplier_proposal') {
         $classpath = 'supplier_proposal/class';
     }
     if ($element_type == 'shipping') {
@@ -2075,45 +2075,45 @@ 
     }
     if ($element_type == 'contract') {
         $classpath = 'contrat/class';
-        $module='contrat';
-        $subelement='contrat';
+        $module = 'contrat';
+        $subelement = 'contrat';
     }
     if ($element_type == 'member') {
         $classpath = 'adherents/class';
-        $module='adherent';
-        $subelement='adherent';
+        $module = 'adherent';
+        $subelement = 'adherent';
     }
     if ($element_type == 'cabinetmed_cons') {
         $classpath = 'cabinetmed/class';
-        $module='cabinetmed';
-        $subelement='cabinetmedcons';
+        $module = 'cabinetmed';
+        $subelement = 'cabinetmedcons';
     }
     if ($element_type == 'fichinter') {
         $classpath = 'fichinter/class';
-        $module='ficheinter';
-        $subelement='fichinter';
+        $module = 'ficheinter';
+        $subelement = 'fichinter';
     }
     if ($element_type == 'dolresource' || $element_type == 'resource') {
         $classpath = 'resource/class';
-        $module='resource';
-        $subelement='dolresource';
+        $module = 'resource';
+        $subelement = 'dolresource';
     }
     if ($element_type == 'propaldet') {
         $classpath = 'comm/propal/class';
-        $module='propal';
-        $subelement='propaleligne';
+        $module = 'propal';
+        $subelement = 'propaleligne';
     }
-    if ($element_type == 'order_supplier')  {
+    if ($element_type == 'order_supplier') {
         $classpath = 'fourn/class';
-        $module='fournisseur';
-        $subelement='commandefournisseur';
-        $classfile='fournisseur.commande';
+        $module = 'fournisseur';
+        $subelement = 'commandefournisseur';
+        $classfile = 'fournisseur.commande';
     }
-    if ($element_type == 'invoice_supplier')  {
+    if ($element_type == 'invoice_supplier') {
         $classpath = 'fourn/class';
-        $module='fournisseur';
-        $subelement='facturefournisseur';
-        $classfile='fournisseur.facture';
+        $module = 'fournisseur';
+        $subelement = 'facturefournisseur';
+        $classfile = 'fournisseur.facture';
     }
 
     if (!isset($classfile)) $classfile = strtolower($subelement);
@@ -2140,10 +2140,10 @@ 
  * @param	ref     	$element_ref 	Element ref (Use this if element_id but not both)
  * @return 	int|object 					object || 0 || -1 if error
  */
-function fetchObjectByElement($element_id, $element_type, $element_ref='')
+function fetchObjectByElement($element_id, $element_type, $element_ref = '')
 {
     global $conf;
-	global $db,$conf;
+	global $db, $conf;
 
     $element_prop = getElementProperties($element_type);
     if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)
@@ -2170,11 +2170,11 @@ 
  *  @return	string						RGB hex value (without # before). For example: 'FF00FF', '01FF02'
  *  @see	colorStringToArray
  */
-function colorArrayToHex($arraycolor,$colorifnotfound='888888')
+function colorArrayToHex($arraycolor, $colorifnotfound = '888888')
 {
-	if (! is_array($arraycolor)) return $colorifnotfound;
+	if (!is_array($arraycolor)) return $colorifnotfound;
 	if (empty($arraycolor)) return $colorifnotfound;
-	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
+	return sprintf("%02s", dechex($arraycolor[0])).sprintf("%02s", dechex($arraycolor[1])).sprintf("%02s", dechex($arraycolor[2]));
 }
 
 /**
@@ -2187,17 +2187,17 @@ 
  *  @return	string						RGB hex value (without # before). For example: FF00FF
  *  @see	colorArrayToHex
  */
-function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
+function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))
 {
-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
-	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
-	if (! $tmp)
+	if (is_array($stringcolor)) return $stringcolor; // If already into correct output format, we return as is
+	$tmp = preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/', $stringcolor, $reg);
+	if (!$tmp)
 	{
-		$tmp=explode(',',$stringcolor);
+		$tmp = explode(',', $stringcolor);
 		if (count($tmp) < 3) return $colorifnotfound;
 		return $tmp;
 	}
-	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+	return array(hexdec($reg[1]), hexdec($reg[2]), hexdec($reg[3]));
 }
 
 /**
@@ -2217,8 +2217,8 @@ 
     foreach ($input as $key => $values) {
         $append = array();
 
-        foreach($result as $product) {
-            foreach($values as $item) {
+        foreach ($result as $product) {
+            foreach ($values as $item) {
                 $product[$key] = $item;
                 $append[] = $product;
             }
@@ -2239,8 +2239,8 @@ 
  */
 function getModuleDirForApiClass($module)
 {
-    $moduledirforclass=$module;
-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    $moduledirforclass = $module;
+    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);
 
     if ($module == 'contracts') {
     	$moduledirforclass = 'contrat';
@@ -2316,9 +2316,9 @@ 
  * @param	$max	int	Between 0 and 255
  * @return String
  */
-function random_color_part($min=0,$max=255)
+function random_color_part($min = 0, $max = 255)
 {
-    return str_pad( dechex( mt_rand( $min, $max) ), 2, '0', STR_PAD_LEFT);
+    return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT);
 }
 
 /*
@@ -2328,7 +2328,7 @@ 
  * @param	$max	int	Between 0 and 255
  * @return String
  */
-function random_color($min=0, $max=255)
+function random_color($min = 0, $max = 255)
 {
-    return random_color_part($min, $max) . random_color_part($min, $max) . random_color_part($min, $max);
+    return random_color_part($min, $max).random_color_part($min, $max).random_color_part($min, $max);
 }

Braces +696 added lines, -349 removed lines

@@ -55,8 +55,7 @@ 
                 $entity = "&#". $unicode . ';';
                 $decodedStr .= utf8_encode($entity);
                 $pos += 4;
-            }
-            else {
+            } else {
                 // we have an escaped ascii character
                 $hexVal = substr($source, $pos, 2);
                 $decodedStr .= chr(hexdec($hexVal));
@@ -97,7 +96,10 @@ 
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.
+                if (preg_match('/disabled/',$file)) {
+                    continue;
+                }
+                // We discard module if it contains disabled into name.
 
                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
                 {
@@ -129,8 +131,14 @@ 
     	$outputlangs=$langs;
     }
 
-    if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada
-    if ($outputlangs->defaultlang == 'en_US') $selected='USLetter';    // US
+    if ($outputlangs->defaultlang == 'ca_CA') {
+        $selected='CAP4';
+    }
+    // Canada
+    if ($outputlangs->defaultlang == 'en_US') {
+        $selected='USLetter';
+    }
+    // US
     return $selected;
 }
 
@@ -155,29 +163,42 @@ 
         {
             $content=file_get_contents($formfile);
             $isutf8=utf8_check($content);
-            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-            else print $content;
+            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+                print utf8_encode($content);
+            } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+                print utf8_decode($content);
+            } else {
+                print $content;
+            }
             return true;
+        } else {
+            dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
         }
-        else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
 
         if ($searchalt) {
             // Test si fichier dans repertoire de la langue alternative
-            if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
-            else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+            if ($langs->defaultlang != "en_US") {
+                $formfilealt = $searchdir."/langs/en_US/".$filename;
+            } else {
+                $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+            }
             dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
             //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
             if (is_readable($formfilealt))
             {
                 $content=file_get_contents($formfilealt);
                 $isutf8=utf8_check($content);
-                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-                elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-                else print $content;
+                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+                    print utf8_encode($content);
+                } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+                    print utf8_decode($content);
+                } else {
+                    print $content;
+                }
                 return true;
+            } else {
+                dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
             }
-            else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
         }
     }
 
@@ -207,279 +228,460 @@ 
     $deltadateforuser=round($deltadateforclient-$deltadateforserver);
     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
-    if ($usetable) print '<table class="border centpercent">';
+    if ($usetable) {
+        print '<table class="border centpercent">';
+    }
 
     // Import key
     if (! empty($object->import_key))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ImportedWithSet");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print $object->import_key;
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User creation (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_creation) || ! empty($object->user_creation_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("CreatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_creation))
         {
-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+        	if ($object->user_creation->id) {
+        	    print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date creation
     if (! empty($object->date_creation))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateCreation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_creation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User change (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_modification) || ! empty($object->user_modification_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ModifiedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_modification))
         {
-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+        	if ($object->user_modification->id) {
+        	    print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date change
     if (! empty($object->date_modification))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastModification");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_modification, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User validation (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_validation) || ! empty($object->user_validation_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ValidatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_validation))
         {
-            if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+            if ($object->user_validation->id) {
+                print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date validation
     if (! empty($object->date_validation))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateValidation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_validation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User approve (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_approve) || ! empty($object->user_approve_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_approve))
         {
-            if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+            if ($object->user_approve->id) {
+                print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date approve
     if (! empty($object->date_approve))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User approve
     if (! empty($object->user_approve_id2))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         $userstatic=new User($db);
         $userstatic->fetch($object->user_approve_id2);
-        if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        else print $langs->trans("Unknown");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($userstatic->id) {
+            print $userstatic->getNomUrl(1, '', 0, 0, 0);
+        } else {
+            print $langs->trans("Unknown");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date approve
     if (! empty($object->date_approve2))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove2");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve2, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User close
     if (! empty($object->user_cloture))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ClosedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_cloture))
         {
-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+			if ($object->user_cloture->id) {
+			    print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_cloture);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date close
     if (! empty($object->date_cloture))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateClosing");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_cloture, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User conciliate
     if (! empty($object->user_rappro))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ConciliatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_rappro))
         {
-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+			if ($object->user_rappro->id) {
+			    print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_rappro);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date conciliate
     if (! empty($object->date_rappro))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateConciliating");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_rappro, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date send
     if (! empty($object->date_envoi))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastSend");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_envoi, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
-    if ($usetable) print '</table>';
-}
+    if ($usetable) {
+        print '</table>';
+    }
+    }
 
 
 /**
@@ -508,8 +710,7 @@ 
     if (checkdnsrr($domain, "MX"))
     {
         return true;
-    }
-    else
+    } else
     {
         return false;
     }
@@ -534,10 +735,14 @@ 
     $urlregex = '';
 
     // SCHEME
-    if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
+    if ($http) {
+        $urlregex .= "^(http:\/\/|https:\/\/)";
+    }
 
     // USER AND PASS
-    if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+    if ($pass) {
+        $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+    }
 
     // HOSTNAME OR IP
     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
@@ -546,13 +751,21 @@ 
     //use only one of the above
 
     // PORT
-    if ($port) $urlregex .= "(\:[0-9]{2,5})";
+    if ($port) {
+        $urlregex .= "(\:[0-9]{2,5})";
+    }
     // PATH
-    if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+    if ($path) {
+        $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+    }
     // GET Query
-    if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+    if ($query) {
+        $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+    }
     // ANCHOR
-    if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+    if ($anchor) {
+        $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+    }
 
     // check
     if (preg_match('/'.$urlregex.'/i', $url))
@@ -600,9 +813,10 @@ 
         $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain,'/').'/i', $newproto.strtolower($domain), $url);
 
         return $CleanUrl;
+    } else {
+        return $url;
+    }
     }
-    else return $url;
-}
 
 
 
@@ -619,7 +833,9 @@ 
  */
 function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
 {
-	if(!isValidEmail($mail))return '';
+	if(!isValidEmail($mail)) {
+	    return '';
+	}
 	$tab = explode('@', $mail);
 	$tab2 = explode('.',$tab[1]);
 	$string_replace = '';
@@ -681,7 +897,9 @@ 
 function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdoptions='')
 {
     $text='' ;
-    if($tableMarkup) $text = '<table '.$tableoptions.'>' ;
+    if($tableMarkup) {
+        $text = '<table '.$tableoptions.'>' ;
+    }
     foreach($data as $key => $item){
         if(is_array($item)){
             $text.=array2tr($item,$troptions,$tdoptions);
@@ -692,7 +910,9 @@ 
             $text.= '</tr>' ;
         }
     }
-    if($tableMarkup) $text.= '</table>' ;
+    if($tableMarkup) {
+        $text.= '</table>' ;
+    }
     return $text ;
 }
 
@@ -716,15 +936,25 @@ 
 {
     global $conf,$user;
 
-    if (! is_object($objsoc)) $valueforccc=$objsoc;
-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;
-    else $valueforccc=$objsoc->code_client;
+    if (! is_object($objsoc)) {
+        $valueforccc=$objsoc;
+    } else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) {
+        $valueforccc=$objsoc->code_fournisseur;
+    } else {
+        $valueforccc=$objsoc->code_client;
+    }
 
     $sharetable = $table;
-    if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
+    if ($table == 'facture' || $table == 'invoice') {
+        $sharetable = 'invoicenumber';
+    }
+    // for getEntity function
 
     // Clean parameters
-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers
+    if ($date == '') {
+        $date=dol_now();
+    }
+    // We use local year and month of PHP server to search numbers
     // but we should use local year and month of user
 
     // For debugging
@@ -741,8 +971,7 @@ 
         $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');
         $maskcounter=$reg[1];
         $hasglobalcounter=true;
-    }
-    else
+    } else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri='00000';
@@ -752,7 +981,9 @@ 
     $maskraz=-1;
     $maskoffset=0;
     $resetEveryMonth=false;
-    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) {
+        return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -764,9 +995,12 @@ 
         $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
     }
-    else $maskrefclient='';
 
     // fail if there is neither a global nor a third party counter
     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -780,8 +1014,7 @@ 
         $masktype=$regType[1];
         $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)
         $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
-    }
-    else
+    } else
     {
     	$masktype='';
     	$masktype_value='';
@@ -791,13 +1024,14 @@ 
     if (preg_match('/\{(u+)\}/i',$mask,$regType))
     {
     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-    	if (is_object($objuser)) $lastname = $objuser->lastname;
+    	if (is_object($objuser)) {
+    	    $lastname = $objuser->lastname;
+    	}
 
     	$maskuser=$regType[1];
     	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
     	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
-    }
-    else
+    } else
     {
     	$maskuser='';
     	$maskuser_value='';
@@ -844,8 +1078,12 @@ 
     //var_dump($reg);
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 
     // Define $sqlwhere
     $sqlwhere='';
@@ -853,14 +1091,21 @@ 
     $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))	$yearoffsettype = preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))	$yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    }
 
     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
-    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
-        $maskraz=$yearoffsettype; // For backward compatibility
-    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
-        $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) {
+            $maskraz=$yearoffsettype;
+    }
+    // For backward compatibility
+    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1)) {
+            $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+    }
     //print "maskraz=".$maskraz;	// -1=no reset
 
     if ($maskraz > 0) {   // A reset is required
@@ -868,23 +1113,28 @@ 
             $maskraz = date('m', $date);
             $resetEveryMonth = true;
         }
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 
         // Define posy, posm and reg
-        if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
+        if ($maskraz > 1) {
+            // if reset is not first month, we need month and year into mask
         {
-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-            else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-
-            if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2;
         }
-        else // if reset is for a specific month in year, we need year
+        $posm=3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else {
+                return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+            }
+
+            if (dol_strlen($reg[$posy]) < 2) {
+                return 'ErrorCantUseRazWithYearOnOneDigit';
+            }
+        } else // if reset is for a specific month in year, we need year
         {
-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }
-            else return 'ErrorCantUseRazIfNoYearInMask';
+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; } else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; } else {
+                return 'ErrorCantUseRazIfNoYearInMask';
+            }
         }
         // Define length
         $yearlen = $posy?dol_strlen($reg[$posy]):0;
@@ -902,9 +1152,11 @@ 
         $monthcomp=$maskraz;
         $yearcomp=0;
 
-        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
+        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+            // $yearoffsettype is - or +
         {
         	$currentyear=date("Y", $date);
+        }
         	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
         	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
         	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
@@ -914,21 +1166,32 @@ 
         	if ($date >= $fiscaldate)
         	{
         		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') {
+        		    $yearoffset=1;
+        		}
         	}
         	// If after or equal of current new year date
-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
+        	else if ($date >= $newyeardate && $yearoffsettype == '-') {
+        	    $yearoffset=-1;
+        	}
         }
         // For backward compatibility
         else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year
 
-        if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
-        elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
-        elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
-        if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
+        if ($yearlen == 4) {
+            $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
+        } elseif ($yearlen == 2) {
+            $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
+        } elseif ($yearlen == 1) {
+            $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
+        }
+        if ($monthcomp > 1 && empty($resetEveryMonth)) {
+            // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
         {
             if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);
-            elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
+        } elseif ($yearlen == 2) {
+                $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
+            }
 
             $sqlwhere.="(";
             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
@@ -937,13 +1200,11 @@ 
             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
             $sqlwhere.=')';
-        }
-		else if ($resetEveryMonth)
+        } else if ($resetEveryMonth)
 		{
 			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
-        else   // reset is done on january
+		} else   // reset is done on january
         {
             $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
         }
@@ -955,12 +1216,13 @@ 
     if (function_exists('mb_strrpos'))
     	{
     	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
-	}
-	else
+	} else
 	{
     	$posnumstart=strrpos($maskwithnocode,$maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
-    if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
+    if ($posnumstart < 0) {
+        return 'ErrorBadMaskFailedToLocatePosOfSequence';
+    }
     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';
 
     // Define $maskLike
@@ -973,9 +1235,15 @@ 
     $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
     $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
     $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);
-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+    if ($maskrefclient) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+    }
+    if ($masktype) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+    }
+    if ($maskuser) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+    }
     foreach($maskperso as $key => $val)
     {
     	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
@@ -987,12 +1255,18 @@ 
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
 	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
-    if ($bentityon) // only if entity enable
+    if ($bentityon) {
+        // only if entity enable
     	$sql.= " AND entity IN (".getEntity($sharetable).")";
-    else if (! empty($forceentity))
-    	$sql.= " AND entity IN (".$forceentity.")";
-    if ($where) $sql.=$where;
-    if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    } else if (! empty($forceentity)) {
+        	$sql.= " AND entity IN (".$forceentity.")";
+    }
+    if ($where) {
+        $sql.=$where;
+    }
+    if ($sqlwhere) {
+        $sql.=' AND '.$sqlwhere;
+    }
 
     //print $sql.'<br>';
     dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
@@ -1001,21 +1275,26 @@ 
     {
         $obj = $db->fetch_object($resql);
         $counter = $obj->val;
+    } else {
+        dol_print_error($db);
     }
-    else dol_print_error($db);
 
     // Check if we must force counter to maskoffset
-    if (empty($counter)) $counter=$maskoffset;
-    else if (preg_match('/[^0-9]/i',$counter))
+    if (empty($counter)) {
+        $counter=$maskoffset;
+    } else if (preg_match('/[^0-9]/i',$counter))
     {
     	$counter=0;
     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
+    } else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) {
+        $counter=$maskoffset;
     }
-    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;
 
-    if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
+    if ($mode == 'last') {
+        // We found value for counter = last counter value. Now need to get corresponding ref of invoice.
     {
         $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+    }
 
         // Define $maskLike
         $maskLike = dol_string_nospecial($mask);
@@ -1027,34 +1306,48 @@ 
         $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
         $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
         $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);
-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+        if ($maskrefclient) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+        }
+        if ($masktype) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+        }
+        if ($maskuser) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+        }
 
         $ref='';
         $sql = "SELECT ".$field." as ref";
         $sql.= " FROM ".MAIN_DB_PREFIX.$table;
         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
     	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
-    	if ($bentityon) // only if entity enable
+    	if ($bentityon) {
+    	    // only if entity enable
         	$sql.= " AND entity IN (".getEntity($sharetable).")";
-        else if (! empty($forceentity))
-        	$sql.= " AND entity IN (".$forceentity.")";
-        if ($where) $sql.=$where;
-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    	} else if (! empty($forceentity)) {
+                	$sql.= " AND entity IN (".$forceentity.")";
+        }
+        if ($where) {
+            $sql.=$where;
+        }
+        if ($sqlwhere) {
+            $sql.=' AND '.$sqlwhere;
+        }
 
         dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
-            if ($obj) $ref = $obj->ref;
+            if ($obj) {
+                $ref = $obj->ref;
+            }
+        } else {
+            dol_print_error($db);
         }
-        else dol_print_error($db);
 
         $numFinal=$ref;
-    }
-    else if ($mode == 'next')
+    } else if ($mode == 'next')
     {
         $counter++;
 
@@ -1070,7 +1363,9 @@ 
 
             // Define $sqlstring
             $maskrefclient_posnumstart=strpos($maskwithnocode,$maskrefclient_maskcounter,strpos($maskwithnocode,$maskrefclient));	// Pos of counter in final string (from 0 to ...)
-            if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';
+            if ($maskrefclient_posnumstart <= 0) {
+                return 'ErrorBadMask';
+            }
             $maskrefclient_sqlstring='SUBSTRING('.$field.', '.($maskrefclient_posnumstart+1).', '.dol_strlen($maskrefclient_maskcounter).')';
             //print "x".$sqlstring;
 
@@ -1092,12 +1387,20 @@ 
             $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;
             //$sql.= " WHERE ".$field." not like '(%'";
             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
-            if ($bentityon) // only if entity enable
+            if ($bentityon) {
+                // only if entity enable
             	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
-            else if (! empty($forceentity))
-            	$sql.= " AND entity IN (".$forceentity.")";
-            if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
-            if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
+            } else if (! empty($forceentity)) {
+                        	$sql.= " AND entity IN (".$forceentity.")";
+            }
+            if ($where) {
+                $maskrefclient_sql.=$where;
+            }
+            //use the same optional where as general mask
+            if ($sqlwhere) {
+                $maskrefclient_sql.=' AND '.$sqlwhere;
+            }
+            //use the same sqlwhere as general mask
             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
 
             dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
@@ -1106,10 +1409,13 @@ 
             {
                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
                 $maskrefclient_counter = $maskrefclient_obj->val;
+            } else {
+                dol_print_error($db);
             }
-            else dol_print_error($db);
 
-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) {
+                $maskrefclient_counter=$maskrefclient_maskoffset;
+            }
 			$maskrefclient_counter++;
         }
 
@@ -1117,13 +1423,14 @@ 
         $numFinal = $mask;
 
         // We replace special codes except refclient
-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
+		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+		    // yearoffsettype is - or +, so we don't want current year
 		{
 	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
+		}
         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
         	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
-		}
-		else	// we want yyyy to be current year
+		} else	// we want yyyy to be current year
 		{
         	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
@@ -1180,7 +1487,9 @@ 
 {
     $string = " ".$string;
      $ini = strpos($string,$start);
-     if ($ini == 0) return "";
+     if ($ini == 0) {
+         return "";
+     }
      $ini += strlen($start);
      $len = strpos($string,$end,$ini) - $ini;
      return substr($string,$ini,$len);
@@ -1204,8 +1513,7 @@ 
         $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');
         $maskcounter=$reg[1];
         $hasglobalcounter=true;
-    }
-    else
+    } else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri='00000';
@@ -1214,7 +1522,9 @@ 
 
     $maskraz=-1;
     $maskoffset=0;
-    if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3) {
+        return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -1226,9 +1536,12 @@ 
         $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
     }
-    else $maskrefclient='';
 
     // fail if there is neither a global nor a third party counter
     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -1250,21 +1563,35 @@ 
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 
     // Define $sqlwhere
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))  $maskraz=preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))  $maskraz=preg_replace('/^@/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $maskraz=preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $maskraz=preg_replace('/^@/','',$reg[3]);
+    }
     if ($maskraz >= 0)
     {
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 
         // Define reg
-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
+        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+        }
+        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazIfNoYearInMask';
+        }
         //print "x".$maskwithonlyymcode." ".$maskraz;
     }
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
@@ -1274,7 +1601,9 @@ 
 
     // Check length
     $len=dol_strlen($maskwithnocode);
-    if (dol_strlen($value) != $len) $result=-1;
+    if (dol_strlen($value) != $len) {
+        $result=-1;
+    }
 
     // Define $maskLike
     /* seems not used
@@ -1355,29 +1684,37 @@ 
      */
 
     // Definition du Jeudi de la semaine
-    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche
+    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) {
+        // Dimanche
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) {
+        // du Lundi au Mercredi
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) {
+        // du Vendredi au Samedi
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
-    else // Jeudi
+    } else {
+        // Jeudi
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
+    }
 
     // Definition du premier Jeudi de l'annee
-    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche
+    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) {
+        // Dimanche
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) {
+        // du Lundi au Mercredi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) {
+        // du Vendredi au Samedi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
     }
-    else // Jeudi
+    } else // Jeudi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));
     }
@@ -1398,8 +1735,7 @@ 
         if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))
         {
             $numeroSemaine = 53;
-        }
-        else
+        } else
         {
             $numeroSemaine = 1;
         }
@@ -1458,7 +1794,9 @@ 
 function dol_set_user_param($db, $conf, &$user, $tab)
 {
     // Verification parametres
-    if (count($tab) < 1) return -1;
+    if (count($tab) < 1) {
+        return -1;
+    }
 
     $db->begin();
 
@@ -1470,7 +1808,9 @@ 
     $i=0;
     foreach ($tab as $key => $value)
     {
-        if ($i > 0) $sql.=',';
+        if ($i > 0) {
+            $sql.=',';
+        }
         $sql.="'".$db->escape($key)."'";
         $i++;
     }
@@ -1504,8 +1844,7 @@ 
             }
             $user->conf->$key = $value;
             //print "key=".$key." user->conf->key=".$user->conf->$key;
-        }
-        else
+        } else
         {
             unset($user->conf->$key);
         }
@@ -1528,8 +1867,7 @@ 
     if ($reduction == 100)
     {
         $string = $langs->transnoentities("Offered");
-    }
-    else
+    } else
     {
     	$string = vatrate($reduction,true);
     }
@@ -1616,9 +1954,11 @@ 
 
             // If this generation module needs to scan a directory, then description field is filled
             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
-            if (! empty($obj->description))	// A list of directories to scan is defined
+            if (! empty($obj->description)) {
+                // A list of directories to scan is defined
             {
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            }
 
                 $const=$obj->description;
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
@@ -1637,7 +1977,9 @@ 
                     {
 			// all type of template is allowed
 			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        if (count($tmpfiles)) {
+                            $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        }
                     }
                 }
 
@@ -1648,40 +1990,41 @@ 
                         $max=($maxfilenamelength?$maxfilenamelength:28);
                         $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');
                     }
-                }
-                else
+                } else
                 {
                     $liste[0]=$obj->label.': '.$langs->trans("None");
                 }
-            }
-            else
+            } else
             {
-                if ($type == 'member' && $obj->lib == 'standard')   // Special case, if member template, we add variant per format
+                if ($type == 'member' && $obj->lib == 'standard') {
+                    // Special case, if member template, we add variant per format
                 {
                     global $_Avery_Labels;
+                }
                     include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
                     foreach($_Avery_Labels as $key => $val)
                     {
                         $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];
                     }
-                }
-                else    // Common usage
+                } else    // Common usage
                 {
                     $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
                 }
             }
             $i++;
         }
-    }
-    else
+    } else
     {
         dol_print_error($db);
         return -1;
     }
 
-    if ($found) return $liste;
-    else return 0;
-}
+    if ($found) {
+        return $liste;
+    } else {
+        return 0;
+    }
+    }
 
 /**
  * This function evaluates a string that should be a valid IPv4
@@ -1696,10 +2039,14 @@ 
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 
 		// Then we test if it is a private range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {
+		    return 2;
+		}
 
 		// Then we test if it is a reserved range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) {
+		    return 0;
+		}
 
 		return 1;
 	}
@@ -1752,8 +2099,7 @@ 
                       'proxy_password' => $proxypass,
                       'trace'		   => 1
         );
-    }
-    else
+    } else
     {
         $params=array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
@@ -1860,14 +2206,12 @@ 
 		$classname='FactureFournisseur';
 		$classpath = 'fourn/class';
 		$module='fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier')   {
+	} elseif ($objecttype == 'order_supplier')   {
 		$classfile = 'fournisseur.commande';
 		$classname='CommandeFournisseur';
 		$classpath = 'fourn/class';
 		$module='fournisseur';
-	}
-	elseif ($objecttype == 'stock')   {
+	} elseif ($objecttype == 'stock')   {
 		$classpath = 'product/stock/class';
 		$classfile='entrepot';
 		$classname='Entrepot';
@@ -1887,8 +2231,9 @@ 
 					$ret=$langs->trans('Deleted');
 				}
 				unset($object);
+			} else {
+			    dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
 			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
 		}
 	}
 	return $ret;
@@ -1920,11 +2265,12 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 			$listofid[]=$obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
+			if ($obj->parent_id > 0) {
+			    $listofparentid[$obj->rowid]=$obj->parent_id;
+			}
 			$i++;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -1959,9 +2305,11 @@ 
 			while ($cursor > 0)
 			{
 				$arrayidparsed[$cursor]=1;
-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
+				if ($arrayidparsed[$listofparentid[$cursor]]) {
+				    // We detect a loop. A record with a parent that was already into child
 				{
 					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
+				}
 					unset($arrayidparsed);
 					$listofidtoclean[$cursor]=$id;
 					break;
@@ -1969,7 +2317,9 @@ 
 				$cursor=$listofparentid[$cursor];
 			}
 
-			if (count($listofidtoclean)) break;
+			if (count($listofidtoclean)) {
+			    break;
+			}
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
@@ -2116,9 +2466,15 @@ 
         $classfile='fournisseur.facture';
     }
 
-    if (!isset($classfile)) $classfile = strtolower($subelement);
-    if (!isset($classname)) $classname = ucfirst($subelement);
-    if (!isset($classpath)) $classpath = $module.'/class';
+    if (!isset($classfile)) {
+        $classfile = strtolower($subelement);
+    }
+    if (!isset($classname)) {
+        $classname = ucfirst($subelement);
+    }
+    if (!isset($classpath)) {
+        $classpath = $module.'/class';
+    }
 
     $element_properties = array(
         'module' => $module,
@@ -2172,8 +2528,12 @@ 
  */
 function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 {
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	if (empty($arraycolor)) return $colorifnotfound;
+	if (! is_array($arraycolor)) {
+	    return $colorifnotfound;
+	}
+	if (empty($arraycolor)) {
+	    return $colorifnotfound;
+	}
 	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
 }
 
@@ -2189,12 +2549,17 @@ 
  */
 function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
 {
-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+	if (is_array($stringcolor)) {
+	    return $stringcolor;
+	}
+	// If already into correct output format, we return as is
 	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
 	if (! $tmp)
 	{
 		$tmp=explode(',',$stringcolor);
-		if (count($tmp) < 3) return $colorifnotfound;
+		if (count($tmp) < 3) {
+		    return $colorifnotfound;
+		}
 		return $tmp;
 	}
 	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
@@ -2240,69 +2605,51 @@ 
 function getModuleDirForApiClass($module)
 {
     $moduledirforclass=$module;
-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    if ($moduledirforclass != 'api') {
+        $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    }
 
     if ($module == 'contracts') {
     	$moduledirforclass = 'contrat';
-    }
-    elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
+    } elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
         $moduledirforclass = 'api';
-    }
-    elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
+    } elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
         $moduledirforclass = 'societe';
-    }
-    elseif ($module == 'propale' || $module == 'proposals') {
+    } elseif ($module == 'propale' || $module == 'proposals') {
         $moduledirforclass = 'comm/propal';
-    }
-    elseif ($module == 'agenda' || $module == 'agendaevents') {
+    } elseif ($module == 'agenda' || $module == 'agendaevents') {
         $moduledirforclass = 'comm/action';
-    }
-    elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
+    } elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
         $moduledirforclass = 'adherents';
-    }
-    elseif ($module == 'banque' || $module == 'bankaccounts') {
+    } elseif ($module == 'banque' || $module == 'bankaccounts') {
         $moduledirforclass = 'compta/bank';
-    }
-    elseif ($module == 'category' || $module == 'categorie') {
+    } elseif ($module == 'category' || $module == 'categorie') {
         $moduledirforclass = 'categories';
-    }
-    elseif ($module == 'order' || $module == 'orders') {
+    } elseif ($module == 'order' || $module == 'orders') {
         $moduledirforclass = 'commande';
-    }
-    elseif ($module == 'shipments') {
+    } elseif ($module == 'shipments') {
     	$moduledirforclass = 'expedition';
-    }
-    elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
+    } elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
         $moduledirforclass = 'compta/facture';
-    }
-    elseif ($module == 'products') {
+    } elseif ($module == 'products') {
         $moduledirforclass = 'product';
-    }
-    elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
+    } elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'task') {
+    } elseif ($module == 'task') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
+    } elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
         $moduledirforclass = 'product/stock';
-    }
-    elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
+    } elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
     	$moduledirforclass = 'supplier_proposal';
-    }
-    elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
+    } elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
         $moduledirforclass = 'fourn';
-    }
-    elseif ($module == 'expensereports') {
+    } elseif ($module == 'expensereports') {
         $moduledirforclass = 'expensereport';
-    }
-    elseif ($module == 'users') {
+    } elseif ($module == 'users') {
         $moduledirforclass = 'user';
-    }
-    elseif ($module == 'ficheinter' || $module == 'interventions') {
+    } elseif ($module == 'ficheinter' || $module == 'interventions') {
     	$moduledirforclass = 'fichinter';
-    }
-    elseif ($module == 'tickets') {
+    } elseif ($module == 'tickets') {
     	$moduledirforclass = 'ticket';
     }