alxarafe / alixar

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

Indentation +179 added lines, -179 removed lines

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

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

Indentation +490 added lines, -490 removed lines

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

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

Indentation +118 added lines, -118 removed lines

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

dolibarr/htdocs/core/class/coreobject.class.php

Indentation +149 added lines, -149 removed lines

@@ -27,55 +27,55 @@ 
 
 class CoreObject extends CommonObject
 {
-	public $withChild = true;
+    public $withChild = true;
 
-	/**
-	 *  @var Array $_fields Fields to synchronize with Database
-	 */
-	protected $fields=array();
+    /**
+     *  @var Array $_fields Fields to synchronize with Database
+     */
+    protected $fields=array();
 
     /**
-	 *  Constructor
-	 *
-	 *  @param      DoliDB		$db      Database handler
-	 */
-	function __construct(DoliDB &$db)
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
+    function __construct(DoliDB &$db)
     {
         $this->db = $db;
-	}
+    }
 
     /**
      * Function to init fields
      *
      * @return bool
      */
-	protected function init()
+    protected function init()
     {
-		$this->id = 0;
-		$this->datec = 0;
-		$this->tms = 0;
-
-		if (!empty($this->fields))
-		{
-			foreach ($this->fields as $field=>$info)
-			{
-		        if ($this->isDate($info)) $this->{$field} = time();
-		        elseif ($this->isArray($info)) $this->{$field} = array();
-		        elseif ($this->isInt($info)) $this->{$field} = (int) 0;
-		        elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
-				else $this->{$field} = '';
-		    }
+        $this->id = 0;
+        $this->datec = 0;
+        $this->tms = 0;
+
+        if (!empty($this->fields))
+        {
+            foreach ($this->fields as $field=>$info)
+            {
+                if ($this->isDate($info)) $this->{$field} = time();
+                elseif ($this->isArray($info)) $this->{$field} = array();
+                elseif ($this->isInt($info)) $this->{$field} = (int) 0;
+                elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
+                else $this->{$field} = '';
+            }
 
             $this->to_delete=false;
             $this->is_clone=false;
 
-			return true;
-		}
-		else
+            return true;
+        }
+        else
         {
-			return false;
-		}
-	}
+            return false;
+        }
+    }
 
     /**
      * Test type of field
@@ -86,15 +86,15 @@ 
      */
     private function checkFieldType($field, $type)
     {
-		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
-		{
-			return $this->{'is_'.$type}($this->fields[$field]);
-		}
-		else
+        if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
+        {
+            return $this->{'is_'.$type}($this->fields[$field]);
+        }
+        else
         {
             return false;
         }
-	}
+    }
 
     /**
      *	Get object and children from database
@@ -103,15 +103,15 @@ 
      * 	@param		bool		$loadChild		used to load children from database
      *	@return     int         				>0 if OK, <0 if KO, 0 if not found
      */
-	public function fetch($id, $loadChild = true)
+    public function fetch($id, $loadChild = true)
     {
-    	$res = $this->fetchCommon($id);
-    	if($res>0) {
-    		if ($loadChild) $this->fetchChild();
-    	}
+        $res = $this->fetchCommon($id);
+        if($res>0) {
+            if ($loadChild) $this->fetchChild();
+        }
 
-    	return $res;
-	}
+        return $res;
+    }
 
 
     /**
@@ -125,25 +125,25 @@ 
      */
     public function addChild($tabName, $id=0, $key='id', $try_to_load = false)
     {
-		if(!empty($id))
-		{
-			foreach($this->{$tabName} as $k=>&$object)
-			{
-				if($object->{$key} === $id) return $k;
-			}
-		}
+        if(!empty($id))
+        {
+            foreach($this->{$tabName} as $k=>&$object)
+            {
+                if($object->{$key} === $id) return $k;
+            }
+        }
 
-		$k = count($this->{$tabName});
+        $k = count($this->{$tabName});
 
-		$className = ucfirst($tabName);
-		$this->{$tabName}[$k] = new $className($this->db);
-		if($id>0 && $key==='id' && $try_to_load)
-		{
-			$this->{$tabName}[$k]->fetch($id);
-		}
+        $className = ucfirst($tabName);
+        $this->{$tabName}[$k] = new $className($this->db);
+        if($id>0 && $key==='id' && $try_to_load)
+        {
+            $this->{$tabName}[$k]->fetch($id);
+        }
 
-		return $k;
-	}
+        return $k;
+    }
 
 
     /**
@@ -156,16 +156,16 @@ 
      */
     public function removeChild($tabName, $id, $key='id')
     {
-		foreach ($this->{$tabName} as &$object)
-		{
-			if ($object->{$key} == $id)
-			{
-				$object->to_delete = true;
-				return true;
-			}
-		}
-		return false;
-	}
+        foreach ($this->{$tabName} as &$object)
+        {
+            if ($object->{$key} == $id)
+            {
+                $object->to_delete = true;
+                return true;
+            }
+        }
+        return false;
+    }
 
 
     /**
@@ -175,10 +175,10 @@ 
      */
     public function fetchChild()
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
-		{
-			foreach($this->childtables as &$childTable)
-			{
+        if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+        {
+            foreach($this->childtables as &$childTable)
+            {
                 $className = ucfirst($childTable);
 
                 $this->{$className}=array();
@@ -200,9 +200,9 @@ 
                 {
                     $this->errors[] = $this->db->lasterror();
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Function to update children data
@@ -210,26 +210,26 @@ 
      * @param   User    $user   user object
      * @return void
      */
-	public function saveChild(User &$user)
+    public function saveChild(User &$user)
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
-		{
-			foreach($this->childtables as &$childTable)
-			{
-				$className = ucfirst($childTable);
-				if(!empty($this->{$className}))
-				{
-					foreach($this->{$className} as $i => &$object)
-					{
-						$object->{$this->fk_element} = $this->id;
-
-						$object->update($user);
-						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
-					}
-				}
-			}
-		}
-	}
+        if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+        {
+            foreach($this->childtables as &$childTable)
+            {
+                $className = ucfirst($childTable);
+                if(!empty($this->{$className}))
+                {
+                    foreach($this->{$className} as $i => &$object)
+                    {
+                        $object->{$this->fk_element} = $this->id;
+
+                        $object->update($user);
+                        if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+                    }
+                }
+            }
+        }
+    }
 
 
     /**
@@ -240,7 +240,7 @@ 
      */
     public function update(User &$user)
     {
-		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
+        if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
         elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
 
         $error = 0;
@@ -270,7 +270,7 @@ 
             $this->db->rollback();
             return -1;
         }
-	}
+    }
 
     /**
      * Function to create object in database
@@ -280,26 +280,26 @@ 
      */
     public function create(User &$user)
     {
-		if($this->id > 0) return $this->update($user);
+        if($this->id > 0) return $this->update($user);
 
         $error = 0;
         $this->db->begin();
 
         $res = $this->createCommon($user);
-		if($res)
-		{
-			$this->id = $this->db->last_insert_id($this->table_element);
+        if($res)
+        {
+            $this->id = $this->db->last_insert_id($this->table_element);
 
-			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
+            $result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
-		}
-		else
+        }
+        else
         {
             $error++;
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
-		}
+        }
 
         if (empty($error))
         {
@@ -311,7 +311,7 @@ 
             $this->db->rollback();
             return -1;
         }
-	}
+    }
 
     /**
      * Function to delete object in database
@@ -319,9 +319,9 @@ 
      * @param   User    $user   user object
      * @return                  < 0 if ko, > 0 if ok
      */
-	public function delete(User &$user)
+    public function delete(User &$user)
     {
-		if ($this->id <= 0) return 0;
+        if ($this->id <= 0) return 0;
 
         $error = 0;
         $this->db->begin();
@@ -360,7 +360,7 @@ 
             $this->db->rollback();
             return -1;
         }
-	}
+    }
 
 
     /**
@@ -372,12 +372,12 @@ 
      */
     public function getDate($field, $format='')
     {
-		if(empty($this->{$field})) return '';
-		else
+        if(empty($this->{$field})) return '';
+        else
         {
-			return dol_print_date($this->{$field}, $format);
-		}
-	}
+            return dol_print_date($this->{$field}, $format);
+        }
+    }
 
     /**
      * Function to set date in field
@@ -388,18 +388,18 @@ 
      */
     public function setDate($field, $date)
     {
-	  	if (empty($date))
-	  	{
-	  		$this->{$field} = 0;
-	  	}
-		else
+            if (empty($date))
+            {
+                $this->{$field} = 0;
+            }
+        else
         {
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-			$this->{$field} = dol_stringtotime($date);
-		}
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+            $this->{$field} = dol_stringtotime($date);
+        }
 
-		return $this->{$field};
-	}
+        return $this->{$field};
+    }
 
 
     /**
@@ -410,29 +410,29 @@ 
      */
     public function setValues(&$Tab)
     {
-		foreach ($Tab as $key => $value)
-		{
-			if($this->checkFieldType($key, 'date'))
-			{
-				$this->setDate($key, $value);
-			}
-			else if( $this->checkFieldType($key, 'array'))
-			{
-				$this->{$key} = $value;
-			}
-			else if( $this->checkFieldType($key, 'float') )
-			{
-				$this->{$key} = (double) price2num($value);
-			}
-			else if( $this->checkFieldType($key, 'int') ) {
-				$this->{$key} = (int) price2num($value);
-			}
-			else
+        foreach ($Tab as $key => $value)
+        {
+            if($this->checkFieldType($key, 'date'))
+            {
+                $this->setDate($key, $value);
+            }
+            else if( $this->checkFieldType($key, 'array'))
             {
-				$this->{$key} = $value;
-			}
-		}
+                $this->{$key} = $value;
+            }
+            else if( $this->checkFieldType($key, 'float') )
+            {
+                $this->{$key} = (double) price2num($value);
+            }
+            else if( $this->checkFieldType($key, 'int') ) {
+                $this->{$key} = (int) price2num($value);
+            }
+            else
+            {
+                $this->{$key} = $value;
+            }
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 }

dolibarr/htdocs/core/class/cstate.class.php

Indentation +180 added lines, -180 removed lines

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

dolibarr/htdocs/core/class/link.class.php

Indentation +10 added lines, -10 removed lines

