alxarafe / alixar

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

Indentation +303 added lines, -303 removed lines

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

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

Indentation +192 added lines, -192 removed lines

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

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

Indentation +15 added lines, -15 removed lines

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

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/html.formticket.class.php

Indentation +7 added lines, -8 removed lines

@@ -32,7 +32,6 @@ 
  * Classe permettant la generation du formulaire d'un nouveau ticket.
  *
  * @package Ticket
-
  * \remarks Utilisation: $formticket = new FormTicket($db)
  * \remarks $formticket->proprietes=1 ou chaine ou tableau de valeurs
  * \remarks $formticket->show_form() affiche le formulaire
@@ -88,9 +87,9 @@ 
     public $param = array();
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+     * @var string Error code (or message)
+     */
+    public $error;
 
 
     /**
@@ -153,7 +152,7 @@ 
         print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
         print '<input type="hidden" name="action" value="' . $this->action . '">';
         foreach ($this->param as $key => $value) {
-        	print '<input type="hidden" name="' . $key . '" value="' . $value . '">';
+            print '<input type="hidden" name="' . $key . '" value="' . $value . '">';
         }
         print '<input type="hidden" name="fk_user_create" value="' . $this->fk_user_create . '">';
 
@@ -306,9 +305,9 @@ 
         // Notify thirdparty at creation
         if (empty($this->ispublic))
         {
-	        print '<tr><td><label for="notify_tiers_at_create">' . $langs->trans("TicketNotifyTiersAtCreation") . '</label></td><td>';
-        	print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate?' checked="checked"':'').'>';
-        	print '</td></tr>';
+            print '<tr><td><label for="notify_tiers_at_create">' . $langs->trans("TicketNotifyTiersAtCreation") . '</label></td><td>';
+            print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate?' checked="checked"':'').'>';
+            print '</td></tr>';
         }
 
         // TITLE