@@ -29,19 +29,19 @@ 
 class Link extends CommonObject
 {
     /**
-	 * @var string ID to identify managed object
-	 */
-	public $element = 'link';
+     * @var string ID to identify managed object
+     */
+    public $element = 'link';
 
     /**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'links';
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'links';
 
     /**
-	 * @var int Entity
-	 */
-	public $entity;
+     * @var int Entity
+     */
+    public $entity;
 
     public $datea;
     public $url;
@@ -343,7 +343,7 @@ 
                 return 1;
             }
             else
-			{
+            {
                 return 0;
             }
         } else {

dolibarr/htdocs/core/class/utils.class.php

Indentation +915 added lines, -915 removed lines

@@ -27,857 +27,857 @@ 
  */
 class Utils
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	var $output;   // Used by Cron method to return message
-	var $result;   // Used by Cron method to return data
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *  Purge files into directory of data files.
-	 *  CAN BE A CRON TASK
-	 *
-	 *  @param	string		$choice		Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than 24h, 'allfiles', 'logfile')
-	 *  @return	int						0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	function purgeFiles($choice='tempfilesold')
-	{
-		global $conf, $langs, $dolibarr_main_data_root;
-
-		$langs->load("admin");
-
-		dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG);
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$filesarray=array();
-		if (empty($choice)) $choice='tempfilesold';
-
-		if ($choice=='tempfiles' || $choice=='tempfilesold')
-		{
-			// Delete temporary files
-			if ($dolibarr_main_data_root)
-			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1);	// Do not follow symlinks
-				if ($choice == 'tempfilesold')
-				{
-					$now = dol_now();
-					foreach($filesarray as $key => $val)
-					{
-						if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]);	// Discard files not older than 24h
-					}
-				}
-			}
-		}
-
-		if ($choice=='allfiles')
-		{
-			// Delete all files (except install.lock, do not follow symbolic links)
-			if ($dolibarr_main_data_root)
-			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
-			}
-		}
-
-		if ($choice=='logfile')
-		{
-			// Define files log
-			if ($dolibarr_main_data_root)
-			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
-			}
-
-			$filelog='';
-			if (! empty($conf->syslog->enabled))
-			{
-				$filelog=$conf->global->SYSLOG_FILE;
-				$filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
-
-				$alreadyincluded=false;
-				foreach ($filesarray as $tmpcursor)
-				{
-					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; }
-				}
-				if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
-			}
-		}
-
-		$count=0;
-		$countdeleted=0;
-		$counterror=0;
-		if (count($filesarray))
-		{
-			foreach($filesarray as $key => $value)
-			{
-				//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
-				if ($filesarray[$key]['type'] == 'dir')
-				{
-					$startcount=0;
-					$tmpcountdeleted=0;
-					$result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
-					$count+=$result;
-					$countdeleted+=$tmpcountdeleted;
-				}
-				elseif ($filesarray[$key]['type'] == 'file')
-				{
-					// If (file that is not logfile) or (if mode is logfile)
-					if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
-					{
-						$result=dol_delete_file($filesarray[$key]['fullname'], 1, 1);
-						if ($result)
-						{
-							$count++;
-							$countdeleted++;
-						}
-						else
-						{
-							$counterror++;
-						}
-					}
-				}
-			}
-
-			// Update cachenbofdoc
-			if (! empty($conf->ecm->enabled) && $choice=='allfiles')
-			{
-				require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
-				$ecmdirstatic = new EcmDirectory($this->db);
-				$result = $ecmdirstatic->refreshcachenboffile(1);
-			}
-		}
-
-		if ($count > 0)
-		{
-			$this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
-			if ($count > $countdeleted) $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
-		}
-		else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
-
-		//return $count;
-		return 0;     // This function can be called by cron so must return 0 if OK
-	}
-
-
-	/**
-	 *  Make a backup of database
-	 *  CAN BE A CRON TASK
-	 *
-	 *  @param	string		$compression	   'gz' or 'bz' or 'none'
-	 *  @param  string      $type              'mysql', 'postgresql', ...
-	 *  @param  int         $usedefault        1=Use default backup profile (Set this to 1 when used as cron)
-	 *  @param  string      $file              'auto' or filename to build
-	 *  @param  int         $keeplastnfiles    Keep only last n files (not used yet)
-	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
-	 *  @return	int						       0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='auto', $keeplastnfiles=0, $execmethod=0)
-	{
-		global $db, $conf, $langs, $dolibarr_main_data_root;
-		global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass;
-
-		$langs->load("admin");
-
-		dol_syslog("Utils::dumpDatabase type=".$type." compression=".$compression." file=".$file, LOG_DEBUG);
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		// Check compression parameter
-		if (! in_array($compression, array('none', 'gz', 'bz', 'zip')))
-		{
-			$langs->load("errors");
-			$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
-			return -1;
-		}
-
-		// Check type parameter
-		if ($type == 'auto') $type = $db->type;
-		if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
-		{
-			$langs->load("errors");
-			$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
-			return -1;
-		}
-
-		// Check file parameter
-		if ($file == 'auto')
-		{
-			$prefix='dump';
-			$ext='sql';
-			if (in_array($type, array('mysql', 'mysqli')))  { $prefix='mysqldump'; $ext='sql'; }
-			//if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
-			if (in_array($type, array('pgsql'))) { $prefix='pg_dump'; $ext='sql'; }
-			$file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
-		}
-
-		$outputdir  = $conf->admin->dir_output.'/backup';
-		$result=dol_mkdir($outputdir);
-
-
-		// MYSQL
-		if ($type == 'mysql' || $type == 'mysqli')
-		{
-			$cmddump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
-
-
-			$outputfile = $outputdir.'/'.$file;
-			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
-			$outputerror = $outputfile.'.err';
-			dol_mkdir($conf->admin->dir_output.'/backup');
-
-			// Parameteres execution
-			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
-
-			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
-			$param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
-			$param.=" -u ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
-			if (! GETPOST("use_transaction"))    $param.=" -l --single-transaction";
-			if (GETPOST("disable_fk") || $usedefault) $param.=" -K";
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
-			if (GETPOST("drop_database"))        $param.=" --add-drop-database";
-			if (GETPOST("sql_structure") || $usedefault)
-			{
-				if (GETPOST("drop") || $usedefault)	$param.=" --add-drop-table=TRUE";
-				else 							    $param.=" --add-drop-table=FALSE";
-			}
-			else
-			{
-				$param.=" -t";
-			}
-			if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE";
-			if (GETPOST("sql_data") || $usedefault)
-			{
-				$param.=" --tables";
-				if (GETPOST("showcolumns") || $usedefault)	 $param.=" -c";
-				if (GETPOST("extended_ins") || $usedefault) $param.=" -e";
-				else $param.=" --skip-extended-insert";
-				if (GETPOST("delayed"))	 	 $param.=" --delayed-insert";
-				if (GETPOST("sql_ignore"))	 $param.=" --insert-ignore";
-				if (GETPOST("hexforbinary") || $usedefault) $param.=" --hex-blob";
-			}
-			else
-			{
-				$param.=" -d";    // No row information (no data)
-			}
-			$param.=" --default-character-set=utf8";    // We always save output into utf8 charset
-			$paramcrypted=$param;
-			$paramclear=$param;
-			if (! empty($dolibarr_main_db_pass))
-			{
-				$paramcrypted.=' -p"'.preg_replace('/./i','*',$dolibarr_main_db_pass).'"';
-				$paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"';
-			}
-
-			$errormsg='';
-			$handle = '';
-
-			// Start call method to execute dump
-			$fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
-			$fullcommandclear=$command." ".$paramclear." 2>&1";
-			if ($compression == 'none') $handle = fopen($outputfile, 'w');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
-
-			if ($handle)
-			{
-				if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-				if (empty($execmethod)) $execmethod=1;
-
-				$ok=0;
-				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
-
-				// TODO Replace with executeCLI function
-				if ($execmethod == 1)
-				{
-					exec($fullcommandclear, $readt, $retval);
-					$result = $retval;
-
-					if ($retval != 0)
-					{
-						$langs->load("errors");
-						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
-						$error = 'Error '.$retval;
-						$ok=0;
-					}
-					else
-					{
-						$i=0;
-						if (!empty($readt))
-						foreach($readt as $key=>$read)
-						{
-							$i++;   // output line number
-							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-							fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
-							if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
-						}
-					}
-				}
-				if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
-				{
-					$handlein = popen($fullcommandclear, 'r');
-					$i=0;
-					while (!feof($handlein))
-					{
-						$i++;   // output line number
-						$read = fgets($handlein);
-						// Exclude warning line we don't want
-						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-						fwrite($handle,$read);
-						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
-					}
-					pclose($handlein);
-				}
-
-
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
-
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-			}
-			else
-			{
-				$langs->load("errors");
-				dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-				$errormsg=$langs->trans("ErrorFailedToWriteInDir");
-			}
-
-			// Get errorstring
-			if ($compression == 'none') $handle = fopen($outputfile, 'r');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');
-			if ($handle)
-			{
-				// Get 2048 first chars of error message.
-				$errormsg = fgets($handle,2048);
-				// Close file
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
-				if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
-				else
-				{
-					// Renommer fichier sortie en fichier erreur
-					//print "$outputfile -> $outputerror";
-					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
-					@rename($outputfile,$outputerror);
-					// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
-					if (! $errormsg)
-					{
-						$langs->load("errors");
-						$errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
-					}
-				}
-			}
-			// Fin execution commande
-
-			$this->output = $errormsg;
-			$this->error = $errormsg;
-			$this->result = array("commandbackuplastdone" => $command." ".$paramcrypted, "commandbackuptorun" => "");
-			//if (empty($this->output)) $this->output=$this->result['commandbackuplastdone'];
-		}
-
-		// MYSQL NO BIN
-		if ($type == 'mysqlnobin')
-		{
-			$outputfile = $outputdir.'/'.$file;
-			$outputfiletemp = $outputfile.'-TMP.sql';
-			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
-			$outputerror = $outputfile.'.err';
-			dol_mkdir($conf->admin->dir_output.'/backup');
-
-			if ($compression == 'gz' or $compression == 'bz')
-			{
-				$this->backupTables($outputfiletemp);
-				dol_compress_file($outputfiletemp, $outputfile, $compression);
-				unlink($outputfiletemp);
-			}
-			else
-			{
-				$this->backupTables($outputfile);
-			}
-
-			$this->output = "";
-			$this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => "");
-		}
-
-		// POSTGRESQL
-		if ($type == 'postgresql' || $type == 'pgsql')
-		{
-			$cmddump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
-
-			$outputfile = $outputdir.'/'.$file;
-			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
-			$outputerror = $outputfile.'.err';
-			dol_mkdir($conf->admin->dir_output.'/backup');
-
-			// Parameteres execution
-			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
-
-			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
-			//$param="-F c";
-			$param="-F p";
-			$param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
-			$param.=" -U ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.="  --disable-dollar-quoting";
-			if (GETPOST("drop_database"))        $param.=" -c -C";
-			if (GETPOST("sql_structure"))
-			{
-				if (GETPOST("drop"))			 $param.=" --add-drop-table";
-				if (! GETPOST("sql_data"))       $param.=" -s";
-			}
-			if (GETPOST("sql_data"))
-			{
-				if (! GETPOST("sql_structure"))	 $param.=" -a";
-				if (GETPOST("showcolumns"))	     $param.=" -c";
-			}
-			$param.=' -f "'.$outputfile.'"';
-			//if ($compression == 'none')
-			if ($compression == 'gz')   $param.=' -Z 9';
-			//if ($compression == 'bz')
-			$paramcrypted=$param;
-			$paramclear=$param;
-			/*if (! empty($dolibarr_main_db_pass))
+    var $output;   // Used by Cron method to return message
+    var $result;   // Used by Cron method to return data
+
+    /**
+     *	Constructor
+     *
+     *  @param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *  Purge files into directory of data files.
+     *  CAN BE A CRON TASK
+     *
+     *  @param	string		$choice		Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than 24h, 'allfiles', 'logfile')
+     *  @return	int						0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
+     */
+    function purgeFiles($choice='tempfilesold')
+    {
+        global $conf, $langs, $dolibarr_main_data_root;
+
+        $langs->load("admin");
+
+        dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG);
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        $filesarray=array();
+        if (empty($choice)) $choice='tempfilesold';
+
+        if ($choice=='tempfiles' || $choice=='tempfilesold')
+        {
+            // Delete temporary files
+            if ($dolibarr_main_data_root)
+            {
+                $filesarray=dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1);	// Do not follow symlinks
+                if ($choice == 'tempfilesold')
+                {
+                    $now = dol_now();
+                    foreach($filesarray as $key => $val)
+                    {
+                        if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]);	// Discard files not older than 24h
+                    }
+                }
+            }
+        }
+
+        if ($choice=='allfiles')
+        {
+            // Delete all files (except install.lock, do not follow symbolic links)
+            if ($dolibarr_main_data_root)
+            {
+                $filesarray=dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+            }
+        }
+
+        if ($choice=='logfile')
+        {
+            // Define files log
+            if ($dolibarr_main_data_root)
+            {
+                $filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+            }
+
+            $filelog='';
+            if (! empty($conf->syslog->enabled))
+            {
+                $filelog=$conf->global->SYSLOG_FILE;
+                $filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
+
+                $alreadyincluded=false;
+                foreach ($filesarray as $tmpcursor)
+                {
+                    if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; }
+                }
+                if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+            }
+        }
+
+        $count=0;
+        $countdeleted=0;
+        $counterror=0;
+        if (count($filesarray))
+        {
+            foreach($filesarray as $key => $value)
+            {
+                //print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
+                if ($filesarray[$key]['type'] == 'dir')
+                {
+                    $startcount=0;
+                    $tmpcountdeleted=0;
+                    $result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
+                    $count+=$result;
+                    $countdeleted+=$tmpcountdeleted;
+                }
+                elseif ($filesarray[$key]['type'] == 'file')
+                {
+                    // If (file that is not logfile) or (if mode is logfile)
+                    if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
+                    {
+                        $result=dol_delete_file($filesarray[$key]['fullname'], 1, 1);
+                        if ($result)
+                        {
+                            $count++;
+                            $countdeleted++;
+                        }
+                        else
+                        {
+                            $counterror++;
+                        }
+                    }
+                }
+            }
+
+            // Update cachenbofdoc
+            if (! empty($conf->ecm->enabled) && $choice=='allfiles')
+            {
+                require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+                $ecmdirstatic = new EcmDirectory($this->db);
+                $result = $ecmdirstatic->refreshcachenboffile(1);
+            }
+        }
+
+        if ($count > 0)
+        {
+            $this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
+            if ($count > $countdeleted) $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
+        }
+        else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
+
+        //return $count;
+        return 0;     // This function can be called by cron so must return 0 if OK
+    }
+
+
+    /**
+     *  Make a backup of database
+     *  CAN BE A CRON TASK
+     *
+     *  @param	string		$compression	   'gz' or 'bz' or 'none'
+     *  @param  string      $type              'mysql', 'postgresql', ...
+     *  @param  int         $usedefault        1=Use default backup profile (Set this to 1 when used as cron)
+     *  @param  string      $file              'auto' or filename to build
+     *  @param  int         $keeplastnfiles    Keep only last n files (not used yet)
+     *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
+     *  @return	int						       0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
+     */
+    function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='auto', $keeplastnfiles=0, $execmethod=0)
+    {
+        global $db, $conf, $langs, $dolibarr_main_data_root;
+        global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass;
+
+        $langs->load("admin");
+
+        dol_syslog("Utils::dumpDatabase type=".$type." compression=".$compression." file=".$file, LOG_DEBUG);
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        // Check compression parameter
+        if (! in_array($compression, array('none', 'gz', 'bz', 'zip')))
+        {
+            $langs->load("errors");
+            $this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
+            return -1;
+        }
+
+        // Check type parameter
+        if ($type == 'auto') $type = $db->type;
+        if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
+        {
+            $langs->load("errors");
+            $this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
+            return -1;
+        }
+
+        // Check file parameter
+        if ($file == 'auto')
+        {
+            $prefix='dump';
+            $ext='sql';
+            if (in_array($type, array('mysql', 'mysqli')))  { $prefix='mysqldump'; $ext='sql'; }
+            //if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
+            if (in_array($type, array('pgsql'))) { $prefix='pg_dump'; $ext='sql'; }
+            $file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
+        }
+
+        $outputdir  = $conf->admin->dir_output.'/backup';
+        $result=dol_mkdir($outputdir);
+
+
+        // MYSQL
+        if ($type == 'mysql' || $type == 'mysqli')
+        {
+            $cmddump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
+
+
+            $outputfile = $outputdir.'/'.$file;
+            // for compression format, we add extension
+            $compression=$compression ? $compression : 'none';
+            if ($compression == 'gz') $outputfile.='.gz';
+            if ($compression == 'bz') $outputfile.='.bz2';
+            $outputerror = $outputfile.'.err';
+            dol_mkdir($conf->admin->dir_output.'/backup');
+
+            // Parameteres execution
+            $command=$cmddump;
+            if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+
+            //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
+            $param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
+            $param.=" -u ".$dolibarr_main_db_user;
+            if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
+            if (! GETPOST("use_transaction"))    $param.=" -l --single-transaction";
+            if (GETPOST("disable_fk") || $usedefault) $param.=" -K";
+            if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
+            if (GETPOST("drop_database"))        $param.=" --add-drop-database";
+            if (GETPOST("sql_structure") || $usedefault)
+            {
+                if (GETPOST("drop") || $usedefault)	$param.=" --add-drop-table=TRUE";
+                else 							    $param.=" --add-drop-table=FALSE";
+            }
+            else
+            {
+                $param.=" -t";
+            }
+            if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE";
+            if (GETPOST("sql_data") || $usedefault)
+            {
+                $param.=" --tables";
+                if (GETPOST("showcolumns") || $usedefault)	 $param.=" -c";
+                if (GETPOST("extended_ins") || $usedefault) $param.=" -e";
+                else $param.=" --skip-extended-insert";
+                if (GETPOST("delayed"))	 	 $param.=" --delayed-insert";
+                if (GETPOST("sql_ignore"))	 $param.=" --insert-ignore";
+                if (GETPOST("hexforbinary") || $usedefault) $param.=" --hex-blob";
+            }
+            else
+            {
+                $param.=" -d";    // No row information (no data)
+            }
+            $param.=" --default-character-set=utf8";    // We always save output into utf8 charset
+            $paramcrypted=$param;
+            $paramclear=$param;
+            if (! empty($dolibarr_main_db_pass))
+            {
+                $paramcrypted.=' -p"'.preg_replace('/./i','*',$dolibarr_main_db_pass).'"';
+                $paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"';
+            }
+
+            $errormsg='';
+            $handle = '';
+
+            // Start call method to execute dump
+            $fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
+            $fullcommandclear=$command." ".$paramclear." 2>&1";
+            if ($compression == 'none') $handle = fopen($outputfile, 'w');
+            if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
+            if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
+
+            if ($handle)
+            {
+                if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
+                if (empty($execmethod)) $execmethod=1;
+
+                $ok=0;
+                dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
+
+                // TODO Replace with executeCLI function
+                if ($execmethod == 1)
+                {
+                    exec($fullcommandclear, $readt, $retval);
+                    $result = $retval;
+
+                    if ($retval != 0)
+                    {
+                        $langs->load("errors");
+                        dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
+                        $error = 'Error '.$retval;
+                        $ok=0;
+                    }
+                    else
+                    {
+                        $i=0;
+                        if (!empty($readt))
+                        foreach($readt as $key=>$read)
+                        {
+                            $i++;   // output line number
+                            if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+                            fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
+                            if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
+                            elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+                        }
+                    }
+                }
+                if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
+                {
+                    $handlein = popen($fullcommandclear, 'r');
+                    $i=0;
+                    while (!feof($handlein))
+                    {
+                        $i++;   // output line number
+                        $read = fgets($handlein);
+                        // Exclude warning line we don't want
+                        if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+                        fwrite($handle,$read);
+                        if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
+                        elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+                    }
+                    pclose($handlein);
+                }
+
+
+                if ($compression == 'none') fclose($handle);
+                if ($compression == 'gz')   gzclose($handle);
+                if ($compression == 'bz')   bzclose($handle);
+
+                if (! empty($conf->global->MAIN_UMASK))
+                    @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+            }
+            else
+            {
+                $langs->load("errors");
+                dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+                $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+            }
+
+            // Get errorstring
+            if ($compression == 'none') $handle = fopen($outputfile, 'r');
+            if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');
+            if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');
+            if ($handle)
+            {
+                // Get 2048 first chars of error message.
+                $errormsg = fgets($handle,2048);
+                // Close file
+                if ($compression == 'none') fclose($handle);
+                if ($compression == 'gz')   gzclose($handle);
+                if ($compression == 'bz')   bzclose($handle);
+                if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
+                else
+                {
+                    // Renommer fichier sortie en fichier erreur
+                    //print "$outputfile -> $outputerror";
+                    @dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
+                    @rename($outputfile,$outputerror);
+                    // Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
+                    if (! $errormsg)
+                    {
+                        $langs->load("errors");
+                        $errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
+                    }
+                }
+            }
+            // Fin execution commande
+
+            $this->output = $errormsg;
+            $this->error = $errormsg;
+            $this->result = array("commandbackuplastdone" => $command." ".$paramcrypted, "commandbackuptorun" => "");
+            //if (empty($this->output)) $this->output=$this->result['commandbackuplastdone'];
+        }
+
+        // MYSQL NO BIN
+        if ($type == 'mysqlnobin')
+        {
+            $outputfile = $outputdir.'/'.$file;
+            $outputfiletemp = $outputfile.'-TMP.sql';
+            // for compression format, we add extension
+            $compression=$compression ? $compression : 'none';
+            if ($compression == 'gz') $outputfile.='.gz';
+            if ($compression == 'bz') $outputfile.='.bz2';
+            $outputerror = $outputfile.'.err';
+            dol_mkdir($conf->admin->dir_output.'/backup');
+
+            if ($compression == 'gz' or $compression == 'bz')
+            {
+                $this->backupTables($outputfiletemp);
+                dol_compress_file($outputfiletemp, $outputfile, $compression);
+                unlink($outputfiletemp);
+            }
+            else
+            {
+                $this->backupTables($outputfile);
+            }
+
+            $this->output = "";
+            $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => "");
+        }
+
+        // POSTGRESQL
+        if ($type == 'postgresql' || $type == 'pgsql')
+        {
+            $cmddump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+
+            $outputfile = $outputdir.'/'.$file;
+            // for compression format, we add extension
+            $compression=$compression ? $compression : 'none';
+            if ($compression == 'gz') $outputfile.='.gz';
+            if ($compression == 'bz') $outputfile.='.bz2';
+            $outputerror = $outputfile.'.err';
+            dol_mkdir($conf->admin->dir_output.'/backup');
+
+            // Parameteres execution
+            $command=$cmddump;
+            if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+
+            //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
+            //$param="-F c";
+            $param="-F p";
+            $param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
+            $param.=" -U ".$dolibarr_main_db_user;
+            if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
+            if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.="  --disable-dollar-quoting";
+            if (GETPOST("drop_database"))        $param.=" -c -C";
+            if (GETPOST("sql_structure"))
+            {
+                if (GETPOST("drop"))			 $param.=" --add-drop-table";
+                if (! GETPOST("sql_data"))       $param.=" -s";
+            }
+            if (GETPOST("sql_data"))
+            {
+                if (! GETPOST("sql_structure"))	 $param.=" -a";
+                if (GETPOST("showcolumns"))	     $param.=" -c";
+            }
+            $param.=' -f "'.$outputfile.'"';
+            //if ($compression == 'none')
+            if ($compression == 'gz')   $param.=' -Z 9';
+            //if ($compression == 'bz')
+            $paramcrypted=$param;
+            $paramclear=$param;
+            /*if (! empty($dolibarr_main_db_pass))
 			 {
 			 $paramcrypted.=" -W".preg_replace('/./i','*',$dolibarr_main_db_pass);
 			 $paramclear.=" -W".$dolibarr_main_db_pass;
 			 }*/
-			$paramcrypted.=" -w ".$dolibarr_main_db_name;
-			$paramclear.=" -w ".$dolibarr_main_db_name;
-
-			$this->output = "";
-			$this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted);
-		}
-
-		// Clean old files
-		if ($keeplastnfiles > 0)
-		{
-			$tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
-			$i=0;
-			foreach($tmpfiles as $key => $val)
-			{
-				$i++;
-				if ($i <= $keeplastnfiles) continue;
-				dol_delete_file($val['fullname'], 0, 0, 0, null, false, 0);
-			}
-		}
-
-		return 0;
-	}
-
-
-
-	/**
-	 * Execute a CLI command.
-	 *
-	 * @param 	string	$command		Command line to execute.
-	 * @param 	string	$outputfile		Output file (used only when method is 2). For exemple $conf->admin->dir_temp.'/out.tmp';
-	 * @param	int		$execmethod		0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
-	 * @return	array					array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
-	 */
-	function executeCLI($command, $outputfile, $execmethod=0)
-	{
-		global $conf, $langs;
-
-		$result = 0;
-		$output = '';
-		$error = '';
-
-		$command=escapeshellcmd($command);
-		$command.=" 2>&1";
-
-		if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-		if (empty($execmethod)) $execmethod=1;
-		//$execmethod=1;
-
-		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
-		$output_arr=array();
-
-		if ($execmethod == 1)
-		{
-			exec($command, $output_arr, $retval);
-			$result = $retval;
-			if ($retval != 0)
-			{
-				$langs->load("errors");
-				dol_syslog("Utils::executeCLI retval after exec=".$retval, LOG_ERR);
-				$error = 'Error '.$retval;
-			}
-		}
-		if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
-		{
-			$ok=0;
-			$handle = fopen($outputfile, 'w+b');
-			if ($handle)
-			{
-				dol_syslog("Utils::executeCLI run command ".$command);
-				$handlein = popen($command, 'r');
-				while (!feof($handlein))
-				{
-					$read = fgets($handlein);
-					fwrite($handle,$read);
-					$output_arr[]=$read;
-				}
-				pclose($handlein);
-				fclose($handle);
-			}
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-		}
-
-		// Update with result
-		if (is_array($output_arr) && count($output_arr)>0)
-		{
-			foreach($output_arr as $val)
-			{
-				$output.=$val.($execmethod == 2 ? '' : "\n");
-			}
-		}
-
-		dol_syslog("Utils::executeCLI result=".$result." output=".$output." error=".$error, LOG_DEBUG);
-
-		return array('result'=>$result, 'output'=>$output, 'error'=>$error);
-	}
-
-	/**
-	 * Generate documentation of a Module
-	 *
-	 * @param 	string	$module		Module name
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function generateDoc($module)
-	{
-		global $conf, $langs;
-		global $dirins;
-
-		$error = 0;
-
-		$modulelowercase=strtolower($module);
-
-		// Dir for module
-		$dir = $dirins.'/'.$modulelowercase;
-		// Zip file to build
-		$FILENAMEDOC='';
-
-		// Load module
-		dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
-		$class='mod'.$module;
-
-		if (class_exists($class))
-		{
-			try {
-				$moduleobj = new $class($this->db);
-			}
-			catch(Exception $e)
-			{
-				$error++;
-				dol_print_error($e->getMessage());
-			}
-		}
-		else
-		{
-			$error++;
-			$langs->load("errors");
-			dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
-			exit;
-		}
-
-		$arrayversion=explode('.',$moduleobj->version,3);
-		if (count($arrayversion))
-		{
-			$FILENAMEASCII=strtolower($module).'.asciidoc';
-			$FILENAMEDOC=strtolower($module).'.html';			// TODO Use/text PDF
-
-			$dirofmodule = dol_buildpath(strtolower($module), 0).'/doc';
-			$dirofmoduletmp = dol_buildpath(strtolower($module), 0).'/doc/temp';
-			$outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
-			if ($dirofmodule)
-			{
-				if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
-				if (! dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
-				if (! is_writable($dirofmoduletmp))
-				{
-					$this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable';
-					return -1;
-				}
-
-				$destfile=$dirofmoduletmp.'/'.$FILENAMEASCII;
-
-				$fhandle = fopen($destfile, 'w+');
-				if ($fhandle)
-				{
-					$specs=dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
-
-					$i = 0;
-					foreach ($specs as $spec)
-					{
-						if (preg_match('/notindoc/', $spec['relativename'])) continue;	// Discard file
-						if (preg_match('/disabled/', $spec['relativename'])) continue;	// Discard file
-
-						$pathtofile = strtolower($module).'/doc/'.$spec['relativename'];
-						$format='asciidoc';
-						if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
-
-						$filecursor = @file_get_contents($spec['fullname']);
-						if ($filecursor)
-						{
-							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
-						}
-						else
-						{
-							$this->error = 'Failed to concat content of file '.$spec['fullname'];
-							return -1;
-						}
-
-						$i++;
-					}
-
-					fwrite($fhandle, "\n\n\n== DATA SPECIFICATIONS...\n\n");
-
-					// TODO
-					fwrite($fhandle, "TODO...");
-
-					fclose($fhandle);
-				}
-
-				$conf->global->MODULEBUILDER_ASCIIDOCTOR='asciidoctor';
-				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR))
-				{
-					dol_print_error('', 'Module setup not complete');
-					exit;
-				}
-
-				$command=$conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC;
-				$outfile=$dirofmoduletmp.'/out.tmp';
-
-				require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
-				$utils = new Utils($db);
-				$resarray = $utils->executeCLI($command, $outfile);
-				if ($resarray['result'] != '0')
-				{
-					$this->error = $resarray['error'].' '.$resarray['output'];
-				}
-				$result = ($resarray['result'] == 0) ? 1 : 0;
-			}
-			else
-			{
-				$result = 0;
-			}
-
-			if ($result > 0)
-			{
-				return 1;
-			}
-			else
-			{
-				$error++;
-				$langs->load("errors");
-				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
-			}
-		}
-		else
-		{
-			$error++;
-			$langs->load("errors");
-			$this->error = $langs->trans("ErrorCheckVersionIsDefined");
-		}
-
-		return -1;
-	}
-
-	/**
-	 * This saves syslog files and compresses older ones.
-	 * Nb of archive to keep is defined into $conf->global->SYSLOG_FILE_SAVES
-	 * CAN BE A CRON TASK
-	 *
-	 * @return	int						0 if OK, < 0 if KO
-	 */
+            $paramcrypted.=" -w ".$dolibarr_main_db_name;
+            $paramclear.=" -w ".$dolibarr_main_db_name;
+
+            $this->output = "";
+            $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted);
+        }
+
+        // Clean old files
+        if ($keeplastnfiles > 0)
+        {
+            $tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
+            $i=0;
+            foreach($tmpfiles as $key => $val)
+            {
+                $i++;
+                if ($i <= $keeplastnfiles) continue;
+                dol_delete_file($val['fullname'], 0, 0, 0, null, false, 0);
+            }
+        }
+
+        return 0;
+    }
+
+
+
+    /**
+     * Execute a CLI command.
+     *
+     * @param 	string	$command		Command line to execute.
+     * @param 	string	$outputfile		Output file (used only when method is 2). For exemple $conf->admin->dir_temp.'/out.tmp';
+     * @param	int		$execmethod		0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
+     * @return	array					array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
+     */
+    function executeCLI($command, $outputfile, $execmethod=0)
+    {
+        global $conf, $langs;
+
+        $result = 0;
+        $output = '';
+        $error = '';
+
+        $command=escapeshellcmd($command);
+        $command.=" 2>&1";
+
+        if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
+        if (empty($execmethod)) $execmethod=1;
+        //$execmethod=1;
+
+        dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
+        $output_arr=array();
+
+        if ($execmethod == 1)
+        {
+            exec($command, $output_arr, $retval);
+            $result = $retval;
+            if ($retval != 0)
+            {
+                $langs->load("errors");
+                dol_syslog("Utils::executeCLI retval after exec=".$retval, LOG_ERR);
+                $error = 'Error '.$retval;
+            }
+        }
+        if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
+        {
+            $ok=0;
+            $handle = fopen($outputfile, 'w+b');
+            if ($handle)
+            {
+                dol_syslog("Utils::executeCLI run command ".$command);
+                $handlein = popen($command, 'r');
+                while (!feof($handlein))
+                {
+                    $read = fgets($handlein);
+                    fwrite($handle,$read);
+                    $output_arr[]=$read;
+                }
+                pclose($handlein);
+                fclose($handle);
+            }
+            if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+        }
+
+        // Update with result
+        if (is_array($output_arr) && count($output_arr)>0)
+        {
+            foreach($output_arr as $val)
+            {
+                $output.=$val.($execmethod == 2 ? '' : "\n");
+            }
+        }
+
+        dol_syslog("Utils::executeCLI result=".$result." output=".$output." error=".$error, LOG_DEBUG);
+
+        return array('result'=>$result, 'output'=>$output, 'error'=>$error);
+    }
+
+    /**
+     * Generate documentation of a Module
+     *
+     * @param 	string	$module		Module name
+     * @return	int					<0 if KO, >0 if OK
+     */
+    function generateDoc($module)
+    {
+        global $conf, $langs;
+        global $dirins;
+
+        $error = 0;
+
+        $modulelowercase=strtolower($module);
+
+        // Dir for module
+        $dir = $dirins.'/'.$modulelowercase;
+        // Zip file to build
+        $FILENAMEDOC='';
+
+        // Load module
+        dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
+        $class='mod'.$module;
+
+        if (class_exists($class))
+        {
+            try {
+                $moduleobj = new $class($this->db);
+            }
+            catch(Exception $e)
+            {
+                $error++;
+                dol_print_error($e->getMessage());
+            }
+        }
+        else
+        {
+            $error++;
+            $langs->load("errors");
+            dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+            exit;
+        }
+
+        $arrayversion=explode('.',$moduleobj->version,3);
+        if (count($arrayversion))
+        {
+            $FILENAMEASCII=strtolower($module).'.asciidoc';
+            $FILENAMEDOC=strtolower($module).'.html';			// TODO Use/text PDF
+
+            $dirofmodule = dol_buildpath(strtolower($module), 0).'/doc';
+            $dirofmoduletmp = dol_buildpath(strtolower($module), 0).'/doc/temp';
+            $outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
+            if ($dirofmodule)
+            {
+                if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
+                if (! dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
+                if (! is_writable($dirofmoduletmp))
+                {
+                    $this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable';
+                    return -1;
+                }
+
+                $destfile=$dirofmoduletmp.'/'.$FILENAMEASCII;
+
+                $fhandle = fopen($destfile, 'w+');
+                if ($fhandle)
+                {
+                    $specs=dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
+
+                    $i = 0;
+                    foreach ($specs as $spec)
+                    {
+                        if (preg_match('/notindoc/', $spec['relativename'])) continue;	// Discard file
+                        if (preg_match('/disabled/', $spec['relativename'])) continue;	// Discard file
+
+                        $pathtofile = strtolower($module).'/doc/'.$spec['relativename'];
+                        $format='asciidoc';
+                        if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
+
+                        $filecursor = @file_get_contents($spec['fullname']);
+                        if ($filecursor)
+                        {
+                            fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
+                        }
+                        else
+                        {
+                            $this->error = 'Failed to concat content of file '.$spec['fullname'];
+                            return -1;
+                        }
+
+                        $i++;
+                    }
+
+                    fwrite($fhandle, "\n\n\n== DATA SPECIFICATIONS...\n\n");
+
+                    // TODO
+                    fwrite($fhandle, "TODO...");
+
+                    fclose($fhandle);
+                }
+
+                $conf->global->MODULEBUILDER_ASCIIDOCTOR='asciidoctor';
+                if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR))
+                {
+                    dol_print_error('', 'Module setup not complete');
+                    exit;
+                }
+
+                $command=$conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC;
+                $outfile=$dirofmoduletmp.'/out.tmp';
+
+                require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
+                $utils = new Utils($db);
+                $resarray = $utils->executeCLI($command, $outfile);
+                if ($resarray['result'] != '0')
+                {
+                    $this->error = $resarray['error'].' '.$resarray['output'];
+                }
+                $result = ($resarray['result'] == 0) ? 1 : 0;
+            }
+            else
+            {
+                $result = 0;
+            }
+
+            if ($result > 0)
+            {
+                return 1;
+            }
+            else
+            {
+                $error++;
+                $langs->load("errors");
+                $this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
+            }
+        }
+        else
+        {
+            $error++;
+            $langs->load("errors");
+            $this->error = $langs->trans("ErrorCheckVersionIsDefined");
+        }
+
+        return -1;
+    }
+
+    /**
+     * This saves syslog files and compresses older ones.
+     * Nb of archive to keep is defined into $conf->global->SYSLOG_FILE_SAVES
+     * CAN BE A CRON TASK
+     *
+     * @return	int						0 if OK, < 0 if KO
+     */
     function compressSyslogs()
     {
-		global $conf;
+        global $conf;
+
+        if(empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
+            return 0;
+        }
+
+        if(! function_exists('gzopen')) {
+            $this->error = 'Support for gzopen not available in this PHP';
+            return -1;
+        }
+
+        dol_include_once('/core/lib/files.lib.php');
+
+        $nbSaves = ! empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
+
+        if (empty($conf->global->SYSLOG_FILE)) {
+            $mainlogdir = DOL_DATA_ROOT;
+            $mainlog = 'dolibarr.log';
+        } else {
+            $mainlogfull = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+            $mainlogdir = dirname($mainlogfull);
+            $mainlog = basename($mainlogfull);
+        }
+
+        $tabfiles = dol_dir_list(DOL_DATA_ROOT, 'files', 0, '^(dolibarr_.+|odt2pdf)\.log$'); // Also handle other log files like dolibarr_install.log
+        $tabfiles[] = array('name' => $mainlog, 'path' => $mainlogdir);
 
-		if(empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
-			return 0;
-		}
+        foreach($tabfiles as $file) {
 
-		if(! function_exists('gzopen')) {
-			$this->error = 'Support for gzopen not available in this PHP';
-			return -1;
-		}
+            $logname = $file['name'];
+            $logpath = $file['path'];
 
-		dol_include_once('/core/lib/files.lib.php');
+            if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0)	// If log file exists and is not empty
+            {
+                // Handle already compressed files to rename them and add +1
 
-		$nbSaves = ! empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
+                $filter = '^'.preg_quote($logname, '/').'\.([0-9]+)\.gz$';
 
-		if (empty($conf->global->SYSLOG_FILE)) {
-			$mainlogdir = DOL_DATA_ROOT;
-			$mainlog = 'dolibarr.log';
-		} else {
-			$mainlogfull = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
-			$mainlogdir = dirname($mainlogfull);
-			$mainlog = basename($mainlogfull);
-		}
+                $gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter);
+                $gzfiles = array();
 
-		$tabfiles = dol_dir_list(DOL_DATA_ROOT, 'files', 0, '^(dolibarr_.+|odt2pdf)\.log$'); // Also handle other log files like dolibarr_install.log
-		$tabfiles[] = array('name' => $mainlog, 'path' => $mainlogdir);
+                foreach($gzfilestmp as $gzfile) {
+                    $tabmatches = array();
+                    preg_match('/'.$filter.'/i', $gzfile['name'], $tabmatches);
 
-		foreach($tabfiles as $file) {
-
-			$logname = $file['name'];
-			$logpath = $file['path'];
-
-			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0)	// If log file exists and is not empty
-			{
-				// Handle already compressed files to rename them and add +1
-
-				$filter = '^'.preg_quote($logname, '/').'\.([0-9]+)\.gz$';
-
-				$gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter);
-				$gzfiles = array();
-
-				foreach($gzfilestmp as $gzfile) {
-					$tabmatches = array();
-					preg_match('/'.$filter.'/i', $gzfile['name'], $tabmatches);
-
-					$numsave = intval($tabmatches[1]);
-
-					$gzfiles[$numsave] = $gzfile;
-				}
-
-				krsort($gzfiles, SORT_NUMERIC);
-
-				foreach($gzfiles as $numsave => $dummy) {
-					if (dol_is_file($logpath.'/'.$logname.'.'.($numsave+1).'.gz')) {
-						return -2;
-					}
-
-					if($numsave >= $nbSaves) {
-						dol_delete_file($logpath.'/'.$logname.'.'.$numsave.'.gz', 0, 0, 0, null, false, 0);
-					} else {
-						dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave+1).'.gz', 0, 1, 0, 0);
-					}
-				}
-
-				// Compress current file and recreate it
-
-				if ($nbSaves > 0) {			// If $nbSaves is 1, we keep 1 archive .gz file, If 2, we keep 2 .gz files
-					$gzfilehandle = gzopen($logpath.'/'.$logname.'.1.gz', 'wb9');
-
-					if (empty($gzfilehandle)) {
-						$this->error = 'Failted to open file '.$logpath.'/'.$logname.'.1.gz';
-						return -3;
-					}
-
-					$sourcehandle = fopen($logpath.'/'.$logname, 'r');
-
-					if (empty($sourcehandle)) {
-						$this->error = 'Failed to open file '.$logpath.'/'.$logname;
-						return -4;
-					}
-
-					while(! feof($sourcehandle)) {
-						gzwrite($gzfilehandle, fread($sourcehandle, 512 * 1024)); // Read 512 kB at a time
-					}
-
-					fclose($sourcehandle);
-					gzclose($gzfilehandle);
-
-					@chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
-				}
-
-				dol_delete_file($logpath.'/'.$logname, 0, 0, 0, null, false, 0);
-
-				// Create empty file
-				$newlog = fopen($logpath.'/'.$logname, 'a+');
-				fclose($newlog);
-
-				//var_dump($logpath.'/'.$logname." - ".octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
-				@chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
-			}
-		}
-
-		$this->output = 'Archive log files (keeping last SYSLOG_FILE_SAVES='.$nbSaves.' files) done.';
-		return 0;
-	}
-
-	/**	Backup the db OR just a table without mysqldump binary, with PHP only (does not require any exec permission)
-	 *	Author: David Walsh (http://davidwalsh.name/backup-mysql-database-php)
-	 *	Updated and enhanced by Stephen Larroque (lrq3000) and by the many commentators from the blog
-	 *	Note about foreign keys constraints: for Dolibarr, since there are a lot of constraints and when imported the tables will be inserted in the dumped order, not in constraints order, then we ABSOLUTELY need to use SET FOREIGN_KEY_CHECKS=0; when importing the sql dump.
-	 *	Note2: db2SQL by Howard Yeend can be an alternative, by using SHOW FIELDS FROM and SHOW KEYS FROM we could generate a more precise dump (eg: by getting the type of the field and then precisely outputting the right formatting - in quotes, numeric or null - instead of trying to guess like we are doing now).
-	 *
-	 *	@param	string	$outputfile		Output file name
-	 *	@param	string	$tables			Table name or '*' for all
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	function backupTables($outputfile, $tables='*')
-	{
-		global $db, $langs;
-		global $errormsg;
-
-		// Set to UTF-8
-		if (is_a($db, 'DoliDBMysqli')) {
-			/** @var DoliDBMysqli $db */
-			$db->db->set_charset('utf8');
-		} else {
-			/** @var DoliDB $db */
-			$db->query('SET NAMES utf8');
-			$db->query('SET CHARACTER SET utf8');
-		}
-
-		//get all of the tables
-		if ($tables == '*')
-		{
-			$tables = array();
-			$result = $db->query('SHOW FULL TABLES WHERE Table_type = \'BASE TABLE\'');
-			while($row = $db->fetch_row($result))
-			{
-				$tables[] = $row[0];
-			}
-		}
-		else
-		{
-			$tables = is_array($tables) ? $tables : explode(',',$tables);
-		}
-
-		//cycle through
-		$handle = fopen($outputfile, 'w+');
-		if (fwrite($handle, '') === false)
-		{
-			$langs->load("errors");
-			dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-			$errormsg=$langs->trans("ErrorFailedToWriteInDir");
-			return -1;
-		}
-
-		// Print headers and global mysql config vars
-		$sqlhead = '';
-		$sqlhead .= "-- ".$db::LABEL." dump via php with Dolibarr ".DOL_VERSION."
+                    $numsave = intval($tabmatches[1]);
+
+                    $gzfiles[$numsave] = $gzfile;
+                }
+
+                krsort($gzfiles, SORT_NUMERIC);
+
+                foreach($gzfiles as $numsave => $dummy) {
+                    if (dol_is_file($logpath.'/'.$logname.'.'.($numsave+1).'.gz')) {
+                        return -2;
+                    }
+
+                    if($numsave >= $nbSaves) {
+                        dol_delete_file($logpath.'/'.$logname.'.'.$numsave.'.gz', 0, 0, 0, null, false, 0);
+                    } else {
+                        dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave+1).'.gz', 0, 1, 0, 0);
+                    }
+                }
+
+                // Compress current file and recreate it
+
+                if ($nbSaves > 0) {			// If $nbSaves is 1, we keep 1 archive .gz file, If 2, we keep 2 .gz files
+                    $gzfilehandle = gzopen($logpath.'/'.$logname.'.1.gz', 'wb9');
+
+                    if (empty($gzfilehandle)) {
+                        $this->error = 'Failted to open file '.$logpath.'/'.$logname.'.1.gz';
+                        return -3;
+                    }
+
+                    $sourcehandle = fopen($logpath.'/'.$logname, 'r');
+
+                    if (empty($sourcehandle)) {
+                        $this->error = 'Failed to open file '.$logpath.'/'.$logname;
+                        return -4;
+                    }
+
+                    while(! feof($sourcehandle)) {
+                        gzwrite($gzfilehandle, fread($sourcehandle, 512 * 1024)); // Read 512 kB at a time
+                    }
+
+                    fclose($sourcehandle);
+                    gzclose($gzfilehandle);
+
+                    @chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+                }
+
+                dol_delete_file($logpath.'/'.$logname, 0, 0, 0, null, false, 0);
+
+                // Create empty file
+                $newlog = fopen($logpath.'/'.$logname, 'a+');
+                fclose($newlog);
+
+                //var_dump($logpath.'/'.$logname." - ".octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+                @chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+            }
+        }
+
+        $this->output = 'Archive log files (keeping last SYSLOG_FILE_SAVES='.$nbSaves.' files) done.';
+        return 0;
+    }
+
+    /**	Backup the db OR just a table without mysqldump binary, with PHP only (does not require any exec permission)
+     *	Author: David Walsh (http://davidwalsh.name/backup-mysql-database-php)
+     *	Updated and enhanced by Stephen Larroque (lrq3000) and by the many commentators from the blog
+     *	Note about foreign keys constraints: for Dolibarr, since there are a lot of constraints and when imported the tables will be inserted in the dumped order, not in constraints order, then we ABSOLUTELY need to use SET FOREIGN_KEY_CHECKS=0; when importing the sql dump.
+     *	Note2: db2SQL by Howard Yeend can be an alternative, by using SHOW FIELDS FROM and SHOW KEYS FROM we could generate a more precise dump (eg: by getting the type of the field and then precisely outputting the right formatting - in quotes, numeric or null - instead of trying to guess like we are doing now).
+     *
+     *	@param	string	$outputfile		Output file name
+     *	@param	string	$tables			Table name or '*' for all
+     *	@return	int						<0 if KO, >0 if OK
+     */
+    function backupTables($outputfile, $tables='*')
+    {
+        global $db, $langs;
+        global $errormsg;
+
+        // Set to UTF-8
+        if (is_a($db, 'DoliDBMysqli')) {
+            /** @var DoliDBMysqli $db */
+            $db->db->set_charset('utf8');
+        } else {
+            /** @var DoliDB $db */
+            $db->query('SET NAMES utf8');
+            $db->query('SET CHARACTER SET utf8');
+        }
+
+        //get all of the tables
+        if ($tables == '*')
+        {
+            $tables = array();
+            $result = $db->query('SHOW FULL TABLES WHERE Table_type = \'BASE TABLE\'');
+            while($row = $db->fetch_row($result))
+            {
+                $tables[] = $row[0];
+            }
+        }
+        else
+        {
+            $tables = is_array($tables) ? $tables : explode(',',$tables);
+        }
+
+        //cycle through
+        $handle = fopen($outputfile, 'w+');
+        if (fwrite($handle, '') === false)
+        {
+            $langs->load("errors");
+            dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+            $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+            return -1;
+        }
+
+        // Print headers and global mysql config vars
+        $sqlhead = '';
+        $sqlhead .= "-- ".$db::LABEL." dump via php with Dolibarr ".DOL_VERSION."
 --
 -- Host: ".$db->db->host_info."    Database: ".$db->database_name."
 -- ------------------------------------------------------
@@ -896,77 +896,77 @@ 
 
 ";
 
-		if (GETPOST("nobin_disable_fk")) $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
-		//$sqlhead .= "SET SQL_MODE=\"NO_AUTO_VALUE_ON_ZERO\";\n";
-		if (GETPOST("nobin_use_transaction")) $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
-
-		fwrite($handle, $sqlhead);
-
-		$ignore = '';
-		if (GETPOST("nobin_sql_ignore")) $ignore = 'IGNORE ';
-		$delayed = '';
-		if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';
-
-		// Process each table and print their definition + their datas
-		foreach($tables as $table)
-		{
-			// Saving the table structure
-			fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n");
-
-			if (GETPOST("nobin_drop")) fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
-			fwrite($handle,"/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
-			fwrite($handle,"/*!40101 SET character_set_client = utf8 */;\n");
-			$resqldrop=$db->query('SHOW CREATE TABLE '.$table);
-			$row2 = $db->fetch_row($resqldrop);
-			if (empty($row2[1]))
-			{
-				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
-			}
-			else
-			{
-				fwrite($handle,$row2[1].";\n");
-				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
-
-				// Dumping the data (locking the table and disabling the keys check while doing the process)
-				fwrite($handle, "\n--\n-- Dumping data for table `".$table."`\n--\n");
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
-				else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
-
-				$sql='SELECT * FROM '.$table;
-				$result = $db->query($sql);
-				while($row = $db->fetch_row($result))
-				{
-					// For each row of data we print a line of INSERT
-					fwrite($handle,'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
-					$columns = count($row);
-					for($j=0; $j<$columns; $j++) {
-						// Processing each columns of the row to ensure that we correctly save the value (eg: add quotes for string - in fact we add quotes for everything, it's easier)
-						if ($row[$j] == null && !is_string($row[$j])) {
-							// IMPORTANT: if the field is NULL we set it NULL
-							$row[$j] = 'NULL';
-						} elseif(is_string($row[$j]) && $row[$j] == '') {
-							// if it's an empty string, we set it as an empty string
-							$row[$j] = "''";
-						} elseif(is_numeric($row[$j]) && !strcmp($row[$j], $row[$j]+0) ) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
-							// if it's a number, we return it as-is
-							//	                    $row[$j] = $row[$j];
-						} else { // else for all other cases we escape the value and put quotes around
-							$row[$j] = addslashes($row[$j]);
-							$row[$j] = preg_replace("#\n#", "\\n", $row[$j]);
-							$row[$j] = "'".$row[$j]."'";
-						}
-					}
-					fwrite($handle,implode(',', $row).");\n");
-				}
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
-				fwrite($handle,"\n\n\n");
-			}
-		}
-
-		/* Backup Procedure structure*/
-		/*
+        if (GETPOST("nobin_disable_fk")) $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
+        //$sqlhead .= "SET SQL_MODE=\"NO_AUTO_VALUE_ON_ZERO\";\n";
+        if (GETPOST("nobin_use_transaction")) $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
+
+        fwrite($handle, $sqlhead);
+
+        $ignore = '';
+        if (GETPOST("nobin_sql_ignore")) $ignore = 'IGNORE ';
+        $delayed = '';
+        if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';
+
+        // Process each table and print their definition + their datas
+        foreach($tables as $table)
+        {
+            // Saving the table structure
+            fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n");
+
+            if (GETPOST("nobin_drop")) fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
+            fwrite($handle,"/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
+            fwrite($handle,"/*!40101 SET character_set_client = utf8 */;\n");
+            $resqldrop=$db->query('SHOW CREATE TABLE '.$table);
+            $row2 = $db->fetch_row($resqldrop);
+            if (empty($row2[1]))
+            {
+                fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
+            }
+            else
+            {
+                fwrite($handle,$row2[1].";\n");
+                //fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
+
+                // Dumping the data (locking the table and disabling the keys check while doing the process)
+                fwrite($handle, "\n--\n-- Dumping data for table `".$table."`\n--\n");
+                if (!GETPOST("nobin_nolocks")) fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)
+                if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
+                else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
+
+                $sql='SELECT * FROM '.$table;
+                $result = $db->query($sql);
+                while($row = $db->fetch_row($result))
+                {
+                    // For each row of data we print a line of INSERT
+                    fwrite($handle,'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
+                    $columns = count($row);
+                    for($j=0; $j<$columns; $j++) {
+                        // Processing each columns of the row to ensure that we correctly save the value (eg: add quotes for string - in fact we add quotes for everything, it's easier)
+                        if ($row[$j] == null && !is_string($row[$j])) {
+                            // IMPORTANT: if the field is NULL we set it NULL
+                            $row[$j] = 'NULL';
+                        } elseif(is_string($row[$j]) && $row[$j] == '') {
+                            // if it's an empty string, we set it as an empty string
+                            $row[$j] = "''";
+                        } elseif(is_numeric($row[$j]) && !strcmp($row[$j], $row[$j]+0) ) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
+                            // if it's a number, we return it as-is
+                            //	                    $row[$j] = $row[$j];
+                        } else { // else for all other cases we escape the value and put quotes around
+                            $row[$j] = addslashes($row[$j]);
+                            $row[$j] = preg_replace("#\n#", "\\n", $row[$j]);
+                            $row[$j] = "'".$row[$j]."'";
+                        }
+                    }
+                    fwrite($handle,implode(',', $row).");\n");
+                }
+                if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
+                if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
+                fwrite($handle,"\n\n\n");
+            }
+        }
+
+        /* Backup Procedure structure*/
+        /*
 		 $result = $db->query('SHOW PROCEDURE STATUS');
 		 if ($db->num_rows($result) > 0)
 		 {
@@ -982,17 +982,17 @@ 
 		 }
 		 }
 		 */
-		/* Backup Procedure structure*/
+        /* Backup Procedure structure*/
 
-		// Write the footer (restore the previous database settings)
-		$sqlfooter="\n\n";
-		if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";
-		if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
-		$sqlfooter.="\n\n-- Dump completed on ".date('Y-m-d G-i-s');
-		fwrite($handle, $sqlfooter);
+        // Write the footer (restore the previous database settings)
+        $sqlfooter="\n\n";
+        if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";
+        if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
+        $sqlfooter.="\n\n-- Dump completed on ".date('Y-m-d G-i-s');
+        fwrite($handle, $sqlfooter);
 
-		fclose($handle);
+        fclose($handle);
 
-		return 1;
-	}
+        return 1;
+    }
 }

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

Indentation +124 added lines, -124 removed lines

@@ -33,9 +33,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -50,135 +50,135 @@ 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show a combo list with contracts qualified for a third party
-	 *
-	 *	@param	int		$socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
-	 *	@param  int		$selected   Id contract preselected
-	 *	@param  string	$htmlname   Nom de la zone html
-	 *	@param	int		$maxlength	Maximum length of label
-	 *	@param	int		$showempty	Show empty line
-	 *	@return int         		Nbr of project if OK, <0 if KO
-	 */
-	function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
-	{
+    /**
+     *	Show a combo list with contracts qualified for a third party
+     *
+     *	@param	int		$socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
+     *	@param  int		$selected   Id contract preselected
+     *	@param  string	$htmlname   Nom de la zone html
+     *	@param	int		$maxlength	Maximum length of label
+     *	@param	int		$showempty	Show empty line
+     *	@return int         		Nbr of project if OK, <0 if KO
+     */
+    function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
+    {
         // phpcs:enable
-		global $db,$user,$conf,$langs;
+        global $db,$user,$conf,$langs;
 
-		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+        $hideunselectables = false;
+        if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
-		// Search all contacts
-		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'contrat as c';
-		$sql.= " WHERE c.entity = ".$conf->entity;
-		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
-		if ($socid > 0)
-		{
-			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))
-			    $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
-		    	else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
-			{
-		        	$sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
-				$sql.= " OR c.fk_soc IS NULL)";
-		    	}
-		}
-		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
-		$sql.= " ORDER BY c.ref ";
+        // Search all contacts
+        $sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
+        $sql.= ' FROM '.MAIN_DB_PREFIX .'contrat as c';
+        $sql.= " WHERE c.entity = ".$conf->entity;
+        //if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
+        if ($socid > 0)
+        {
+            // CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
+                if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))
+                $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
+                else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
+            {
+                    $sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
+                $sql.= " OR c.fk_soc IS NULL)";
+                }
+        }
+        if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+        $sql.= " ORDER BY c.ref ";
 
-		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			print '<select class="flat" name="'.$htmlname.'">';
-			if ($showempty) print '<option value="0">&nbsp;</option>';
-			$num = $db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $db->fetch_object($resql);
-					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
-					{
-						// Do nothing
-					}
-					else
-					{
-						$labeltoshow=dol_trunc($obj->ref,18);
-						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
-						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
-						{
-							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							$disabled=0;
-							if ( $obj->statut ==  0)
-							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
-							}
-							if ( empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
-							}
+        dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            print '<select class="flat" name="'.$htmlname.'">';
+            if ($showempty) print '<option value="0">&nbsp;</option>';
+            $num = $db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $db->fetch_object($resql);
+                    // If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+                    if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+                    {
+                        // Do nothing
+                    }
+                    else
+                    {
+                        $labeltoshow=dol_trunc($obj->ref,18);
+                        //if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
+                        //else $labeltoshow.=' ('.$langs->trans("Private").')';
+                        if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
+                        {
+                            print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            $disabled=0;
+                            if ( $obj->statut ==  0)
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' ('.$langs->trans("Draft").')';
+                            }
+                            if ( empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+                            }
 
-							if ($hideunselectables && $disabled)
-							{
-								$resultat='';
-							}
-							else
-							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
-								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
-							}
-							print $resultat;
-						}
-					}
-					$i++;
-				}
-			}
-			print '</select>';
-			$db->free($resql);
+                            if ($hideunselectables && $disabled)
+                            {
+                                $resultat='';
+                            }
+                            else
+                            {
+                                $resultat='<option value="'.$obj->rowid.'"';
+                                if ($disabled) $resultat.=' disabled';
+                                //if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
+                                //else $labeltoshow.=' ('.$langs->trans("Private").')';
+                                $resultat.='>'.$labeltoshow;
+                                $resultat.='</option>';
+                            }
+                            print $resultat;
+                        }
+                    }
+                    $i++;
+                }
+            }
+            print '</select>';
+            $db->free($resql);
 
-			if (!empty($conf->use_javascript_ajax))
-			{
-				// Make select dynamic
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				print ajax_combobox($htmlname);
-			}
+            if (!empty($conf->use_javascript_ajax))
+            {
+                // Make select dynamic
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                print ajax_combobox($htmlname);
+            }
 
-			return $num;
-		}
-		else
-		{
-			dol_print_error($db);
-			return -1;
-		}
-	}
+            return $num;
+        }
+        else
+        {
+            dol_print_error($db);
+            return -1;
+        }
+    }
 
-	/**
-	 *	Show a form to select a contract
-	 *
-	 *  @param	int		$page       Page
-	 *	@param	int		$socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
-	 *	@param  int		$selected   Id contract preselected
-	 *	@param  string	$htmlname   Nom de la zone html
-	 *	@param	int		$maxlength	Maximum length of label
-	 *	@param	int		$showempty	Show empty line
-	 *	@return int                 Nbr of project if OK, <0 if KO
-	 */
-	function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
-	{
+    /**
+     *	Show a form to select a contract
+     *
+     *  @param	int		$page       Page
+     *	@param	int		$socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
+     *	@param  int		$selected   Id contract preselected
+     *	@param  string	$htmlname   Nom de la zone html
+     *	@param	int		$maxlength	Maximum length of label
+     *	@param	int		$showempty	Show empty line
+     *	@return int                 Nbr of project if OK, <0 if KO
+     */
+    function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
+    {
         global $langs;
 
         print "\n";

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

Indentation +209 added lines, -209 removed lines

@@ -34,9 +34,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -51,234 +51,234 @@ 
 
 
 
-	/**
-	 *	get array with margin information from lines of object
-	 *  TODO Move this in common class.
-	 *
-	 * 	@param	CommonObject	$object			Object we want to get margin information for
-	 * 	@param 	boolean			$force_price	True of not
-	 * 	@return array							Array with info
-	 */
-	function getMarginInfosArray($object, $force_price=false)
-	{
-		global $conf, $db;
+    /**
+     *	get array with margin information from lines of object
+     *  TODO Move this in common class.
+     *
+     * 	@param	CommonObject	$object			Object we want to get margin information for
+     * 	@param 	boolean			$force_price	True of not
+     * 	@return array							Array with info
+     */
+    function getMarginInfosArray($object, $force_price=false)
+    {
+        global $conf, $db;
 
-		// Default returned array
-		$marginInfos = array(
-				'pa_products' => 0,
-				'pv_products' => 0,
-				'margin_on_products' => 0,
-				'margin_rate_products' => '',
-				'mark_rate_products' => '',
-				'pa_services' => 0,
-				'pv_services' => 0,
-				'margin_on_services' => 0,
-				'margin_rate_services' => '',
-				'mark_rate_services' => '',
-				'pa_total' => 0,
-				'pv_total' => 0,
-				'total_margin' => 0,
-				'total_margin_rate' => '',
-				'total_mark_rate' => ''
-		);
+        // Default returned array
+        $marginInfos = array(
+                'pa_products' => 0,
+                'pv_products' => 0,
+                'margin_on_products' => 0,
+                'margin_rate_products' => '',
+                'mark_rate_products' => '',
+                'pa_services' => 0,
+                'pv_services' => 0,
+                'margin_on_services' => 0,
+                'margin_rate_services' => '',
+                'mark_rate_services' => '',
+                'pa_total' => 0,
+                'pv_total' => 0,
+                'total_margin' => 0,
+                'total_margin_rate' => '',
+                'total_mark_rate' => ''
+        );
 
-		foreach($object->lines as $line)
-		{
-			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-				$product = new ProductFournisseur($db);
-				if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
-					$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-			}
-			// si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente
-			if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
-				$line->pa_ht = $line->subprice * (1 - ($line->remise_percent / 100));
-			}
+        foreach($object->lines as $line)
+        {
+            if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+                $product = new ProductFournisseur($db);
+                if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
+                    $line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+            }
+            // si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente
+            if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+                $line->pa_ht = $line->subprice * (1 - ($line->remise_percent / 100));
+            }
 
-			$pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
-			$pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
-			$pa = $line->qty * $pa_ht;
+            $pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
+            $pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
+            $pa = $line->qty * $pa_ht;
 
-			// calcul des marges
-			if (isset($line->fk_remise_except) && isset($conf->global->MARGIN_METHODE_FOR_DISCOUNT)) {    // remise
-				if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit
-					$marginInfos['pa_products'] += $pa;
-					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
-					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-					//if ($pv < 0)
-					//{
-					//	$marginInfos['margin_on_products'] += -1 * (abs($pv) - $pa);
-					//}
-					//else
-						$marginInfos['margin_on_products'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
-					$marginInfos['pa_services'] += $pa;
-					$marginInfos['pv_services'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
-					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-					//if ($pv < 0)
-					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
-					//else
-						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
-					$marginInfos['pa_total'] += $pa;
-					$marginInfos['pv_total'] += $pv;
-				}
-			}
-			else {
-				$type=$line->product_type?$line->product_type:$line->fk_product_type;
-				if ($type == 0) {  // product
-					$marginInfos['pa_products'] += $pa;
-					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
-					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-					//if ($pv < 0)
-					//{
-					//    $marginInfos['margin_on_products'] += -1 * (abs($pv) - $pa);
-					//}
-					//else
-					//{
-					    $marginInfos['margin_on_products'] += $pv - $pa;
-					//}
-				}
-				elseif ($type == 1) {  // service
-					$marginInfos['pa_services'] += $pa;
-					$marginInfos['pv_services'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
-					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-					//if ($pv < 0)
-					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
-					//else
-						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-			}
-		}
-		if ($marginInfos['pa_products'] > 0)
-			$marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
-		if ($marginInfos['pv_products'] > 0)
-			$marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
+            // calcul des marges
+            if (isset($line->fk_remise_except) && isset($conf->global->MARGIN_METHODE_FOR_DISCOUNT)) {    // remise
+                if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit
+                    $marginInfos['pa_products'] += $pa;
+                    $marginInfos['pv_products'] += $pv;
+                    $marginInfos['pa_total'] +=  $pa;
+                    $marginInfos['pv_total'] +=  $pv;
+                    // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+                    //if ($pv < 0)
+                    //{
+                    //	$marginInfos['margin_on_products'] += -1 * (abs($pv) - $pa);
+                    //}
+                    //else
+                        $marginInfos['margin_on_products'] += $pv - $pa;
+                }
+                elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
+                    $marginInfos['pa_services'] += $pa;
+                    $marginInfos['pv_services'] += $pv;
+                    $marginInfos['pa_total'] +=  $pa;
+                    $marginInfos['pv_total'] +=  $pv;
+                    // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+                    //if ($pv < 0)
+                    //	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
+                    //else
+                        $marginInfos['margin_on_services'] += $pv - $pa;
+                }
+                elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
+                    $marginInfos['pa_total'] += $pa;
+                    $marginInfos['pv_total'] += $pv;
+                }
+            }
+            else {
+                $type=$line->product_type?$line->product_type:$line->fk_product_type;
+                if ($type == 0) {  // product
+                    $marginInfos['pa_products'] += $pa;
+                    $marginInfos['pv_products'] += $pv;
+                    $marginInfos['pa_total'] +=  $pa;
+                    $marginInfos['pv_total'] +=  $pv;
+                    // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+                    //if ($pv < 0)
+                    //{
+                    //    $marginInfos['margin_on_products'] += -1 * (abs($pv) - $pa);
+                    //}
+                    //else
+                    //{
+                        $marginInfos['margin_on_products'] += $pv - $pa;
+                    //}
+                }
+                elseif ($type == 1) {  // service
+                    $marginInfos['pa_services'] += $pa;
+                    $marginInfos['pv_services'] += $pv;
+                    $marginInfos['pa_total'] +=  $pa;
+                    $marginInfos['pv_total'] +=  $pv;
+                    // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+                    //if ($pv < 0)
+                    //	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
+                    //else
+                        $marginInfos['margin_on_services'] += $pv - $pa;
+                }
+            }
+        }
+        if ($marginInfos['pa_products'] > 0)
+            $marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
+        if ($marginInfos['pv_products'] > 0)
+            $marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
 
-		if ($marginInfos['pa_services'] > 0)
-			$marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
-		if ($marginInfos['pv_services'] > 0)
-			$marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
+        if ($marginInfos['pa_services'] > 0)
+            $marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
+        if ($marginInfos['pv_services'] > 0)
+            $marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
 
-		// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-		//if ($marginInfos['pv_total'] < 0)
-		//	$marginInfos['total_margin'] = -1 * (abs($marginInfos['pv_total']) - $marginInfos['pa_total']);
-		//else
-			$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
-		if ($marginInfos['pa_total'] > 0)
-			$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
-		if ($marginInfos['pv_total'] > 0)
-			$marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
+        // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+        //if ($marginInfos['pv_total'] < 0)
+        //	$marginInfos['total_margin'] = -1 * (abs($marginInfos['pv_total']) - $marginInfos['pa_total']);
+        //else
+            $marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
+        if ($marginInfos['pa_total'] > 0)
+            $marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
+        if ($marginInfos['pv_total'] > 0)
+            $marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
 
-		return $marginInfos;
-	}
+        return $marginInfos;
+    }
 
-	/**
-	 * 	Show the array with all margin infos
-	 *
-	 *	@param	CommonObject	$object			Object we want to get margin information for
-	 * 	@param 	boolean			$force_price	Force price
-	 * 	@return	void
-	 */
-	function displayMarginInfos($object, $force_price=false)
-	{
-		global $langs, $conf, $user;
+    /**
+     * 	Show the array with all margin infos
+     *
+     *	@param	CommonObject	$object			Object we want to get margin information for
+     * 	@param 	boolean			$force_price	Force price
+     * 	@return	void
+     */
+    function displayMarginInfos($object, $force_price=false)
+    {
+        global $langs, $conf, $user;
 
-    	if (! empty($user->societe_id)) return;
+        if (! empty($user->societe_id)) return;
 
-    	if (! $user->rights->margins->liretous) return;
+        if (! $user->rights->margins->liretous) return;
 
         $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
-		$marginInfo = $this->getMarginInfosArray($object, $force_price);
+        $marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
-		{
-			print $langs->trans('ShowMarginInfos').' : ';
-	        $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
-	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
-	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
+        if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
+        {
+            print $langs->trans('ShowMarginInfos').' : ';
+            $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
+            print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
+            print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
 
-    	    print '<script>$(document).ready(function() {
+            print '<script>$(document).ready(function() {
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
         	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
-    	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
-		}
+            if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+        }
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<!-- Margin table -->'."\n";
+        print '<div class="div-table-responsive-no-min">';
+        print '<!-- Margin table -->'."\n";
 
-		print '<table class="noborder margintable centpercent">';
-		print '<tr class="liste_titre">';
-		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
-		print '<td class="liste_titre" align="right">'.$langs->trans('SellingPrice').'</td>';
-		if ($conf->global->MARGIN_TYPE == "1")
-			print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
-		else
-			print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
-		print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
-		if (! empty($conf->global->DISPLAY_MARK_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
-		print '</tr>';
+        print '<table class="noborder margintable centpercent">';
+        print '<tr class="liste_titre">';
+        print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
+        print '<td class="liste_titre" align="right">'.$langs->trans('SellingPrice').'</td>';
+        if ($conf->global->MARGIN_TYPE == "1")
+            print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
+        else
+            print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
+        print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
+        if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+            print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
+        if (! empty($conf->global->DISPLAY_MARK_RATES))
+            print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
+        print '</tr>';
 
-		if (! empty($conf->product->enabled))
-		{
-			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
-			print '<tr class="oddeven">';
-			print '<td>'.$langs->trans('MarginOnProducts').'</td>';
-			print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
-			print '</tr>';
-		}
+        if (! empty($conf->product->enabled))
+        {
+            //if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
+            print '<tr class="oddeven">';
+            print '<td>'.$langs->trans('MarginOnProducts').'</td>';
+            print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+            if (! empty($conf->global->DISPLAY_MARK_RATES))
+                print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+            print '</tr>';
+        }
 
-		if (! empty($conf->service->enabled))
-		{
-			print '<tr class="oddeven">';
-			print '<td>'.$langs->trans('MarginOnServices').'</td>';
-			print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
-			print '</tr>';
-		}
+        if (! empty($conf->service->enabled))
+        {
+            print '<tr class="oddeven">';
+            print '<td>'.$langs->trans('MarginOnServices').'</td>';
+            print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+            if (! empty($conf->global->DISPLAY_MARK_RATES))
+                print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+            print '</tr>';
+        }
 
-		if (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
-		{
-			print '<tr class="liste_total">';
-			print '<td>'.$langs->trans('TotalMargin').'</td>';
-			print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
-			print '</tr>';
-		}
-		print '</table>';
-		print '</div>';
-	}
+        if (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
+        {
+            print '<tr class="liste_total">';
+            print '<td>'.$langs->trans('TotalMargin').'</td>';
+            print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+            if (! empty($conf->global->DISPLAY_MARK_RATES))
+                print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+            print '</tr>';
+        }
+        print '</table>';
+        print '</div>';
+    }
 }