alxarafe / alixar

dolibarr/htdocs/core/modules/import/import_csv.modules.php

Indentation +562 added lines, -562 removed lines

@@ -40,383 +40,383 @@ 
 
     public $datatoimport;
 
-	/**
-	 * @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 int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var string label
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+    public $extension;    // Extension of files imported by driver
 
-	/**
+    /**
      * Dolibarr version of driver
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+    public $label_lib;    // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+    public $version_lib;  // Version of external lib used by driver
 
-	public $separator;
+    public $separator;
 
-	public $file;      // Path of file
+    public $file;      // Path of file
 
-	public $handle;    // Handle fichier
+    public $handle;    // Handle fichier
 
-	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+    public $cacheconvert=array();      // Array to cache list of value found after a convertion
 
-	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+    public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
 
-	public $nbinsert = 0; // # of insert done during the import
+    public $nbinsert = 0; // # of insert done during the import
 
-	public $nbupdate = 0; // # of update done during the import
+    public $nbupdate = 0; // # of update done during the import
 
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	DoliDB		$db				Database handler
-	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
-	 */
-	function __construct($db,$datatoimport)
-	{
-		global $conf, $langs;
-		$this->db = $db;
-
-		$this->separator=(GETPOST('separator')?GETPOST('separator'):(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?',':$conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
-		$this->enclosure='"';
-		$this->escape='"';
-
-		$this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Csv';             // Label of driver
-		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
-		$this->extension='csv';         // Extension for generated file by this driver
-		$this->picto='mime/other';		// Picto
-		$this->version='1.34';         // Driver version
-
-		// If driver use an external library, put its name here
-		$this->label_lib='Dolibarr';
-		$this->version_lib=DOL_VERSION;
-
-		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
-	}
+    /**
+     *	Constructor
+     *
+     *	@param	DoliDB		$db				Database handler
+     *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
+     */
+    function __construct($db,$datatoimport)
+    {
+        global $conf, $langs;
+        $this->db = $db;
+
+        $this->separator=(GETPOST('separator')?GETPOST('separator'):(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?',':$conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
+        $this->enclosure='"';
+        $this->escape='"';
+
+        $this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
+        $this->label='Csv';             // Label of driver
+        $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
+        $this->extension='csv';         // Extension for generated file by this driver
+        $this->picto='mime/other';		// Picto
+        $this->version='1.34';         // Driver version
+
+        // If driver use an external library, put its name here
+        $this->label_lib='Dolibarr';
+        $this->version_lib=DOL_VERSION;
+
+        $this->datatoimport=$datatoimport;
+        if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output header of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @return	string
-	 */
-	function write_header_example($outputlangs)
-	{
+    /**
+     * 	Output header of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @return	string
+     */
+    function write_header_example($outputlangs)
+    {
         // phpcs:enable
-		return '';
-	}
+        return '';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output title line of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @param	array		$headerlinefields	Array of fields name
-	 * 	@return	string
-	 */
-	function write_title_example($outputlangs,$headerlinefields)
-	{
+    /**
+     * 	Output title line of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @param	array		$headerlinefields	Array of fields name
+     * 	@return	string
+     */
+    function write_title_example($outputlangs,$headerlinefields)
+    {
         // phpcs:enable
-		$s=join($this->separator,array_map('cleansep',$headerlinefields));
-		return $s."\n";
-	}
+        $s=join($this->separator,array_map('cleansep',$headerlinefields));
+        return $s."\n";
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output record of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 * 	@param	array		$contentlinevalues	Array of lines
-	 * 	@return	string
-	 */
-	function write_record_example($outputlangs,$contentlinevalues)
-	{
+    /**
+     * 	Output record of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     * 	@param	array		$contentlinevalues	Array of lines
+     * 	@return	string
+     */
+    function write_record_example($outputlangs,$contentlinevalues)
+    {
         // phpcs:enable
-		$s=join($this->separator,array_map('cleansep',$contentlinevalues));
-		return $s."\n";
-	}
+        $s=join($this->separator,array_map('cleansep',$contentlinevalues));
+        return $s."\n";
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output footer of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @return	string
-	 */
-	function write_footer_example($outputlangs)
-	{
+    /**
+     * 	Output footer of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @return	string
+     */
+    function write_footer_example($outputlangs)
+    {
         // phpcs:enable
-		return '';
-	}
+        return '';
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Open input file
-	 *
-	 *	@param	string	$file		Path of filename
-	 *	@return	int					<0 if KO, >=0 if OK
-	 */
-	function import_open_file($file)
-	{
+    /**
+     *	Open input file
+     *
+     *	@param	string	$file		Path of filename
+     *	@return	int					<0 if KO, >=0 if OK
+     */
+    function import_open_file($file)
+    {
         // phpcs:enable
-		global $langs;
-		$ret=1;
-
-		dol_syslog(get_class($this)."::open_file file=".$file);
-
-		ini_set('auto_detect_line_endings',1);	// For MAC compatibility
-
-		$this->handle = fopen(dol_osencode($file), "r");
-		if (! $this->handle)
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToOpenFile",$file);
-			$ret=-1;
-		}
-		else
-		{
-			$this->file=$file;
-		}
-
-		return $ret;
-	}
+        global $langs;
+        $ret=1;
+
+        dol_syslog(get_class($this)."::open_file file=".$file);
+
+        ini_set('auto_detect_line_endings',1);	// For MAC compatibility
+
+        $this->handle = fopen(dol_osencode($file), "r");
+        if (! $this->handle)
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans("ErrorFailToOpenFile",$file);
+            $ret=-1;
+        }
+        else
+        {
+            $this->file=$file;
+        }
+
+        return $ret;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Return nb of records. File must be closed.
-	 *
-	 *	@param	string	$file		Path of filename
-	 * 	@return		int		<0 if KO, >=0 if OK
-	 */
-	function import_get_nb_of_lines($file)
-	{
+    /**
+     * 	Return nb of records. File must be closed.
+     *
+     *	@param	string	$file		Path of filename
+     * 	@return		int		<0 if KO, >=0 if OK
+     */
+    function import_get_nb_of_lines($file)
+    {
         // phpcs:enable
-       return dol_count_nb_of_line($file);
+        return dol_count_nb_of_line($file);
     }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Input header line from file
-	 *
-	 * 	@return		int		<0 if KO, >=0 if OK
-	 */
-	function import_read_header()
-	{
+    /**
+     * 	Input header line from file
+     *
+     * 	@return		int		<0 if KO, >=0 if OK
+     */
+    function import_read_header()
+    {
         // phpcs:enable
-		return 0;
-	}
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Return array of next record in input file.
-	 *
-	 * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
-	 */
-	function import_read_record()
-	{
+    /**
+     * 	Return array of next record in input file.
+     *
+     * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
+     */
+    function import_read_record()
+    {
         // phpcs:enable
-		global $conf;
-
-		$arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
-
-		// End of file
-		if ($arrayres === false) return false;
-
-		//var_dump($this->handle);
-		//var_dump($arrayres);exit;
-		$newarrayres=array();
-		if ($arrayres && is_array($arrayres))
-		{
-			foreach($arrayres as $key => $val)
-			{
-				if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
-				{
-					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8')
-					{
-						$newarrayres[$key]['val']=$val;
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-					else
-					{
-						$newarrayres[$key]['val']=utf8_encode($val);
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-				}
-				else	// Autodetect format (UTF8 or ISO)
-				{
-					if (utf8_check($val))
-					{
-						$newarrayres[$key]['val']=$val;
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-					else
-					{
-						$newarrayres[$key]['val']=utf8_encode($val);
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-				}
-			}
-
-			$this->col=count($newarrayres);
-		}
-
-		return $newarrayres;
-	}
+        global $conf;
+
+        $arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
+
+        // End of file
+        if ($arrayres === false) return false;
+
+        //var_dump($this->handle);
+        //var_dump($arrayres);exit;
+        $newarrayres=array();
+        if ($arrayres && is_array($arrayres))
+        {
+            foreach($arrayres as $key => $val)
+            {
+                if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
+                {
+                    if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8')
+                    {
+                        $newarrayres[$key]['val']=$val;
+                        $newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+                    }
+                    else
+                    {
+                        $newarrayres[$key]['val']=utf8_encode($val);
+                        $newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+                    }
+                }
+                else	// Autodetect format (UTF8 or ISO)
+                {
+                    if (utf8_check($val))
+                    {
+                        $newarrayres[$key]['val']=$val;
+                        $newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+                    }
+                    else
+                    {
+                        $newarrayres[$key]['val']=utf8_encode($val);
+                        $newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+                    }
+                }
+            }
+
+            $this->col=count($newarrayres);
+        }
+
+        return $newarrayres;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Close file handle
-	 *
-	 *  @return	integer
-	 */
-	function import_close_file()
-	{
+    /**
+     * 	Close file handle
+     *
+     *  @return	integer
+     */
+    function import_close_file()
+    {
         // phpcs:enable
-		fclose($this->handle);
-		return 0;
-	}
+        fclose($this->handle);
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Insert a record into database
-	 *
-	 * @param	array	$arrayrecord					Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
-	 * @param	array	$array_match_file_to_database	Array of target fields where to insert data: [fieldpos] => 's.fieldname', [fieldpos+1]...
-	 * @param 	Object	$objimport						Object import (contains objimport->array_import_tables, objimport->array_import_fields, objimport->array_import_convertvalue, ...)
-	 * @param	int		$maxfields						Max number of fields to use
-	 * @param	string	$importid						Import key
-	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
-	 * @return	int										<0 if KO, >0 if OK
-	 */
-	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
-	{
+    /**
+     * Insert a record into database
+     *
+     * @param	array	$arrayrecord					Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
+     * @param	array	$array_match_file_to_database	Array of target fields where to insert data: [fieldpos] => 's.fieldname', [fieldpos+1]...
+     * @param 	Object	$objimport						Object import (contains objimport->array_import_tables, objimport->array_import_fields, objimport->array_import_convertvalue, ...)
+     * @param	int		$maxfields						Max number of fields to use
+     * @param	string	$importid						Import key
+     * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
+     * @return	int										<0 if KO, >0 if OK
+     */
+    function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
+    {
         // phpcs:enable
-		global $langs,$conf,$user;
+        global $langs,$conf,$user;
         global $thirdparty_static;    	// Specific to thirdparty import
-		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
-
-		$error=0;
-		$warning=0;
-		$this->errors=array();
-		$this->warnings=array();
-
-		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
-
-		//var_dump($array_match_file_to_database);
-		//var_dump($arrayrecord);
-		$array_match_database_to_file=array_flip($array_match_file_to_database);
-		$sort_array_match_file_to_database=$array_match_file_to_database;
-		ksort($sort_array_match_file_to_database);
-
-		//var_dump($sort_array_match_file_to_database);
-
-		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
-		{
-			//print 'W';
-			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
-			$this->warnings[$warning]['type']='EMPTY';
-			$warning++;
-		}
-		else
-		{
-			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
-			$updatedone = false;
-			$insertdone = false;
-			// For each table to insert, me make a separate insert
-			foreach($objimport->array_import_tables[0] as $alias => $tablename)
-			{
-				// Build sql request
-				$sql='';
-				$listfields=array();
-				$listvalues=array();
-				$i=0;
-				$errorforthistable=0;
-
-				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
-				{
-					dol_syslog("Check if table ".$tablename." has an entity field");
-					$resql=$this->db->DDLDescTable($tablename,'entity');
-					if ($resql)
-					{
-						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else
-				{
-					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
-				}
-
-
-				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach($sort_array_match_file_to_database as $key => $val)
-				{
-				    $fieldalias=preg_replace('/\..*$/i','',$val);
-				    $fieldname=preg_replace('/^.*\./i','',$val);
-
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
-
-					if ($key <= $maxfields)
-					{
-						// Set $newval with value to insert and set $listvalues with sql request part for insert
-						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
-
-						// Make some tests on $newval
-
-						// Is it a required field ?
-						if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
-						{
-							$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
-							$this->errors[$error]['type']='NOTNULL';
-							$errorforthistable++;
-							$error++;
-						}
-						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
-						    // We convert field if required
-						    if (! empty($objimport->array_import_convertvalue[0][$val]))
-						    {
+        global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
+
+        $error=0;
+        $warning=0;
+        $this->errors=array();
+        $this->warnings=array();
+
+        //dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
+
+        //var_dump($array_match_file_to_database);
+        //var_dump($arrayrecord);
+        $array_match_database_to_file=array_flip($array_match_file_to_database);
+        $sort_array_match_file_to_database=$array_match_file_to_database;
+        ksort($sort_array_match_file_to_database);
+
+        //var_dump($sort_array_match_file_to_database);
+
+        if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
+        {
+            //print 'W';
+            $this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
+            $this->warnings[$warning]['type']='EMPTY';
+            $warning++;
+        }
+        else
+        {
+            $last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
+            $updatedone = false;
+            $insertdone = false;
+            // For each table to insert, me make a separate insert
+            foreach($objimport->array_import_tables[0] as $alias => $tablename)
+            {
+                // Build sql request
+                $sql='';
+                $listfields=array();
+                $listvalues=array();
+                $i=0;
+                $errorforthistable=0;
+
+                // Define $tablewithentity_cache[$tablename] if not already defined
+                if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+                {
+                    dol_syslog("Check if table ".$tablename." has an entity field");
+                    $resql=$this->db->DDLDescTable($tablename,'entity');
+                    if ($resql)
+                    {
+                        $obj=$this->db->fetch_object($resql);
+                        if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
+                        else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+                    }
+                    else dol_print_error($this->db);
+                }
+                else
+                {
+                    //dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
+                }
+
+
+                // Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
+                foreach($sort_array_match_file_to_database as $key => $val)
+                {
+                    $fieldalias=preg_replace('/\..*$/i','',$val);
+                    $fieldname=preg_replace('/^.*\./i','',$val);
+
+                    if ($alias != $fieldalias) continue;    // Not a field of current table
+
+                    if ($key <= $maxfields)
+                    {
+                        // Set $newval with value to insert and set $listvalues with sql request part for insert
+                        $newval='';
+                        if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+
+                        // Make some tests on $newval
+
+                        // Is it a required field ?
+                        if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
+                        {
+                            $this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
+                            $this->errors[$error]['type']='NOTNULL';
+                            $errorforthistable++;
+                            $error++;
+                        }
+                        // Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
+                        else
+                        {
+                            // We convert field if required
+                            if (! empty($objimport->array_import_convertvalue[0][$val]))
+                            {
                                 //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
                                 if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
-                                	)
+                                    || $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
+                                    || $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                    )
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
                                     $isidorref='id';
@@ -431,10 +431,10 @@ 
                                         $method=$objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                            $newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
                                         else
-										{
+                                        {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -447,7 +447,7 @@ 
                                             // If not found, try the fetch from label
                                             if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
                                             {
-												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+                                                call_user_func_array(array($classinstance, $method),array('', '', $newval));
                                             }
                                             $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
@@ -534,264 +534,264 @@ 
                                 }
 
                                 //print 'Val to use as insert is '.$newval.'<br>';
-						    }
-
-						    // Test regexp
-							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
-							{
-								// If test is "Must exist in a field@table"
-								if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
-								{
-									$field=$reg[1];
-									$table=$reg[2];
-
-									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
-									{
-										$sql="SELECT ".$field." as aliasfield FROM ".$table;
-										$resql=$this->db->query($sql);
-										if ($resql)
-										{
-											$num=$this->db->num_rows($resql);
-											$i=0;
-											while ($i < $num)
-											{
-												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
-												$i++;
-											}
-										}
-										else
-										{
-											dol_print_error($this->db);
-										}
-									}
-
-									// Now we check cache is not empty (should not) and key is into cache
-									if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
-									{
-										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
-										$this->errors[$error]['type']='FOREIGNKEY';
-									    $errorforthistable++;
-										$error++;
-									}
-								}
-								// If test is just a static regex
-								else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
-								{
-								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
-									$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
-									$this->errors[$error]['type']='REGEX';
-									$errorforthistable++;
-									$error++;
-								}
-							}
-
-							// Other tests
-							// ...
-						}
-
-						// Define $listfields and $listvalues to build SQL request
-						$listfields[] = $fieldname;
-
-						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) {
+                            }
+
+                            // Test regexp
+                            if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
+                            {
+                                // If test is "Must exist in a field@table"
+                                if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
+                                {
+                                    $field=$reg[1];
+                                    $table=$reg[2];
+
+                                    // Load content of field@table into cache array
+                                    if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+                                    {
+                                        $sql="SELECT ".$field." as aliasfield FROM ".$table;
+                                        $resql=$this->db->query($sql);
+                                        if ($resql)
+                                        {
+                                            $num=$this->db->num_rows($resql);
+                                            $i=0;
+                                            while ($i < $num)
+                                            {
+                                                $obj=$this->db->fetch_object($resql);
+                                                if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+                                                $i++;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            dol_print_error($this->db);
+                                        }
+                                    }
+
+                                    // Now we check cache is not empty (should not) and key is into cache
+                                    if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
+                                    {
+                                        $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
+                                        $this->errors[$error]['type']='FOREIGNKEY';
+                                        $errorforthistable++;
+                                        $error++;
+                                    }
+                                }
+                                // If test is just a static regex
+                                else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
+                                {
+                                    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+                                    $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
+                                    $this->errors[$error]['type']='REGEX';
+                                    $errorforthistable++;
+                                    $error++;
+                                }
+                            }
+
+                            // Other tests
+                            // ...
+                        }
+
+                        // Define $listfields and $listvalues to build SQL request
+                        $listfields[] = $fieldname;
+
+                        // Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
+                        if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) {
                             $listvalues[] = ($newval=='0'?$newval:"null");
                         } elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0) {
                             $listvalues[] = "''";
                         } else {
                             $listvalues[] = "'".$this->db->escape($newval)."'";
                         }
-					}
-					$i++;
-				}
-
-				// We add hidden fields (but only if there is at least one field to add into table)
-				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
-				{
-    				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
-    				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
-    				    if ($val == 'user->id')
-    				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
-    				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
-    				    {
-    				        $tmp=explode('-',$val);
-    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
-							$keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
-    				        $listfields[] = $keyfield;
+                    }
+                    $i++;
+                }
+
+                // We add hidden fields (but only if there is at least one field to add into table)
+                if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
+                {
+                    // Loop on each hidden fields to add them into listfields/listvalues
+                    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
+                    {
+                        if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+                        if ($val == 'user->id')
+                        {
+                            $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+                            $listvalues[] = $user->id;
+                        }
+                        elseif (preg_match('/^lastrowid-/',$val))
+                        {
+                            $tmp=explode('-',$val);
+                            $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
+                            $keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+                            $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
-    				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				}
-				}
-				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
-
-				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
-				// so we can try to make the insert or update now.
-				if (! $errorforthistable)
-				{
-					//print "$alias/$tablename/$listfields/$listvalues<br>";
-					if (!empty($listfields))
-					{
-						$updatedone = false;
-						$insertdone = false;
-
-						if (!empty($updatekeys)) {
-							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
-
-							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
-
-								$data = array_combine($listfields, $listvalues);
-								$where = array();
-								$filters = array();
-								foreach ($updatekeys as $key) {
-									$col = $objimport->array_import_updatekeys[0][$key];
-									$key=preg_replace('/^.*\./i','',$key);
-									$where[] = $key.' = '.$data[$key];
-									$filters[] = $col.' = '.$data[$key];
-								}
-								$sqlSelect.= ' WHERE '.implode(' AND ', $where);
-
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
-									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
-										$lastinsertid = $res->rowid;
-										$last_insert_id_array[$tablename] = $lastinsertid;
-									} else if($resql->num_rows > 1) {
-										$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
-										$this->errors[$error]['type']='SQL';
-										$error++;
-									} else {
-										// No record found with filters, insert will be tried below
-									}
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							} else {
-								// We have a last INSERT ID (got by previous pass), so we check if we have a row referencing this foreign key.
-								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
-								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
-								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
-								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
-
-								if(empty($keyfield)) $keyfield = 'rowid';
-								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
-
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
-									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
-										// We have a row referencing this last foreign key, continue with UPDATE.
-									} else {
-										// No record found referencing this last foreign key,
-										// force $lastinsertid to 0 so we INSERT below.
-										$lastinsertid = 0;
-									}
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-
-							if (!empty($lastinsertid)) {
-								// Build SQL UPDATE request
-								$sqlstart = 'UPDATE '.$tablename;
-
-								$data = array_combine($listfields, $listvalues);
-								$set = array();
-								foreach ($data as $key => $val) {
-									$set[] = $key.' = '.$val;
-								}
-								$sqlstart.= ' SET '.implode(', ', $set);
-
-								if(empty($keyfield)) $keyfield = 'rowid';
-								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
-
-								$sql = $sqlstart.$sqlend;
-
-								// Run update request
-								$resql=$this->db->query($sql);
-								if($resql) {
-									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
-									$updatedone = true;
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-						}
-
-						// Update not done, we do insert
-						if (!$error && !$updatedone) {
-							// Build SQL INSERT request
-							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
-							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
-							if (! empty($tablewithentity_cache[$tablename])) {
-								$sqlstart.= ', entity';
-								$sqlend.= ', '.$conf->entity;
-							}
-							if (! empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend.=', '.$user->id;
-							}
-							$sql = $sqlstart.$sqlend.')';
-							dol_syslog("import_csv.modules", LOG_DEBUG);
-
-							// Run insert request
-							if ($sql)
-							{
-								$resql=$this->db->query($sql);
-								if ($resql)
-								{
-								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
-								    $insertdone = true;
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-						}
-					}
-					/*else
+                            //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+                        }
+                    }
+                }
+                //print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
+
+                // If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
+                // so we can try to make the insert or update now.
+                if (! $errorforthistable)
+                {
+                    //print "$alias/$tablename/$listfields/$listvalues<br>";
+                    if (!empty($listfields))
+                    {
+                        $updatedone = false;
+                        $insertdone = false;
+
+                        if (!empty($updatekeys)) {
+                            // We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
+
+                            if (empty($lastinsertid)) {	// No insert done yet for a parent table
+                                $sqlSelect = 'SELECT rowid FROM '.$tablename;
+
+                                $data = array_combine($listfields, $listvalues);
+                                $where = array();
+                                $filters = array();
+                                foreach ($updatekeys as $key) {
+                                    $col = $objimport->array_import_updatekeys[0][$key];
+                                    $key=preg_replace('/^.*\./i','',$key);
+                                    $where[] = $key.' = '.$data[$key];
+                                    $filters[] = $col.' = '.$data[$key];
+                                }
+                                $sqlSelect.= ' WHERE '.implode(' AND ', $where);
+
+                                $resql=$this->db->query($sqlSelect);
+                                if($resql) {
+                                    $res = $this->db->fetch_object($resql);
+                                    if($resql->num_rows == 1) {
+                                        $lastinsertid = $res->rowid;
+                                        $last_insert_id_array[$tablename] = $lastinsertid;
+                                    } else if($resql->num_rows > 1) {
+                                        $this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
+                                        $this->errors[$error]['type']='SQL';
+                                        $error++;
+                                    } else {
+                                        // No record found with filters, insert will be tried below
+                                    }
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            } else {
+                                // We have a last INSERT ID (got by previous pass), so we check if we have a row referencing this foreign key.
+                                // This is required when updating table with some extrafields. When inserting a record in parent table, we can make
+                                // a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
+                                // may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
+                                // Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
+                                $sqlSelect = 'SELECT rowid FROM '.$tablename;
+
+                                if(empty($keyfield)) $keyfield = 'rowid';
+                                $sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
+
+                                $resql=$this->db->query($sqlSelect);
+                                if($resql) {
+                                    $res = $this->db->fetch_object($resql);
+                                    if($resql->num_rows == 1) {
+                                        // We have a row referencing this last foreign key, continue with UPDATE.
+                                    } else {
+                                        // No record found referencing this last foreign key,
+                                        // force $lastinsertid to 0 so we INSERT below.
+                                        $lastinsertid = 0;
+                                    }
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+
+                            if (!empty($lastinsertid)) {
+                                // Build SQL UPDATE request
+                                $sqlstart = 'UPDATE '.$tablename;
+
+                                $data = array_combine($listfields, $listvalues);
+                                $set = array();
+                                foreach ($data as $key => $val) {
+                                    $set[] = $key.' = '.$val;
+                                }
+                                $sqlstart.= ' SET '.implode(', ', $set);
+
+                                if(empty($keyfield)) $keyfield = 'rowid';
+                                $sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
+
+                                $sql = $sqlstart.$sqlend;
+
+                                // Run update request
+                                $resql=$this->db->query($sql);
+                                if($resql) {
+                                    // No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
+                                    $updatedone = true;
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+                        }
+
+                        // Update not done, we do insert
+                        if (!$error && !$updatedone) {
+                            // Build SQL INSERT request
+                            $sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
+                            $sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
+                            if (! empty($tablewithentity_cache[$tablename])) {
+                                $sqlstart.= ', entity';
+                                $sqlend.= ', '.$conf->entity;
+                            }
+                            if (! empty($objimport->array_import_tables_creator[0][$alias])) {
+                                $sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
+                                $sqlend.=', '.$user->id;
+                            }
+                            $sql = $sqlstart.$sqlend.')';
+                            dol_syslog("import_csv.modules", LOG_DEBUG);
+
+                            // Run insert request
+                            if ($sql)
+                            {
+                                $resql=$this->db->query($sql);
+                                if ($resql)
+                                {
+                                    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
+                                    $insertdone = true;
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+                        }
+                    }
+                    /*else
 					{
 						dol_print_error('','ErrorFieldListEmptyFor '.$alias."/".$tablename);
 					}*/
-				}
+                }
 
-			    if ($error) break;
-			}
+                if ($error) break;
+            }
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
-		}
+            if($updatedone) $this->nbupdate++;
+            if($insertdone) $this->nbinsert++;
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 }
 
 /**
@@ -802,5 +802,5 @@ 
  */
 function cleansep($value)
 {
-	return str_replace(array(',',';'),'/',$value);
+    return str_replace(array(',',';'),'/',$value);
 };

Spacing +187 added lines, -187 removed lines

@@ -25,7 +25,7 @@ 
  *		\brief      File to load import files with CSV format
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/import/modules_import.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
 
 
 /**
@@ -43,7 +43,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -60,7 +60,7 @@ 
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+	public $extension; // Extension of files imported by driver
 
 	/**
      * Dolibarr version of driver
@@ -68,19 +68,19 @@ 
      */
 	public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+	public $label_lib; // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+	public $version_lib; // Version of external lib used by driver
 
 	public $separator;
 
-	public $file;      // Path of file
+	public $file; // Path of file
 
-	public $handle;    // Handle fichier
+	public $handle; // Handle fichier
 
-	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+	public $cacheconvert = array(); // Array to cache list of value found after a convertion
 
-	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+	public $cachefieldtable = array(); // Array to cache list of value found into fields@tables
 
 	public $nbinsert = 0; // # of insert done during the import
 
@@ -93,28 +93,28 @@ 
 	 *	@param	DoliDB		$db				Database handler
 	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
 	 */
-	function __construct($db,$datatoimport)
+	function __construct($db, $datatoimport)
 	{
 		global $conf, $langs;
 		$this->db = $db;
 
-		$this->separator=(GETPOST('separator')?GETPOST('separator'):(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?',':$conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
-		$this->enclosure='"';
-		$this->escape='"';
+		$this->separator = (GETPOST('separator') ?GETPOST('separator') : (empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
+		$this->enclosure = '"';
+		$this->escape = '"';
 
-		$this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Csv';             // Label of driver
-		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
-		$this->extension='csv';         // Extension for generated file by this driver
-		$this->picto='mime/other';		// Picto
-		$this->version='1.34';         // Driver version
+		$this->id = 'csv'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'Csv'; // Label of driver
+		$this->desc = $langs->trans("CSVFormatDesc", $this->separator, $this->enclosure, $this->escape);
+		$this->extension = 'csv'; // Extension for generated file by this driver
+		$this->picto = 'mime/other'; // Picto
+		$this->version = '1.34'; // Driver version
 
 		// If driver use an external library, put its name here
-		$this->label_lib='Dolibarr';
-		$this->version_lib=DOL_VERSION;
+		$this->label_lib = 'Dolibarr';
+		$this->version_lib = DOL_VERSION;
 
-		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+		$this->datatoimport = $datatoimport;
+		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
 	}
 
 
@@ -139,10 +139,10 @@ 
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string
 	 */
-	function write_title_example($outputlangs,$headerlinefields)
+	function write_title_example($outputlangs, $headerlinefields)
 	{
         // phpcs:enable
-		$s=join($this->separator,array_map('cleansep',$headerlinefields));
+		$s = join($this->separator, array_map('cleansep', $headerlinefields));
 		return $s."\n";
 	}
 
@@ -154,10 +154,10 @@ 
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string
 	 */
-	function write_record_example($outputlangs,$contentlinevalues)
+	function write_record_example($outputlangs, $contentlinevalues)
 	{
         // phpcs:enable
-		$s=join($this->separator,array_map('cleansep',$contentlinevalues));
+		$s = join($this->separator, array_map('cleansep', $contentlinevalues));
 		return $s."\n";
 	}
 
@@ -187,22 +187,22 @@ 
 	{
         // phpcs:enable
 		global $langs;
-		$ret=1;
+		$ret = 1;
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
 
-		ini_set('auto_detect_line_endings',1);	// For MAC compatibility
+		ini_set('auto_detect_line_endings', 1); // For MAC compatibility
 
 		$this->handle = fopen(dol_osencode($file), "r");
-		if (! $this->handle)
+		if (!$this->handle)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToOpenFile",$file);
-			$ret=-1;
+			$this->error = $langs->trans("ErrorFailToOpenFile", $file);
+			$ret = -1;
 		}
 		else
 		{
-			$this->file=$file;
+			$this->file = $file;
 		}
 
 		return $ret;
@@ -247,47 +247,47 @@ 
         // phpcs:enable
 		global $conf;
 
-		$arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
+		$arrayres = fgetcsv($this->handle, 100000, $this->separator, $this->enclosure, $this->escape);
 
 		// End of file
 		if ($arrayres === false) return false;
 
 		//var_dump($this->handle);
 		//var_dump($arrayres);exit;
-		$newarrayres=array();
+		$newarrayres = array();
 		if ($arrayres && is_array($arrayres))
 		{
-			foreach($arrayres as $key => $val)
+			foreach ($arrayres as $key => $val)
 			{
-				if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
+				if (!empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
 				{
 					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8')
 					{
-						$newarrayres[$key]['val']=$val;
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+						$newarrayres[$key]['val'] = $val;
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 					else
 					{
-						$newarrayres[$key]['val']=utf8_encode($val);
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+						$newarrayres[$key]['val'] = utf8_encode($val);
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 				}
 				else	// Autodetect format (UTF8 or ISO)
 				{
 					if (utf8_check($val))
 					{
-						$newarrayres[$key]['val']=$val;
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+						$newarrayres[$key]['val'] = $val;
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 					else
 					{
-						$newarrayres[$key]['val']=utf8_encode($val);
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+						$newarrayres[$key]['val'] = utf8_encode($val);
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 				}
 			}
 
-			$this->col=count($newarrayres);
+			$this->col = count($newarrayres);
 		}
 
 		return $newarrayres;
@@ -319,24 +319,24 @@ 
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
 	 * @return	int										<0 if KO, >0 if OK
 	 */
-	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
+	function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
         // phpcs:enable
-		global $langs,$conf,$user;
-        global $thirdparty_static;    	// Specific to thirdparty import
-		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
+		global $langs, $conf, $user;
+        global $thirdparty_static; // Specific to thirdparty import
+		global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
 
-		$error=0;
-		$warning=0;
-		$this->errors=array();
-		$this->warnings=array();
+		$error = 0;
+		$warning = 0;
+		$this->errors = array();
+		$this->warnings = array();
 
 		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
 
 		//var_dump($array_match_file_to_database);
 		//var_dump($arrayrecord);
-		$array_match_database_to_file=array_flip($array_match_file_to_database);
-		$sort_array_match_file_to_database=$array_match_file_to_database;
+		$array_match_database_to_file = array_flip($array_match_file_to_database);
+		$sort_array_match_file_to_database = $array_match_file_to_database;
 		ksort($sort_array_match_file_to_database);
 
 		//var_dump($sort_array_match_file_to_database);
@@ -344,8 +344,8 @@ 
 		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
 		{
 			//print 'W';
-			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
-			$this->warnings[$warning]['type']='EMPTY';
+			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
+			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
 		}
 		else
@@ -354,25 +354,25 @@ 
 			$updatedone = false;
 			$insertdone = false;
 			// For each table to insert, me make a separate insert
-			foreach($objimport->array_import_tables[0] as $alias => $tablename)
+			foreach ($objimport->array_import_tables[0] as $alias => $tablename)
 			{
 				// Build sql request
-				$sql='';
-				$listfields=array();
-				$listvalues=array();
-				$i=0;
-				$errorforthistable=0;
+				$sql = '';
+				$listfields = array();
+				$listvalues = array();
+				$i = 0;
+				$errorforthistable = 0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+				if (!isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
 				{
 					dol_syslog("Check if table ".$tablename." has an entity field");
-					$resql=$this->db->DDLDescTable($tablename,'entity');
+					$resql = $this->db->DDLDescTable($tablename, 'entity');
 					if ($resql)
 					{
-						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+						$obj = $this->db->fetch_object($resql);
+						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
+						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
 					}
 					else dol_print_error($this->db);
 				}
@@ -383,26 +383,26 @@ 
 
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach($sort_array_match_file_to_database as $key => $val)
+				foreach ($sort_array_match_file_to_database as $key => $val)
 				{
-				    $fieldalias=preg_replace('/\..*$/i','',$val);
-				    $fieldname=preg_replace('/^.*\./i','',$val);
+				    $fieldalias = preg_replace('/\..*$/i', '', $val);
+				    $fieldname = preg_replace('/^.*\./i', '', $val);
 
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
+				    if ($alias != $fieldalias) continue; // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
-						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+						$newval = '';
+						if ($arrayrecord[($key - 1)]['type'] > 0) $newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
 
 						// Make some tests on $newval
 
 						// Is it a required field ?
-						if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
+						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == ''))
 						{
-							$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
-							$this->errors[$error]['type']='NOTNULL';
+							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
+							$this->errors[$error]['type'] = 'NOTNULL';
 							$errorforthistable++;
 							$error++;
 						}
@@ -410,28 +410,28 @@ 
 						else
 						{
 						    // We convert field if required
-						    if (! empty($objimport->array_import_convertvalue[0][$val]))
+						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
                                 //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-                                if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
                                 	)
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
-                                    $isidorref='id';
-                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) $isidorref='ref';
-                                    $newval=preg_replace('/^(id|ref):/i','',$newval);    // Remove id: or ref: that was used to force if field is id or ref
+                                    $isidorref = 'id';
+                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+                                    $newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
                                     //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
                                     if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
                                     {
-                                        $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class=$objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method=$objimport->array_import_convertvalue[0][$val]['method'];
+                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
+                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                        	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
                                         else
 										{
@@ -441,94 +441,94 @@ 
                                                 dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
                                                 break;
                                             }
-                                            $classinstance=new $class($this->db);
+                                            $classinstance = new $class($this->db);
                                             // Try the fetch from code or ref
-                                            call_user_func_array(array($classinstance, $method),array('', $newval));
+                                            call_user_func_array(array($classinstance, $method), array('', $newval));
                                             // If not found, try the fetch from label
-                                            if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
+                                            if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
                                             {
-												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+												call_user_func_array(array($classinstance, $method), array('', '', $newval));
                                             }
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
+                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
-                                                $newval=$classinstance->id;
+                                                $newval = $classinstance->id;
                                             }
                                             else
                                             {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
-                                                $this->errors[$error]['type']='FOREIGNKEY';
+                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+                                                else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
                                                 $errorforthistable++;
                                                 $error++;
                                             }
                                         }
                                     }
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
                                 {
-                                    if (empty($newval)) $newval='0';
+                                    if (empty($newval)) $newval = '0';
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
-                                        $this->thirpartyobject->get_codeclient(0,0);
-                                        $newval=$this->thirpartyobject->code_client;
+                                        $this->thirpartyobject->get_codeclient(0, 0);
+                                        $newval = $this->thirpartyobject->code_client;
                                         //print 'code_client='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
-                                        $newval=$this->thirpartyobject->get_codefournisseur(0,1);
-                                        $newval=$this->thirpartyobject->code_fournisseur;
+                                        $newval = $this->thirpartyobject->get_codefournisseur(0, 1);
+                                        $newval = $this->thirpartyobject->code_fournisseur;
                                         //print 'code_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('customer');
-                                        $newval=$this->thirpartyobject->code_compta;
+                                        $newval = $this->thirpartyobject->code_compta;
                                         //print 'code_compta='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('supplier');
-                                        $newval=$this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                        $newval = $this->thirpartyobject->code_compta_fournisseur;
+                                        if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
                                 {
-                                    $defaultref='';
+                                    $defaultref = '';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
-                                    $obj = empty($conf->global->PROJECT_TASK_ADDON)?'mod_task_simple':$conf->global->PROJECT_TASK_ADDON;
-                                    if (! empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+                                    $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+                                    if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
                                     {
-                                        require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+                                        require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
                                         $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null,null);
+                                        $defaultref = $modTask->getNextValue(null, null);
                                     }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
-                                    $newval=$defaultref;
+                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+                                    $newval = $defaultref;
                                 }
 
 
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -537,27 +537,27 @@ 
 						    }
 
 						    // Test regexp
-							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
+							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table"
-								if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
+								if (preg_match('/^(.*)@(.*)$/', $objimport->array_import_regex[0][$val], $reg))
 								{
-									$field=$reg[1];
-									$table=$reg[2];
+									$field = $reg[1];
+									$table = $reg[2];
 
 									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+									if (!is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
 									{
-										$sql="SELECT ".$field." as aliasfield FROM ".$table;
-										$resql=$this->db->query($sql);
+										$sql = "SELECT ".$field." as aliasfield FROM ".$table;
+										$resql = $this->db->query($sql);
 										if ($resql)
 										{
-											$num=$this->db->num_rows($resql);
-											$i=0;
+											$num = $this->db->num_rows($resql);
+											$i = 0;
 											while ($i < $num)
 											{
-												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												$obj = $this->db->fetch_object($resql);
+												if ($obj) $this->cachefieldtable[$field.'@'.$table][] = $obj->aliasfield;
 												$i++;
 											}
 										}
@@ -568,20 +568,20 @@ 
 									}
 
 									// Now we check cache is not empty (should not) and key is into cache
-									if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
+									if (!is_array($this->cachefieldtable[$field.'@'.$table]) || !in_array($newval, $this->cachefieldtable[$field.'@'.$table]))
 									{
-										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
-										$this->errors[$error]['type']='FOREIGNKEY';
+										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $table);
+										$this->errors[$error]['type'] = 'FOREIGNKEY';
 									    $errorforthistable++;
 										$error++;
 									}
 								}
 								// If test is just a static regex
-								else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
+								else if (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval))
 								{
 								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
-									$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
-									$this->errors[$error]['type']='REGEX';
+									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
+									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
 									$error++;
 								}
@@ -595,9 +595,9 @@ 
 						$listfields[] = $fieldname;
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) {
-                            $listvalues[] = ($newval=='0'?$newval:"null");
-                        } elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0) {
+						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0) {
+                            $listvalues[] = ($newval == '0' ? $newval : "null");
+                        } elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
                             $listvalues[] = "''";
                         } else {
                             $listvalues[] = "'".$this->db->escape($newval)."'";
@@ -610,19 +610,19 @@ 
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
 				{
     				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
+				    foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
     				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+    				    if (!preg_match('/^'.preg_quote($alias).'\./', $key)) continue; // Not a field of current table
     				    if ($val == 'user->id')
     				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
     				        $listvalues[] = $user->id;
     				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
+    				    elseif (preg_match('/^lastrowid-/', $val))
     				    {
-    				        $tmp=explode('-',$val);
-    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
-							$keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+    				        $tmp = explode('-', $val);
+    				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
+							$keyfield = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
@@ -633,7 +633,7 @@ 
 
 				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
 				// so we can try to make the insert or update now.
-				if (! $errorforthistable)
+				if (!$errorforthistable)
 				{
 					//print "$alias/$tablename/$listfields/$listvalues<br>";
 					if (!empty($listfields))
@@ -652,21 +652,21 @@ 
 								$filters = array();
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
-									$key=preg_replace('/^.*\./i','',$key);
+									$key = preg_replace('/^.*\./i', '', $key);
 									$where[] = $key.' = '.$data[$key];
 									$filters[] = $col.' = '.$data[$key];
 								}
-								$sqlSelect.= ' WHERE '.implode(' AND ', $where);
+								$sqlSelect .= ' WHERE '.implode(' AND ', $where);
 
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
+								$resql = $this->db->query($sqlSelect);
+								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
+									if ($resql->num_rows == 1) {
 										$lastinsertid = $res->rowid;
 										$last_insert_id_array[$tablename] = $lastinsertid;
-									} else if($resql->num_rows > 1) {
-										$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
-										$this->errors[$error]['type']='SQL';
+									} else if ($resql->num_rows > 1) {
+										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
+										$this->errors[$error]['type'] = 'SQL';
 										$error++;
 									} else {
 										// No record found with filters, insert will be tried below
@@ -675,8 +675,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							} else {
@@ -687,13 +687,13 @@ 
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) $keyfield = 'rowid';
 								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
+								$resql = $this->db->query($sqlSelect);
+								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
+									if ($resql->num_rows == 1) {
 										// We have a row referencing this last foreign key, continue with UPDATE.
 									} else {
 										// No record found referencing this last foreign key,
@@ -704,8 +704,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -719,24 +719,24 @@ 
 								foreach ($data as $key => $val) {
 									$set[] = $key.' = '.$val;
 								}
-								$sqlstart.= ' SET '.implode(', ', $set);
+								$sqlstart .= ' SET '.implode(', ', $set);
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) $keyfield = 'rowid';
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$sql = $sqlstart.$sqlend;
 
 								// Run update request
-								$resql=$this->db->query($sql);
-								if($resql) {
+								$resql = $this->db->query($sql);
+								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
 								}
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -747,13 +747,13 @@ 
 							// Build SQL INSERT request
 							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
 							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
-							if (! empty($tablewithentity_cache[$tablename])) {
-								$sqlstart.= ', entity';
-								$sqlend.= ', '.$conf->entity;
+							if (!empty($tablewithentity_cache[$tablename])) {
+								$sqlstart .= ', entity';
+								$sqlend .= ', '.$conf->entity;
 							}
-							if (! empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend.=', '.$user->id;
+							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
+								$sqlstart .= ', '.$objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ', '.$user->id;
 							}
 							$sql = $sqlstart.$sqlend.')';
 							dol_syslog("import_csv.modules", LOG_DEBUG);
@@ -761,7 +761,7 @@ 
 							// Run insert request
 							if ($sql)
 							{
-								$resql=$this->db->query($sql);
+								$resql = $this->db->query($sql);
 								if ($resql)
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
@@ -770,8 +770,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -786,8 +786,8 @@ 
 			    if ($error) break;
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if ($updatedone) $this->nbupdate++;
+			if ($insertdone) $this->nbinsert++;
 		}
 
 		return 1;
@@ -802,5 +802,5 @@ 
  */
 function cleansep($value)
 {
-	return str_replace(array(',',';'),'/',$value);
+	return str_replace(array(',', ';'), '/', $value);
 };

Braces +117 added lines, -73 removed lines

@@ -114,7 +114,9 @@ 
 		$this->version_lib=DOL_VERSION;
 
 		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+		if (preg_match('/^societe_/',$datatoimport)) {
+		    $this->thirpartyobject=new Societe($this->db);
+		}
 	}
 
 
@@ -199,8 +201,7 @@ 
 			$langs->load("errors");
 			$this->error=$langs->trans("ErrorFailToOpenFile",$file);
 			$ret=-1;
-		}
-		else
+		} else
 		{
 			$this->file=$file;
 		}
@@ -250,7 +251,9 @@ 
 		$arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
 
 		// End of file
-		if ($arrayres === false) return false;
+		if ($arrayres === false) {
+		    return false;
+		}
 
 		//var_dump($this->handle);
 		//var_dump($arrayres);exit;
@@ -259,27 +262,26 @@ 
 		{
 			foreach($arrayres as $key => $val)
 			{
-				if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
+				if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET)) {
+				    // Forced charset
 				{
 					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8')
 					{
 						$newarrayres[$key]['val']=$val;
+				}
 						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-					else
+					} else
 					{
 						$newarrayres[$key]['val']=utf8_encode($val);
 						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
 					}
-				}
-				else	// Autodetect format (UTF8 or ISO)
+				} else	// Autodetect format (UTF8 or ISO)
 				{
 					if (utf8_check($val))
 					{
 						$newarrayres[$key]['val']=$val;
 						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-					else
+					} else
 					{
 						$newarrayres[$key]['val']=utf8_encode($val);
 						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
@@ -347,8 +349,7 @@ 
 			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
 			$this->warnings[$warning]['type']='EMPTY';
 			$warning++;
-		}
-		else
+		} else
 		{
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
@@ -364,19 +365,27 @@ 
 				$errorforthistable=0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+				if (! isset($tablewithentity_cache[$tablename])) {
+				    // keep this test with "isset"
 				{
 					dol_syslog("Check if table ".$tablename." has an entity field");
+				}
 					$resql=$this->db->DDLDescTable($tablename,'entity');
 					if ($resql)
 					{
 						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+						if ($obj) {
+						    $tablewithentity_cache[$tablename]=1;
+						}
+						// table contains entity field
+						else {
+						    $tablewithentity_cache[$tablename]=0;
+						}
+						// table does not contains entity field
+					} else {
+					    dol_print_error($this->db);
 					}
-					else dol_print_error($this->db);
-				}
-				else
+				} else
 				{
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
@@ -388,13 +397,19 @@ 
 				    $fieldalias=preg_replace('/\..*$/i','',$val);
 				    $fieldname=preg_replace('/^.*\./i','',$val);
 
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
+				    if ($alias != $fieldalias) {
+				        continue;
+				    }
+				    // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
 						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+						if ($arrayrecord[($key-1)]['type'] > 0) {
+						    $newval=$arrayrecord[($key-1)]['val'];
+						}
+						// If type of field into input file is not empty string (so defined into input file), we get value
 
 						// Make some tests on $newval
 
@@ -420,20 +435,23 @@ 
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
                                     $isidorref='id';
-                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) $isidorref='ref';
+                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) {
+                                        $isidorref='ref';
+                                    }
                                     $newval=preg_replace('/^(id|ref):/i','',$newval);    // Remove id: or ref: that was used to force if field is id or ref
                                     //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-                                    if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
+                                    if ($isidorref == 'ref') {
+                                        // If value into input import file is a ref, we apply the function defined into descriptor
                                     {
                                         $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
+                                    }
                                         $class=$objimport->array_import_convertvalue[0][$val]['class'];
                                         $method=$objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
+                                        } else
 										{
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
@@ -451,27 +469,32 @@ 
                                             }
                                             $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
+                                            if ($classinstance->id != '') {
+                                                // id may be 0, it is a found value
                                             {
                                                 $newval=$classinstance->id;
                                             }
-                                            else
+                                            } else
                                             {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+                                                    $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                                } else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
+                                                    $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+                                                } else {
+                                                    $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                                }
                                                 $this->errors[$error]['type']='FOREIGNKEY';
                                                 $errorforthistable++;
                                                 $error++;
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
                                 {
-                                    if (empty($newval)) $newval='0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+                                    if (empty($newval)) {
+                                        $newval='0';
+                                    }
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -479,9 +502,11 @@ 
                                         $newval=$this->thirpartyobject->code_client;
                                         //print 'code_client='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -489,9 +514,11 @@ 
                                         $newval=$this->thirpartyobject->code_fournisseur;
                                         //print 'code_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -499,20 +526,27 @@ 
                                         $newval=$this->thirpartyobject->code_compta;
                                         //print 'code_compta='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('supplier');
                                         $newval=$this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                        if (empty($newval)) {
+                                            $arrayrecord[($key-1)]['type']=-1;
+                                        }
+                                        // If we get empty value, we will use "null"
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
                                 {
                                     $defaultref='';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -523,12 +557,11 @@ 
                                         $modTask = new $obj;
                                         $defaultref = $modTask->getNextValue(null,null);
                                     }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+                                    if (is_numeric($defaultref) && $defaultref <= 0) {
+                                        $defaultref='';
+                                    }
                                     $newval=$defaultref;
-                                }
-
-
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -546,9 +579,11 @@ 
 									$table=$reg[2];
 
 									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+									if (! is_array($this->cachefieldtable[$field.'@'.$table])) {
+									    // If content of field@table not already loaded into cache
 									{
 										$sql="SELECT ".$field." as aliasfield FROM ".$table;
+									}
 										$resql=$this->db->query($sql);
 										if ($resql)
 										{
@@ -557,11 +592,12 @@ 
 											while ($i < $num)
 											{
 												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												if ($obj) {
+												    $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												}
 												$i++;
 											}
-										}
-										else
+										} else
 										{
 											dol_print_error($this->db);
 										}
@@ -612,13 +648,15 @@ 
     				// Loop on each hidden fields to add them into listfields/listvalues
 				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
     				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) {
+    				        continue;
+    				    }
+    				    // Not a field of current table
     				    if ($val == 'user->id')
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
+    				    } elseif (preg_match('/^lastrowid-/',$val))
     				    {
     				        $tmp=explode('-',$val);
     				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
@@ -671,8 +709,7 @@ 
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -687,7 +724,9 @@ 
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+								    $keyfield = 'rowid';
+								}
 								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$resql=$this->db->query($sqlSelect);
@@ -700,8 +739,7 @@ 
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -721,7 +759,9 @@ 
 								}
 								$sqlstart.= ' SET '.implode(', ', $set);
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+								    $keyfield = 'rowid';
+								}
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$sql = $sqlstart.$sqlend;
@@ -731,8 +771,7 @@ 
 								if($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -766,8 +805,7 @@ 
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -783,11 +821,17 @@ 
 					}*/
 				}
 
-			    if ($error) break;
+			    if ($error) {
+			        break;
+			    }
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if($updatedone) {
+			    $this->nbupdate++;
+			}
+			if($insertdone) {
+			    $this->nbinsert++;
+			}
 		}
 
 		return 1;

dolibarr/htdocs/core/modules/modClickToDial.class.php

Indentation +31 added lines, -31 removed lines

@@ -33,44 +33,44 @@
 class modClickToDial extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 58;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 58;
 
-		$this->family = "interface";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion du Click To Dial";
+        $this->family = "interface";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Gestion du Click To Dial";
 
-		$this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version
+        $this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version
 
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='phoning';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='phoning';
 
-		// Data directories to create when module is enabled
-		$this->dirs = array();
+        // Data directories to create when module is enabled
+        $this->dirs = array();
 
-		// Dependencies
-		$this->depends = array();
-		$this->requiredby = array();
+        // Dependencies
+        $this->depends = array();
+        $this->requiredby = array();
 
-		// Config pages
-		$this->config_page_url = array("clicktodial.php");
+        // Config pages
+        $this->config_page_url = array("clicktodial.php");
 
-		// Constants
-		$this->const = array();
+        // Constants
+        $this->const = array();
 
-		// Boxes
-		$this->boxes = array();
+        // Boxes
+        $this->boxes = array();
 
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'clicktodial';
-	}
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'clicktodial';
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Fichier de description et activation du module de click to Dial
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -45,13 +45,13 @@ 
 
 		$this->family = "interface";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion du Click To Dial";
 
-		$this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version
+		$this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='phoning';
+		$this->picto = 'phoning';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();

dolibarr/htdocs/core/modules/modAccounting.class.php

Indentation +219 added lines, -219 removed lines

@@ -32,161 +32,161 @@ 
  */
 class modAccounting extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
 
-		$this->db = $db;
-		$this->numero = 50400;
+        $this->db = $db;
+        $this->numero = 50400;
 
-		$this->family = "financial";
-		$this->module_position = '61';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "Advanced accounting management";
+        $this->family = "financial";
+        $this->module_position = '61';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
+        $this->description = "Advanced accounting management";
 
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-		$this->version = 'dolibarr';
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+        $this->version = 'dolibarr';
 
-		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
-		$this->picto = 'accounting';
+        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+        $this->picto = 'accounting';
 
-		// Data directories to create when module is enabled
-		$this->dirs = array('/accounting/temp');
+        // Data directories to create when module is enabled
+        $this->dirs = array('/accounting/temp');
 
-		// Config pages
-		$this->config_page_url = array();
+        // Config pages
+        $this->config_page_url = array();
 
-		// Dependencies
-		$this->depends = array("modFacture","modBanque","modTax"); // List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array(); // List of modules id to disable if this one is disabled
-		$this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
-		$this->langfiles = array("accountancy","compta");
+        // Dependencies
+        $this->depends = array("modFacture","modBanque","modTax"); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+        $this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
+        $this->phpmin = array(5, 4); // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
+        $this->langfiles = array("accountancy","compta");
 
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-		$this->const[1] = array(
-				"MAIN_COMPANY_CODE_ALWAYS_REQUIRED",
-				"chaine",
-				"1",
-				"With this constants on, third party code is always required whatever is numbering module behaviour", 0, 'current', 1
-		);
-		$this->const[2] = array(
-				"MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED",
-				"chaine",
-				"1",
-				"With this constants on, bank account number is always required", 0, 'current', 1
-		);
-		$this->const[3] = array(
-				"ACCOUNTING_ACCOUNT_SUSPENSE",
-				"chaine",
-				"471",
-				"", 0, 'current', 0
-		);
-		$this->const[4] = array(
-				"ACCOUNTING_ACCOUNT_TRANSFER_CASH",
-				"chaine",
-				"58",
-				"", 0, 'current', 0
-		);
-		$this->const[5] = array(
-				"CHARTOFACCOUNTS",
-				"chaine",
-				"2",
-				"", 0, 'current', 0
-		);
-		$this->const[6] = array(
-				"ACCOUNTING_EXPORT_MODELCSV",
-				"chaine",
-				"1",
-				"", 0, 'current', 0
-		);
-		$this->const[7] = array(
-				"ACCOUNTING_LENGTH_GACCOUNT",
-				"chaine",
-				"",
-				"", 0, 'current', 0
-		);
-		$this->const[8] = array(
-				"ACCOUNTING_LENGTH_AACCOUNT",
-				"chaine",
-				"",
-				"", 0, 'current', 0
-		);
-		$this->const[9] = array(
-				"ACCOUNTING_LIST_SORT_VENTILATION_TODO",
-				"yesno",
-				"1",
-				"", 0, 'current', 0
-		);
-		$this->const[10] = array(
-				"ACCOUNTING_LIST_SORT_VENTILATION_DONE",
-				"yesno",
-				"1",
-				"", 0, 'current', 0
-		);
-		$this->const[11] = array (
-				"ACCOUNTING_EXPORT_DATE",
-				"chaine",
-				"%d%m%Y",
-				"", 0, 'current', 0
-		);
-		$this->const[12] = array(
-				"ACCOUNTING_EXPORT_SEPARATORCSV",
-				"string",
-				",",
-				"", 0, 'current', 0
-		);
-		$this->const[13] = array(
-				"ACCOUNTING_EXPORT_FORMAT",
-				"chaine",
-				"csv",
-				"", 0, 'current', 0
-		);
+        // Constants
+        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // );
+        $this->const = array();
+        $this->const[1] = array(
+                "MAIN_COMPANY_CODE_ALWAYS_REQUIRED",
+                "chaine",
+                "1",
+                "With this constants on, third party code is always required whatever is numbering module behaviour", 0, 'current', 1
+        );
+        $this->const[2] = array(
+                "MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED",
+                "chaine",
+                "1",
+                "With this constants on, bank account number is always required", 0, 'current', 1
+        );
+        $this->const[3] = array(
+                "ACCOUNTING_ACCOUNT_SUSPENSE",
+                "chaine",
+                "471",
+                "", 0, 'current', 0
+        );
+        $this->const[4] = array(
+                "ACCOUNTING_ACCOUNT_TRANSFER_CASH",
+                "chaine",
+                "58",
+                "", 0, 'current', 0
+        );
+        $this->const[5] = array(
+                "CHARTOFACCOUNTS",
+                "chaine",
+                "2",
+                "", 0, 'current', 0
+        );
+        $this->const[6] = array(
+                "ACCOUNTING_EXPORT_MODELCSV",
+                "chaine",
+                "1",
+                "", 0, 'current', 0
+        );
+        $this->const[7] = array(
+                "ACCOUNTING_LENGTH_GACCOUNT",
+                "chaine",
+                "",
+                "", 0, 'current', 0
+        );
+        $this->const[8] = array(
+                "ACCOUNTING_LENGTH_AACCOUNT",
+                "chaine",
+                "",
+                "", 0, 'current', 0
+        );
+        $this->const[9] = array(
+                "ACCOUNTING_LIST_SORT_VENTILATION_TODO",
+                "yesno",
+                "1",
+                "", 0, 'current', 0
+        );
+        $this->const[10] = array(
+                "ACCOUNTING_LIST_SORT_VENTILATION_DONE",
+                "yesno",
+                "1",
+                "", 0, 'current', 0
+        );
+        $this->const[11] = array (
+                "ACCOUNTING_EXPORT_DATE",
+                "chaine",
+                "%d%m%Y",
+                "", 0, 'current', 0
+        );
+        $this->const[12] = array(
+                "ACCOUNTING_EXPORT_SEPARATORCSV",
+                "string",
+                ",",
+                "", 0, 'current', 0
+        );
+        $this->const[13] = array(
+                "ACCOUNTING_EXPORT_FORMAT",
+                "chaine",
+                "csv",
+                "", 0, 'current', 0
+        );
 
-		// Tabs
-		$this->tabs = array();
+        // Tabs
+        $this->tabs = array();
 
-		// Css
-		$this->module_parts = array();
+        // Css
+        $this->module_parts = array();
 
-		// Boxes
-		$this->boxes = array();
+        // Boxes
+        $this->boxes = array();
 
-		// Permissions
-		$this->rights_class = 'accounting';
+        // Permissions
+        $this->rights_class = 'accounting';
 
-		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+        $this->rights = array(); // Permission array used by this module
+        $r = 0;
 
-		$this->rights[$r][0] = 50440;
-		$this->rights[$r][1] = 'Manage chart of accounts, setup of accountancy';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'chartofaccount';
-		$this->rights[$r][5] = '';
-		$r++;
+        $this->rights[$r][0] = 50440;
+        $this->rights[$r][1] = 'Manage chart of accounts, setup of accountancy';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'chartofaccount';
+        $this->rights[$r][5] = '';
+        $r++;
 
-		$this->rights[$r][0] = 50401;
-		$this->rights[$r][1] = 'Bind products and invoices with accounting accounts';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'bind';
-		$this->rights[$r][5] = 'write';
-		$r++;
+        $this->rights[$r][0] = 50401;
+        $this->rights[$r][1] = 'Bind products and invoices with accounting accounts';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'bind';
+        $this->rights[$r][5] = 'write';
+        $r++;
 
-		/*
+        /*
 		$this->rights[$r][0] = 50402;
 		$this->rights[$r][1] = 'Make binding with products and invoices';
 		$this->rights[$r][2] = 'r';
@@ -196,96 +196,96 @@ 
 		$r++;
         */
 
-		$this->rights[$r][0] = 50411;
-		$this->rights[$r][1] = 'Read operations in Ledger';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mouvements';
-		$this->rights[$r][5] = 'lire';
-		$r++;
+        $this->rights[$r][0] = 50411;
+        $this->rights[$r][1] = 'Read operations in Ledger';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'mouvements';
+        $this->rights[$r][5] = 'lire';
+        $r++;
 
-		$this->rights[$r][0] = 50412;
-		$this->rights[$r][1] = 'Write/Edit operations in Ledger';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mouvements';
-		$this->rights[$r][5] = 'creer';
-		$r++;
+        $this->rights[$r][0] = 50412;
+        $this->rights[$r][1] = 'Write/Edit operations in Ledger';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'mouvements';
+        $this->rights[$r][5] = 'creer';
+        $r++;
 
-		$this->rights[$r][0] = 50420;
-		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, ledger)';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'comptarapport';
-		$this->rights[$r][5] = 'lire';
-		$r++;
+        $this->rights[$r][0] = 50420;
+        $this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, ledger)';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'comptarapport';
+        $this->rights[$r][5] = 'lire';
+        $r++;
 
-		$this->rights[$r][0] = 50430;
-		$this->rights[$r][1] = 'Define and close a fiscal year';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'fiscalyear';
-		$this->rights[$r][5] = '';
-		$r++;
+        $this->rights[$r][0] = 50430;
+        $this->rights[$r][1] = 'Define and close a fiscal year';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'fiscalyear';
+        $this->rights[$r][5] = '';
+        $r++;
 
 
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
-		// Exports
-		//--------
-		$r=0;
+        // Exports
+        //--------
+        $r=0;
 
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Chartofaccounts';
-		$this->export_icon[$r]='Accounting';
-		$this->export_permission[$r]=array(array("accounting","chartofaccount"));
-		$this->export_fields_array[$r]=array('ac.rowid'=>'ChartofaccountsId','ac.pcg_version'=>'Chartofaccounts','aa.rowid'=>'Id','aa.account_number'=>"AccountAccounting",'aa.label'=>"Label",'aa.account_parent'=>"Accountparent",'aa.pcg_type'=>"Pcgtype",'aa.pcg_subtype'=>'Pcgsubtype','aa.active'=>'Status');
-		$this->export_TypeFields_array[$r]=array('ac.rowid'=>'List:accounting_system:pcg_version','aa.account_number'=>"Text",'aa.label'=>"Text",'aa.pcg_type'=>'Text','aa.pcg_subtype'=>'Text','aa.active'=>'Status');
-		$this->export_entities_array[$r]=array('ac.rowid'=>"Accounting",'ac.pcg_version'=>"Accounting",'aa.rowid'=>'Accounting','aa.account_number'=>"Accounting",'aa.label'=>"Accounting",'aa.accountparent'=>"Accounting",'aa.pcg_type'=>"Accounting",'aa.pcgsubtype'=>"Accounting",'aa_active'=>"Accounting");
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='Chartofaccounts';
+        $this->export_icon[$r]='Accounting';
+        $this->export_permission[$r]=array(array("accounting","chartofaccount"));
+        $this->export_fields_array[$r]=array('ac.rowid'=>'ChartofaccountsId','ac.pcg_version'=>'Chartofaccounts','aa.rowid'=>'Id','aa.account_number'=>"AccountAccounting",'aa.label'=>"Label",'aa.account_parent'=>"Accountparent",'aa.pcg_type'=>"Pcgtype",'aa.pcg_subtype'=>'Pcgsubtype','aa.active'=>'Status');
+        $this->export_TypeFields_array[$r]=array('ac.rowid'=>'List:accounting_system:pcg_version','aa.account_number'=>"Text",'aa.label'=>"Text",'aa.pcg_type'=>'Text','aa.pcg_subtype'=>'Text','aa.active'=>'Status');
+        $this->export_entities_array[$r]=array('ac.rowid'=>"Accounting",'ac.pcg_version'=>"Accounting",'aa.rowid'=>'Accounting','aa.account_number'=>"Accounting",'aa.label'=>"Accounting",'aa.accountparent'=>"Accounting",'aa.pcg_type'=>"Accounting",'aa.pcgsubtype'=>"Accounting",'aa_active'=>"Accounting");
 
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
-		$this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
+        $this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
 
 
-		// Imports
-		//--------
-		$r=0;
+        // Imports
+        //--------
+        $r=0;
 
-		// General ledger
-		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]='ImportAccountingEntries';
-		$this->import_icon[$r]=$this->picto;
-		$this->import_entities_array[$r]=array();	// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('b'=>MAIN_DB_PREFIX.'accounting_bookkeeping');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array('b.doc_date'=>"Docdate",'b.code_journal'=>'Codejournal','b.numero_compte'=>'AccountAccountingShort','b.label_operation'=>'LabelOperation','b.debit'=>"Debit",'b.credit'=>"Credit",'b.date_creation'=>"DateCreation");
-		$this->import_fieldshidden_array[$r]=array('b.fk_user'=>'user->id');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_convertvalue_array[$r]=array(
-				't.fk_projet'=>array('rule'=>'fetchidfromref','classfile'=>'/projet/class/project.class.php','class'=>'Project','method'=>'fetch','element'=>'Project'),
-				't.ref'=>array('rule'=>'getrefifauto')
-		);
-		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-		//$this->import_examplevalues_array[$r]=array('t.fk_projet'=>'MyProjectRef','t.ref'=>"auto or TK2010-1234",'t.label'=>"My task",'t.progress'=>"0 (not started) to 100 (finished)",'t.datec'=>'1972-10-10','t.note_private'=>"My private note",'t.note_public'=>"My public note");
+        // General ledger
+        $r++;
+        $this->import_code[$r]=$this->rights_class.'_'.$r;
+        $this->import_label[$r]='ImportAccountingEntries';
+        $this->import_icon[$r]=$this->picto;
+        $this->import_entities_array[$r]=array();	// We define here only fields that use another icon that the one defined into import_icon
+        $this->import_tables_array[$r]=array('b'=>MAIN_DB_PREFIX.'accounting_bookkeeping');	// List of tables to insert into (insert done in same order)
+        $this->import_fields_array[$r]=array('b.doc_date'=>"Docdate",'b.code_journal'=>'Codejournal','b.numero_compte'=>'AccountAccountingShort','b.label_operation'=>'LabelOperation','b.debit'=>"Debit",'b.credit'=>"Credit",'b.date_creation'=>"DateCreation");
+        $this->import_fieldshidden_array[$r]=array('b.fk_user'=>'user->id');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+        $this->import_convertvalue_array[$r]=array(
+                't.fk_projet'=>array('rule'=>'fetchidfromref','classfile'=>'/projet/class/project.class.php','class'=>'Project','method'=>'fetch','element'=>'Project'),
+                't.ref'=>array('rule'=>'getrefifauto')
+        );
+        //$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+        $this->import_regex_array[$r]=array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+        //$this->import_examplevalues_array[$r]=array('t.fk_projet'=>'MyProjectRef','t.ref'=>"auto or TK2010-1234",'t.label'=>"My task",'t.progress'=>"0 (not started) to 100 (finished)",'t.datec'=>'1972-10-10','t.note_private'=>"My private note",'t.note_public'=>"My public note");
 
-		// Chart of accounts
-		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]="Chartofaccounts"; // Translation key
-		$this->import_icon[$r]=$this->picto;
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('aa'=>MAIN_DB_PREFIX.'accounting_account');
-		$this->import_tables_creator_array[$r]=array('aa'=>'fk_user_author');    // Fields to store import user id
-		$this->import_fields_array[$r]=array('aa.fk_pcg_version'=>"Chartofaccounts*",'aa.account_number'=>"AccountAccounting*",'aa.label'=>"Label*",'aa.account_parent'=>"Accountparent","aa.fk_accounting_category"=>"AccountingCategory","aa.pcg_type"=>"Pcgtype*",'aa.pcg_subtype'=>'Pcgsubtype*','aa.active'=>'Status*','aa.datec'=>"DateCreation");
-		$this->import_regex_array[$r]=array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system','aa.account_number'=>'^\d{1,32}$','aa.label'=>'^.{1,255}$','aa.account_parent'=>'^\d{0,32}$','aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category','aa.pcg_type'=>'^.{1,20}$','aa.pcg_subtype'=>'^.{1,20}$','aa.active'=>'^0|1$','aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
-		$this->import_convertvalue_array[$r]=array(
-			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/accountancy/class/accountancycategory.class.php','class'=>'AccountancyCategory','method'=>'fetch','dict'=>'DictionaryAccountancyCategory'),
-			'aa.account_parent'=>array('rule'=>'zeroifnull'),
-		);
-		$this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
-	}
+        // Chart of accounts
+        $r++;
+        $this->import_code[$r]=$this->rights_class.'_'.$r;
+        $this->import_label[$r]="Chartofaccounts"; // Translation key
+        $this->import_icon[$r]=$this->picto;
+        $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+        $this->import_tables_array[$r]=array('aa'=>MAIN_DB_PREFIX.'accounting_account');
+        $this->import_tables_creator_array[$r]=array('aa'=>'fk_user_author');    // Fields to store import user id
+        $this->import_fields_array[$r]=array('aa.fk_pcg_version'=>"Chartofaccounts*",'aa.account_number'=>"AccountAccounting*",'aa.label'=>"Label*",'aa.account_parent'=>"Accountparent","aa.fk_accounting_category"=>"AccountingCategory","aa.pcg_type"=>"Pcgtype*",'aa.pcg_subtype'=>'Pcgsubtype*','aa.active'=>'Status*','aa.datec'=>"DateCreation");
+        $this->import_regex_array[$r]=array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system','aa.account_number'=>'^\d{1,32}$','aa.label'=>'^.{1,255}$','aa.account_parent'=>'^\d{0,32}$','aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category','aa.pcg_type'=>'^.{1,20}$','aa.pcg_subtype'=>'^.{1,20}$','aa.active'=>'^0|1$','aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
+        $this->import_convertvalue_array[$r]=array(
+            'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/accountancy/class/accountancycategory.class.php','class'=>'AccountancyCategory','method'=>'fetch','dict'=>'DictionaryAccountancyCategory'),
+            'aa.account_parent'=>array('rule'=>'zeroifnull'),
+        );
+        $this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
+    }
 }

Spacing +39 added lines, -39 removed lines

@@ -25,7 +25,7 @@ 
  * \ingroup		Advanced accountancy
  * \brief		Module to activate Accounting Expert module
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  * Description and activation class for module accounting expert
@@ -53,7 +53,7 @@ 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
 		$this->version = 'dolibarr';
 
-		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->picto = 'accounting';
 
 		// Data directories to create when module is enabled
@@ -63,12 +63,12 @@ 
 		$this->config_page_url = array();
 
 		// Dependencies
-		$this->depends = array("modFacture","modBanque","modTax"); // List of modules id that must be enabled if this module is enabled
+		$this->depends = array("modFacture", "modBanque", "modTax"); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
-		$this->langfiles = array("accountancy","compta");
+		$this->langfiles = array("accountancy", "compta");
 
 		// Constants
 		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
@@ -136,7 +136,7 @@ 
 				"1",
 				"", 0, 'current', 0
 		);
-		$this->const[11] = array (
+		$this->const[11] = array(
 				"ACCOUNTING_EXPORT_DATE",
 				"chaine",
 				"%d%m%Y",
@@ -231,61 +231,61 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 		// Exports
 		//--------
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Chartofaccounts';
-		$this->export_icon[$r]='Accounting';
-		$this->export_permission[$r]=array(array("accounting","chartofaccount"));
-		$this->export_fields_array[$r]=array('ac.rowid'=>'ChartofaccountsId','ac.pcg_version'=>'Chartofaccounts','aa.rowid'=>'Id','aa.account_number'=>"AccountAccounting",'aa.label'=>"Label",'aa.account_parent'=>"Accountparent",'aa.pcg_type'=>"Pcgtype",'aa.pcg_subtype'=>'Pcgsubtype','aa.active'=>'Status');
-		$this->export_TypeFields_array[$r]=array('ac.rowid'=>'List:accounting_system:pcg_version','aa.account_number'=>"Text",'aa.label'=>"Text",'aa.pcg_type'=>'Text','aa.pcg_subtype'=>'Text','aa.active'=>'Status');
-		$this->export_entities_array[$r]=array('ac.rowid'=>"Accounting",'ac.pcg_version'=>"Accounting",'aa.rowid'=>'Accounting','aa.account_number'=>"Accounting",'aa.label'=>"Accounting",'aa.accountparent'=>"Accounting",'aa.pcg_type'=>"Accounting",'aa.pcgsubtype'=>"Accounting",'aa_active'=>"Accounting");
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'Chartofaccounts';
+		$this->export_icon[$r] = 'Accounting';
+		$this->export_permission[$r] = array(array("accounting", "chartofaccount"));
+		$this->export_fields_array[$r] = array('ac.rowid'=>'ChartofaccountsId', 'ac.pcg_version'=>'Chartofaccounts', 'aa.rowid'=>'Id', 'aa.account_number'=>"AccountAccounting", 'aa.label'=>"Label", 'aa.account_parent'=>"Accountparent", 'aa.pcg_type'=>"Pcgtype", 'aa.pcg_subtype'=>'Pcgsubtype', 'aa.active'=>'Status');
+		$this->export_TypeFields_array[$r] = array('ac.rowid'=>'List:accounting_system:pcg_version', 'aa.account_number'=>"Text", 'aa.label'=>"Text", 'aa.pcg_type'=>'Text', 'aa.pcg_subtype'=>'Text', 'aa.active'=>'Status');
+		$this->export_entities_array[$r] = array('ac.rowid'=>"Accounting", 'ac.pcg_version'=>"Accounting", 'aa.rowid'=>'Accounting', 'aa.account_number'=>"Accounting", 'aa.label'=>"Accounting", 'aa.accountparent'=>"Accounting", 'aa.pcg_type'=>"Accounting", 'aa.pcgsubtype'=>"Accounting", 'aa_active'=>"Accounting");
 
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
-		$this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
+		$this->export_sql_end[$r] .= ' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
 
 
 		// Imports
 		//--------
-		$r=0;
+		$r = 0;
 
 		// General ledger
 		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]='ImportAccountingEntries';
-		$this->import_icon[$r]=$this->picto;
-		$this->import_entities_array[$r]=array();	// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('b'=>MAIN_DB_PREFIX.'accounting_bookkeeping');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array('b.doc_date'=>"Docdate",'b.code_journal'=>'Codejournal','b.numero_compte'=>'AccountAccountingShort','b.label_operation'=>'LabelOperation','b.debit'=>"Debit",'b.credit'=>"Credit",'b.date_creation'=>"DateCreation");
-		$this->import_fieldshidden_array[$r]=array('b.fk_user'=>'user->id');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_convertvalue_array[$r]=array(
-				't.fk_projet'=>array('rule'=>'fetchidfromref','classfile'=>'/projet/class/project.class.php','class'=>'Project','method'=>'fetch','element'=>'Project'),
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = 'ImportAccountingEntries';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('b'=>MAIN_DB_PREFIX.'accounting_bookkeeping'); // List of tables to insert into (insert done in same order)
+		$this->import_fields_array[$r] = array('b.doc_date'=>"Docdate", 'b.code_journal'=>'Codejournal', 'b.numero_compte'=>'AccountAccountingShort', 'b.label_operation'=>'LabelOperation', 'b.debit'=>"Debit", 'b.credit'=>"Credit", 'b.date_creation'=>"DateCreation");
+		$this->import_fieldshidden_array[$r] = array('b.fk_user'=>'user->id'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_convertvalue_array[$r] = array(
+				't.fk_projet'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project'),
 				't.ref'=>array('rule'=>'getrefifauto')
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+		$this->import_regex_array[$r] = array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
 		//$this->import_examplevalues_array[$r]=array('t.fk_projet'=>'MyProjectRef','t.ref'=>"auto or TK2010-1234",'t.label'=>"My task",'t.progress'=>"0 (not started) to 100 (finished)",'t.datec'=>'1972-10-10','t.note_private'=>"My private note",'t.note_public'=>"My public note");
 
 		// Chart of accounts
 		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]="Chartofaccounts"; // Translation key
-		$this->import_icon[$r]=$this->picto;
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('aa'=>MAIN_DB_PREFIX.'accounting_account');
-		$this->import_tables_creator_array[$r]=array('aa'=>'fk_user_author');    // Fields to store import user id
-		$this->import_fields_array[$r]=array('aa.fk_pcg_version'=>"Chartofaccounts*",'aa.account_number'=>"AccountAccounting*",'aa.label'=>"Label*",'aa.account_parent'=>"Accountparent","aa.fk_accounting_category"=>"AccountingCategory","aa.pcg_type"=>"Pcgtype*",'aa.pcg_subtype'=>'Pcgsubtype*','aa.active'=>'Status*','aa.datec'=>"DateCreation");
-		$this->import_regex_array[$r]=array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system','aa.account_number'=>'^\d{1,32}$','aa.label'=>'^.{1,255}$','aa.account_parent'=>'^\d{0,32}$','aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category','aa.pcg_type'=>'^.{1,20}$','aa.pcg_subtype'=>'^.{1,20}$','aa.active'=>'^0|1$','aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
-		$this->import_convertvalue_array[$r]=array(
-			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/accountancy/class/accountancycategory.class.php','class'=>'AccountancyCategory','method'=>'fetch','dict'=>'DictionaryAccountancyCategory'),
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Chartofaccounts"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('aa'=>MAIN_DB_PREFIX.'accounting_account');
+		$this->import_tables_creator_array[$r] = array('aa'=>'fk_user_author'); // Fields to store import user id
+		$this->import_fields_array[$r] = array('aa.fk_pcg_version'=>"Chartofaccounts*", 'aa.account_number'=>"AccountAccounting*", 'aa.label'=>"Label*", 'aa.account_parent'=>"Accountparent", "aa.fk_accounting_category"=>"AccountingCategory", "aa.pcg_type"=>"Pcgtype*", 'aa.pcg_subtype'=>'Pcgsubtype*', 'aa.active'=>'Status*', 'aa.datec'=>"DateCreation");
+		$this->import_regex_array[$r] = array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system', 'aa.account_number'=>'^\d{1,32}$', 'aa.label'=>'^.{1,255}$', 'aa.account_parent'=>'^\d{0,32}$', 'aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category', 'aa.pcg_type'=>'^.{1,20}$', 'aa.pcg_subtype'=>'^.{1,20}$', 'aa.active'=>'^0|1$', 'aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
+		$this->import_convertvalue_array[$r] = array(
+			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/accountancy/class/accountancycategory.class.php', 'class'=>'AccountancyCategory', 'method'=>'fetch', 'dict'=>'DictionaryAccountancyCategory'),
 			'aa.account_parent'=>array('rule'=>'zeroifnull'),
 		);
-		$this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
+		$this->import_examplevalues_array[$r] = array('aa.fk_pcg_version'=>"PCG99-ABREGE", 'aa.account_number'=>"707", 'aa.label'=>"Product sales", 'aa.account_parent'=>"1407", "aa.fk_accounting_category"=>"", "aa.pcg_type"=>"PROD", 'aa.pcg_subtype'=>'PRODUCT', 'aa.active'=>'1', 'aa.datec'=>"2017-04-28");
 	}
 }

dolibarr/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php

Indentation +489 added lines, -489 removed lines

@@ -38,511 +38,511 @@
  */
 class doc_generic_proposal_odt extends ModelePDFPropales
 {
-	/**
-	 * Issuer
-	 * @var Company object that emits
-	 */
-	public $emetteur;
-
-	/**
-   * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-   */
-	public $phpmin = array(5, 4);
-
-	/**
+    /**
+     * Issuer
+     * @var Company object that emits
+     */
+    public $emetteur;
+
+    /**
+     * @var array() Minimum version of PHP required by module.
+     * e.g.: PHP ≥ 5.4 = array(5, 4)
+     */
+    public $phpmin = array(5, 4);
+
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("main","companies"));
 
-		$this->db = $db;
-		$this->name = "ODT templates";
-		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'PROPALE_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
-
-		// Dimension page pour format A4
-		$this->type = 'odt';
-		$this->page_largeur = 0;
-		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva PROPALE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
-
-		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
-	}
-
-
-	/**
-	 *	Return description of a module
-	 *
-	 *	@param	Translate	$langs      Lang object to use for output
-	 *	@return string       			Description
-	 */
-	function info($langs)
-	{
-		global $conf,$langs;
-
-		// Load translation files required by the page
+        $this->db = $db;
+        $this->name = "ODT templates";
+        $this->description = $langs->trans("DocumentModelOdt");
+        $this->scandir = 'PROPALE_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+        // Dimension page pour format A4
+        $this->type = 'odt';
+        $this->page_largeur = 0;
+        $this->page_hauteur = 0;
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=0;
+        $this->marge_droite=0;
+        $this->marge_haute=0;
+        $this->marge_basse=0;
+
+        $this->option_logo = 1;                    // Affiche logo
+        $this->option_tva = 0;                     // Gere option tva PROPALE_TVAOPTION
+        $this->option_modereg = 0;                 // Affiche mode reglement
+        $this->option_condreg = 0;                 // Affiche conditions reglement
+        $this->option_codeproduitservice = 0;      // Affiche code produit-service
+        $this->option_multilang = 1;               // Dispo en plusieurs langues
+        $this->option_escompte = 0;                // Affiche si il y a eu escompte
+        $this->option_credit_note = 0;             // Support credit notes
+        $this->option_freetext = 1;				   // Support add of a personalised text
+        $this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+
+        // Recupere emetteur
+        $this->emetteur=$mysoc;
+        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+    }
+
+
+    /**
+     *	Return description of a module
+     *
+     *	@param	Translate	$langs      Lang object to use for output
+     *	@return string       			Description
+     */
+    function info($langs)
+    {
+        global $conf,$langs;
+
+        // Load translation files required by the page
         $langs->loadLangs(array("errors","companies"));
 
-		$form = new Form($this->db);
-
-		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="PROPALE_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
-			$texte.= '<input type="hidden" name="param2" value="PROPALE_ADDON_PDF_ODT_DEFAULT">';
-			$texte.= '<input type="hidden" name="param3" value="PROPALE_ADDON_PDF_ODT_TOBILL">';
-			$texte.= '<input type="hidden" name="param4" value="PROPALE_ADDON_PDF_ODT_CLOSED">';
-		}
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROPALE_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
-		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
-				unset($listofdir[$key]); continue;
-			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
-			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
-			}
-		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
-		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->PROPALE_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
-
-		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->PROPALE_ADDON_PDF_ODT_PATH))
-		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
-			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=count($listoffiles);
-			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
-		}
-
-		if ($nbofiles)
-		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
-   			{
+        $form = new Form($this->db);
+
+        $texte = $this->description.".<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+        $texte.= '<input type="hidden" name="param1" value="PROPALE_ADDON_PDF_ODT_PATH">';
+        if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+        {
+            $texte.= '<input type="hidden" name="param2" value="PROPALE_ADDON_PDF_ODT_DEFAULT">';
+            $texte.= '<input type="hidden" name="param3" value="PROPALE_ADDON_PDF_ODT_TOBILL">';
+            $texte.= '<input type="hidden" name="param4" value="PROPALE_ADDON_PDF_ODT_CLOSED">';
+        }
+        $texte.= '<table class="nobordernopadding" width="100%">';
+
+        // List of directories area
+        $texte.= '<tr><td>';
+        $texttitle=$langs->trans("ListOfDirectories");
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROPALE_ADDON_PDF_ODT_PATH)));
+        $listoffiles=array();
+        foreach($listofdir as $key=>$tmpdir)
+        {
+            $tmpdir=trim($tmpdir);
+            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+            if (! $tmpdir) {
+                unset($listofdir[$key]); continue;
+            }
+            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            else
+            {
+                $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
+                if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+            }
+        }
+        $texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+        // Add list of substitution keys
+        $texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+        $texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+        $texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+        $texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+        $texte.= '<textarea class="flat" cols="60" name="value1">';
+        $texte.=$conf->global->PROPALE_ADDON_PDF_ODT_PATH;
+        $texte.= '</textarea>';
+        $texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+        $texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+        $texte.= '<br></div></div>';
+
+        // Scan directories
+        $nbofiles=count($listoffiles);
+        if (! empty($conf->global->PROPALE_ADDON_PDF_ODT_PATH))
+        {
+            $texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+            //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+            $texte.=count($listoffiles);
+            //$texte.=$nbofiles?'</a>':'';
+            $texte.='</b>';
+        }
+
+        if ($nbofiles)
+        {
+                $texte.='<div id="div_'.get_class($this).'" class="hidden">';
+                foreach($listoffiles as $file)
+                {
                 $texte.=$file['name'].'<br>';
-   			}
-   			$texte.='<div id="div_'.get_class($this).'">';
-
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-			{
-				// Model for creation
-				$liste=ModelePDFPropales::liste_modeles($this->db);
-				$texte.= '<table width="50%;">';
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value2',$liste,$conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT);
-				$texte.= "</td></tr>";
-
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value3',$liste,$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL);
-				$texte.= "</td></tr>";
-				$texte.= '<tr>';
-
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value4',$liste,$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED);
-				$texte.= "</td></tr>";
-				$texte.= '</table>';
-			}
-		}
-
-		$texte.= '</td>';
-
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
-
-		$texte.= '</table>';
-		$texte.= '</form>';
-
-		return $texte;
-	}
+                }
+                $texte.='<div id="div_'.get_class($this).'">';
+
+            if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+            {
+                // Model for creation
+                $liste=ModelePDFPropales::liste_modeles($this->db);
+                $texte.= '<table width="50%;">';
+                $texte.= '<tr>';
+                $texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+                $texte.= '<td colspan="">';
+                $texte.= $form->selectarray('value2',$liste,$conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT);
+                $texte.= "</td></tr>";
+
+                $texte.= '<tr>';
+                $texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+                $texte.= '<td colspan="">';
+                $texte.= $form->selectarray('value3',$liste,$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL);
+                $texte.= "</td></tr>";
+                $texte.= '<tr>';
+
+                $texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+                $texte.= '<td colspan="">';
+                $texte.= $form->selectarray('value4',$liste,$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED);
+                $texte.= "</td></tr>";
+                $texte.= '</table>';
+            }
+        }
+
+        $texte.= '</td>';
+
+        $texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+        $texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+        $texte.= '</td>';
+        $texte.= '</tr>';
+
+        $texte.= '</table>';
+        $texte.= '</form>';
+
+        return $texte;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to build a document on disk using the generic odt module.
-	 *
-	 *	@param		Propale		$object				Object source to build document
-	 *	@param		Translate	$outputlangs		Lang output object
-	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
-	 *  @param		int			$hidedetails		Do not show line details
-	 *  @param		int			$hidedesc			Do not show desc
-	 *  @param		int			$hideref			Do not show ref
-	 *	@return		int         					1 if OK, <=0 if KO
-	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
-	{
+    /**
+     *	Function to build a document on disk using the generic odt module.
+     *
+     *	@param		Propale		$object				Object source to build document
+     *	@param		Translate	$outputlangs		Lang output object
+     * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+     *  @param		int			$hidedetails		Do not show line details
+     *  @param		int			$hidedesc			Do not show desc
+     *  @param		int			$hideref			Do not show ref
+     *	@return		int         					1 if OK, <=0 if KO
+     */
+    function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+    {
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
-
-		if (empty($srctemplatepath))
-		{
-			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
-			return -1;
-		}
-
-		// Add odtgeneration hook
-		if (! is_object($hookmanager))
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
-		}
-		$hookmanager->initHooks(array('odtgeneration'));
-		global $action;
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
-
-		// Load translation files required by the page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
-
-		if ($conf->propal->multidir_output[$conf->entity])
-		{
-			// If $object is id instead of object
-			if (! is_object($object))
-			{
-				$id = $object;
-				$object = new Propal($this->db);
-				$result=$object->fetch($id);
-				if ($result < 0)
-				{
-					dol_print_error($this->db,$object->error);
-					return -1;
-				}
-			}
-
-			$dir = $conf->propal->multidir_output[$object->entity];
-			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
-
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return -1;
-				}
-			}
-
-			if (file_exists($dir))
-			{
-				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-
-				$newfiletmp=$objectref.'_'.$newfiletmp;
-
-				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
-				{
-					$filename=$newfiletmp.'.'.$newfileformat;
-				}
-				$file=$dir.'/'.$filename;
-				//print "newdir=".$dir;
-				//print "newfile=".$newfile;
-				//print "file=".$file;
-				//print "conf->propal->dir_temp=".$conf->propal->dir_temp;
-
-				dol_mkdir($conf->propal->multidir_temp[$object->entity]);
-
-
-				// If CUSTOMER contact defined on proposal, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
-				}
-
-				// Recipient name
-				$contactobject=null;
-				if (! empty($usecontact))
-				{
-					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
-                        			$socobject = $object->thirdparty;
-                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        			$contactobject = $object->contact;
-                    			}
-				}
-				else
-				{
-					$socobject=$object->thirdparty;
-				}
-				// Make substitution
-				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->name,
-				'__FROM_EMAIL__' => $this->emetteur->email,
-				'__TOTAL_TTC__' => $object->total_ttc,
-				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
-				);
-				complete_substitutions_array($substitutionarray, $langs, $object);
-				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				// Line of free text
-				$newfreetext='';
-				$paramfreetext='PROPOSAL_FREE_TEXT';
-				if (! empty($conf->global->$paramfreetext))
-				{
-					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
-				}
-
-				// Open and load template
-				require_once ODTPHP_PATH.'odf.php';
-				try {
-					$odfHandler = new odf(
-						$srctemplatepath,
-						array(
-						'PATH_TO_TMP'	  => $conf->propal->multidir_temp[$object->entity],
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
-						'DELIMITER_LEFT'  => '{',
-						'DELIMITER_RIGHT' => '}'
-						)
-					);
-				}
-				catch(Exception $e)
-				{
-					$this->error=$e->getMessage();
-					dol_syslog($e->getMessage(), LOG_INFO);
-					return -1;
-				}
-				// After construction $odfHandler->contentXml contains content and
-				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
-				// [!-- BEGIN lines --]*[!-- END lines --]
-				//print html_entity_decode($odfHandler->__toString());
-				//print exit;
-
-				$object->fetch_optionals();
-
-				// Make substitutions into odt of freetext
-				try {
-					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
-				{
-					dol_syslog($e->getMessage(), LOG_INFO);
-				}
-
-				// Define substitution array
-				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-				$array_object_from_properties=$this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
-				// retrieve contact information for use in object as contact_xxx tags
-				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
-
-				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
-				complete_substitutions_array($tmparray, $outputlangs, $object);
-
-				// Call the ODTSubstitution hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
+        global $user,$langs,$conf,$mysoc,$hookmanager;
+
+        if (empty($srctemplatepath))
+        {
+            dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+            return -1;
+        }
+
+        // Add odtgeneration hook
+        if (! is_object($hookmanager))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+            $hookmanager=new HookManager($this->db);
+        }
+        $hookmanager->initHooks(array('odtgeneration'));
+        global $action;
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        $sav_charset_output=$outputlangs->charset_output;
+        $outputlangs->charset_output='UTF-8';
+
+        // Load translation files required by the page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
+
+        if ($conf->propal->multidir_output[$conf->entity])
+        {
+            // If $object is id instead of object
+            if (! is_object($object))
+            {
+                $id = $object;
+                $object = new Propal($this->db);
+                $result=$object->fetch($id);
+                if ($result < 0)
+                {
+                    dol_print_error($this->db,$object->error);
+                    return -1;
+                }
+            }
+
+            $dir = $conf->propal->multidir_output[$object->entity];
+            $objectref = dol_sanitizeFileName($object->ref);
+            if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+            $file = $dir . "/" . $objectref . ".odt";
+
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return -1;
+                }
+            }
+
+            if (file_exists($dir))
+            {
+                //print "srctemplatepath=".$srctemplatepath;	// Src filename
+                $newfile=basename($srctemplatepath);
+                $newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
+                $newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+                $newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+
+                $newfiletmp=$objectref.'_'.$newfiletmp;
+
+                // Get extension (ods or odt)
+                $newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+                if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+                {
+                    $format=$conf->global->MAIN_DOC_USE_TIMING;
+                    if ($format == '1') $format='%Y%m%d%H%M%S';
+                    $filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+                }
+                else
+                {
+                    $filename=$newfiletmp.'.'.$newfileformat;
+                }
+                $file=$dir.'/'.$filename;
+                //print "newdir=".$dir;
+                //print "newfile=".$newfile;
+                //print "file=".$file;
+                //print "conf->propal->dir_temp=".$conf->propal->dir_temp;
+
+                dol_mkdir($conf->propal->multidir_temp[$object->entity]);
+
+
+                // If CUSTOMER contact defined on proposal, we use it
+                $usecontact=false;
+                $arrayidcontact=$object->getIdContact('external','CUSTOMER');
+                if (count($arrayidcontact) > 0)
+                {
+                    $usecontact=true;
+                    $result=$object->fetch_contact($arrayidcontact[0]);
+                }
+
+                // Recipient name
+                $contactobject=null;
+                if (! empty($usecontact))
+                {
+                    // On peut utiliser le nom de la societe du contact
+                    if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+                    else {
+                                    $socobject = $object->thirdparty;
+                                    // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+                                    $contactobject = $object->contact;
+                                }
+                }
+                else
+                {
+                    $socobject=$object->thirdparty;
+                }
+                // Make substitution
+                $substitutionarray=array(
+                '__FROM_NAME__' => $this->emetteur->name,
+                '__FROM_EMAIL__' => $this->emetteur->email,
+                '__TOTAL_TTC__' => $object->total_ttc,
+                '__TOTAL_HT__' => $object->total_ht,
+                '__TOTAL_VAT__' => $object->total_vat
+                );
+                complete_substitutions_array($substitutionarray, $langs, $object);
+                // Call the ODTSubstitution hook
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
+                $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                // Line of free text
+                $newfreetext='';
+                $paramfreetext='PROPOSAL_FREE_TEXT';
+                if (! empty($conf->global->$paramfreetext))
+                {
+                    $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+                }
+
+                // Open and load template
+                require_once ODTPHP_PATH.'odf.php';
+                try {
+                    $odfHandler = new odf(
+                        $srctemplatepath,
+                        array(
+                        'PATH_TO_TMP'	  => $conf->propal->multidir_temp[$object->entity],
+                        'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+                        'DELIMITER_LEFT'  => '{',
+                        'DELIMITER_RIGHT' => '}'
+                        )
+                    );
+                }
+                catch(Exception $e)
+                {
+                    $this->error=$e->getMessage();
+                    dol_syslog($e->getMessage(), LOG_INFO);
+                    return -1;
+                }
+                // After construction $odfHandler->contentXml contains content and
+                // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+                // [!-- BEGIN lines --]*[!-- END lines --]
+                //print html_entity_decode($odfHandler->__toString());
+                //print exit;
+
+                $object->fetch_optionals();
+
+                // Make substitutions into odt of freetext
+                try {
+                    $odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
+                }
+                catch (OdfException $e)
+                {
+                    dol_syslog($e->getMessage(), LOG_INFO);
+                }
+
+                // Define substitution array
+                $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+                $array_object_from_properties=$this->get_substitutionarray_each_var_object($object, $outputlangs);
+                $array_objet=$this->get_substitutionarray_object($object,$outputlangs);
+                $array_user=$this->get_substitutionarray_user($user,$outputlangs);
+                $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+                $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+                $array_other=$this->get_substitutionarray_other($outputlangs);
+                // retrieve contact information for use in object as contact_xxx tags
+                $array_thirdparty_contact = array();
+                if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+
+                $tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
+                complete_substitutions_array($tmparray, $outputlangs, $object);
+
+                // Call the ODTSubstitution hook
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        if (preg_match('/logo$/',$key)) // Image
+                        {
+                            if (file_exists($value)) $odfHandler->setImage($key, $value);
+                            else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+                        }
+                        else    // Text
+                        {
+                            $odfHandler->setVars($key, $value, true, 'UTF-8');
+                        }
+                    }
+                    catch(OdfException $e)
+                    {
+                        dol_syslog($e->getMessage(), LOG_INFO);
+                    }
+                }
+                // Replace tags of lines
+                try
+                {
+                    $foundtagforlines = 1;
+                    try {
+                        $listlines = $odfHandler->setSegment('lines');
+                    }
+                    catch(OdfException $e)
+                    {
+                        // We may arrive here if tags for lines not present into template
+                        $foundtagforlines = 0;
                         dol_syslog($e->getMessage(), LOG_INFO);
-					}
-				}
-				// Replace tags of lines
-				try
-				{
-					$foundtagforlines = 1;
-					try {
-						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch(OdfException $e)
-					{
-						// We may arrive here if tags for lines not present into template
-						$foundtagforlines = 0;
-						dol_syslog($e->getMessage(), LOG_INFO);
-					}
-					if ($foundtagforlines)
-					{
-						foreach ($object->lines as $line)
-						{
-							$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
-							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
-							// Call the ODTSubstitutionLine hook
-							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-							foreach($tmparray as $key => $val)
-							{
-								try
-								{
-									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-							}
-							$listlines->merge();
-						}
-						$odfHandler->mergeSegment($listlines);
-					}
-				}
-				catch(OdfException $e)
-				{
-					$this->error=$e->getMessage();
-					dol_syslog($this->error, LOG_WARNING);
-					return -1;
-				}
-
-				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
-					{
+                    }
+                    if ($foundtagforlines)
+                    {
+                        foreach ($object->lines as $line)
+                        {
+                            $tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
+                            complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+                            // Call the ODTSubstitutionLine hook
+                            $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
+                            $reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                            foreach($tmparray as $key => $val)
+                            {
+                                try
+                                {
+                                    $listlines->setVars($key, $val, true, 'UTF-8');
+                                }
+                                catch(OdfException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch(SegmentException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listlines->merge();
+                        }
+                        $odfHandler->mergeSegment($listlines);
+                    }
+                }
+                catch(OdfException $e)
+                {
+                    $this->error=$e->getMessage();
+                    dol_syslog($this->error, LOG_WARNING);
+                    return -1;
+                }
+
+                // Replace labels translated
+                $tmparray=$outputlangs->get_translations_for_substitutions();
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        $odfHandler->setVars($key, $value, true, 'UTF-8');
+                    }
+                    catch (OdfException $e)
+                    {
                         dol_syslog($e->getMessage(), LOG_INFO);
-					}
-				}
-
-				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				// Write new file
-				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
-					try {
-						$odfHandler->exportAsAttachedPDF($file);
-					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+                    }
+                }
+
+                // Call the beforeODTSave hook
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                // Write new file
+                if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+                    try {
+                        $odfHandler->exportAsAttachedPDF($file);
+                    } catch (Exception $e) {
+                        $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
-						return -1;
-					}
-				}
-				else {
-					try {
-					$odfHandler->saveToDisk($file);
-					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+                        return -1;
+                    }
+                }
+                else {
+                    try {
+                    $odfHandler->saveToDisk($file);
+                    } catch (Exception $e) {
+                        $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
-						return -1;
-					}
-				}
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				$odfHandler=null;	// Destroy object
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;   // Success
-			}
-			else
-			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-				return -1;
-			}
-		}
-
-		return -1;
-	}
+                        return -1;
+                    }
+                }
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                if (! empty($conf->global->MAIN_UMASK))
+                    @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $odfHandler=null;	// Destroy object
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Success
+            }
+            else
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return -1;
+            }
+        }
+
+        return -1;
+    }
 }

Spacing +167 added lines, -167 removed lines

@@ -67,37 +67,37 @@ 
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main","companies"));
+        $langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'PROPALE_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'PROPALE_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Dimension page pour format A4
 		$this->type = 'odt';
 		$this->page_largeur = 0;
 		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva PROPALE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva PROPALE_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
 		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
@@ -109,114 +109,114 @@ 
 	 */
 	function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors","companies"));
+        $langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="PROPALE_ADDON_PDF_ODT_PATH">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="PROPALE_ADDON_PDF_ODT_PATH">';
 		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 		{
-			$texte.= '<input type="hidden" name="param2" value="PROPALE_ADDON_PDF_ODT_DEFAULT">';
-			$texte.= '<input type="hidden" name="param3" value="PROPALE_ADDON_PDF_ODT_TOBILL">';
-			$texte.= '<input type="hidden" name="param4" value="PROPALE_ADDON_PDF_ODT_CLOSED">';
+			$texte .= '<input type="hidden" name="param2" value="PROPALE_ADDON_PDF_ODT_DEFAULT">';
+			$texte .= '<input type="hidden" name="param3" value="PROPALE_ADDON_PDF_ODT_TOBILL">';
+			$texte .= '<input type="hidden" name="param4" value="PROPALE_ADDON_PDF_ODT_CLOSED">';
 		}
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROPALE_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PROPALE_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
 		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
 			else
 			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
 		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->PROPALE_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->PROPALE_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
 
 		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->PROPALE_ADDON_PDF_ODT_PATH))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->PROPALE_ADDON_PDF_ODT_PATH))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=count($listoffiles);
+			$texte .= count($listoffiles);
 			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
+			$texte .= '</b>';
 		}
 
 		if ($nbofiles)
 		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
+   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+   			foreach ($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+                $texte .= $file['name'].'<br>';
    			}
-   			$texte.='<div id="div_'.get_class($this).'">';
+   			$texte .= '<div id="div_'.get_class($this).'">';
 
 			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 			{
 				// Model for creation
-				$liste=ModelePDFPropales::liste_modeles($this->db);
-				$texte.= '<table width="50%;">';
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value2',$liste,$conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT);
-				$texte.= "</td></tr>";
-
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value3',$liste,$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL);
-				$texte.= "</td></tr>";
-				$texte.= '<tr>';
-
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value4',$liste,$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED);
-				$texte.= "</td></tr>";
-				$texte.= '</table>';
+				$liste = ModelePDFPropales::liste_modeles($this->db);
+				$texte .= '<table width="50%;">';
+				$texte .= '<tr>';
+				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+				$texte .= '<td colspan="">';
+				$texte .= $form->selectarray('value2', $liste, $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT);
+				$texte .= "</td></tr>";
+
+				$texte .= '<tr>';
+				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+				$texte .= '<td colspan="">';
+				$texte .= $form->selectarray('value3', $liste, $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL);
+				$texte .= "</td></tr>";
+				$texte .= '<tr>';
+
+				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+				$texte .= '<td colspan="">';
+				$texte .= $form->selectarray('value4', $liste, $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED);
+				$texte .= "</td></tr>";
+				$texte .= '</table>';
 			}
 		}
 
-		$texte.= '</td>';
+		$texte .= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+		$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -233,10 +233,10 @@ 
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -245,17 +245,17 @@ 
 		}
 
 		// Add odtgeneration hook
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
@@ -263,28 +263,28 @@ 
 		if ($conf->propal->multidir_output[$conf->entity])
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new Propal($this->db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$object->error);
+					dol_print_error($this->db, $object->error);
 					return -1;
 				}
 			}
 
 			$dir = $conf->propal->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -292,26 +292,26 @@ 
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp=$objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 
 				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				    $format = $conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
 				else
 				{
-					$filename=$newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file=$dir.'/'.$filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -321,20 +321,20 @@ 
 
 
 				// If CUSTOMER contact defined on proposal, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 				if (count($arrayidcontact) > 0)
 				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				$contactobject=null;
-				if (! empty($usecontact))
+				$contactobject = null;
+				if (!empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
                         			$socobject = $object->thirdparty;
                         			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
@@ -343,10 +343,10 @@ 
 				}
 				else
 				{
-					$socobject=$object->thirdparty;
+					$socobject = $object->thirdparty;
 				}
 				// Make substitution
-				$substitutionarray=array(
+				$substitutionarray = array(
 				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
@@ -355,15 +355,15 @@ 
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$substitutionarray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Line of free text
-				$newfreetext='';
-				$paramfreetext='PROPOSAL_FREE_TEXT';
-				if (! empty($conf->global->$paramfreetext))
+				$newfreetext = '';
+				$paramfreetext = 'PROPOSAL_FREE_TEXT';
+				if (!empty($conf->global->$paramfreetext))
 				{
-					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
 				// Open and load template
@@ -373,15 +373,15 @@ 
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->propal->multidir_temp[$object->entity],
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
 				}
@@ -404,27 +404,27 @@ 
 
 				// Define substitution array
 				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-				$array_object_from_properties=$this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
+				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet = $this->get_substitutionarray_object($object, $outputlangs);
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
 
-				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
+				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
 				// Call the ODTSubstitution hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/', $key)) // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
@@ -434,7 +434,7 @@ 
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -446,7 +446,7 @@ 
 					try {
 						$listlines = $odfHandler->setSegment('lines');
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -456,22 +456,22 @@ 
 					{
 						foreach ($object->lines as $line)
 						{
-							$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
-							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-							foreach($tmparray as $key => $val)
+							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
+							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+							foreach ($tmparray as $key => $val)
 							{
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
-								catch(OdfException $e)
+								catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
-								catch(SegmentException $e)
+								catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -481,16 +481,16 @@ 
 						$odfHandler->mergeSegment($listlines);
 					}
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
 
 				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -502,15 +502,15 @@ 
 				}
 
 				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Write new file
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
@@ -519,26 +519,26 @@ 
 					try {
 					$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$odfHandler=null;	// Destroy object
+				$odfHandler = null; // Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Success
+				return 1; // Success
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}

Braces +46 added lines, -40 removed lines

@@ -97,7 +97,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -141,11 +144,14 @@ 
 			if (! $tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
+			if (! is_dir($tmpdir)) {
+			    $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			} else
 			{
 				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				if (count($tmpfiles)) {
+				    $listoffiles=array_merge($listoffiles,$tmpfiles);
+				}
 			}
 		}
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
@@ -253,7 +259,9 @@ 
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -277,7 +285,9 @@ 
 
 			$dir = $conf->propal->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+			    $dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".odt";
 
 			if (! file_exists($dir))
@@ -304,10 +314,11 @@ 
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
 				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+				    if ($format == '1') {
+				        $format='%Y%m%d%H%M%S';
+				    }
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
+				} else
 				{
 					$filename=$newfiletmp.'.'.$newfileformat;
 				}
@@ -334,14 +345,14 @@ 
 				if (! empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+					    $socobject = $object->contact;
+					} else {
                         			$socobject = $object->thirdparty;
                         			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         			$contactobject = $object->contact;
                     			}
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -378,8 +389,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -396,8 +406,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -412,7 +421,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact && is_object($contactobject)) {
+				    $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -424,17 +435,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -445,8 +457,7 @@ 
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -466,12 +477,10 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -480,8 +489,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -494,8 +502,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -514,8 +521,7 @@ 
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -527,16 +533,16 @@ 
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;

dolibarr/htdocs/core/modules/propale/doc/pdf_azur.modules.php

Indentation +1446 added lines, -1446 removed lines

@@ -41,17 +41,17 @@ 
  */
 class pdf_azur extends ModelePDFPropales
 {
-	/**
+    /**
      * @var DoliDb Database handler
      */
     public $db;
 
-	/**
+    /**
      * @var string model name
      */
     public $name;
 
-	/**
+    /**
      * @var string model description (short text)
      */
     public $description;
@@ -59,151 +59,151 @@ 
     /**
      * @var string Save the name of generated file as the main doc when generating a doc with this template
      */
-	public $update_main_doc_field;
+    public $update_main_doc_field;
 
-	/**
+    /**
      * @var string document type
      */
     public $type;
 
     /**
      * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.4 = array(5, 4)
+     * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4);
+    public $phpmin = array(5, 4);
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	/**
+    /**
      * @var int page_largeur
      */
     public $page_largeur;
 
-	/**
+    /**
      * @var int page_hauteur
      */
     public $page_hauteur;
 
-	/**
+    /**
      * @var array format
      */
     public $format;
 
-	/**
+    /**
      * @var int marge_gauche
      */
-	public $marge_gauche;
+    public $marge_gauche;
 
-	/**
+    /**
      * @var int marge_droite
      */
-	public $marge_droite;
+    public $marge_droite;
 
-	/**
+    /**
      * @var int marge_haute
      */
-	public $marge_haute;
+    public $marge_haute;
 
-	/**
+    /**
      * @var int marge_basse
      */
-	public $marge_basse;
-
-	/**
-	 * Issuer
-	 * @var Company object that emits
-	 */
-	public $emetteur;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf,$langs,$mysoc;
-
-		// Translations
-		$langs->loadLangs(array("main", "bills"));
-
-		$this->db = $db;
-		$this->name = "azur";
-		$this->description = $langs->trans('DocModelAzurDescription');
-		$this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
-
-		// Dimension page
-		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
-		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   //Support add of a watermark on drafts
-
-		$this->franchise=!$mysoc->tva_assuj;
-
-		// Get source company
-		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
-
-		// Define position of columns
-		$this->posxdesc=$this->marge_gauche+1;
-		if($conf->global->PRODUCT_USE_UNITS)
-		{
-			$this->posxtva=101;
-			$this->posxup=118;
-			$this->posxqty=135;
-			$this->posxunit=151;
-		}
-		else
-		{
-			$this->posxtva=110;
-			$this->posxup=126;
-			$this->posxqty=145;
-		}
-		$this->posxdiscount=162;
-		$this->postotalht=174;
-		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva=$this->posxup;
-		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$this->posxpicture-=20;
-			$this->posxtva-=20;
-			$this->posxup-=20;
-			$this->posxqty-=20;
-			$this->posxunit-=20;
-			$this->posxdiscount-=20;
-			$this->postotalht-=20;
-		}
-
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
-	}
+    public $marge_basse;
+
+    /**
+     * Issuer
+     * @var Company object that emits
+     */
+    public $emetteur;
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf,$langs,$mysoc;
+
+        // Translations
+        $langs->loadLangs(array("main", "bills"));
+
+        $this->db = $db;
+        $this->name = "azur";
+        $this->description = $langs->trans('DocModelAzurDescription');
+        $this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
+
+        // Dimension page
+        $this->type = 'pdf';
+        $formatarray=pdf_getFormat();
+        $this->page_largeur = $formatarray['width'];
+        $this->page_hauteur = $formatarray['height'];
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+        $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+        $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+        $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+        $this->option_logo = 1;                    // Affiche logo
+        $this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+        $this->option_modereg = 1;                 // Affiche mode reglement
+        $this->option_condreg = 1;                 // Affiche conditions reglement
+        $this->option_codeproduitservice = 1;      // Affiche code produit-service
+        $this->option_multilang = 1;               // Dispo en plusieurs langues
+        $this->option_escompte = 0;                // Affiche si il y a eu escompte
+        $this->option_credit_note = 0;             // Support credit notes
+        $this->option_freetext = 1;				   // Support add of a personalised text
+        $this->option_draft_watermark = 1;		   //Support add of a watermark on drafts
+
+        $this->franchise=!$mysoc->tva_assuj;
+
+        // Get source company
+        $this->emetteur=$mysoc;
+        if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+
+        // Define position of columns
+        $this->posxdesc=$this->marge_gauche+1;
+        if($conf->global->PRODUCT_USE_UNITS)
+        {
+            $this->posxtva=101;
+            $this->posxup=118;
+            $this->posxqty=135;
+            $this->posxunit=151;
+        }
+        else
+        {
+            $this->posxtva=110;
+            $this->posxup=126;
+            $this->posxqty=145;
+        }
+        $this->posxdiscount=162;
+        $this->postotalht=174;
+        if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva=$this->posxup;
+        $this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
+        if ($this->page_largeur < 210) // To work with US executive format
+        {
+            $this->posxpicture-=20;
+            $this->posxtva-=20;
+            $this->posxup-=20;
+            $this->posxqty-=20;
+            $this->posxunit-=20;
+            $this->posxdiscount-=20;
+            $this->postotalht-=20;
+        }
+
+        $this->tva=array();
+        $this->localtax1=array();
+        $this->localtax2=array();
+        $this->atleastoneratenotnull=0;
+        $this->atleastonediscount=0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *  Function to build pdf onto disk
      *
      *  @param		Object		$object				Object to generate
@@ -213,126 +213,126 @@ 
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
      *  @return     int             				1=OK, 0=KO
-	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
-	{
+     */
+    function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+    {
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+        global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
 
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
 
-		$nblignes = count($object->lines);
+        $nblignes = count($object->lines);
 
-		// Loop on each lines to detect if there is at least one image to show
-		$realpatharray=array();
-		if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
-		{
-			$objphoto = new Product($this->db);
+        // Loop on each lines to detect if there is at least one image to show
+        $realpatharray=array();
+        if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
+        {
+            $objphoto = new Product($this->db);
 
-			for ($i = 0 ; $i < $nblignes ; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+            for ($i = 0 ; $i < $nblignes ; $i++)
+            {
+                if (empty($object->lines[$i]->fk_product)) continue;
 
-				$objphoto->fetch($object->lines[$i]->fk_product);
+                $objphoto->fetch($object->lines[$i]->fk_product);
                 //var_dump($objphoto->ref);exit;
-				if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
-					$pdir[0] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";
-					$pdir[1] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
-				}
-				else
-				{
-					$pdir[0] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
-					$pdir[1] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";	// alternative
-				}
-
-				$arephoto = false;
-				foreach ($pdir as $midir)
-				{
-					if (! $arephoto)
-					{
-						$dir = $conf->product->dir_output.'/'.$midir;
-
-						foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
-						{
-							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-							{
-								if ($obj['photo_vignette'])
-								{
-									$filename= $obj['photo_vignette'];
-								}
-								else
-								{
-									$filename=$obj['photo'];
-								}
-							}
-							else
-							{
-								$filename=$obj['photo'];
-							}
-
-							$realpath = $dir.$filename;
-							$arephoto = true;
-						}
-					}
-				}
-
-				if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
-			}
-		}
-
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
-
-		if ($conf->propal->multidir_output[$conf->entity])
-		{
-			$object->fetch_thirdparty();
-
-			$deja_regle = 0;
+                if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+                {
+                    $pdir[0] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";
+                    $pdir[1] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
+                }
+                else
+                {
+                    $pdir[0] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
+                    $pdir[1] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";	// alternative
+                }
 
-			// Definition of $dir and $file
-			if ($object->specimen)
-			{
-				$dir = $conf->propal->multidir_output[$conf->entity];
-				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
-			{
-				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->propal->multidir_output[$object->entity] . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
-			}
+                $arephoto = false;
+                foreach ($pdir as $midir)
+                {
+                    if (! $arephoto)
+                    {
+                        $dir = $conf->product->dir_output.'/'.$midir;
+
+                        foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+                        {
+                            if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+                            {
+                                if ($obj['photo_vignette'])
+                                {
+                                    $filename= $obj['photo_vignette'];
+                                }
+                                else
+                                {
+                                    $filename=$obj['photo'];
+                                }
+                            }
+                            else
+                            {
+                                $filename=$obj['photo'];
+                            }
+
+                            $realpath = $dir.$filename;
+                            $arephoto = true;
+                        }
+                    }
+                }
 
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return 0;
-				}
-			}
+                if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+            }
+        }
+
+        if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+
+        if ($conf->propal->multidir_output[$conf->entity])
+        {
+            $object->fetch_thirdparty();
+
+            $deja_regle = 0;
+
+            // Definition of $dir and $file
+            if ($object->specimen)
+            {
+                $dir = $conf->propal->multidir_output[$conf->entity];
+                $file = $dir . "/SPECIMEN.pdf";
+            }
+            else
+            {
+                $objectref = dol_sanitizeFileName($object->ref);
+                $dir = $conf->propal->multidir_output[$object->entity] . "/" . $objectref;
+                $file = $dir . "/" . $objectref . ".pdf";
+            }
+
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return 0;
+                }
+            }
 
-			if (file_exists($dir))
-			{
-				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+            if (file_exists($dir))
+            {
+                // Add pdfgeneration hook
+                if (! is_object($hookmanager))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+                    $hookmanager=new HookManager($this->db);
+                }
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-				// Create pdf instance
+                // Create pdf instance
                 $pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1,0);
+                $pdf->SetAutoPageBreak(1,0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -347,589 +347,589 @@ 
                     $tplidx = $pdf->importPage(1);
                 }
 
-				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+                $pdf->Open();
+                $pagenb=0;
+                $pdf->SetDrawColor(128,128,128);
 
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("PdfCommercialProposalTitle"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+                $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+                $pdf->SetSubject($outputlangs->transnoentities("PdfCommercialProposalTitle"));
+                $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+                $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+                $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+                if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+                $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
-				// Positionne $this->atleastonediscount si on a au moins une remise
-				for ($i = 0 ; $i < $nblignes ; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
-						$this->atleastonediscount++;
-					}
-				}
-				if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS))
-				{
-					$this->posxpicture+=($this->postotalht - $this->posxdiscount);
-					$this->posxtva+=($this->postotalht - $this->posxdiscount);
-					$this->posxup+=($this->postotalht - $this->posxdiscount);
-					$this->posxqty+=($this->postotalht - $this->posxdiscount);
-					$this->posxdiscount+=($this->postotalht - $this->posxdiscount);
-					//$this->postotalht;
-				}
+                // Positionne $this->atleastonediscount si on a au moins une remise
+                for ($i = 0 ; $i < $nblignes ; $i++)
+                {
+                    if ($object->lines[$i]->remise_percent)
+                    {
+                        $this->atleastonediscount++;
+                    }
+                }
+                if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS))
+                {
+                    $this->posxpicture+=($this->postotalht - $this->posxdiscount);
+                    $this->posxtva+=($this->postotalht - $this->posxdiscount);
+                    $this->posxup+=($this->postotalht - $this->posxdiscount);
+                    $this->posxqty+=($this->postotalht - $this->posxdiscount);
+                    $this->posxdiscount+=($this->postotalht - $this->posxdiscount);
+                    //$this->postotalht;
+                }
 
-				// New page
-				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				$pagenb++;
+                // New page
+                $pdf->AddPage();
+                if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                $pagenb++;
 
                 $heightforinfotot = 40;	// Height reserved to output the info and total part
                 $heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE)?(pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature"))+10):0;
                 $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+                $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+                if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
                 //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+                $top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+                $pdf->SetFont('','', $default_font_size - 1);
+                $pdf->MultiCell(0, 3, '');		// Set interline to 3
+                $pdf->SetTextColor(0,0,0);
 
 
-	            $tab_top = 90+$top_shift;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
+                $tab_top = 90+$top_shift;
+                $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
 
-				// Incoterm
-				if ($conf->incoterm->enabled)
-				{
-					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
-						$tab_top -= 2;
-
-						$pdf->SetFont('','', $default_font_size - 1);
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
-						$nexY = $pdf->GetY();
-						$height_incoterms=$nexY-$tab_top;
-
-						// Rect prend une longueur en 3eme param
-						$pdf->SetDrawColor(192,192,192);
-						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
-
-						$tab_top = $nexY+6;
-					}
-				}
+                // Incoterm
+                if ($conf->incoterm->enabled)
+                {
+                    $desc_incoterms = $object->getIncotermsForPDF();
+                    if ($desc_incoterms)
+                    {
+                        $tab_top -= 2;
+
+                        $pdf->SetFont('','', $default_font_size - 1);
+                        $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+                        $nexY = $pdf->GetY();
+                        $height_incoterms=$nexY-$tab_top;
+
+                        // Rect prend une longueur en 3eme param
+                        $pdf->SetDrawColor(192,192,192);
+                        $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
+
+                        $tab_top = $nexY+6;
+                    }
+                }
 
-				// Affiche notes
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
-				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
-					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
-						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
-						$salerepobj=new User($this->db);
-						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
-					}
-				}
-				if (! empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
-				{
-				    $tmpuser=new User($this->db);
-				    $tmpuser->fetch($object->user_author_id);
-				    $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs);
-				    if ($tmpuser->email) $notetoshow.=',  Mail: '.$tmpuser->email;
-				    if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
-				}
-				if ($notetoshow)
-				{
-					$tab_top -= 2;
+                // Affiche notes
+                $notetoshow=empty($object->note_public)?'':$object->note_public;
+                if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
+                {
+                    // Get first sale rep
+                    if (is_object($object->thirdparty))
+                    {
+                        $salereparray=$object->thirdparty->getSalesRepresentatives($user);
+                        $salerepobj=new User($this->db);
+                        $salerepobj->fetch($salereparray[0]['id']);
+                        if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+                    }
+                }
+                if (! empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
+                {
+                    $tmpuser=new User($this->db);
+                    $tmpuser->fetch($object->user_author_id);
+                    $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs);
+                    if ($tmpuser->email) $notetoshow.=',  Mail: '.$tmpuser->email;
+                    if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
+                }
+                if ($notetoshow)
+                {
+                    $tab_top -= 2;
 
-					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
-					complete_substitutions_array($substitutionarray, $outputlangs, $object);
-					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+                    $substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+                    complete_substitutions_array($substitutionarray, $outputlangs, $object);
+                    $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($notetoshow), 0, 1);
-					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
+                    $pdf->SetFont('','', $default_font_size - 1);
+                    $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($notetoshow), 0, 1);
+                    $nexY = $pdf->GetY();
+                    $height_note=$nexY-$tab_top;
 
-					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+                    // Rect prend une longueur en 3eme param
+                    $pdf->SetDrawColor(192,192,192);
+                    $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
 
-					$tab_top = $nexY+6;
-				}
+                    $tab_top = $nexY+6;
+                }
 
-				$iniY = $tab_top + 7;
-				$curY = $tab_top + 7;
-				$nexY = $tab_top + 7;
+                $iniY = $tab_top + 7;
+                $curY = $tab_top + 7;
+                $nexY = $tab_top + 7;
 
-				// Loop on each lines
-				for ($i = 0; $i < $nblignes; $i++)
-				{
-					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
-
-					// Define size of image if we need it
-					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
-
-					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
-
-					$showpricebeforepagebreak=1;
-					$posYAfterImage=0;
-					$posYAfterDescription=0;
-
-					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
-						$pdf->AddPage('','',true);
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-						$pdf->setPage($pageposbefore+1);
-
-						$curY = $tab_top_newpage;
-						$showpricebeforepagebreak=0;
-					}
-
-					if (isset($imglinesize['width']) && isset($imglinesize['height']))
-					{
-						$curX = $this->posxpicture-1;
-						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
-						// $pdf->Image does not increase value return by getY, so we save it manually
-						$posYAfterImage=$curY+$imglinesize['height'];
-					}
-
-					// Description of product line
-					$curX = $this->posxdesc-1;
-
-					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
-					$pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
-						$pdf->rollbackTransaction(true);
-						$pageposafter=$pageposbefore;
-						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
-
-						$pageposafter=$pdf->getPage();
-						$posyafter=$pdf->GetY();
-						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
-							{
-								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-								$pdf->setPage($pageposafter+1);
-							}
-						}
-						else
-						{
-							// We found a page break
-							$showpricebeforepagebreak=0;
-						}
-					}
-					else	// No pagebreak
-					{
-						$pdf->commitTransaction();
-					}
-					$posYAfterDescription=$pdf->GetY();
-
-					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
-
-					$pdf->setPage($pageposbefore);
-					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-
-					// We suppose that a too long description or photo were moved completely on next page
-					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-					}
-
-					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
-
-					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-					{
-						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-						$pdf->SetXY($this->posxtva-5, $curY);
-						$pdf->MultiCell($this->posxup-$this->posxtva+4, 3, $vat_rate, 0, 'R');
-					}
-
-					// Unit price before discount
-					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
-
-					// Quantity
-					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY($this->posxqty, $curY);
-					// Enough for 6 chars
-					if($conf->global->PRODUCT_USE_UNITS)
-					{
-						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R');
-					}
-					else
-					{
-						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
-					}
-
-					// Unit
-					if($conf->global->PRODUCT_USE_UNITS)
-					{
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
-						$pdf->SetXY($this->posxunit, $curY);
-						$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');
-					}
-
-					// Discount on line
-					$pdf->SetXY($this->posxdiscount, $curY);
-					if ($object->lines[$i]->remise_percent)
-					{
-						$pdf->SetXY($this->posxdiscount-2, $curY);
-						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
-						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
-					}
-
-					// Total HT line
-					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
-
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne=$object->lines[$i]->total_tva;
-
-					$localtax1ligne=$object->lines[$i]->total_localtax1;
-					$localtax2ligne=$object->lines[$i]->total_localtax2;
-					$localtax1_rate=$object->lines[$i]->localtax1_tx;
-					$localtax2_rate=$object->lines[$i]->localtax2_tx;
-					$localtax1_type=$object->lines[$i]->localtax1_type;
-					$localtax2_type=$object->lines[$i]->localtax2_type;
-
-					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
-
-					$vatrate=(string) $object->lines[$i]->tva_tx;
-
-					// Retrieve type from database for backward compatibility with old records
-					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
-					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
-					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
-					}
-
-				    // retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
-						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
-						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
-
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
-					$this->tva[$vatrate] += $tvaligne;
-
-					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
-
-					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
-					{
-						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
-						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
-						$pdf->SetLineStyle(array('dash'=>0));
-					}
-
-					$nexY+=2;    // Passe espace entre les lignes
-
-					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
-						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						$pagenb++;
-						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						// New page
-						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-				}
+                // Loop on each lines
+                for ($i = 0; $i < $nblignes; $i++)
+                {
+                    $curY = $nexY;
+                    $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+                    $pdf->SetTextColor(0,0,0);
+
+                    // Define size of image if we need it
+                    $imglinesize=array();
+                    if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+
+                    $pdf->setTopMargin($tab_top_newpage);
+                    $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+                    $pageposbefore=$pdf->getPage();
+
+                    $showpricebeforepagebreak=1;
+                    $posYAfterImage=0;
+                    $posYAfterDescription=0;
+
+                    // We start with Photo of product line
+                    if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// If photo too high, we moved completely on new page
+                    {
+                        $pdf->AddPage('','',true);
+                        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                        $pdf->setPage($pageposbefore+1);
+
+                        $curY = $tab_top_newpage;
+                        $showpricebeforepagebreak=0;
+                    }
+
+                    if (isset($imglinesize['width']) && isset($imglinesize['height']))
+                    {
+                        $curX = $this->posxpicture-1;
+                        $pdf->Image($realpatharray[$i], $curX + (($this->posxtva-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
+                        // $pdf->Image does not increase value return by getY, so we save it manually
+                        $posYAfterImage=$curY+$imglinesize['height'];
+                    }
+
+                    // Description of product line
+                    $curX = $this->posxdesc-1;
+
+                    $pdf->startTransaction();
+                    pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+                    $pageposafter=$pdf->getPage();
+                    if ($pageposafter > $pageposbefore)	// There is a pagebreak
+                    {
+                        $pdf->rollbackTransaction(true);
+                        $pageposafter=$pageposbefore;
+                        //print $pageposafter.'-'.$pageposbefore;exit;
+                        $pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+                        pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+
+                        $pageposafter=$pdf->getPage();
+                        $posyafter=$pdf->GetY();
+                        //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+                        if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// There is no space left for total+free text
+                        {
+                            if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+                            {
+                                $pdf->AddPage('','',true);
+                                if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                                if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                                $pdf->setPage($pageposafter+1);
+                            }
+                        }
+                        else
+                        {
+                            // We found a page break
+                            $showpricebeforepagebreak=0;
+                        }
+                    }
+                    else	// No pagebreak
+                    {
+                        $pdf->commitTransaction();
+                    }
+                    $posYAfterDescription=$pdf->GetY();
+
+                    $nexY = $pdf->GetY();
+                    $pageposafter=$pdf->getPage();
+
+                    $pdf->setPage($pageposbefore);
+                    $pdf->setTopMargin($this->marge_haute);
+                    $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+
+                    // We suppose that a too long description or photo were moved completely on next page
+                    if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+                        $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+                    }
+
+                    $pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
+
+                    // VAT Rate
+                    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+                    {
+                        $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+                        $pdf->SetXY($this->posxtva-5, $curY);
+                        $pdf->MultiCell($this->posxup-$this->posxtva+4, 3, $vat_rate, 0, 'R');
+                    }
+
+                    // Unit price before discount
+                    $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+                    $pdf->SetXY($this->posxup, $curY);
+                    $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
+
+                    // Quantity
+                    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+                    $pdf->SetXY($this->posxqty, $curY);
+                    // Enough for 6 chars
+                    if($conf->global->PRODUCT_USE_UNITS)
+                    {
+                        $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R');
+                    }
+                    else
+                    {
+                        $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
+                    }
+
+                    // Unit
+                    if($conf->global->PRODUCT_USE_UNITS)
+                    {
+                        $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+                        $pdf->SetXY($this->posxunit, $curY);
+                        $pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');
+                    }
+
+                    // Discount on line
+                    $pdf->SetXY($this->posxdiscount, $curY);
+                    if ($object->lines[$i]->remise_percent)
+                    {
+                        $pdf->SetXY($this->posxdiscount-2, $curY);
+                        $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+                        $pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
+                    }
+
+                    // Total HT line
+                    $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
+                    $pdf->SetXY($this->postotalht, $curY);
+                    $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+
+                    // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+                    else $tvaligne=$object->lines[$i]->total_tva;
+
+                    $localtax1ligne=$object->lines[$i]->total_localtax1;
+                    $localtax2ligne=$object->lines[$i]->total_localtax2;
+                    $localtax1_rate=$object->lines[$i]->localtax1_tx;
+                    $localtax2_rate=$object->lines[$i]->localtax2_tx;
+                    $localtax1_type=$object->lines[$i]->localtax1_type;
+                    $localtax2_type=$object->lines[$i]->localtax2_type;
+
+                    if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
+                    if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+                    if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+
+                    $vatrate=(string) $object->lines[$i]->tva_tx;
+
+                    // Retrieve type from database for backward compatibility with old records
+                    if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
+                    && (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
+                    {
+                        $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
+                        $localtax1_type = $localtaxtmp_array[0];
+                        $localtax2_type = $localtaxtmp_array[2];
+                    }
+
+                    // retrieve global local tax
+                    if ($localtax1_type && $localtax1ligne != 0)
+                        $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+                    if ($localtax2_type && $localtax2ligne != 0)
+                        $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+
+                    if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
+                    if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
+                    $this->tva[$vatrate] += $tvaligne;
+
+                    if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
+
+                    // Add line
+                    if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+                    {
+                        $pdf->setPage($pageposafter);
+                        $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+                        //$pdf->SetDrawColor(190,190,200);
+                        $pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+                        $pdf->SetLineStyle(array('dash'=>0));
+                    }
+
+                    $nexY+=2;    // Passe espace entre les lignes
+
+                    // Detect if some page were added automatically and output _tableau for past pages
+                    while ($pagenb < $pageposafter)
+                    {
+                        $pdf->setPage($pagenb);
+                        if ($pagenb == 1)
+                        {
+                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+                        }
+                        else
+                        {
+                            $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+                        }
+                        $this->_pagefoot($pdf,$object,$outputlangs,1);
+                        $pagenb++;
+                        $pdf->setPage($pagenb);
+                        $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                    }
+                    if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+                    {
+                        if ($pagenb == 1)
+                        {
+                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+                        }
+                        else
+                        {
+                            $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+                        }
+                        $this->_pagefoot($pdf,$object,$outputlangs,1);
+                        // New page
+                        $pdf->AddPage();
+                        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                        $pagenb++;
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                    }
+                }
 
-				// Show square
-				if ($pagenb == 1)
-				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else
-				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
+                // Show square
+                if ($pagenb == 1)
+                {
+                    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
+                }
+                else
+                {
+                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
+                }
 
-				// Affiche zone infos
-				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+                // Affiche zone infos
+                $posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
-				// Affiche zone totaux
-				$posy=$this->_tableau_tot($pdf, $object, 0, $bottomlasttab, $outputlangs);
+                // Affiche zone totaux
+                $posy=$this->_tableau_tot($pdf, $object, 0, $bottomlasttab, $outputlangs);
 
-				// Affiche zone versements
-				/*
+                // Affiche zone versements
+                /*
 				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
 				{
 					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
 				}
 				*/
 
-				// Customer signature area
-				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
-				{
-				    $posy=$this->_signature_area($pdf, $object, $posy, $outputlangs);
-				}
+                // Customer signature area
+                if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
+                {
+                    $posy=$this->_signature_area($pdf, $object, $posy, $outputlangs);
+                }
 
-				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+                // Pied de page
+                $this->_pagefoot($pdf,$object,$outputlangs);
+                if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
-				//If propal merge product PDF is active
-				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
-				{
-					require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
-
-					$already_merged = array ();
-					foreach ( $object->lines as $line ) {
-						if (! empty($line->fk_product) && ! (in_array($line->fk_product, $already_merged))) {
-							// Find the desire PDF
-							$filetomerge = new Propalmergepdfproduct($this->db);
-
-							if ($conf->global->MAIN_MULTILANGS) {
-								$filetomerge->fetch_by_product($line->fk_product, $outputlangs->defaultlang);
-							} else {
-								$filetomerge->fetch_by_product($line->fk_product);
-							}
-
-							$already_merged[] = $line->fk_product;
-
-							$product = new Product($this->db);
-							$product->fetch($line->fk_product);
-
-							if ($product->entity!=$conf->entity) {
-								$entity_product_file=$product->entity;
-							} else {
-								$entity_product_file=$conf->entity;
-							}
-
-							// If PDF is selected and file is not empty
-							if (count($filetomerge->lines) > 0) {
-								foreach ( $filetomerge->lines as $linefile ) {
-									if (! empty($linefile->id) && ! empty($linefile->file_name)) {
-
-
-										if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-										{
-											if (! empty($conf->product->enabled)) {
-												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
-											} elseif (! empty($conf->service->enabled)) {
-												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
-											}
-										}
-										else
-										{
-											if (! empty($conf->product->enabled)) {
-												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
-											} elseif (! empty($conf->service->enabled)) {
-												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
-											}
-										}
-
-										dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG);
-
-										$infile = $filetomerge_dir . '/' . $linefile->file_name;
-										if (file_exists($infile) && is_readable($infile)) {
-											$pagecount = $pdf->setSourceFile($infile);
-											for($i = 1; $i <= $pagecount; $i ++) {
-												$tplIdx = $pdf->importPage($i);
-												if ($tplIdx!==false) {
-													$s = $pdf->getTemplatesize($tplIdx);
-													$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-													$pdf->useTemplate($tplIdx);
-												} else {
-													setEventMessages(null, array($infile.' cannot be added, probably protected PDF'),'warnings');
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
+                //If propal merge product PDF is active
+                if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
+                {
+                    require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
+
+                    $already_merged = array ();
+                    foreach ( $object->lines as $line ) {
+                        if (! empty($line->fk_product) && ! (in_array($line->fk_product, $already_merged))) {
+                            // Find the desire PDF
+                            $filetomerge = new Propalmergepdfproduct($this->db);
+
+                            if ($conf->global->MAIN_MULTILANGS) {
+                                $filetomerge->fetch_by_product($line->fk_product, $outputlangs->defaultlang);
+                            } else {
+                                $filetomerge->fetch_by_product($line->fk_product);
+                            }
+
+                            $already_merged[] = $line->fk_product;
+
+                            $product = new Product($this->db);
+                            $product->fetch($line->fk_product);
+
+                            if ($product->entity!=$conf->entity) {
+                                $entity_product_file=$product->entity;
+                            } else {
+                                $entity_product_file=$conf->entity;
+                            }
+
+                            // If PDF is selected and file is not empty
+                            if (count($filetomerge->lines) > 0) {
+                                foreach ( $filetomerge->lines as $linefile ) {
+                                    if (! empty($linefile->id) && ! empty($linefile->file_name)) {
+
+
+                                        if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+                                        {
+                                            if (! empty($conf->product->enabled)) {
+                                                $filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+                                            } elseif (! empty($conf->service->enabled)) {
+                                                $filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+                                            }
+                                        }
+                                        else
+                                        {
+                                            if (! empty($conf->product->enabled)) {
+                                                $filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
+                                            } elseif (! empty($conf->service->enabled)) {
+                                                $filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
+                                            }
+                                        }
+
+                                        dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG);
+
+                                        $infile = $filetomerge_dir . '/' . $linefile->file_name;
+                                        if (file_exists($infile) && is_readable($infile)) {
+                                            $pagecount = $pdf->setSourceFile($infile);
+                                            for($i = 1; $i <= $pagecount; $i ++) {
+                                                $tplIdx = $pdf->importPage($i);
+                                                if ($tplIdx!==false) {
+                                                    $s = $pdf->getTemplatesize($tplIdx);
+                                                    $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+                                                    $pdf->useTemplate($tplIdx);
+                                                } else {
+                                                    setEventMessages(null, array($infile.' cannot be added, probably protected PDF'),'warnings');
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
 
-				$pdf->Close();
+                $pdf->Close();
 
-				$pdf->Output($file,'F');
+                $pdf->Output($file,'F');
 
-				//Add pdfgeneration hook
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                //Add pdfgeneration hook
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+                if (! empty($conf->global->MAIN_UMASK))
+                @chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$this->result = array('fullpath'=>$file);
+                $this->result = array('fullpath'=>$file);
 
-				return 1;   // Pas d'erreur
-			}
-			else
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
-			return 0;
-		}
-	}
+                return 1;   // Pas d'erreur
+            }
+            else
+            {
+                $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Show payments table
-	 *
+    /**
+     *  Show payments table
+     *
      *  @param	TCPDF		$pdf           Object PDF
      *  @param  Object		$object         Object proposal
      *  @param  int			$posy           Position y in PDF
      *  @param  Translate	$outputlangs    Object langs for output
      *  @return int             			<0 if KO, >0 if OK
-	 */
-	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
-	{
+     */
+    function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+    {
         // phpcs:enable
-	}
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Show miscellaneous information (payment mode, payment term, ...)
-	 *
-	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
-	 */
-	function _tableau_info(&$pdf, $object, $posy, $outputlangs)
-	{
+    /**
+     *   Show miscellaneous information (payment mode, payment term, ...)
+     *
+     *   @param		TCPDF		$pdf     		Object PDF
+     *   @param		Object		$object			Object to show
+     *   @param		int			$posy			Y
+     *   @param		Translate	$outputlangs	Langs object
+     *   @return	void
+     */
+    function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+        global $conf;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$pdf->SetFont('','', $default_font_size - 1);
+        $pdf->SetFont('','', $default_font_size - 1);
 
-		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+        // If France, show VAT mention if not applicable
+        if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
+        {
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->SetXY($this->marge_gauche, $posy);
+            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
 
-			$posy=$pdf->GetY()+4;
-		}
+            $posy=$pdf->GetY()+4;
+        }
 
-		$posxval=52;
+        $posxval=52;
 
         // Show shipping date
         if (! empty($object->date_livraison))
-		{
+        {
             $outputlangs->load("sendings");
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
-			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posxval, $posy);
-			$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
-			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->SetXY($this->marge_gauche, $posy);
+            $titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
+            $pdf->MultiCell(80, 4, $titre, 0, 'L');
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posxval, $posy);
+            $dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
+            $pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy=$pdf->GetY()+1;
-		}
+        }
         elseif ($object->availability_code || $object->availability)    // Show availability conditions
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
-			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posxval, $posy);
-			$lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
-			$lib_availability=str_replace('\n',"\n",$lib_availability);
-			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
-
-			$posy=$pdf->GetY()+1;
-		}
-
-		// Show payments conditions
-		if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$titre = $outputlangs->transnoentities("PaymentConditions").':';
-			$pdf->MultiCell(43, 4, $titre, 0, 'L');
-
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posxval, $posy);
-			$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
-			$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
-			$pdf->MultiCell(67, 4, $lib_condition_paiement,0,'L');
-
-			$posy=$pdf->GetY()+3;
-		}
-
-		if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMMODE))
-		{
-			// Check a payment mode is defined
-			/* Not required on a proposal
+        {
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->SetXY($this->marge_gauche, $posy);
+            $titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
+            $pdf->MultiCell(80, 4, $titre, 0, 'L');
+            $pdf->SetTextColor(0,0,0);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posxval, $posy);
+            $lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
+            $lib_availability=str_replace('\n',"\n",$lib_availability);
+            $pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
+
+            $posy=$pdf->GetY()+1;
+        }
+
+        // Show payments conditions
+        if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
+        {
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->SetXY($this->marge_gauche, $posy);
+            $titre = $outputlangs->transnoentities("PaymentConditions").':';
+            $pdf->MultiCell(43, 4, $titre, 0, 'L');
+
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posxval, $posy);
+            $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
+            $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
+            $pdf->MultiCell(67, 4, $lib_condition_paiement,0,'L');
+
+            $posy=$pdf->GetY()+3;
+        }
+
+        if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMMODE))
+        {
+            // Check a payment mode is defined
+            /* Not required on a proposal
 			if (empty($object->mode_reglement_code)
 			&& ! $conf->global->FACTURE_CHQ_NUMBER
 			&& ! $conf->global->FACTURE_RIB_NUMBER)
@@ -944,335 +944,335 @@ 
 			}
 			*/
 
-			// Show payment mode
-			if ($object->mode_reglement_code
-			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR')
-			{
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->SetXY($this->marge_gauche, $posy);
-				$titre = $outputlangs->transnoentities("PaymentMode").':';
-				$pdf->MultiCell(80, 5, $titre, 0, 'L');
-				$pdf->SetFont('','', $default_font_size - 2);
-				$pdf->SetXY($posxval, $posy);
-				$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
-				$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
-
-				$posy=$pdf->GetY()+2;
-			}
-
-			// Show payment mode CHQ
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-			{
-				// Si mode reglement non force ou si force a CHQ
-				if (! empty($conf->global->FACTURE_CHQ_NUMBER))
-				{
-					$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-					{
-						$account = new Account($this->db);
-						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
-						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
-						$posy=$pdf->GetY()+1;
-
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
-							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
-			            }
-					}
-					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-					{
-						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
-						$posy=$pdf->GetY()+1;
-
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
-							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
-			            }
-					}
-				}
-			}
+            // Show payment mode
+            if ($object->mode_reglement_code
+            && $object->mode_reglement_code != 'CHQ'
+            && $object->mode_reglement_code != 'VIR')
+            {
+                $pdf->SetFont('','B', $default_font_size - 2);
+                $pdf->SetXY($this->marge_gauche, $posy);
+                $titre = $outputlangs->transnoentities("PaymentMode").':';
+                $pdf->MultiCell(80, 5, $titre, 0, 'L');
+                $pdf->SetFont('','', $default_font_size - 2);
+                $pdf->SetXY($posxval, $posy);
+                $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
+                $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
+
+                $posy=$pdf->GetY()+2;
+            }
+
+            // Show payment mode CHQ
+            if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
+            {
+                // Si mode reglement non force ou si force a CHQ
+                if (! empty($conf->global->FACTURE_CHQ_NUMBER))
+                {
+                    $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
+
+                    if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+                    {
+                        $account = new Account($this->db);
+                        $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+                        $pdf->SetXY($this->marge_gauche, $posy);
+                        $pdf->SetFont('','B', $default_font_size - $diffsizetitle);
+                        $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
+                        $posy=$pdf->GetY()+1;
+
+                        if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+                        {
+                            $pdf->SetXY($this->marge_gauche, $posy);
+                            $pdf->SetFont('','', $default_font_size - $diffsizetitle);
+                            $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+                            $posy=$pdf->GetY()+2;
+                        }
+                    }
+                    if ($conf->global->FACTURE_CHQ_NUMBER == -1)
+                    {
+                        $pdf->SetXY($this->marge_gauche, $posy);
+                        $pdf->SetFont('','B', $default_font_size - $diffsizetitle);
+                        $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
+                        $posy=$pdf->GetY()+1;
+
+                        if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+                        {
+                            $pdf->SetXY($this->marge_gauche, $posy);
+                            $pdf->SetFont('','', $default_font_size - $diffsizetitle);
+                            $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+                            $posy=$pdf->GetY()+2;
+                        }
+                    }
+                }
+            }
 
-			// If payment mode not forced or forced to VIR, show payment with BAN
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-			{
-				if (! empty($object->fk_account) || ! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
-				{
-					$bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
-					if (! empty($object->fk_bank)) $bankid=$object->fk_bank;   // For backward compatibility when object->fk_account is forced with object->fk_bank
-					$account = new Account($this->db);
-					$account->fetch($bankid);
+            // If payment mode not forced or forced to VIR, show payment with BAN
+            if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
+            {
+                if (! empty($object->fk_account) || ! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
+                {
+                    $bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
+                    if (! empty($object->fk_bank)) $bankid=$object->fk_bank;   // For backward compatibility when object->fk_account is forced with object->fk_bank
+                    $account = new Account($this->db);
+                    $account->fetch($bankid);
 
-					$curx=$this->marge_gauche;
-					$cury=$posy;
+                    $curx=$this->marge_gauche;
+                    $cury=$posy;
 
-					$posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+                    $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
 
-					$posy+=2;
-				}
-			}
-		}
+                    $posy+=2;
+                }
+            }
+        }
 
-		return $posy;
-	}
+        return $posy;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show total to pay
-	 *
-	 *	@param	PDF			$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
-	 */
-	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
-	{
+    /**
+     *	Show total to pay
+     *
+     *	@param	PDF			$pdf            Object PDF
+     *	@param  Facture		$object         Object invoice
+     *	@param  int			$deja_regle     Montant deja regle
+     *	@param	int			$posy			Position depart
+     *	@param	Translate	$outputlangs	Objet langs
+     *	@return int							Position pour suite
+     */
+    function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+    {
         // phpcs:enable
-		global $conf,$mysoc;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$tab2_top = $posy;
-		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// Tableau total
-		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$col2x-=20;
-		}
-		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
-
-		$useborder=0;
-		$index = 0;
-
-		// Total HT
-		$pdf->SetFillColor(255,255,255);
-		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
-
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
-		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
-
-		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
-
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
-
-		$this->atleastoneratenotnull=0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
-			$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
-				// Nothing to do
-			}
-			else
-			{
-				//Local tax 1 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-	      		//}
-				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-				//}
-				// VAT
-				foreach($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
-						$this->atleastoneratenotnull++;
-
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-						$tvacompl='';
-						if (preg_match('/\*/',$tvakey))
-						{
-							$tvakey=str_replace('*','',$tvakey);
-							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-						}
-						$totalvat =$outputlangs->transcountrynoentities("TotalVAT",$mysoc->country_code).' ';
-						$totalvat.=vatrate($tvakey,1).$tvacompl;
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-					}
-				}
-
-				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey != 0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-	      		//}
-				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-						    // retrieve global local tax
-							if ($tvakey != 0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
-
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-				//}
-
-				// Total TTC
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->SetFillColor(224,224,224);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
-
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
-			}
-		}
-
-		$pdf->SetTextColor(0,0,0);
+        global $conf,$mysoc;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        $tab2_top = $posy;
+        $tab2_hl = 4;
+        $pdf->SetFont('','', $default_font_size - 1);
+
+        // Tableau total
+        $col1x = 120; $col2x = 170;
+        if ($this->page_largeur < 210) // To work with US executive format
+        {
+            $col2x-=20;
+        }
+        $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+
+        $useborder=0;
+        $index = 0;
+
+        // Total HT
+        $pdf->SetFillColor(255,255,255);
+        $pdf->SetXY($col1x, $tab2_top + 0);
+        $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+
+        $total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+        $pdf->SetXY($col2x, $tab2_top + 0);
+        $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
+
+        // Show VAT by rates and total
+        $pdf->SetFillColor(248,248,248);
+
+        $total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+
+        $this->atleastoneratenotnull=0;
+        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+        {
+            $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
+            if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
+            {
+                // Nothing to do
+            }
+            else
+            {
+                //Local tax 1 before VAT
+                //if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+                //{
+                    foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+                    {
+                        if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+
+                        foreach( $localtax_rate as $tvakey => $tvaval )
+                        {
+                            if ($tvakey!=0)    // On affiche pas taux 0
+                            {
+                                //$this->atleastoneratenotnull++;
+
+                                $index++;
+                                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                                $tvacompl='';
+                                if (preg_match('/\*/',$tvakey))
+                                {
+                                    $tvakey=str_replace('*','',$tvakey);
+                                    $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                                }
+                                $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
+                                $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+                                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+                                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                                $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                            }
+                        }
+                    }
+                    //}
+                //Local tax 2 before VAT
+                //if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+                //{
+                    foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+                    {
+                        if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+
+                        foreach( $localtax_rate as $tvakey => $tvaval )
+                        {
+                            if ($tvakey!=0)    // On affiche pas taux 0
+                            {
+                                //$this->atleastoneratenotnull++;
+
+
+
+                                $index++;
+                                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                                $tvacompl='';
+                                if (preg_match('/\*/',$tvakey))
+                                {
+                                    $tvakey=str_replace('*','',$tvakey);
+                                    $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                                }
+                                $totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+                                $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+                                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+                                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                                $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                            }
+                        }
+                    }
+                //}
+                // VAT
+                foreach($this->tva as $tvakey => $tvaval)
+                {
+                    if ($tvakey != 0)    // On affiche pas taux 0
+                    {
+                        $this->atleastoneratenotnull++;
+
+                        $index++;
+                        $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                        $tvacompl='';
+                        if (preg_match('/\*/',$tvakey))
+                        {
+                            $tvakey=str_replace('*','',$tvakey);
+                            $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                        }
+                        $totalvat =$outputlangs->transcountrynoentities("TotalVAT",$mysoc->country_code).' ';
+                        $totalvat.=vatrate($tvakey,1).$tvacompl;
+                        $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+                        $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                        $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                    }
+                }
 
-		/*
+                //Local tax 1 after VAT
+                //if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+                //{
+                    foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+                    {
+                        if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+
+                        foreach( $localtax_rate as $tvakey => $tvaval )
+                        {
+                            if ($tvakey != 0)    // On affiche pas taux 0
+                            {
+                                //$this->atleastoneratenotnull++;
+
+                                $index++;
+                                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                                $tvacompl='';
+                                if (preg_match('/\*/',$tvakey))
+                                {
+                                    $tvakey=str_replace('*','',$tvakey);
+                                    $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                                }
+                                $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
+
+                                $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+                                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+                                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                                $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                            }
+                        }
+                    }
+                    //}
+                //Local tax 2 after VAT
+                //if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+                //{
+                    foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+                    {
+                        if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+
+                        foreach( $localtax_rate as $tvakey => $tvaval )
+                        {
+                            // retrieve global local tax
+                            if ($tvakey != 0)    // On affiche pas taux 0
+                            {
+                                //$this->atleastoneratenotnull++;
+
+                                $index++;
+                                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                                $tvacompl='';
+                                if (preg_match('/\*/',$tvakey))
+                                {
+                                    $tvakey=str_replace('*','',$tvakey);
+                                    $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                                }
+                                $totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
+
+                                $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+                                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+                                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                                $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                            }
+                        }
+                    }
+                //}
+
+                // Total TTC
+                $index++;
+                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+                $pdf->SetTextColor(0,0,60);
+                $pdf->SetFillColor(224,224,224);
+                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+
+                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+            }
+        }
+
+        $pdf->SetTextColor(0,0,0);
+
+        /*
 		$resteapayer = $object->total_ttc - $deja_regle;
 		if (! empty($object->paye)) $resteapayer=0;
 		*/
 
-		if ($deja_regle > 0)
-		{
-			$index++;
+        if ($deja_regle > 0)
+        {
+            $index++;
 
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+            $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
 
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+            $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
 
-			/*
+            /*
 			if ($object->close_code == 'discount_vat')
 			{
 				$index++;
@@ -1288,419 +1288,419 @@ 
 			}
 			*/
 
-			$index++;
-			$pdf->SetTextColor(0,0,60);
-			$pdf->SetFillColor(224,224,224);
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
-
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
-
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetTextColor(0,0,0);
-		}
-
-		$index++;
-		return ($tab2_top + ($tab2_hl * $index));
-	}
-
-	/**
-	 *   Show table for lines
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
-	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @param		string		$currency		Currency code
-	 *   @return	void
-	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
-	{
-		global $conf;
-
-		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
-
-		$currency = !empty($currency) ? $currency : $conf->currency;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',$default_font_size - 2);
-
-		if (empty($hidetop))
-		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
-			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
-			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
-
-			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
-		}
-
-		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','',$default_font_size - 1);
-
-		// Output Rect
-		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
-
-		if (empty($hidetop))
-		{
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
-
-			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
-			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
-		}
-
-		if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
-		{
-			$pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
-				//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
-			}
-		}
-
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
-			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-				// Not do -3 and +3 instead of -1 -1 to have more space for text 'Sales tax'
-				$pdf->SetXY($this->posxtva-3, $tab_top+1);
-				$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
-			}
-		}
-
-		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->posxup-1, $tab_top+1);
-			$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
-		}
-
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->posxqty-1, $tab_top+1);
-			if($conf->global->PRODUCT_USE_UNITS)
-			{
-				$pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-			}
-			else
-			{
-				$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-			}
-		}
-
-		if($conf->global->PRODUCT_USE_UNITS) {
-			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
-			if (empty($hidetop)) {
-				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
-				$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
-					'C');
-			}
-		}
+            $index++;
+            $pdf->SetTextColor(0,0,60);
+            $pdf->SetFillColor(224,224,224);
+            $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
 
-		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
-				$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
-				$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
-			}
-		}
-		if ($this->atleastonediscount)
-		{
-			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-		}
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->postotalht-1, $tab_top+1);
-			$pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
-		}
-	}
-
-	/**
-	 *  Show top header of page.
-	 *
-	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
-	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
-	{
-		global $conf,$langs;
-
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
-
-		//  Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
-		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
-		}
+            $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+            $pdf->SetFont('','', $default_font_size - 1);
+            $pdf->SetTextColor(0,0,0);
+        }
 
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
+        $index++;
+        return ($tab2_top + ($tab2_hl * $index));
+    }
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+    /**
+     *   Show table for lines
+     *
+     *   @param		PDF			$pdf     		Object PDF
+     *   @param		string		$tab_top		Top position of table
+     *   @param		string		$tab_height		Height of table (rectangle)
+     *   @param		int			$nexY			Y (not used)
+     *   @param		Translate	$outputlangs	Langs object
+     *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+     *   @param		int			$hidebottom		Hide bottom bar of array
+     *   @param		string		$currency		Currency code
+     *   @return	void
+     */
+    function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+    {
+        global $conf;
+
+        // Force to disable hidetop and hidebottom
+        $hidebottom=0;
+        if ($hidetop) $hidetop=-1;
+
+        $currency = !empty($currency) ? $currency : $conf->currency;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        // Amount in (at tab_top - 1)
+        $pdf->SetTextColor(0,0,0);
+        $pdf->SetFont('','',$default_font_size - 2);
+
+        if (empty($hidetop))
+        {
+            $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
+            $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+            $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+            //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+            if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+        }
+
+        $pdf->SetDrawColor(128,128,128);
+        $pdf->SetFont('','',$default_font_size - 1);
+
+        // Output Rect
+        $this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+
+        if (empty($hidetop))
+        {
+            $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+
+            $pdf->SetXY($this->posxdesc-1, $tab_top+1);
+            $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
+        }
+
+        if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
+        {
+            $pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
+            if (empty($hidetop))
+            {
+                //$pdf->SetXY($this->posxpicture-1, $tab_top+1);
+                //$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
+            }
+        }
+
+        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+        {
+            $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+            if (empty($hidetop))
+            {
+                // Not do -3 and +3 instead of -1 -1 to have more space for text 'Sales tax'
+                $pdf->SetXY($this->posxtva-3, $tab_top+1);
+                $pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
+            }
+        }
+
+        $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+        if (empty($hidetop))
+        {
+            $pdf->SetXY($this->posxup-1, $tab_top+1);
+            $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
+        }
+
+        $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+        if (empty($hidetop))
+        {
+            $pdf->SetXY($this->posxqty-1, $tab_top+1);
+            if($conf->global->PRODUCT_USE_UNITS)
+            {
+                $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+            }
+            else
+            {
+                $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+            }
+        }
+
+        if($conf->global->PRODUCT_USE_UNITS) {
+            $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
+            if (empty($hidetop)) {
+                $pdf->SetXY($this->posxunit - 1, $tab_top + 1);
+                $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
+                    'C');
+            }
+        }
+
+        $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+        if (empty($hidetop))
+        {
+            if ($this->atleastonediscount)
+            {
+                $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+                $pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
+            }
+        }
+        if ($this->atleastonediscount)
+        {
+            $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+        }
+        if (empty($hidetop))
+        {
+            $pdf->SetXY($this->postotalht-1, $tab_top+1);
+            $pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
+        }
+    }
 
-		// Logo
-		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
-		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-			if ($this->emetteur->logo)
-			{
-				if (is_readable($logo))
-				{
-				    $height=pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-				}
-				else
-				{
-					$pdf->SetTextColor(200,0,0);
-					$pdf->SetFont('','B',$default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
-				}
-			}
-			else
-			{
-				$text=$this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-			}
-		}
-
-		$pdf->SetFont('','B',$default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$title=$outputlangs->transnoentities("PdfCommercialProposalTitle");
-		$pdf->MultiCell(100, 4, $title, '', 'R');
-
-		$pdf->SetFont('','B',$default_font_size);
-
-		$posy+=5;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
-
-		$posy+=1;
-		$pdf->SetFont('','', $default_font_size - 2);
-
-		if ($object->ref_client)
-		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
-		}
-
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
-
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dol_print_date($object->fin_validite,"day",false,$outputlangs,true), '', 'R');
-
-		if ($object->thirdparty->code_client)
-		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
-		}
-
-		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
-		    $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $usertmp=new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy+=4;
-                $pdf->SetXY($posx,$posy);
-		        $pdf->SetTextColor(0,0,60);
-		        $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
-		}
-
-		$posy+=2;
-
-		$top_shift = 0;
-		// Show list of linked objects
-		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
-			$top_shift = $pdf->getY() - $current_y;
-		}
-
-		if ($showaddress)
-		{
-			// Sender properties
-			$carac_emetteur='';
-		 	// Add internal contact of proposal if defined
-			$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname=($outputlangs->transnoentities("FromContactName")!='FromContactName'?$outputlangs->transnoentities("FromContactName"):$outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
-
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
-
-			// Show sender
-			$posy=42+$top_shift;
-		 	$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
-
-			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
-
-			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
-
-			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-
-
-			// If CUSTOMER contact defined, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
-			}
+    /**
+     *  Show top header of page.
+     *
+     *  @param	PDF			$pdf     		Object PDF
+     *  @param  Object		$object     	Object to show
+     *  @param  int	    	$showaddress    0=no, 1=yes
+     *  @param  Translate	$outputlangs	Object lang for output
+     *  @return	void
+     */
+    function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+    {
+        global $conf,$langs;
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
-				$thirdparty = $object->contact;
-			} else {
-				$thirdparty = $object->thirdparty;
-			}
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
 
-			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->thirdparty,($usecontact?$object->contact:''),$usecontact,'target',$object);
+        pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
-			// Show recipient
-			$widthrecbox=100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42+$top_shift;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+        //  Show Draft Watermark
+        if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
+        {
+            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
+        }
 
-			// Show recipient frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx+2,$posy-5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->SetFont('','B', $default_font_size + 3);
 
-			// Show recipient name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+        $posy=$this->marge_haute;
+        $posx=$this->page_largeur-$this->marge_droite-100;
 
-			$posy = $pdf->getY();
+        $pdf->SetXY($this->marge_gauche,$posy);
 
-			// Show recipient information
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
-		}
+        // Logo
+        if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
+        {
+            $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+            if ($this->emetteur->logo)
+            {
+                if (is_readable($logo))
+                {
+                    $height=pdf_getHeightForLogo($logo);
+                    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+                }
+                else
+                {
+                    $pdf->SetTextColor(200,0,0);
+                    $pdf->SetFont('','B',$default_font_size - 2);
+                    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+                    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+                }
+            }
+            else
+            {
+                $text=$this->emetteur->name;
+                $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+            }
+        }
+
+        $pdf->SetFont('','B',$default_font_size + 3);
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $title=$outputlangs->transnoentities("PdfCommercialProposalTitle");
+        $pdf->MultiCell(100, 4, $title, '', 'R');
+
+        $pdf->SetFont('','B',$default_font_size);
+
+        $posy+=5;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+
+        $posy+=1;
+        $pdf->SetFont('','', $default_font_size - 2);
+
+        if ($object->ref_client)
+        {
+            $posy+=4;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+        }
+
+        $posy+=4;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
+
+        $posy+=4;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dol_print_date($object->fin_validite,"day",false,$outputlangs,true), '', 'R');
+
+        if ($object->thirdparty->code_client)
+        {
+            $posy+=4;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+        }
+
+        // Get contact
+        if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
+        {
+            $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+            if (count($arrayidcontact) > 0)
+            {
+                $usertmp=new User($this->db);
+                $usertmp->fetch($arrayidcontact[0]);
+                $posy+=4;
+                $pdf->SetXY($posx,$posy);
+                $pdf->SetTextColor(0,0,60);
+                $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+            }
+        }
+
+        $posy+=2;
+
+        $top_shift = 0;
+        // Show list of linked objects
+        $current_y = $pdf->getY();
+        $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+        if ($current_y < $pdf->getY())
+        {
+            $top_shift = $pdf->getY() - $current_y;
+        }
+
+        if ($showaddress)
+        {
+            // Sender properties
+            $carac_emetteur='';
+                // Add internal contact of proposal if defined
+            $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+                if (count($arrayidcontact) > 0)
+                {
+                    $object->fetch_user($arrayidcontact[0]);
+                    $labelbeforecontactname=($outputlangs->transnoentities("FromContactName")!='FromContactName'?$outputlangs->transnoentities("FromContactName"):$outputlangs->transnoentities("Name"));
+                    $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+                }
 
-		$pdf->SetTextColor(0,0,0);
-		return $top_shift;
-	}
+                $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+
+            // Show sender
+            $posy=42+$top_shift;
+                $posx=$this->marge_gauche;
+            if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+            $hautcadre=40;
+
+            // Show sender frame
+            $pdf->SetTextColor(0,0,0);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posx,$posy-5);
+            $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetFillColor(230,230,230);
+            $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+            $pdf->SetTextColor(0,0,60);
+
+            // Show sender name
+            $pdf->SetXY($posx+2,$posy+3);
+            $pdf->SetFont('','B', $default_font_size);
+            $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+            $posy=$pdf->getY();
+
+            // Show sender information
+            $pdf->SetXY($posx+2,$posy);
+            $pdf->SetFont('','', $default_font_size - 1);
+            $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+
+
+            // If CUSTOMER contact defined, we use it
+            $usecontact=false;
+            $arrayidcontact=$object->getIdContact('external','CUSTOMER');
+            if (count($arrayidcontact) > 0)
+            {
+                $usecontact=true;
+                $result=$object->fetch_contact($arrayidcontact[0]);
+            }
+
+            //Recipient name
+            // On peut utiliser le nom de la societe du contact
+            if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+                $thirdparty = $object->contact;
+            } else {
+                $thirdparty = $object->thirdparty;
+            }
+
+            $carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+
+            $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->thirdparty,($usecontact?$object->contact:''),$usecontact,'target',$object);
+
+            // Show recipient
+            $widthrecbox=100;
+            if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+            $posy=42+$top_shift;
+            $posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
+            if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+
+            // Show recipient frame
+            $pdf->SetTextColor(0,0,0);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posx+2,$posy-5);
+            $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+            $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+            // Show recipient name
+            $pdf->SetXY($posx+2,$posy+3);
+            $pdf->SetFont('','B', $default_font_size);
+            $pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+
+            $posy = $pdf->getY();
+
+            // Show recipient information
+            $pdf->SetFont('','', $default_font_size - 1);
+            $pdf->SetXY($posx+2,$posy);
+            $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+        }
+
+        $pdf->SetTextColor(0,0,0);
+        return $top_shift;
+    }
 
-	/**
-	 *   	Show footer of page. Need this->emetteur object
+    /**
+     *   	Show footer of page. Need this->emetteur object
      *
-	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	int								Return height of bottom margin including footer text
-	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
-	{
-		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
-	}
+     *   	@param	PDF			$pdf     			PDF
+     * 		@param	Object		$object				Object to show
+     *      @param	Translate	$outputlangs		Object lang for output
+     *      @param	int			$hidefreetext		1=Hide free text
+     *      @return	int								Return height of bottom margin including footer text
+     */
+    function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+    {
+        global $conf;
+        $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+        return pdf_pagefoot($pdf,$outputlangs,'PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show area for the customer to sign
-	 *
-	 *	@param	PDF			$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
-	 */
-	function _signature_area(&$pdf, $object, $posy, $outputlangs)
-	{
+    /**
+     *	Show area for the customer to sign
+     *
+     *	@param	PDF			$pdf            Object PDF
+     *	@param  Facture		$object         Object invoice
+     *	@param	int			$posy			Position depart
+     *	@param	Translate	$outputlangs	Objet langs
+     *	@return int							Position pour suite
+     */
+    function _signature_area(&$pdf, $object, $posy, $outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-		$tab_top = $posy + 4;
-		$tab_hl = 4;
-
-		$posx = 120;
-		$largcol = ($this->page_largeur - $this->marge_droite - $posx);
-		$useborder=0;
-		$index = 0;
-		// Total HT
-		$pdf->SetFillColor(255,255,255);
-		$pdf->SetXY($posx, $tab_top + 0);
-		$pdf->SetFont('','', $default_font_size - 2);
-		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);
-
-		$pdf->SetXY($posx, $tab_top + $tab_hl);
-		$pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
-		if (! empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
-			$pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl*3);
-		}
-
-		return ($tab_hl*7);
-	}
+        global $conf;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+        $tab_top = $posy + 4;
+        $tab_hl = 4;
+
+        $posx = 120;
+        $largcol = ($this->page_largeur - $this->marge_droite - $posx);
+        $useborder=0;
+        $index = 0;
+        // Total HT
+        $pdf->SetFillColor(255,255,255);
+        $pdf->SetXY($posx, $tab_top + 0);
+        $pdf->SetFont('','', $default_font_size - 2);
+        $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);
+
+        $pdf->SetXY($posx, $tab_top + $tab_hl);
+        $pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
+        if (! empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
+            $pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl*3);
+        }
+
+        return ($tab_hl*7);
+    }
 }

Spacing +476 added lines, -476 removed lines

@@ -127,7 +127,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		// Translations
 		$langs->loadLangs(array("main", "bills"));
@@ -135,71 +135,71 @@ 
 		$this->db = $db;
 		$this->name = "azur";
 		$this->description = $langs->trans('DocModelAzurDescription');
-		$this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Dimension page
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   //Support add of a watermark on drafts
-
-		$this->franchise=!$mysoc->tva_assuj;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Affiche mode reglement
+		$this->option_condreg = 1; // Affiche conditions reglement
+		$this->option_codeproduitservice = 1; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 1; //Support add of a watermark on drafts
+
+		$this->franchise = !$mysoc->tva_assuj;
 
 		// Get source company
-		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+		$this->emetteur = $mysoc;
+		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 
 		// Define position of columns
-		$this->posxdesc=$this->marge_gauche+1;
-		if($conf->global->PRODUCT_USE_UNITS)
+		$this->posxdesc = $this->marge_gauche + 1;
+		if ($conf->global->PRODUCT_USE_UNITS)
 		{
-			$this->posxtva=101;
-			$this->posxup=118;
-			$this->posxqty=135;
-			$this->posxunit=151;
+			$this->posxtva = 101;
+			$this->posxup = 118;
+			$this->posxqty = 135;
+			$this->posxunit = 151;
 		}
 		else
 		{
-			$this->posxtva=110;
-			$this->posxup=126;
-			$this->posxqty=145;
+			$this->posxtva = 110;
+			$this->posxup = 126;
+			$this->posxqty = 145;
 		}
-		$this->posxdiscount=162;
-		$this->postotalht=174;
-		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva=$this->posxup;
-		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
+		$this->posxdiscount = 162;
+		$this->postotalht = 174;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva = $this->posxup;
+		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-			$this->posxpicture-=20;
-			$this->posxtva-=20;
-			$this->posxup-=20;
-			$this->posxqty-=20;
-			$this->posxunit-=20;
-			$this->posxdiscount-=20;
-			$this->postotalht-=20;
+			$this->posxpicture -= 20;
+			$this->posxtva -= 20;
+			$this->posxup -= 20;
+			$this->posxqty -= 20;
+			$this->posxunit -= 20;
+			$this->posxdiscount -= 20;
+			$this->postotalht -= 20;
 		}
 
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
+		$this->tva = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -214,14 +214,14 @@ 
      *  @param		int			$hideref			Do not show ref
      *  @return     int             				1=OK, 0=KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblignes;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
@@ -229,51 +229,51 @@ 
 		$nblignes = count($object->lines);
 
 		// Loop on each lines to detect if there is at least one image to show
-		$realpatharray=array();
-		if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
+		$realpatharray = array();
+		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
 		{
 			$objphoto = new Product($this->db);
 
-			for ($i = 0 ; $i < $nblignes ; $i++)
+			for ($i = 0; $i < $nblignes; $i++)
 			{
 				if (empty($object->lines[$i]->fk_product)) continue;
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
                 //var_dump($objphoto->ref);exit;
-				if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 				{
-					$pdir[0] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";
-					$pdir[1] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
+					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				}
 				else
 				{
-					$pdir[0] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
-					$pdir[1] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";	// alternative
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
 
 				$arephoto = false;
 				foreach ($pdir as $midir)
 				{
-					if (! $arephoto)
+					if (!$arephoto)
 					{
 						$dir = $conf->product->dir_output.'/'.$midir;
 
-						foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
 						{
 							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
 							{
 								if ($obj['photo_vignette'])
 								{
-									$filename= $obj['photo_vignette'];
+									$filename = $obj['photo_vignette'];
 								}
 								else
 								{
-									$filename=$obj['photo'];
+									$filename = $obj['photo'];
 								}
 							}
 							else
 							{
-								$filename=$obj['photo'];
+								$filename = $obj['photo'];
 							}
 
 							$realpath = $dir.$filename;
@@ -282,11 +282,11 @@ 
 					}
 				}
 
-				if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
 
 		if ($conf->propal->multidir_output[$conf->entity])
 		{
@@ -298,20 +298,20 @@ 
 			if ($object->specimen)
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
-				$file = $dir . "/SPECIMEN.pdf";
+				$file = $dir."/SPECIMEN.pdf";
 			}
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->propal->multidir_output[$object->entity] . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
+				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
+				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -319,20 +319,20 @@ 
 			if (file_exists($dir))
 			{
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Create pdf instance
-                $pdf=pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1,0);
+                $pdf = pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+	            $pdf->SetAutoPageBreak(1, 0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -341,27 +341,27 @@ 
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("PdfCommercialProposalTitle"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Positionne $this->atleastonediscount si on a au moins une remise
-				for ($i = 0 ; $i < $nblignes ; $i++)
+				for ($i = 0; $i < $nblignes; $i++)
 				{
 					if ($object->lines[$i]->remise_percent)
 					{
@@ -370,34 +370,34 @@ 
 				}
 				if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS))
 				{
-					$this->posxpicture+=($this->postotalht - $this->posxdiscount);
-					$this->posxtva+=($this->postotalht - $this->posxdiscount);
-					$this->posxup+=($this->postotalht - $this->posxdiscount);
-					$this->posxqty+=($this->postotalht - $this->posxdiscount);
-					$this->posxdiscount+=($this->postotalht - $this->posxdiscount);
+					$this->posxpicture += ($this->postotalht - $this->posxdiscount);
+					$this->posxtva += ($this->postotalht - $this->posxdiscount);
+					$this->posxup += ($this->postotalht - $this->posxdiscount);
+					$this->posxqty += ($this->postotalht - $this->posxdiscount);
+					$this->posxdiscount += ($this->postotalht - $this->posxdiscount);
 					//$this->postotalht;
 				}
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 
-                $heightforinfotot = 40;	// Height reserved to output the info and total part
-                $heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE)?(pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature"))+10):0;
-                $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+                $heightforinfotot = 40; // Height reserved to output the info and total part
+                $heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE) ? (pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature")) + 10) : 0;
+                $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
                 //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
 
-	            $tab_top = 90+$top_shift;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
+	            $tab_top = 90 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
 				if ($conf->incoterm->enabled)
@@ -407,58 +407,58 @@ 
 					{
 						$tab_top -= 2;
 
-						$pdf->SetFont('','', $default_font_size - 1);
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
 						$nexY = $pdf->GetY();
-						$height_incoterms=$nexY-$tab_top;
+						$height_incoterms = $nexY - $tab_top;
 
 						// Rect prend une longueur en 3eme param
-						$pdf->SetDrawColor(192,192,192);
-						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
+						$pdf->SetDrawColor(192, 192, 192);
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
 
-						$tab_top = $nexY+6;
+						$tab_top = $nexY + 6;
 					}
 				}
 
 				// Affiche notes
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
-				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
 				{
 					// Get first sale rep
 					if (is_object($object->thirdparty))
 					{
-						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
-						$salerepobj=new User($this->db);
+						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
+						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
-				if (! empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
+				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
 				{
-				    $tmpuser=new User($this->db);
+				    $tmpuser = new User($this->db);
 				    $tmpuser->fetch($object->user_author_id);
-				    $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs);
-				    if ($tmpuser->email) $notetoshow.=',  Mail: '.$tmpuser->email;
-				    if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
+				    $notetoshow .= 'Affaire suivi par '.$tmpuser->getFullName($langs);
+				    if ($tmpuser->email) $notetoshow .= ',  Mail: '.$tmpuser->email;
+				    if ($tmpuser->office_phone) $notetoshow .= ', Tel: '.$tmpuser->office_phone;
 				}
 				if ($notetoshow)
 				{
 					$tab_top -= 2;
 
-					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($notetoshow), 0, 1);
 					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
+					$height_note = $nexY - $tab_top;
 
 					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+					$pdf->SetDrawColor(192, 192, 192);
+					$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
 
-					$tab_top = $nexY+6;
+					$tab_top = $nexY + 6;
 				}
 
 				$iniY = $tab_top + 7;
@@ -469,191 +469,191 @@ 
 				for ($i = 0; $i < $nblignes; $i++)
 				{
 					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
-					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
-					$showpricebeforepagebreak=1;
-					$posYAfterImage=0;
-					$posYAfterDescription=0;
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
+					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// If photo too high, we moved completely on new page
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// If photo too high, we moved completely on new page
 					{
-						$pdf->AddPage('','',true);
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pdf->AddPage('', '', true);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-						$pdf->setPage($pageposbefore+1);
+						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
-						$showpricebeforepagebreak=0;
+						$showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
 					{
-						$curX = $this->posxpicture-1;
-						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
+						$curX = $this->posxpicture - 1;
+						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
-						$posYAfterImage=$curY+$imglinesize['height'];
+						$posYAfterImage = $curY + $imglinesize['height'];
 					}
 
 					// Description of product line
-					$curX = $this->posxdesc-1;
+					$curX = $this->posxdesc - 1;
 
 					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
-					$pageposafter=$pdf->getPage();
+					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
+					$pageposafter = $pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
-						$pageposafter=$pageposbefore;
+						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
-						$pageposafter=$pdf->getPage();
-						$posyafter=$pdf->GetY();
+						$pageposafter = $pdf->getPage();
+						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// There is no space left for total+free text
 						{
-							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+							if ($i == ($nblignes - 1))	// No more lines, and no space left to show total, so we create a new page
 							{
-								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								$pdf->AddPage('', '', true);
+								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-								$pdf->setPage($pageposafter+1);
+								$pdf->setPage($pageposafter + 1);
 							}
 						}
 						else
 						{
 							// We found a page break
-							$showpricebeforepagebreak=0;
+							$showpricebeforepagebreak = 0;
 						}
 					}
 					else	// No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
-					$posYAfterDescription=$pdf->GetY();
+					$posYAfterDescription = $pdf->GetY();
 
 					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
+					$pageposafter = $pdf->getPage();
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// VAT Rate
 					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
 					{
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-						$pdf->SetXY($this->posxtva-5, $curY);
-						$pdf->MultiCell($this->posxup-$this->posxtva+4, 3, $vat_rate, 0, 'R');
+						$pdf->SetXY($this->posxtva - 5, $curY);
+						$pdf->MultiCell($this->posxup - $this->posxtva + 4, 3, $vat_rate, 0, 'R');
 					}
 
 					// Unit price before discount
 					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', 0);
 
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxqty, $curY);
 					// Enough for 6 chars
-					if($conf->global->PRODUCT_USE_UNITS)
+					if ($conf->global->PRODUCT_USE_UNITS)
 					{
-						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R');
+						$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R');
 					}
 					else
 					{
-						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
+						$pdf->MultiCell($this->posxdiscount - $this->posxqty - 0.8, 4, $qty, 0, 'R');
 					}
 
 					// Unit
-					if($conf->global->PRODUCT_USE_UNITS)
+					if ($conf->global->PRODUCT_USE_UNITS)
 					{
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
-						$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');
+						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
 
 					// Discount on line
 					$pdf->SetXY($this->posxdiscount, $curY);
 					if ($object->lines[$i]->remise_percent)
 					{
-						$pdf->SetXY($this->posxdiscount-2, $curY);
+						$pdf->SetXY($this->posxdiscount - 2, $curY);
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
-						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
+						$pdf->MultiCell($this->postotalht - $this->posxdiscount + 2, 3, $remise_percent, 0, 'R');
 					}
 
 					// Total HT line
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne=$object->lines[$i]->total_tva;
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					else $tvaligne = $object->lines[$i]->total_tva;
 
-					$localtax1ligne=$object->lines[$i]->total_localtax1;
-					$localtax2ligne=$object->lines[$i]->total_localtax2;
-					$localtax1_rate=$object->lines[$i]->localtax1_tx;
-					$localtax2_rate=$object->lines[$i]->localtax2_tx;
-					$localtax1_type=$object->lines[$i]->localtax1_type;
-					$localtax2_type=$object->lines[$i]->localtax2_type;
+					$localtax1ligne = $object->lines[$i]->total_localtax1;
+					$localtax2ligne = $object->lines[$i]->total_localtax2;
+					$localtax1_rate = $object->lines[$i]->localtax1_tx;
+					$localtax2_rate = $object->lines[$i]->localtax2_tx;
+					$localtax1_type = $object->lines[$i]->localtax1_type;
+					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
 
-					$vatrate=(string) $object->lines[$i]->tva_tx;
+					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
-					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
-					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
+					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
+						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
 				    // retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
-						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
-						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
+					if (!isset($this->tva[$vatrate]))				$this->tva[$vatrate] = 0;
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
 
 					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-					$nexY+=2;    // Passe espace entre les lignes
+					$nexY += 2; // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -667,13 +667,13 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
@@ -683,10 +683,10 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
@@ -696,19 +696,19 @@ 
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
 
 				// Affiche zone infos
-				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
 				// Affiche zone totaux
-				$posy=$this->_tableau_tot($pdf, $object, 0, $bottomlasttab, $outputlangs);
+				$posy = $this->_tableau_tot($pdf, $object, 0, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
 				/*
@@ -721,21 +721,21 @@ 
 				// Customer signature area
 				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
 				{
-				    $posy=$this->_signature_area($pdf, $object, $posy, $outputlangs);
+				    $posy = $this->_signature_area($pdf, $object, $posy, $outputlangs);
 				}
 
 				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				//If propal merge product PDF is active
 				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
 
-					$already_merged = array ();
-					foreach ( $object->lines as $line ) {
-						if (! empty($line->fk_product) && ! (in_array($line->fk_product, $already_merged))) {
+					$already_merged = array();
+					foreach ($object->lines as $line) {
+						if (!empty($line->fk_product) && !(in_array($line->fk_product, $already_merged))) {
 							// Find the desire PDF
 							$filetomerge = new Propalmergepdfproduct($this->db);
 
@@ -750,48 +750,48 @@ 
 							$product = new Product($this->db);
 							$product->fetch($line->fk_product);
 
-							if ($product->entity!=$conf->entity) {
-								$entity_product_file=$product->entity;
+							if ($product->entity != $conf->entity) {
+								$entity_product_file = $product->entity;
 							} else {
-								$entity_product_file=$conf->entity;
+								$entity_product_file = $conf->entity;
 							}
 
 							// If PDF is selected and file is not empty
 							if (count($filetomerge->lines) > 0) {
-								foreach ( $filetomerge->lines as $linefile ) {
-									if (! empty($linefile->id) && ! empty($linefile->file_name)) {
+								foreach ($filetomerge->lines as $linefile) {
+									if (!empty($linefile->id) && !empty($linefile->file_name)) {
 
 
-										if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+										if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 										{
-											if (! empty($conf->product->enabled)) {
-												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
-											} elseif (! empty($conf->service->enabled)) {
-												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+											if (!empty($conf->product->enabled)) {
+												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
+											} elseif (!empty($conf->service->enabled)) {
+												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
 										}
 										else
 										{
-											if (! empty($conf->product->enabled)) {
-												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
-											} elseif (! empty($conf->service->enabled)) {
-												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
+											if (!empty($conf->product->enabled)) {
+												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
+											} elseif (!empty($conf->service->enabled)) {
+												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											}
 										}
 
-										dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG);
+										dol_syslog(get_class($this).':: upload_dir='.$filetomerge_dir, LOG_DEBUG);
 
-										$infile = $filetomerge_dir . '/' . $linefile->file_name;
+										$infile = $filetomerge_dir.'/'.$linefile->file_name;
 										if (file_exists($infile) && is_readable($infile)) {
 											$pagecount = $pdf->setSourceFile($infile);
-											for($i = 1; $i <= $pagecount; $i ++) {
+											for ($i = 1; $i <= $pagecount; $i++) {
 												$tplIdx = $pdf->importPage($i);
-												if ($tplIdx!==false) {
+												if ($tplIdx !== false) {
 													$s = $pdf->getTemplatesize($tplIdx);
 													$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 													$pdf->useTemplate($tplIdx);
 												} else {
-													setEventMessages(null, array($infile.' cannot be added, probably protected PDF'),'warnings');
+													setEventMessages(null, array($infile.' cannot be added, probably protected PDF'), 'warnings');
 												}
 											}
 										}
@@ -804,30 +804,30 @@ 
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				//Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Pas d'erreur
+				return 1; // Pas d'erreur
 			}
 			else
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
+			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -864,66 +864,66 @@ 
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
 		{
-			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
 
-			$posy=$pdf->GetY()+4;
+			$posy = $pdf->GetY() + 4;
 		}
 
-		$posxval=52;
+		$posxval = 52;
 
         // Show shipping date
-        if (! empty($object->date_livraison))
+        if (!empty($object->date_livraison))
 		{
             $outputlangs->load("sendings");
-			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
+			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
-            $posy=$pdf->GetY()+1;
+            $posy = $pdf->GetY() + 1;
 		}
         elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
-			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
-			$lib_availability=str_replace('\n',"\n",$lib_availability);
+			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset($object->availability);
+			$lib_availability = str_replace('\n', "\n", $lib_availability);
 			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
 
-			$posy=$pdf->GetY()+1;
+			$posy = $pdf->GetY() + 1;
 		}
 
 		// Show payments conditions
 		if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
 		{
-			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
 			$pdf->MultiCell(43, 4, $titre, 0, 'L');
 
-			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
-			$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
-			$pdf->MultiCell(67, 4, $lib_condition_paiement,0,'L');
+			$lib_condition_paiement = $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) != ('PaymentCondition'.$object->cond_reglement_code) ? $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) : $outputlangs->convToOutputCharset($object->cond_reglement_doc);
+			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
+			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
-			$posy=$pdf->GetY()+3;
+			$posy = $pdf->GetY() + 3;
 		}
 
 		if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMMODE))
@@ -949,25 +949,25 @@ 
 			&& $object->mode_reglement_code != 'CHQ'
 			&& $object->mode_reglement_code != 'VIR')
 			{
-				$pdf->SetFont('','B', $default_font_size - 2);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
 				$pdf->MultiCell(80, 5, $titre, 0, 'L');
-				$pdf->SetFont('','', $default_font_size - 2);
+				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posxval, $posy);
-				$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
-				$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
+				$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
+				$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
 
-				$posy=$pdf->GetY()+2;
+				$posy = $pdf->GetY() + 2;
 			}
 
 			// Show payment mode CHQ
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
 			{
 				// Si mode reglement non force ou si force a CHQ
-				if (! empty($conf->global->FACTURE_CHQ_NUMBER))
+				if (!empty($conf->global->FACTURE_CHQ_NUMBER))
 				{
-					$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
+					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
 					{
@@ -975,31 +975,31 @@ 
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
-						$posy=$pdf->GetY()+1;
+						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+						$posy = $pdf->GetY() + 1;
 
 			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 			            {
 							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
+							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
+							$posy = $pdf->GetY() + 2;
 			            }
 					}
 					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
 					{
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
-						$posy=$pdf->GetY()+1;
+						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+						$posy = $pdf->GetY() + 1;
 
 			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 			            {
 							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
+							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
+							$posy = $pdf->GetY() + 2;
 			            }
 					}
 				}
@@ -1008,19 +1008,19 @@ 
 			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
 			{
-				if (! empty($object->fk_account) || ! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
+				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
 				{
-					$bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
-					if (! empty($object->fk_bank)) $bankid=$object->fk_bank;   // For backward compatibility when object->fk_account is forced with object->fk_bank
+					$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+					if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
-					$curx=$this->marge_gauche;
-					$cury=$posy;
+					$curx = $this->marge_gauche;
+					$cury = $posy;
 
-					$posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+					$posy = pdf_bank($pdf, $outputlangs, $curx, $cury, $account, 0, $default_font_size);
 
-					$posy+=2;
+					$posy += 2;
 				}
 			}
 		}
@@ -1043,43 +1043,43 @@ 
 	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-			$col2x-=20;
+			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
 
-		$useborder=0;
+		$useborder = 0;
 		$index = 0;
 
 		// Total HT
-		$pdf->SetFillColor(255,255,255);
+		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
 		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
+		$pdf->SetFillColor(248, 248, 248);
 
 		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
-		$this->atleastoneratenotnull=0;
+		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 		{
-			$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
+			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
 			}
@@ -1088,28 +1088,28 @@ 
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+					foreach ($this->localtax1 as $localtax_type => $localtax_rate)
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
 
-						foreach( $localtax_rate as $tvakey => $tvaval )
+						foreach ($localtax_rate as $tvakey => $tvaval)
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey != 0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
+								$tvacompl = '';
+								if (preg_match('/\*/', $tvakey))
 								{
-									$tvakey=str_replace('*','',$tvakey);
+									$tvakey = str_replace('*', '', $tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
+								$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1120,13 +1120,13 @@ 
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+					foreach ($this->localtax2 as $localtax_type => $localtax_rate)
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
 
-						foreach( $localtax_rate as $tvakey => $tvaval )
+						foreach ($localtax_rate as $tvakey => $tvaval)
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey != 0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
@@ -1135,15 +1135,15 @@ 
 								$index++;
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
+								$tvacompl = '';
+								if (preg_match('/\*/', $tvakey))
 								{
-									$tvakey=str_replace('*','',$tvakey);
+									$tvakey = str_replace('*', '', $tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
 								$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
+								$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1152,7 +1152,7 @@ 
 					}
 				//}
 				// VAT
-				foreach($this->tva as $tvakey => $tvaval)
+				foreach ($this->tva as $tvakey => $tvaval)
 				{
 					if ($tvakey != 0)    // On affiche pas taux 0
 					{
@@ -1161,15 +1161,15 @@ 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-						$tvacompl='';
-						if (preg_match('/\*/',$tvakey))
+						$tvacompl = '';
+						if (preg_match('/\*/', $tvakey))
 						{
-							$tvakey=str_replace('*','',$tvakey);
+							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
-						$totalvat =$outputlangs->transcountrynoentities("TotalVAT",$mysoc->country_code).' ';
-						$totalvat.=vatrate($tvakey,1).$tvacompl;
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
+						$totalvat .= vatrate($tvakey, 1).$tvacompl;
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1179,11 +1179,11 @@ 
 				//Local tax 1 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+					foreach ($this->localtax1 as $localtax_type => $localtax_rate)
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
 
-						foreach( $localtax_rate as $tvakey => $tvaval )
+						foreach ($localtax_rate as $tvakey => $tvaval)
 						{
 							if ($tvakey != 0)    // On affiche pas taux 0
 							{
@@ -1192,16 +1192,16 @@ 
 								$index++;
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
+								$tvacompl = '';
+								if (preg_match('/\*/', $tvakey))
 								{
-									$tvakey=str_replace('*','',$tvakey);
+									$tvakey = str_replace('*', '', $tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
+								$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
 
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
+								$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 							}
@@ -1211,11 +1211,11 @@ 
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+					foreach ($this->localtax2 as $localtax_type => $localtax_rate)
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
 
-						foreach( $localtax_rate as $tvakey => $tvaval )
+						foreach ($localtax_rate as $tvakey => $tvaval)
 						{
 						    // retrieve global local tax
 							if ($tvakey != 0)    // On affiche pas taux 0
@@ -1225,16 +1225,16 @@ 
 								$index++;
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
+								$tvacompl = '';
+								if (preg_match('/\*/', $tvakey))
 								{
-									$tvakey=str_replace('*','',$tvakey);
+									$tvakey = str_replace('*', '', $tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
+								$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
 
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
+								$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1246,16 +1246,16 @@ 
 				// Total TTC
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->SetFillColor(224,224,224);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->SetFillColor(224, 224, 224);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 
 		/*
 		$resteapayer = $object->total_ttc - $deja_regle;
@@ -1267,7 +1267,7 @@ 
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
@@ -1289,16 +1289,16 @@ 
 			*/
 
 			$index++;
-			$pdf->SetTextColor(0,0,60);
-			$pdf->SetFillColor(224,224,224);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
 
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetTextColor(0, 0, 0);
 		}
 
 		$index++;
@@ -1318,48 +1318,48 @@ 
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
 		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',$default_font_size - 2);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
-			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
-		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','',$default_font_size - 1);
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Output Rect
-		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
 
 		if (empty($hidetop))
 		{
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line prend une position y en 2eme param et 4eme param
 
-			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
-			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
+			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
+			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
+		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
 		{
-			$pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
+			$pdf->line($this->posxpicture - 1, $tab_top, $this->posxpicture - 1, $tab_top + $tab_height);
 			if (empty($hidetop))
 			{
 				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
@@ -1369,37 +1369,37 @@ 
 
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
 		{
-			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
 			if (empty($hidetop))
 			{
 				// Not do -3 and +3 instead of -1 -1 to have more space for text 'Sales tax'
-				$pdf->SetXY($this->posxtva-3, $tab_top+1);
-				$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
+				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
+				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
 		}
 
-		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
-			$pdf->SetXY($this->posxup-1, $tab_top+1);
-			$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
+			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 		}
 
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
-			$pdf->SetXY($this->posxqty-1, $tab_top+1);
-			if($conf->global->PRODUCT_USE_UNITS)
+			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
+			if ($conf->global->PRODUCT_USE_UNITS)
 			{
-				$pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+				$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 			}
 			else
 			{
-				$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+				$pdf->MultiCell($this->posxdiscount - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 			}
 		}
 
-		if($conf->global->PRODUCT_USE_UNITS) {
+		if ($conf->global->PRODUCT_USE_UNITS) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
@@ -1408,13 +1408,13 @@ 
 			}
 		}
 
-		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
 			if ($this->atleastonediscount)
 			{
-				$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
-				$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
+				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
+				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
 		if ($this->atleastonediscount)
@@ -1423,8 +1423,8 @@ 
 		}
 		if (empty($hidetop))
 		{
-			$pdf->SetXY($this->postotalht-1, $tab_top+1);
-			$pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
+			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
+			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 		}
 	}
 
@@ -1439,113 +1439,113 @@ 
 	 */
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		//  Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
+		if ($object->statut == 0 && (!empty($conf->global->PROPALE_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
+            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
 		}
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+			$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 			if ($this->emetteur->logo)
 			{
 				if (is_readable($logo))
 				{
-				    $height=pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+				    $height = pdf_getHeightForLogo($logo);
+				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				}
 				else
 				{
-					$pdf->SetTextColor(200,0,0);
-					$pdf->SetFont('','B',$default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+					$pdf->SetTextColor(200, 0, 0);
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
 			else
 			{
-				$text=$this->emetteur->name;
+				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
 		}
 
-		$pdf->SetFont('','B',$default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$title=$outputlangs->transnoentities("PdfCommercialProposalTitle");
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("PdfCommercialProposalTitle");
 		$pdf->MultiCell(100, 4, $title, '', 'R');
 
-		$pdf->SetFont('','B',$default_font_size);
+		$pdf->SetFont('', 'B', $default_font_size);
 
-		$posy+=5;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
 
-		$posy+=1;
-		$pdf->SetFont('','', $default_font_size - 2);
+		$posy += 1;
+		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if ($object->ref_client)
 		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
+		$posy += 4;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dol_print_date($object->fin_validite,"day",false,$outputlangs,true), '', 'R');
+		$posy += 4;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : ".dol_print_date($object->fin_validite, "day", false, $outputlangs, true), '', 'R');
 
 		if ($object->thirdparty->code_client)
 		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 		    if (count($arrayidcontact) > 0)
 		    {
-		        $usertmp=new User($this->db);
+		        $usertmp = new User($this->db);
 		        $usertmp->fetch($arrayidcontact[0]);
-                $posy+=4;
-                $pdf->SetXY($posx,$posy);
-		        $pdf->SetTextColor(0,0,60);
+                $posy += 4;
+                $pdf->SetXY($posx, $posy);
+		        $pdf->SetTextColor(0, 0, 60);
 		        $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
 		    }
 		}
 
-		$posy+=2;
+		$posy += 2;
 
 		$top_shift = 0;
 		// Show list of linked objects
@@ -1559,53 +1559,53 @@ 
 		if ($showaddress)
 		{
 			// Sender properties
-			$carac_emetteur='';
+			$carac_emetteur = '';
 		 	// Add internal contact of proposal if defined
-			$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 		 	if (count($arrayidcontact) > 0)
 		 	{
 		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname=($outputlangs->transnoentities("FromContactName")!='FromContactName'?$outputlangs->transnoentities("FromContactName"):$outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+		 		$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
+		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
 		 	}
 
 		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
-			$posy=42+$top_shift;
-		 	$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
+			$posy = 42 + $top_shift;
+		 	$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			$hautcadre = 40;
 
 			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
+			$pdf->SetTextColor(0, 0, 60);
 
 			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
+			$posy = $pdf->getY();
 
 			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 
 			// If CUSTOMER contact defined, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+			$usecontact = false;
+			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 			if (count($arrayidcontact) > 0)
 			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
 			//Recipient name
@@ -1616,38 +1616,38 @@ 
 				$thirdparty = $object->thirdparty;
 			}
 
-			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->thirdparty,($usecontact?$object->contact:''),$usecontact,'target',$object);
+			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
-			$widthrecbox=100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42+$top_shift;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			$widthrecbox = 100;
+			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			$posy = 42 + $top_shift;
+			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
 			// Show recipient frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx+2,$posy-5);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx + 2, $posy - 5);
 			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
 		}
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 		return $top_shift;
 	}
 
@@ -1660,11 +1660,11 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1687,20 +1687,20 @@ 
 
 		$posx = 120;
 		$largcol = ($this->page_largeur - $this->marge_droite - $posx);
-		$useborder=0;
+		$useborder = 0;
 		$index = 0;
 		// Total HT
-		$pdf->SetFillColor(255,255,255);
+		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($posx, $tab_top + 0);
-		$pdf->SetFont('','', $default_font_size - 2);
+		$pdf->SetFont('', '', $default_font_size - 2);
 		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);
 
 		$pdf->SetXY($posx, $tab_top + $tab_hl);
-		$pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
-		if (! empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
-			$pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl*3);
+		$pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
+		if (!empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
+			$pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl * 3);
 		}
 
-		return ($tab_hl*7);
+		return ($tab_hl * 7);
 	}
 }

Braces +188 added lines, -96 removed lines

@@ -163,7 +163,10 @@ 
 
 		// Get source company
 		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default, if was not defined
 
 		// Define position of columns
 		$this->posxdesc=$this->marge_gauche+1;
@@ -173,8 +176,7 @@ 
 			$this->posxup=118;
 			$this->posxqty=135;
 			$this->posxunit=151;
-		}
-		else
+		} else
 		{
 			$this->posxtva=110;
 			$this->posxup=126;
@@ -182,11 +184,15 @@ 
 		}
 		$this->posxdiscount=162;
 		$this->postotalht=174;
-		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva=$this->posxup;
+		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		    $this->posxtva=$this->posxup;
+		}
 		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 			$this->posxpicture-=20;
+		}
 			$this->posxtva-=20;
 			$this->posxup-=20;
 			$this->posxqty-=20;
@@ -219,9 +225,13 @@ 
         // phpcs:enable
 		global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
@@ -236,7 +246,9 @@ 
 
 			for ($i = 0 ; $i < $nblignes ; $i++)
 			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+				if (empty($object->lines[$i]->fk_product)) {
+				    continue;
+				}
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
                 //var_dump($objphoto->ref);exit;
@@ -244,8 +256,7 @@ 
 				{
 					$pdir[0] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";
 					$pdir[1] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
-				}
-				else
+				} else
 				{
 					$pdir[0] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
 					$pdir[1] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";	// alternative
@@ -260,18 +271,18 @@ 
 
 						foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
 						{
-							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {
+							    // If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
 							{
 								if ($obj['photo_vignette'])
 								{
 									$filename= $obj['photo_vignette'];
-								}
-								else
+							}
+								} else
 								{
 									$filename=$obj['photo'];
 								}
-							}
-							else
+							} else
 							{
 								$filename=$obj['photo'];
 							}
@@ -282,11 +293,15 @@ 
 					}
 				}
 
-				if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+				if ($realpath && $arephoto) {
+				    $realpatharray[$i]=$realpath;
+				}
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		if (count($realpatharray) == 0) {
+		    $this->posxpicture=$this->posxtva;
+		}
 
 		if ($conf->propal->multidir_output[$conf->entity])
 		{
@@ -299,8 +314,7 @@ 
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity] . "/" . $objectref;
@@ -356,7 +370,9 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+				    $pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
@@ -380,14 +396,18 @@ 
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (! empty($tplidx)) {
+				    $pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 
                 $heightforinfotot = 40;	// Height reserved to output the info and total part
                 $heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE)?(pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature"))+10):0;
                 $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
 	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) {
+				    $heightforfooter+= 6;
+				}
                 //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
@@ -430,7 +450,9 @@ 
 						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj=new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (! empty($salerepobj->signature)) {
+						    $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 				if (! empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
@@ -438,8 +460,12 @@ 
 				    $tmpuser=new User($this->db);
 				    $tmpuser->fetch($object->user_author_id);
 				    $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs);
-				    if ($tmpuser->email) $notetoshow.=',  Mail: '.$tmpuser->email;
-				    if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
+				    if ($tmpuser->email) {
+				        $notetoshow.=',  Mail: '.$tmpuser->email;
+				    }
+				    if ($tmpuser->office_phone) {
+				        $notetoshow.=', Tel: '.$tmpuser->office_phone;
+				    }
 				}
 				if ($notetoshow)
 				{
@@ -474,7 +500,9 @@ 
 
 					// Define size of image if we need it
 					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					if (! empty($realpatharray[$i])) {
+					    $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
@@ -485,11 +513,17 @@ 
 					$posYAfterDescription=0;
 
 					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// If photo too high, we moved completely on new page
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot))) {
+					    // If photo too high, we moved completely on new page
 					{
 						$pdf->AddPage('','',true);
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+						if (! empty($tplidx)) {
+						    $pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore+1);
 
 						$curY = $tab_top_newpage;
@@ -510,9 +544,11 @@ 
 					$pdf->startTransaction();
 					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
 					$pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					if ($pageposafter > $pageposbefore) {
+					    // There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
+					}
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
@@ -521,23 +557,27 @@ 
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot))) {
+						    // There is no space left for total+free text
 						{
 							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
 							{
 								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+								if (! empty($tplidx)) {
+								    $pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								    $this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter+1);
 							}
-						}
-						else
+						} else
 						{
 							// We found a page break
 							$showpricebeforepagebreak=0;
 						}
-					}
-					else	// No pagebreak
+					} else	// No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -577,8 +617,7 @@ 
 					if($conf->global->PRODUCT_USE_UNITS)
 					{
 						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R');
-					}
-					else
+					} else
 					{
 						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
 					}
@@ -606,8 +645,11 @@ 
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne=$object->lines[$i]->total_tva;
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) {
+					    $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+					} else {
+					    $tvaligne=$object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
@@ -616,32 +658,48 @@ 
 					$localtax1_type=$object->lines[$i]->localtax1_type;
 					$localtax2_type=$object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+					if ($object->remise_percent) {
+					    $tvaligne-=($tvaligne*$object->remise_percent)/100;
+					}
+					if ($object->remise_percent) {
+					    $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+					}
+					if ($object->remise_percent) {
+					    $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+					}
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
-					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
+					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) {
+					    // and there is local tax
 					{
 						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
+					}
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
 				    // retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
-						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
-						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+					if ($localtax1_type && $localtax1ligne != 0) {
+											$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
+											$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+					    $vatrate.='*';
+					}
+					if (! isset($this->tva[$vatrate])) {
+					    $this->tva[$vatrate]=0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) {
+					    $nexY=$posYAfterImage;
+					}
 
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
@@ -662,8 +720,7 @@ 
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
@@ -671,24 +728,29 @@ 
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (! empty($tplidx)) {
+						    $pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -697,8 +759,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
@@ -726,7 +787,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				//If propal merge product PDF is active
 				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
@@ -769,8 +832,7 @@ 
 											} elseif (! empty($conf->service->enabled)) {
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
 											}
-										}
-										else
+										} else
 										{
 											if (! empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
@@ -812,20 +874,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+								@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Pas d'erreur
-			}
-			else
+			} else
 			{
 				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
 			return 0;
@@ -892,10 +953,11 @@ 
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy=$pdf->GetY()+1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability) {
+            // Show availability conditions
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
+        }
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
@@ -1011,7 +1073,10 @@ 
 				if (! empty($object->fk_account) || ! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
 				{
 					$bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
-					if (! empty($object->fk_bank)) $bankid=$object->fk_bank;   // For backward compatibility when object->fk_account is forced with object->fk_bank
+					if (! empty($object->fk_bank)) {
+					    $bankid=$object->fk_bank;
+					}
+					// For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
@@ -1052,10 +1117,12 @@ 
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 			$col2x-=20;
 		}
+		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
 
 		$useborder=0;
@@ -1082,23 +1149,26 @@ 
 			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
+			} else
 			{
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey!=0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1122,17 +1192,21 @@ 
 				//{
 					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey!=0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1154,9 +1228,11 @@ 
 				// VAT
 				foreach($this->tva as $tvakey => $tvaval)
 				{
-					if ($tvakey != 0)    // On affiche pas taux 0
+					if ($tvakey != 0) {
+					    // On affiche pas taux 0
 					{
 						$this->atleastoneratenotnull++;
+					}
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1181,15 +1257,19 @@ 
 				//{
 					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2','4','6'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey != 0)    // On affiche pas taux 0
+							if ($tvakey != 0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1213,16 +1293,20 @@ 
 				//{
 					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2','4','6'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
 						    // retrieve global local tax
-							if ($tvakey != 0)    // On affiche pas taux 0
+							if ($tvakey != 0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1324,7 +1408,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+		    $hidetop=-1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1340,7 +1426,9 @@ 
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+			    $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128,128,128);
@@ -1392,8 +1480,7 @@ 
 			if($conf->global->PRODUCT_USE_UNITS)
 			{
 				$pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-			}
-			else
+			} else
 			{
 				$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
 			}
@@ -1472,16 +1559,14 @@ 
 				{
 				    $height=pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-				}
-				else
+				} else
 				{
 					$pdf->SetTextColor(200,0,0);
 					$pdf->SetFont('','B',$default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
+			} else
 			{
 				$text=$this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -1574,7 +1659,9 @@ 
 			// Show sender
 			$posy=42+$top_shift;
 		 	$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->page_largeur-$this->marge_droite-80;
+			}
 			$hautcadre=40;
 
 			// Show sender frame
@@ -1622,10 +1709,15 @@ 
 
 			// Show recipient
 			$widthrecbox=100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+			if ($this->page_largeur < 210) {
+			    $widthrecbox=84;
+			}
+			// To work with US executive format
 			$posy=42+$top_shift;
 			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0,0,0);

dolibarr/htdocs/core/modules/propale/doc/pdf_cyan.modules.php

Indentation +1687 added lines, -1687 removed lines

@@ -41,85 +41,85 @@ 
  */
 class pdf_cyan extends ModelePDFPropales
 {
-	public $db;
-	public $name;
-	public $description;
-	public $update_main_doc_field;	// Save the name of generated file as the main doc when generating a doc with this template
-	public $type;
-
-	public $phpmin = array(4,3,0); // Minimum version of PHP required by module
-	public $version = 'development';
-
-	public $page_largeur;
-	public $page_hauteur;
-	public $format;
-	public $marge_gauche;
-	public	$marge_droite;
-	public	$marge_haute;
-	public	$marge_basse;
-
-	public $emetteur;	// Objet societe qui emet
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	public function __construct($db)
-	{
-		global $conf,$langs,$mysoc;
-
-		// Translations
-		$langs->loadLangs(array("main", "bills"));
-
-		$this->db = $db;
-		$this->name = "cyan";
-		$this->description = $langs->trans('DocModelCyanDescription');
-		$this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
-
-		// Dimension page
-		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
-		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   //Support add of a watermark on drafts
-
-		$this->franchise=!$mysoc->tva_assuj;
-
-		// Get source company
-		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
-
-		// Define position of columns
-		$this->posxdesc=$this->marge_gauche+1;
-
-
-
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
-	}
+    public $db;
+    public $name;
+    public $description;
+    public $update_main_doc_field;	// Save the name of generated file as the main doc when generating a doc with this template
+    public $type;
+
+    public $phpmin = array(4,3,0); // Minimum version of PHP required by module
+    public $version = 'development';
+
+    public $page_largeur;
+    public $page_hauteur;
+    public $format;
+    public $marge_gauche;
+    public	$marge_droite;
+    public	$marge_haute;
+    public	$marge_basse;
+
+    public $emetteur;	// Objet societe qui emet
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        global $conf,$langs,$mysoc;
+
+        // Translations
+        $langs->loadLangs(array("main", "bills"));
+
+        $this->db = $db;
+        $this->name = "cyan";
+        $this->description = $langs->trans('DocModelCyanDescription');
+        $this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
+
+        // Dimension page
+        $this->type = 'pdf';
+        $formatarray=pdf_getFormat();
+        $this->page_largeur = $formatarray['width'];
+        $this->page_hauteur = $formatarray['height'];
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+        $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+        $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+        $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+        $this->option_logo = 1;                    // Affiche logo
+        $this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+        $this->option_modereg = 1;                 // Affiche mode reglement
+        $this->option_condreg = 1;                 // Affiche conditions reglement
+        $this->option_codeproduitservice = 1;      // Affiche code produit-service
+        $this->option_multilang = 1;               // Dispo en plusieurs langues
+        $this->option_escompte = 0;                // Affiche si il y a eu escompte
+        $this->option_credit_note = 0;             // Support credit notes
+        $this->option_freetext = 1;				   // Support add of a personalised text
+        $this->option_draft_watermark = 1;		   //Support add of a watermark on drafts
+
+        $this->franchise=!$mysoc->tva_assuj;
+
+        // Get source company
+        $this->emetteur=$mysoc;
+        if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+
+        // Define position of columns
+        $this->posxdesc=$this->marge_gauche+1;
+
+
+
+        $this->tva=array();
+        $this->localtax1=array();
+        $this->localtax2=array();
+        $this->atleastoneratenotnull=0;
+        $this->atleastonediscount=0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
+    /**
      *  Function to build pdf onto disk
      *
      *  @param		Object		$object				Object to generate
@@ -129,132 +129,132 @@ 
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
      *  @return     int             				1=OK, 0=KO
-	 */
-	public function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
-	{
-	  // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		$outputlangs->load("main");
-		$outputlangs->load("dict");
-		$outputlangs->load("companies");
-		$outputlangs->load("bills");
-		$outputlangs->load("propal");
-		$outputlangs->load("products");
-
-		$nblignes = count($object->lines);
-
-		// Loop on each lines to detect if there is at least one image to show
-		$realpatharray=array();
-		$this->atleastonephoto = false;
-		if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
-		{
-			$objphoto = new Product($this->db);
-
-			for ($i = 0 ; $i < $nblignes ; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
-
-				$objphoto->fetch($object->lines[$i]->fk_product);
+     */
+    public function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+    {
+        // phpcs:enable
+        global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+        $outputlangs->load("main");
+        $outputlangs->load("dict");
+        $outputlangs->load("companies");
+        $outputlangs->load("bills");
+        $outputlangs->load("propal");
+        $outputlangs->load("products");
+
+        $nblignes = count($object->lines);
+
+        // Loop on each lines to detect if there is at least one image to show
+        $realpatharray=array();
+        $this->atleastonephoto = false;
+        if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
+        {
+            $objphoto = new Product($this->db);
+
+            for ($i = 0 ; $i < $nblignes ; $i++)
+            {
+                if (empty($object->lines[$i]->fk_product)) continue;
+
+                $objphoto->fetch($object->lines[$i]->fk_product);
                 //var_dump($objphoto->ref);exit;
-				if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
-					$pdir[0] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";
-					$pdir[1] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
-				}
-				else
-				{
-					$pdir[0] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
-					$pdir[1] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";	// alternative
-				}
-
-				$arephoto = false;
-				foreach ($pdir as $midir)
-				{
-					if (! $arephoto)
-					{
-						$dir = $conf->product->dir_output.'/'.$midir;
-
-						foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
-						{
-							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-							{
-								if ($obj['photo_vignette'])
-								{
-									$filename= $obj['photo_vignette'];
-								}
-								else
-								{
-									$filename=$obj['photo'];
-								}
-							}
-							else
-							{
-								$filename=$obj['photo'];
-							}
-
-							$realpath = $dir.$filename;
-							$arephoto = true;
-							$this->atleastonephoto = true;
-						}
-					}
-				}
-
-				if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
-			}
-		}
-
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
-
-		if ($conf->propal->multidir_output[$conf->entity])
-		{
-			$object->fetch_thirdparty();
-
-			$deja_regle = 0;
+                if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+                {
+                    $pdir[0] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";
+                    $pdir[1] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
+                }
+                else
+                {
+                    $pdir[0] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
+                    $pdir[1] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";	// alternative
+                }
 
-			// Definition of $dir and $file
-			if ($object->specimen)
-			{
-				$dir = $conf->propal->multidir_output[$conf->entity];
-				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
-			{
-				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->propal->multidir_output[$object->entity] . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
-			}
+                $arephoto = false;
+                foreach ($pdir as $midir)
+                {
+                    if (! $arephoto)
+                    {
+                        $dir = $conf->product->dir_output.'/'.$midir;
+
+                        foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+                        {
+                            if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+                            {
+                                if ($obj['photo_vignette'])
+                                {
+                                    $filename= $obj['photo_vignette'];
+                                }
+                                else
+                                {
+                                    $filename=$obj['photo'];
+                                }
+                            }
+                            else
+                            {
+                                $filename=$obj['photo'];
+                            }
+
+                            $realpath = $dir.$filename;
+                            $arephoto = true;
+                            $this->atleastonephoto = true;
+                        }
+                    }
+                }
 
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return 0;
-				}
-			}
+                if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+            }
+        }
+
+        if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+
+        if ($conf->propal->multidir_output[$conf->entity])
+        {
+            $object->fetch_thirdparty();
+
+            $deja_regle = 0;
+
+            // Definition of $dir and $file
+            if ($object->specimen)
+            {
+                $dir = $conf->propal->multidir_output[$conf->entity];
+                $file = $dir . "/SPECIMEN.pdf";
+            }
+            else
+            {
+                $objectref = dol_sanitizeFileName($object->ref);
+                $dir = $conf->propal->multidir_output[$object->entity] . "/" . $objectref;
+                $file = $dir . "/" . $objectref . ".pdf";
+            }
+
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return 0;
+                }
+            }
 
-			if (file_exists($dir))
-			{
-				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+            if (file_exists($dir))
+            {
+                // Add pdfgeneration hook
+                if (! is_object($hookmanager))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+                    $hookmanager=new HookManager($this->db);
+                }
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-				// Create pdf instance
+                // Create pdf instance
                 $pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1,0);
+                $pdf->SetAutoPageBreak(1,0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -269,33 +269,33 @@ 
                     $tplidx = $pdf->importPage(1);
                 }
 
-				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
-
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("PdfCommercialProposalTitle"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
-
-				// Does we have at least one line with discount $this->atleastonediscount
-				foreach ($object->lines as $line) {
-				    if ($line->remise_percent){
-				        $this->atleastonediscount = true;
-				        break;
-				    }
-				}
+                $pdf->Open();
+                $pagenb=0;
+                $pdf->SetDrawColor(128,128,128);
+
+                $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+                $pdf->SetSubject($outputlangs->transnoentities("PdfCommercialProposalTitle"));
+                $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+                $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+                $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+                if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+                $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+
+                // Does we have at least one line with discount $this->atleastonediscount
+                foreach ($object->lines as $line) {
+                    if ($line->remise_percent){
+                        $this->atleastonediscount = true;
+                        break;
+                    }
+                }
 
 
 
-				// New page
-				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				$pagenb++;
+                // New page
+                $pdf->AddPage();
+                if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                $pagenb++;
 
                 $heightforinfotot = 40;	// Height reserved to output the info and total part
                 $heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE)?(pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature"))+10):0;
@@ -303,669 +303,669 @@ 
                 $heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)?12:22);	// Height reserved to output the footer (value include bottom margin)
                 //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+                $top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+                $pdf->SetFont('','', $default_font_size - 1);
+                $pdf->MultiCell(0, 3, '');		// Set interline to 3
+                $pdf->SetTextColor(0,0,0);
 
 
-	            $tab_top = 90+$top_shift;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
+                $tab_top = 90+$top_shift;
+                $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
 
 
-				// Incoterm
-				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
-				{
-					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
-						$tab_top -= 2;
-
-						$pdf->SetFont('','', $default_font_size - 1);
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
-						$nexY = $pdf->GetY();
-						$height_incoterms=$nexY-$tab_top;
-
-						// Rect prend une longueur en 3eme param
-						$pdf->SetDrawColor(192,192,192);
-						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
-
-						$tab_top = $nexY+6;
-					}
-				}
+                // Incoterm
+                $height_incoterms = 0;
+                if ($conf->incoterm->enabled)
+                {
+                    $desc_incoterms = $object->getIncotermsForPDF();
+                    if ($desc_incoterms)
+                    {
+                        $tab_top -= 2;
+
+                        $pdf->SetFont('','', $default_font_size - 1);
+                        $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+                        $nexY = $pdf->GetY();
+                        $height_incoterms=$nexY-$tab_top;
+
+                        // Rect prend une longueur en 3eme param
+                        $pdf->SetDrawColor(192,192,192);
+                        $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
+
+                        $tab_top = $nexY+6;
+                    }
+                }
 
-				// Affiche notes
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
-				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
-					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
-						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
-						$salerepobj=new User($this->db);
-						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
-					}
-				}
-				if (! empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
-				{
-				    $tmpuser=new User($this->db);
-				    $tmpuser->fetch($object->user_author_id);
-				    $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs);
-				    if ($tmpuser->email) $notetoshow.=',  Mail: '.$tmpuser->email;
-				    if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
-				}
+                // Affiche notes
+                $notetoshow=empty($object->note_public)?'':$object->note_public;
+                if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
+                {
+                    // Get first sale rep
+                    if (is_object($object->thirdparty))
+                    {
+                        $salereparray=$object->thirdparty->getSalesRepresentatives($user);
+                        $salerepobj=new User($this->db);
+                        $salerepobj->fetch($salereparray[0]['id']);
+                        if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+                    }
+                }
+                if (! empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
+                {
+                    $tmpuser=new User($this->db);
+                    $tmpuser->fetch($object->user_author_id);
+                    $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs);
+                    if ($tmpuser->email) $notetoshow.=',  Mail: '.$tmpuser->email;
+                    if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
+                }
 
-				$pagenb = $pdf->getPage();
-				if ($notetoshow)
-				{
-					$tab_top -= 2;
-
-				    $tab_width = $this->page_largeur-$this->marge_gauche-$this->marge_droite;
-				    $pageposbeforenote = $pagenb;
-
-					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
-					complete_substitutions_array($substitutionarray, $outputlangs, $object);
-					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-
-
-					$pdf->startTransaction();
-
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-					// Description
-					$pageposafternote=$pdf->getPage();
-					$posyafter = $pdf->GetY();
-
-					if($pageposafternote>$pageposbeforenote )
-					{
-					    $pdf->rollbackTransaction(true);
-
-					    // prepar pages to receive notes
-					    while ($pagenb < $pageposafternote) {
-					        $pdf->AddPage();
-					        $pagenb++;
-					        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-					        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					        // $this->_pagefoot($pdf,$object,$outputlangs,1);
-					        $pdf->setTopMargin($tab_top_newpage);
-					        // The only function to edit the bottom margin of current page to set it.
-					        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-					    }
-
-					    // back to start
-					    $pdf->setPage($pageposbeforenote);
-					    $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-					    $pdf->SetFont('','', $default_font_size - 1);
-					    $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-					    $pageposafternote=$pdf->getPage();
-
-					    $posyafter = $pdf->GetY();
-
-					    if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20)))	// There is no space left for total+free text
-					    {
-					        $pdf->AddPage('','',true);
-					        $pagenb++;
-					        $pageposafternote++;
-					        $pdf->setPage($pageposafternote);
-					        $pdf->setTopMargin($tab_top_newpage);
-					        // The only function to edit the bottom margin of current page to set it.
-					        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-					        //$posyafter = $tab_top_newpage;
-					    }
-
-
-					    // apply note frame to previus pages
-					    $i = $pageposbeforenote;
-					    while ($i < $pageposafternote) {
-					        $pdf->setPage($i);
-
-
-					        $pdf->SetDrawColor(128,128,128);
-					        // Draw note frame
-					        if($i>$pageposbeforenote){
-					            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-					            $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note + 1);
-					        }
-					        else{
-					            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-					            $pdf->Rect($this->marge_gauche, $tab_top-1, $tab_width, $height_note + 1);
-					        }
-
-					        // Add footer
-					        $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-					        $this->_pagefoot($pdf,$object,$outputlangs,1);
-
-					        $i++;
-					    }
-
-					    // apply note frame to last page
-					    $pdf->setPage($pageposafternote);
-					    if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-					    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					    $height_note=$posyafter-$tab_top_newpage;
-					    $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note+1);
-					}
-					else // No pagebreak
-					{
-					    $pdf->commitTransaction();
-					    $posyafter = $pdf->GetY();
-					    $height_note=$posyafter-$tab_top;
-					    $pdf->Rect($this->marge_gauche, $tab_top-1, $tab_width, $height_note+1);
-
-
-					    if($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20)) )
-					    {
-					        // not enough space, need to add page
-					        $pdf->AddPage('','',true);
-					        $pagenb++;
-					        $pageposafternote++;
-					        $pdf->setPage($pageposafternote);
-					        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-					        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-
-					        $posyafter = $tab_top_newpage;
-					    }
-					}
-
-					$tab_height = $tab_height - $height_note;
-					$tab_top = $posyafter +6;
-				}
-				else
-				{
-					$height_note=0;
-				}
+                $pagenb = $pdf->getPage();
+                if ($notetoshow)
+                {
+                    $tab_top -= 2;
+
+                    $tab_width = $this->page_largeur-$this->marge_gauche-$this->marge_droite;
+                    $pageposbeforenote = $pagenb;
+
+                    $substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+                    complete_substitutions_array($substitutionarray, $outputlangs, $object);
+                    $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+
+
+                    $pdf->startTransaction();
+
+                    $pdf->SetFont('','', $default_font_size - 1);
+                    $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+                    // Description
+                    $pageposafternote=$pdf->getPage();
+                    $posyafter = $pdf->GetY();
+
+                    if($pageposafternote>$pageposbeforenote )
+                    {
+                        $pdf->rollbackTransaction(true);
+
+                        // prepar pages to receive notes
+                        while ($pagenb < $pageposafternote) {
+                            $pdf->AddPage();
+                            $pagenb++;
+                            if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                            // $this->_pagefoot($pdf,$object,$outputlangs,1);
+                            $pdf->setTopMargin($tab_top_newpage);
+                            // The only function to edit the bottom margin of current page to set it.
+                            $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+                        }
+
+                        // back to start
+                        $pdf->setPage($pageposbeforenote);
+                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+                        $pdf->SetFont('','', $default_font_size - 1);
+                        $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+                        $pageposafternote=$pdf->getPage();
+
+                        $posyafter = $pdf->GetY();
+
+                        if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20)))	// There is no space left for total+free text
+                        {
+                            $pdf->AddPage('','',true);
+                            $pagenb++;
+                            $pageposafternote++;
+                            $pdf->setPage($pageposafternote);
+                            $pdf->setTopMargin($tab_top_newpage);
+                            // The only function to edit the bottom margin of current page to set it.
+                            $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+                            //$posyafter = $tab_top_newpage;
+                        }
+
+
+                        // apply note frame to previus pages
+                        $i = $pageposbeforenote;
+                        while ($i < $pageposafternote) {
+                            $pdf->setPage($i);
+
+
+                            $pdf->SetDrawColor(128,128,128);
+                            // Draw note frame
+                            if($i>$pageposbeforenote){
+                                $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+                                $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note + 1);
+                            }
+                            else{
+                                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+                                $pdf->Rect($this->marge_gauche, $tab_top-1, $tab_width, $height_note + 1);
+                            }
+
+                            // Add footer
+                            $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+                            $this->_pagefoot($pdf,$object,$outputlangs,1);
+
+                            $i++;
+                        }
+
+                        // apply note frame to last page
+                        $pdf->setPage($pageposafternote);
+                        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                        $height_note=$posyafter-$tab_top_newpage;
+                        $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note+1);
+                    }
+                    else // No pagebreak
+                    {
+                        $pdf->commitTransaction();
+                        $posyafter = $pdf->GetY();
+                        $height_note=$posyafter-$tab_top;
+                        $pdf->Rect($this->marge_gauche, $tab_top-1, $tab_width, $height_note+1);
+
+
+                        if($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20)) )
+                        {
+                            // not enough space, need to add page
+                            $pdf->AddPage('','',true);
+                            $pagenb++;
+                            $pageposafternote++;
+                            $pdf->setPage($pageposafternote);
+                            if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+
+                            $posyafter = $tab_top_newpage;
+                        }
+                    }
+
+                    $tab_height = $tab_height - $height_note;
+                    $tab_top = $posyafter +6;
+                }
+                else
+                {
+                    $height_note=0;
+                }
 
-				$iniY = $tab_top + 7;
-				$curY = $tab_top + 7;
-				$nexY = $tab_top + 7;
+                $iniY = $tab_top + 7;
+                $curY = $tab_top + 7;
+                $nexY = $tab_top + 7;
 
-				// Use new auto collum system
-				$this->prepareArrayColumnField($object,$outputlangs,$hidedetails,$hidedesc,$hideref);
+                // Use new auto collum system
+                $this->prepareArrayColumnField($object,$outputlangs,$hidedetails,$hidedesc,$hideref);
 
-				// Loop on each lines
-				$pageposbeforeprintlines=$pdf->getPage();
-				$pagenb = $pageposbeforeprintlines;
-				for ($i = 0; $i < $nblignes; $i++)
-				{
-					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
-
-					// Define size of image if we need it
-					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
-
-					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
-
-					$showpricebeforepagebreak=1;
-					$posYAfterImage=0;
-					$posYAfterDescription=0;
-
-					if($this->getColumnStatus('photo'))
-					{
-    					// We start with Photo of product line
-    					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// If photo too high, we moved completely on new page
-    					{
-    						$pdf->AddPage('','',true);
-    						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-    						//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-    						$pdf->setPage($pageposbefore+1);
-
-    						$curY = $tab_top_newpage;
-    						$showpricebeforepagebreak=0;
-    					}
-
-
-    					if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-    					{
-    						$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
-    						// $pdf->Image does not increase value return by getY, so we save it manually
-    						$posYAfterImage=$curY+$imglinesize['height'];
-    					}
-					}
-
-					// Description of product line
-					if($this->getColumnStatus('desc'))
-					{
-    					$pdf->startTransaction();
-    					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->getColumnContentWidth('desc'),3,$this->getColumnContentXStart('desc'),$curY,$hideref,$hidedesc);
-    					$pageposafter=$pdf->getPage();
-    					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-    					{
-    						$pdf->rollbackTransaction(true);
-    						$pageposafter=$pageposbefore;
-    						//print $pageposafter.'-'.$pageposbefore;exit;
-    						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-    						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->getColumnContentWidth('desc'),3,$this->getColumnContentXStart('desc'),$curY,$hideref,$hidedesc);
-
-    						$pageposafter=$pdf->getPage();
-    						$posyafter=$pdf->GetY();
-    						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-    						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// There is no space left for total+free text
-    						{
-    							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
-    							{
-    								$pdf->AddPage('','',true);
-    								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-    								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-    								$pdf->setPage($pageposafter+1);
-    							}
-    						}
-    						else
-    						{
-    							// We found a page break
-    							$showpricebeforepagebreak=0;
-    						}
-    					}
-    					else	// No pagebreak
-    					{
-    						$pdf->commitTransaction();
-    					}
-    					$posYAfterDescription=$pdf->GetY();
-					}
-
-					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
-
-					$pdf->setPage($pageposbefore);
-					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-
-					// We suppose that a too long description or photo were moved completely on next page
-					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-					}
-
-					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
-
-					// VAT Rate
-					if ($this->getColumnStatus('vat'))
-					{
-					    $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
-					    $nexY = max($pdf->GetY(),$nexY);
-					}
-
-					// Unit price before discount
-					if ($this->getColumnStatus('subprice'))
-					{
-					    $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
-					    $nexY = max($pdf->GetY(),$nexY);
-					}
-
-					// Quantity
-					// Enough for 6 chars
-					if ($this->getColumnStatus('qty'))
-					{
-					    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
-					    $nexY = max($pdf->GetY(),$nexY);
-					}
-
-
-					// Unit
-					if ($this->getColumnStatus('unit'))
-					{
-					    $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
-					    $this->printStdColumnContent($pdf, $curY, 'unit', $unit);
-					    $nexY = max($pdf->GetY(),$nexY);
-					}
-
-					// Discount on line
-					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent)
-					{
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
-					    $nexY = max($pdf->GetY(),$nexY);
-					}
-
-					// Total HT line
-					if ($this->getColumnStatus('totalexcltax'))
-					{
-					    $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
-					    $nexY = max($pdf->GetY(),$nexY);
-					}
-
-
-					$parameters=array(
-					    'object' => $object,
-					    'i' => $i,
-					    'pdf' =>& $pdf,
-					    'curY' =>& $curY,
-					    'nexY' =>& $nexY,
-					    'outputlangs' => $outputlangs,
-					    'hidedetails' => $hidedetails
-					);
-					$reshook=$hookmanager->executeHooks('printPDFline',$parameters,$this);    // Note that $object may have been modified by hook
-
-
-
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne=$object->lines[$i]->total_tva;
-
-					$localtax1ligne=$object->lines[$i]->total_localtax1;
-					$localtax2ligne=$object->lines[$i]->total_localtax2;
-					$localtax1_rate=$object->lines[$i]->localtax1_tx;
-					$localtax2_rate=$object->lines[$i]->localtax2_tx;
-					$localtax1_type=$object->lines[$i]->localtax1_type;
-					$localtax2_type=$object->lines[$i]->localtax2_type;
-
-					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
-
-					$vatrate=(string) $object->lines[$i]->tva_tx;
-
-					// Retrieve type from database for backward compatibility with old records
-					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
-					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
-					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
-					}
-
-				    // retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
-						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
-						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
-
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
-					$this->tva[$vatrate] += $tvaligne;
-
-					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
-
-					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
-					{
-						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
-						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
-						$pdf->SetLineStyle(array('dash'=>0));
-					}
-
-					$nexY+=2;    // Passe espace entre les lignes
-
-					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
-						$pdf->setPage($pagenb);
-						if ($pagenb == $pageposbeforeprintlines)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						$pagenb++;
-						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
-					{
-					    if ($pagenb == $pageposafter)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						// New page
-						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-				}
+                // Loop on each lines
+                $pageposbeforeprintlines=$pdf->getPage();
+                $pagenb = $pageposbeforeprintlines;
+                for ($i = 0; $i < $nblignes; $i++)
+                {
+                    $curY = $nexY;
+                    $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+                    $pdf->SetTextColor(0,0,0);
+
+                    // Define size of image if we need it
+                    $imglinesize=array();
+                    if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+
+                    $pdf->setTopMargin($tab_top_newpage);
+                    $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+                    $pageposbefore=$pdf->getPage();
+
+                    $showpricebeforepagebreak=1;
+                    $posYAfterImage=0;
+                    $posYAfterDescription=0;
+
+                    if($this->getColumnStatus('photo'))
+                    {
+                        // We start with Photo of product line
+                        if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// If photo too high, we moved completely on new page
+                        {
+                            $pdf->AddPage('','',true);
+                            if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                            //if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                            $pdf->setPage($pageposbefore+1);
+
+                            $curY = $tab_top_newpage;
+                            $showpricebeforepagebreak=0;
+                        }
+
+
+                        if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
+                        {
+                            $pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
+                            // $pdf->Image does not increase value return by getY, so we save it manually
+                            $posYAfterImage=$curY+$imglinesize['height'];
+                        }
+                    }
+
+                    // Description of product line
+                    if($this->getColumnStatus('desc'))
+                    {
+                        $pdf->startTransaction();
+                        pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->getColumnContentWidth('desc'),3,$this->getColumnContentXStart('desc'),$curY,$hideref,$hidedesc);
+                        $pageposafter=$pdf->getPage();
+                        if ($pageposafter > $pageposbefore)	// There is a pagebreak
+                        {
+                            $pdf->rollbackTransaction(true);
+                            $pageposafter=$pageposbefore;
+                            //print $pageposafter.'-'.$pageposbefore;exit;
+                            $pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+                            pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->getColumnContentWidth('desc'),3,$this->getColumnContentXStart('desc'),$curY,$hideref,$hidedesc);
+
+                            $pageposafter=$pdf->getPage();
+                            $posyafter=$pdf->GetY();
+                            //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+                            if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// There is no space left for total+free text
+                            {
+                                if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+                                {
+                                    $pdf->AddPage('','',true);
+                                    if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                                    //if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                                    $pdf->setPage($pageposafter+1);
+                                }
+                            }
+                            else
+                            {
+                                // We found a page break
+                                $showpricebeforepagebreak=0;
+                            }
+                        }
+                        else	// No pagebreak
+                        {
+                            $pdf->commitTransaction();
+                        }
+                        $posYAfterDescription=$pdf->GetY();
+                    }
+
+                    $nexY = $pdf->GetY();
+                    $pageposafter=$pdf->getPage();
+
+                    $pdf->setPage($pageposbefore);
+                    $pdf->setTopMargin($this->marge_haute);
+                    $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+
+                    // We suppose that a too long description or photo were moved completely on next page
+                    if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+                        $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+                    }
+
+                    $pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
+
+                    // VAT Rate
+                    if ($this->getColumnStatus('vat'))
+                    {
+                        $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+                        $this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
+                        $nexY = max($pdf->GetY(),$nexY);
+                    }
+
+                    // Unit price before discount
+                    if ($this->getColumnStatus('subprice'))
+                    {
+                        $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+                        $this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
+                        $nexY = max($pdf->GetY(),$nexY);
+                    }
+
+                    // Quantity
+                    // Enough for 6 chars
+                    if ($this->getColumnStatus('qty'))
+                    {
+                        $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+                        $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+                        $nexY = max($pdf->GetY(),$nexY);
+                    }
+
+
+                    // Unit
+                    if ($this->getColumnStatus('unit'))
+                    {
+                        $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+                        $this->printStdColumnContent($pdf, $curY, 'unit', $unit);
+                        $nexY = max($pdf->GetY(),$nexY);
+                    }
+
+                    // Discount on line
+                    if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent)
+                    {
+                        $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+                        $this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
+                        $nexY = max($pdf->GetY(),$nexY);
+                    }
+
+                    // Total HT line
+                    if ($this->getColumnStatus('totalexcltax'))
+                    {
+                        $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
+                        $this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
+                        $nexY = max($pdf->GetY(),$nexY);
+                    }
+
+
+                    $parameters=array(
+                        'object' => $object,
+                        'i' => $i,
+                        'pdf' =>& $pdf,
+                        'curY' =>& $curY,
+                        'nexY' =>& $nexY,
+                        'outputlangs' => $outputlangs,
+                        'hidedetails' => $hidedetails
+                    );
+                    $reshook=$hookmanager->executeHooks('printPDFline',$parameters,$this);    // Note that $object may have been modified by hook
+
+
+
+                    // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+                    else $tvaligne=$object->lines[$i]->total_tva;
+
+                    $localtax1ligne=$object->lines[$i]->total_localtax1;
+                    $localtax2ligne=$object->lines[$i]->total_localtax2;
+                    $localtax1_rate=$object->lines[$i]->localtax1_tx;
+                    $localtax2_rate=$object->lines[$i]->localtax2_tx;
+                    $localtax1_type=$object->lines[$i]->localtax1_type;
+                    $localtax2_type=$object->lines[$i]->localtax2_type;
+
+                    if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
+                    if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+                    if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+
+                    $vatrate=(string) $object->lines[$i]->tva_tx;
+
+                    // Retrieve type from database for backward compatibility with old records
+                    if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
+                    && (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
+                    {
+                        $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
+                        $localtax1_type = $localtaxtmp_array[0];
+                        $localtax2_type = $localtaxtmp_array[2];
+                    }
+
+                    // retrieve global local tax
+                    if ($localtax1_type && $localtax1ligne != 0)
+                        $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+                    if ($localtax2_type && $localtax2ligne != 0)
+                        $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+
+                    if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
+                    if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
+                    $this->tva[$vatrate] += $tvaligne;
+
+                    if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
+
+                    // Add line
+                    if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+                    {
+                        $pdf->setPage($pageposafter);
+                        $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+                        //$pdf->SetDrawColor(190,190,200);
+                        $pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+                        $pdf->SetLineStyle(array('dash'=>0));
+                    }
+
+                    $nexY+=2;    // Passe espace entre les lignes
+
+                    // Detect if some page were added automatically and output _tableau for past pages
+                    while ($pagenb < $pageposafter)
+                    {
+                        $pdf->setPage($pagenb);
+                        if ($pagenb == $pageposbeforeprintlines)
+                        {
+                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+                        }
+                        else
+                        {
+                            $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+                        }
+                        $this->_pagefoot($pdf,$object,$outputlangs,1);
+                        $pagenb++;
+                        $pdf->setPage($pagenb);
+                        $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                    }
+                    if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+                    {
+                        if ($pagenb == $pageposafter)
+                        {
+                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+                        }
+                        else
+                        {
+                            $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+                        }
+                        $this->_pagefoot($pdf,$object,$outputlangs,1);
+                        // New page
+                        $pdf->AddPage();
+                        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                        $pagenb++;
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                    }
+                }
 
-				// Show square
-				if ($pagenb == $pageposbeforeprintlines)
-				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else
-				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
+                // Show square
+                if ($pagenb == $pageposbeforeprintlines)
+                {
+                    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
+                }
+                else
+                {
+                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
+                }
 
-				// Affiche zone infos
-				$posy=$this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+                // Affiche zone infos
+                $posy=$this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
-				// Affiche zone totaux
-				$posy=$this->drawTotalTable($pdf, $object, 0, $bottomlasttab, $outputlangs);
+                // Affiche zone totaux
+                $posy=$this->drawTotalTable($pdf, $object, 0, $bottomlasttab, $outputlangs);
 
-				// Affiche zone versements
-				/*
+                // Affiche zone versements
+                /*
 				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
 				{
 					$posy=$this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
 				}
 				*/
 
-				// Customer signature area
-				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
-				{
-				    $posy=$this->drawSignatureArea($pdf, $object, $posy, $outputlangs);
-				}
-
-				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
-
-				//If propal merge product PDF is active
-				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
-				{
-					require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
-
-					$already_merged = array ();
-					foreach ( $object->lines as $line ) {
-						if (! empty($line->fk_product) && ! (in_array($line->fk_product, $already_merged))) {
-							// Find the desire PDF
-							$filetomerge = new Propalmergepdfproduct($this->db);
-
-							if ($conf->global->MAIN_MULTILANGS) {
-								$filetomerge->fetch_by_product($line->fk_product, $outputlangs->defaultlang);
-							} else {
-								$filetomerge->fetch_by_product($line->fk_product);
-							}
-
-							$already_merged[] = $line->fk_product;
-
-							$product = new Product($this->db);
-							$product->fetch($line->fk_product);
-
-							if ($product->entity!=$conf->entity) {
-								$entity_product_file=$product->entity;
-							} else {
-								$entity_product_file=$conf->entity;
-							}
-
-							// If PDF is selected and file is not empty
-							if (count($filetomerge->lines) > 0) {
-								foreach ( $filetomerge->lines as $linefile ) {
-									if (! empty($linefile->id) && ! empty($linefile->file_name)) {
-
-
-										if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-										{
-											if (! empty($conf->product->enabled)) {
-												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
-											} elseif (! empty($conf->service->enabled)) {
-												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
-											}
-										}
-										else
-										{
-											if (! empty($conf->product->enabled)) {
-												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
-											} elseif (! empty($conf->service->enabled)) {
-												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
-											}
-										}
-
-										dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG);
-
-										$infile = $filetomerge_dir . '/' . $linefile->file_name;
-										if (file_exists($infile) && is_readable($infile)) {
-											$pagecount = $pdf->setSourceFile($infile);
-											for($i = 1; $i <= $pagecount; $i ++) {
-												$tplIdx = $pdf->importPage($i);
-												if ($tplIdx!==false) {
-													$s = $pdf->getTemplatesize($tplIdx);
-													$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-													$pdf->useTemplate($tplIdx);
-												} else {
-													setEventMessages(null, array($infile.' cannot be added, probably protected PDF'),'warnings');
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-
-				$pdf->Close();
-
-				$pdf->Output($file,'F');
-
-				//Add pdfgeneration hook
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                // Customer signature area
+                if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
+                {
+                    $posy=$this->drawSignatureArea($pdf, $object, $posy, $outputlangs);
+                }
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+                // Pied de page
+                $this->_pagefoot($pdf,$object,$outputlangs);
+                if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
-				$this->result = array('fullpath'=>$file);
+                //If propal merge product PDF is active
+                if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
+                {
+                    require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
+
+                    $already_merged = array ();
+                    foreach ( $object->lines as $line ) {
+                        if (! empty($line->fk_product) && ! (in_array($line->fk_product, $already_merged))) {
+                            // Find the desire PDF
+                            $filetomerge = new Propalmergepdfproduct($this->db);
+
+                            if ($conf->global->MAIN_MULTILANGS) {
+                                $filetomerge->fetch_by_product($line->fk_product, $outputlangs->defaultlang);
+                            } else {
+                                $filetomerge->fetch_by_product($line->fk_product);
+                            }
+
+                            $already_merged[] = $line->fk_product;
+
+                            $product = new Product($this->db);
+                            $product->fetch($line->fk_product);
+
+                            if ($product->entity!=$conf->entity) {
+                                $entity_product_file=$product->entity;
+                            } else {
+                                $entity_product_file=$conf->entity;
+                            }
+
+                            // If PDF is selected and file is not empty
+                            if (count($filetomerge->lines) > 0) {
+                                foreach ( $filetomerge->lines as $linefile ) {
+                                    if (! empty($linefile->id) && ! empty($linefile->file_name)) {
+
+
+                                        if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+                                        {
+                                            if (! empty($conf->product->enabled)) {
+                                                $filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+                                            } elseif (! empty($conf->service->enabled)) {
+                                                $filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+                                            }
+                                        }
+                                        else
+                                        {
+                                            if (! empty($conf->product->enabled)) {
+                                                $filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
+                                            } elseif (! empty($conf->service->enabled)) {
+                                                $filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
+                                            }
+                                        }
+
+                                        dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG);
+
+                                        $infile = $filetomerge_dir . '/' . $linefile->file_name;
+                                        if (file_exists($infile) && is_readable($infile)) {
+                                            $pagecount = $pdf->setSourceFile($infile);
+                                            for($i = 1; $i <= $pagecount; $i ++) {
+                                                $tplIdx = $pdf->importPage($i);
+                                                if ($tplIdx!==false) {
+                                                    $s = $pdf->getTemplatesize($tplIdx);
+                                                    $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+                                                    $pdf->useTemplate($tplIdx);
+                                                } else {
+                                                    setEventMessages(null, array($infile.' cannot be added, probably protected PDF'),'warnings');
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
 
-				return 1;   // Pas d'erreur
-			}
-			else
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
-			return 0;
-		}
-	}
-
-	/**
-	 *  Show payments table
-	 *
+                $pdf->Close();
+
+                $pdf->Output($file,'F');
+
+                //Add pdfgeneration hook
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                if (! empty($conf->global->MAIN_UMASK))
+                @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Pas d'erreur
+            }
+            else
+            {
+                $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
+            return 0;
+        }
+    }
+
+    /**
+     *  Show payments table
+     *
      *  @param	TCPDF		$pdf           Object PDF
      *  @param  Object		$object         Object proposal
      *  @param  int			$posy           Position y in PDF
      *  @param  Translate	$outputlangs    Object langs for output
      *  @return int             			<0 if KO, >0 if OK
-	 */
-	private function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
-	{
-	}
-
-	/**
-	 *   Show miscellaneous information (payment mode, payment term, ...)
-	 *
-	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
-	 */
-	function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
-	{
-		global $conf;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
-
-			$posy=$pdf->GetY()+4;
-		}
-
-		$posxval=52;
+     */
+    private function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
+    {
+    }
+
+    /**
+     *   Show miscellaneous information (payment mode, payment term, ...)
+     *
+     *   @param		TCPDF		$pdf     		Object PDF
+     *   @param		Object		$object			Object to show
+     *   @param		int			$posy			Y
+     *   @param		Translate	$outputlangs	Langs object
+     *   @return	void
+     */
+    function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
+    {
+        global $conf;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        $pdf->SetFont('','', $default_font_size - 1);
+
+        // If France, show VAT mention if not applicable
+        if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
+        {
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->SetXY($this->marge_gauche, $posy);
+            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+
+            $posy=$pdf->GetY()+4;
+        }
+
+        $posxval=52;
 
         // Show shipping date
         if (! empty($object->date_livraison))
-		{
+        {
             $outputlangs->load("sendings");
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
-			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posxval, $posy);
-			$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
-			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->SetXY($this->marge_gauche, $posy);
+            $titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
+            $pdf->MultiCell(80, 4, $titre, 0, 'L');
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posxval, $posy);
+            $dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
+            $pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy=$pdf->GetY()+1;
-		}
+        }
         elseif ($object->availability_code || $object->availability)    // Show availability conditions
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
-			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posxval, $posy);
-			$lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
-			$lib_availability=str_replace('\n',"\n",$lib_availability);
-			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
-
-			$posy=$pdf->GetY()+1;
-		}
-
-		// Show payments conditions
-		if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$titre = $outputlangs->transnoentities("PaymentConditions").':';
-			$pdf->MultiCell(43, 4, $titre, 0, 'L');
-
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posxval, $posy);
-			$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
-			$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
-			$pdf->MultiCell(67, 4, $lib_condition_paiement,0,'L');
-
-			$posy=$pdf->GetY()+3;
-		}
-
-		if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMMODE))
-		{
-			// Check a payment mode is defined
-			/* Not required on a proposal
+        {
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->SetXY($this->marge_gauche, $posy);
+            $titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
+            $pdf->MultiCell(80, 4, $titre, 0, 'L');
+            $pdf->SetTextColor(0,0,0);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posxval, $posy);
+            $lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
+            $lib_availability=str_replace('\n',"\n",$lib_availability);
+            $pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
+
+            $posy=$pdf->GetY()+1;
+        }
+
+        // Show payments conditions
+        if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
+        {
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->SetXY($this->marge_gauche, $posy);
+            $titre = $outputlangs->transnoentities("PaymentConditions").':';
+            $pdf->MultiCell(43, 4, $titre, 0, 'L');
+
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posxval, $posy);
+            $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
+            $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
+            $pdf->MultiCell(67, 4, $lib_condition_paiement,0,'L');
+
+            $posy=$pdf->GetY()+3;
+        }
+
+        if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMMODE))
+        {
+            // Check a payment mode is defined
+            /* Not required on a proposal
 			if (empty($object->mode_reglement_code)
 			&& ! $conf->global->FACTURE_CHQ_NUMBER
 			&& ! $conf->global->FACTURE_RIB_NUMBER)
@@ -980,333 +980,333 @@ 
 			}
 			*/
 
-			// Show payment mode
-			if ($object->mode_reglement_code
-			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR')
-			{
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->SetXY($this->marge_gauche, $posy);
-				$titre = $outputlangs->transnoentities("PaymentMode").':';
-				$pdf->MultiCell(80, 5, $titre, 0, 'L');
-				$pdf->SetFont('','', $default_font_size - 2);
-				$pdf->SetXY($posxval, $posy);
-				$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
-				$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
-
-				$posy=$pdf->GetY()+2;
-			}
-
-			// Show payment mode CHQ
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-			{
-				// Si mode reglement non force ou si force a CHQ
-				if (! empty($conf->global->FACTURE_CHQ_NUMBER))
-				{
-					$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-					{
-						$account = new Account($this->db);
-						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
-						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
-						$posy=$pdf->GetY()+1;
-
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
-							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
-			            }
-					}
-					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-					{
-						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
-						$posy=$pdf->GetY()+1;
-
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
-							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
-			            }
-					}
-				}
-			}
+            // Show payment mode
+            if ($object->mode_reglement_code
+            && $object->mode_reglement_code != 'CHQ'
+            && $object->mode_reglement_code != 'VIR')
+            {
+                $pdf->SetFont('','B', $default_font_size - 2);
+                $pdf->SetXY($this->marge_gauche, $posy);
+                $titre = $outputlangs->transnoentities("PaymentMode").':';
+                $pdf->MultiCell(80, 5, $titre, 0, 'L');
+                $pdf->SetFont('','', $default_font_size - 2);
+                $pdf->SetXY($posxval, $posy);
+                $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
+                $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
+
+                $posy=$pdf->GetY()+2;
+            }
+
+            // Show payment mode CHQ
+            if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
+            {
+                // Si mode reglement non force ou si force a CHQ
+                if (! empty($conf->global->FACTURE_CHQ_NUMBER))
+                {
+                    $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
+
+                    if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+                    {
+                        $account = new Account($this->db);
+                        $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+                        $pdf->SetXY($this->marge_gauche, $posy);
+                        $pdf->SetFont('','B', $default_font_size - $diffsizetitle);
+                        $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
+                        $posy=$pdf->GetY()+1;
+
+                        if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+                        {
+                            $pdf->SetXY($this->marge_gauche, $posy);
+                            $pdf->SetFont('','', $default_font_size - $diffsizetitle);
+                            $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+                            $posy=$pdf->GetY()+2;
+                        }
+                    }
+                    if ($conf->global->FACTURE_CHQ_NUMBER == -1)
+                    {
+                        $pdf->SetXY($this->marge_gauche, $posy);
+                        $pdf->SetFont('','B', $default_font_size - $diffsizetitle);
+                        $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
+                        $posy=$pdf->GetY()+1;
+
+                        if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+                        {
+                            $pdf->SetXY($this->marge_gauche, $posy);
+                            $pdf->SetFont('','', $default_font_size - $diffsizetitle);
+                            $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+                            $posy=$pdf->GetY()+2;
+                        }
+                    }
+                }
+            }
 
-			// If payment mode not forced or forced to VIR, show payment with BAN
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-			{
-				if (! empty($object->fk_account) || ! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
-				{
-					$bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
-					if (! empty($object->fk_bank)) $bankid=$object->fk_bank;   // For backward compatibility when object->fk_account is forced with object->fk_bank
-					$account = new Account($this->db);
-					$account->fetch($bankid);
+            // If payment mode not forced or forced to VIR, show payment with BAN
+            if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
+            {
+                if (! empty($object->fk_account) || ! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
+                {
+                    $bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
+                    if (! empty($object->fk_bank)) $bankid=$object->fk_bank;   // For backward compatibility when object->fk_account is forced with object->fk_bank
+                    $account = new Account($this->db);
+                    $account->fetch($bankid);
 
-					$curx=$this->marge_gauche;
-					$cury=$posy;
+                    $curx=$this->marge_gauche;
+                    $cury=$posy;
 
-					$posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+                    $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
 
-					$posy+=2;
-				}
-			}
-		}
-
-		return $posy;
-	}
-
-
-	/**
-	 *	Show total to pay
-	 *
-	 *	@param	PDF			$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
-	 */
-	private function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
-	{
-		global $conf,$mysoc;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$tab2_top = $posy;
-		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// Tableau total
-		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$col2x-=20;
-		}
-		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
-
-		$useborder=0;
-		$index = 0;
-
-		// Total HT
-		$pdf->SetFillColor(255,255,255);
-		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
-
-		$total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
-		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
-
-		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
-
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
-
-		$this->atleastoneratenotnull=0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
-			$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
-				// Nothing to do
-			}
-			else
-			{
-				//Local tax 1 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-	      		//}
-				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-				//}
-				// VAT
-				foreach($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
-						$this->atleastoneratenotnull++;
-
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-						$tvacompl='';
-						if (preg_match('/\*/',$tvakey))
-						{
-							$tvakey=str_replace('*','',$tvakey);
-							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-						}
-						$totalvat =$outputlangs->transcountrynoentities("TotalVAT",$mysoc->country_code).' ';
-						$totalvat.=vatrate($tvakey,1).$tvacompl;
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-					}
-				}
+                    $posy+=2;
+                }
+            }
+        }
 
-				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey != 0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-	      		//}
-				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-						    // retrieve global local tax
-							if ($tvakey != 0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
-
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-				//}
-
-				// Total TTC
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->SetFillColor(224,224,224);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+        return $posy;
+    }
 
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
-			}
-		}
 
-		$pdf->SetTextColor(0,0,0);
+    /**
+     *	Show total to pay
+     *
+     *	@param	PDF			$pdf            Object PDF
+     *	@param  Facture		$object         Object invoice
+     *	@param  int			$deja_regle     Montant deja regle
+     *	@param	int			$posy			Position depart
+     *	@param	Translate	$outputlangs	Objet langs
+     *	@return int							Position pour suite
+     */
+    private function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+    {
+        global $conf,$mysoc;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        $tab2_top = $posy;
+        $tab2_hl = 4;
+        $pdf->SetFont('','', $default_font_size - 1);
+
+        // Tableau total
+        $col1x = 120; $col2x = 170;
+        if ($this->page_largeur < 210) // To work with US executive format
+        {
+            $col2x-=20;
+        }
+        $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+
+        $useborder=0;
+        $index = 0;
+
+        // Total HT
+        $pdf->SetFillColor(255,255,255);
+        $pdf->SetXY($col1x, $tab2_top + 0);
+        $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+
+        $total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
+        $pdf->SetXY($col2x, $tab2_top + 0);
+        $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
+
+        // Show VAT by rates and total
+        $pdf->SetFillColor(248,248,248);
+
+        $total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+
+        $this->atleastoneratenotnull=0;
+        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+        {
+            $tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
+            if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
+            {
+                // Nothing to do
+            }
+            else
+            {
+                //Local tax 1 before VAT
+                //if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+                //{
+                    foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+                    {
+                        if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+
+                        foreach( $localtax_rate as $tvakey => $tvaval )
+                        {
+                            if ($tvakey!=0)    // On affiche pas taux 0
+                            {
+                                //$this->atleastoneratenotnull++;
+
+                                $index++;
+                                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                                $tvacompl='';
+                                if (preg_match('/\*/',$tvakey))
+                                {
+                                    $tvakey=str_replace('*','',$tvakey);
+                                    $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                                }
+                                $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
+                                $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+                                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+                                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                                $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                            }
+                        }
+                    }
+                    //}
+                //Local tax 2 before VAT
+                //if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+                //{
+                    foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+                    {
+                        if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+
+                        foreach( $localtax_rate as $tvakey => $tvaval )
+                        {
+                            if ($tvakey!=0)    // On affiche pas taux 0
+                            {
+                                //$this->atleastoneratenotnull++;
+
+
+
+                                $index++;
+                                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                                $tvacompl='';
+                                if (preg_match('/\*/',$tvakey))
+                                {
+                                    $tvakey=str_replace('*','',$tvakey);
+                                    $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                                }
+                                $totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+                                $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+                                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+                                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                                $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                            }
+                        }
+                    }
+                //}
+                // VAT
+                foreach($this->tva as $tvakey => $tvaval)
+                {
+                    if ($tvakey != 0)    // On affiche pas taux 0
+                    {
+                        $this->atleastoneratenotnull++;
+
+                        $index++;
+                        $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                        $tvacompl='';
+                        if (preg_match('/\*/',$tvakey))
+                        {
+                            $tvakey=str_replace('*','',$tvakey);
+                            $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                        }
+                        $totalvat =$outputlangs->transcountrynoentities("TotalVAT",$mysoc->country_code).' ';
+                        $totalvat.=vatrate($tvakey,1).$tvacompl;
+                        $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+                        $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                        $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                    }
+                }
 
-		/*
+                //Local tax 1 after VAT
+                //if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+                //{
+                    foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+                    {
+                        if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+
+                        foreach( $localtax_rate as $tvakey => $tvaval )
+                        {
+                            if ($tvakey != 0)    // On affiche pas taux 0
+                            {
+                                //$this->atleastoneratenotnull++;
+
+                                $index++;
+                                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                                $tvacompl='';
+                                if (preg_match('/\*/',$tvakey))
+                                {
+                                    $tvakey=str_replace('*','',$tvakey);
+                                    $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                                }
+                                $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
+
+                                $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+                                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+                                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                                $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                            }
+                        }
+                    }
+                    //}
+                //Local tax 2 after VAT
+                //if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+                //{
+                    foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+                    {
+                        if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+
+                        foreach( $localtax_rate as $tvakey => $tvaval )
+                        {
+                            // retrieve global local tax
+                            if ($tvakey != 0)    // On affiche pas taux 0
+                            {
+                                //$this->atleastoneratenotnull++;
+
+                                $index++;
+                                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+                                $tvacompl='';
+                                if (preg_match('/\*/',$tvakey))
+                                {
+                                    $tvakey=str_replace('*','',$tvakey);
+                                    $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+                                }
+                                $totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
+
+                                $totalvat.=vatrate(abs($tvakey),1).$tvacompl;
+                                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+                                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                                $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+                            }
+                        }
+                    }
+                //}
+
+                // Total TTC
+                $index++;
+                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+                $pdf->SetTextColor(0,0,60);
+                $pdf->SetFillColor(224,224,224);
+                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+
+                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+            }
+        }
+
+        $pdf->SetTextColor(0,0,0);
+
+        /*
 		$resteapayer = $object->total_ttc - $deja_regle;
 		if (! empty($object->paye)) $resteapayer=0;
 		*/
 
-		if ($deja_regle > 0)
-		{
-			$index++;
+        if ($deja_regle > 0)
+        {
+            $index++;
 
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+            $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
 
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+            $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
 
-			/*
+            /*
 			if ($object->close_code == 'discount_vat')
 			{
 				$index++;
@@ -1322,398 +1322,398 @@ 
 			}
 			*/
 
-			$index++;
-			$pdf->SetTextColor(0,0,60);
-			$pdf->SetFillColor(224,224,224);
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
-
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
-
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetTextColor(0,0,0);
-		}
-
-		$index++;
-		return ($tab2_top + ($tab2_hl * $index));
-	}
-
-	/**
-	 *   Show table for lines
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
-	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @param		string		$currency		Currency code
-	 *   @return	void
-	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
-	{
-		global $conf;
-
-		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
-
-		$currency = !empty($currency) ? $currency : $conf->currency;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','', $default_font_size - 2);
-
-		if (empty($hidetop))
-		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
-			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
-			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
-
-			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
-		}
-
-		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// Output Rect
-		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
-
-
-		foreach ($this->cols as $colKey => $colDef)
-		{
-		    if(!$this->getColumnStatus($colKey)) continue;
-
-		    // get title label
-		    $colDef['title']['label'] = !empty($colDef['title']['label'])?$colDef['title']['label']:$outputlangs->transnoentities($colDef['title']['textkey']);
-
-		    // Add column separator
-		    if(!empty($colDef['border-left'])){
-		        $pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
-		    }
-
-		    if (empty($hidetop))
-		    {
-		      $pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0] );
-
-		      $textWidth = $colDef['width'] - $colDef['title']['padding'][3] -$colDef['title']['padding'][1];
-		      $pdf->MultiCell($textWidth,2,$colDef['title']['label'],'',$colDef['title']['align']);
-		    }
-		}
-
-		if (empty($hidetop)){
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
-		}
-	}
-
-	/**
-	 *  Show top header of page.
-	 *
-	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
-	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
-	{
-		global $conf,$langs;
-
-		$outputlangs->load("main");
-		$outputlangs->load("bills");
-		$outputlangs->load("propal");
-		$outputlangs->load("companies");
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
-
-		//  Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
-		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
-		}
+            $index++;
+            $pdf->SetTextColor(0,0,60);
+            $pdf->SetFillColor(224,224,224);
+            $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+            $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
 
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
+            $pdf->SetFont('','', $default_font_size - 1);
+            $pdf->SetTextColor(0,0,0);
+        }
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+        $index++;
+        return ($tab2_top + ($tab2_hl * $index));
+    }
 
-		// Logo
-		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
-		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-			if ($this->emetteur->logo)
-			{
-				if (is_readable($logo))
-				{
-				    $height=pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-				}
-				else
-				{
-					$pdf->SetTextColor(200,0,0);
-					$pdf->SetFont('','B',$default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
-				}
-			}
-			else
-			{
-				$text=$this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-			}
-		}
-
-		$pdf->SetFont('','B',$default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$title=$outputlangs->transnoentities("PdfCommercialProposalTitle");
-		$pdf->MultiCell(100, 4, $title, '', 'R');
-
-		$pdf->SetFont('','B',$default_font_size);
-
-		$posy+=5;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
-
-		$posy+=1;
-		$pdf->SetFont('','', $default_font_size - 2);
-
-		if ($object->ref_client)
-		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
-		}
-
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
-
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dol_print_date($object->fin_validite,"day",false,$outputlangs,true), '', 'R');
-
-		if ($object->thirdparty->code_client)
-		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
-		}
-
-		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
-		    $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $usertmp=new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy+=4;
-                $pdf->SetXY($posx,$posy);
-		        $pdf->SetTextColor(0,0,60);
-		        $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
-		}
-
-		$posy+=2;
-
-		$top_shift = 0;
-		// Show list of linked objects
-		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
-			$top_shift = $pdf->getY() - $current_y;
-		}
-
-		if ($showaddress)
-		{
-			// Sender properties
-			$carac_emetteur='';
-		 	// Add internal contact of proposal if defined
-			$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname=($outputlangs->transnoentities("FromContactName")!='FromContactName'?$outputlangs->transnoentities("FromContactName"):$outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
-
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
-
-			// Show sender
-			$posy=42+$top_shift;
-		 	$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
-
-			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
-
-			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
-
-			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-
-
-			// If CUSTOMER contact defined, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
-			}
+    /**
+     *   Show table for lines
+     *
+     *   @param		PDF			$pdf     		Object PDF
+     *   @param		string		$tab_top		Top position of table
+     *   @param		string		$tab_height		Height of table (rectangle)
+     *   @param		int			$nexY			Y (not used)
+     *   @param		Translate	$outputlangs	Langs object
+     *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+     *   @param		int			$hidebottom		Hide bottom bar of array
+     *   @param		string		$currency		Currency code
+     *   @return	void
+     */
+    function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+    {
+        global $conf;
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
-				$thirdparty = $object->contact;
-			} else {
-				$thirdparty = $object->thirdparty;
-			}
+        // Force to disable hidetop and hidebottom
+        $hidebottom=0;
+        if ($hidetop) $hidetop=-1;
+
+        $currency = !empty($currency) ? $currency : $conf->currency;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        // Amount in (at tab_top - 1)
+        $pdf->SetTextColor(0,0,0);
+        $pdf->SetFont('','', $default_font_size - 2);
+
+        if (empty($hidetop))
+        {
+            $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
+            $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+            $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
-			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+            //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+            if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+        }
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->thirdparty,($usecontact?$object->contact:''),$usecontact,'target',$object);
+        $pdf->SetDrawColor(128,128,128);
+        $pdf->SetFont('','', $default_font_size - 1);
 
-			// Show recipient
-			$widthrecbox=100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42+$top_shift;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+        // Output Rect
+        $this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
 
-			// Show recipient frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx+2,$posy-5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
-			// Show recipient name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+        foreach ($this->cols as $colKey => $colDef)
+        {
+            if(!$this->getColumnStatus($colKey)) continue;
 
-			$posy = $pdf->getY();
+            // get title label
+            $colDef['title']['label'] = !empty($colDef['title']['label'])?$colDef['title']['label']:$outputlangs->transnoentities($colDef['title']['textkey']);
 
-			// Show recipient information
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
-		}
+            // Add column separator
+            if(!empty($colDef['border-left'])){
+                $pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
+            }
 
-		$pdf->SetTextColor(0,0,0);
-		return $top_shift;
-	}
+            if (empty($hidetop))
+            {
+                $pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0] );
+
+                $textWidth = $colDef['width'] - $colDef['title']['padding'][3] -$colDef['title']['padding'][1];
+                $pdf->MultiCell($textWidth,2,$colDef['title']['label'],'',$colDef['title']['align']);
+            }
+        }
+
+        if (empty($hidetop)){
+            $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+        }
+    }
+
+    /**
+     *  Show top header of page.
+     *
+     *  @param	PDF			$pdf     		Object PDF
+     *  @param  Object		$object     	Object to show
+     *  @param  int	    	$showaddress    0=no, 1=yes
+     *  @param  Translate	$outputlangs	Object lang for output
+     *  @return	void
+     */
+    function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+    {
+        global $conf,$langs;
 
-	/**
-	 *   	Show footer of page. Need this->emetteur object
+        $outputlangs->load("main");
+        $outputlangs->load("bills");
+        $outputlangs->load("propal");
+        $outputlangs->load("companies");
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+        //  Show Draft Watermark
+        if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
+        {
+            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
+        }
+
+        $pdf->SetTextColor(0,0,60);
+        $pdf->SetFont('','B', $default_font_size + 3);
+
+        $posy=$this->marge_haute;
+        $posx=$this->page_largeur-$this->marge_droite-100;
+
+        $pdf->SetXY($this->marge_gauche,$posy);
+
+        // Logo
+        if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
+        {
+            $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+            if ($this->emetteur->logo)
+            {
+                if (is_readable($logo))
+                {
+                    $height=pdf_getHeightForLogo($logo);
+                    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+                }
+                else
+                {
+                    $pdf->SetTextColor(200,0,0);
+                    $pdf->SetFont('','B',$default_font_size - 2);
+                    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+                    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+                }
+            }
+            else
+            {
+                $text=$this->emetteur->name;
+                $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+            }
+        }
+
+        $pdf->SetFont('','B',$default_font_size + 3);
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $title=$outputlangs->transnoentities("PdfCommercialProposalTitle");
+        $pdf->MultiCell(100, 4, $title, '', 'R');
+
+        $pdf->SetFont('','B',$default_font_size);
+
+        $posy+=5;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+
+        $posy+=1;
+        $pdf->SetFont('','', $default_font_size - 2);
+
+        if ($object->ref_client)
+        {
+            $posy+=4;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+        }
+
+        $posy+=4;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
+
+        $posy+=4;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dol_print_date($object->fin_validite,"day",false,$outputlangs,true), '', 'R');
+
+        if ($object->thirdparty->code_client)
+        {
+            $posy+=4;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+        }
+
+        // Get contact
+        if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
+        {
+            $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+            if (count($arrayidcontact) > 0)
+            {
+                $usertmp=new User($this->db);
+                $usertmp->fetch($arrayidcontact[0]);
+                $posy+=4;
+                $pdf->SetXY($posx,$posy);
+                $pdf->SetTextColor(0,0,60);
+                $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+            }
+        }
+
+        $posy+=2;
+
+        $top_shift = 0;
+        // Show list of linked objects
+        $current_y = $pdf->getY();
+        $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+        if ($current_y < $pdf->getY())
+        {
+            $top_shift = $pdf->getY() - $current_y;
+        }
+
+        if ($showaddress)
+        {
+            // Sender properties
+            $carac_emetteur='';
+                // Add internal contact of proposal if defined
+            $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+                if (count($arrayidcontact) > 0)
+                {
+                    $object->fetch_user($arrayidcontact[0]);
+                    $labelbeforecontactname=($outputlangs->transnoentities("FromContactName")!='FromContactName'?$outputlangs->transnoentities("FromContactName"):$outputlangs->transnoentities("Name"));
+                    $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+                }
+
+                $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+
+            // Show sender
+            $posy=42+$top_shift;
+                $posx=$this->marge_gauche;
+            if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+            $hautcadre=40;
+
+            // Show sender frame
+            $pdf->SetTextColor(0,0,0);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posx,$posy-5);
+            $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetFillColor(230,230,230);
+            $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+            $pdf->SetTextColor(0,0,60);
+
+            // Show sender name
+            $pdf->SetXY($posx+2,$posy+3);
+            $pdf->SetFont('','B', $default_font_size);
+            $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+            $posy=$pdf->getY();
+
+            // Show sender information
+            $pdf->SetXY($posx+2,$posy);
+            $pdf->SetFont('','', $default_font_size - 1);
+            $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+
+
+            // If CUSTOMER contact defined, we use it
+            $usecontact=false;
+            $arrayidcontact=$object->getIdContact('external','CUSTOMER');
+            if (count($arrayidcontact) > 0)
+            {
+                $usecontact=true;
+                $result=$object->fetch_contact($arrayidcontact[0]);
+            }
+
+            //Recipient name
+            // On peut utiliser le nom de la societe du contact
+            if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+                $thirdparty = $object->contact;
+            } else {
+                $thirdparty = $object->thirdparty;
+            }
+
+            $carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+
+            $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->thirdparty,($usecontact?$object->contact:''),$usecontact,'target',$object);
+
+            // Show recipient
+            $widthrecbox=100;
+            if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+            $posy=42+$top_shift;
+            $posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
+            if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+
+            // Show recipient frame
+            $pdf->SetTextColor(0,0,0);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posx+2,$posy-5);
+            $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+            $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+            // Show recipient name
+            $pdf->SetXY($posx+2,$posy+3);
+            $pdf->SetFont('','B', $default_font_size);
+            $pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+
+            $posy = $pdf->getY();
+
+            // Show recipient information
+            $pdf->SetFont('','', $default_font_size - 1);
+            $pdf->SetXY($posx+2,$posy);
+            $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+        }
+
+        $pdf->SetTextColor(0,0,0);
+        return $top_shift;
+    }
+
+    /**
+     *   	Show footer of page. Need this->emetteur object
+     *
+     *   	@param	PDF			$pdf     			PDF
+     * 		@param	Object		$object				Object to show
+     *      @param	Translate	$outputlangs		Object lang for output
+     *      @param	int			$hidefreetext		1=Hide free text
+     *      @return	int								Return height of bottom margin including footer text
+     */
+    function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+    {
+        global $conf;
+        $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+        return pdf_pagefoot($pdf,$outputlangs,'PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+    }
+
+    /**
+     *	Show area for the customer to sign
+     *
+     *	@param	PDF			$pdf            Object PDF
+     *	@param  Facture		$object         Object invoice
+     *	@param	int			$posy			Position depart
+     *	@param	Translate	$outputlangs	Objet langs
+     *	@return int							Position pour suite
+     */
+    private function drawSignatureArea(&$pdf, $object, $posy, $outputlangs)
+    {
+        global $conf;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+        $tab_top = $posy + 4;
+        $tab_hl = 4;
+
+        $posx = 120;
+        $largcol = ($this->page_largeur - $this->marge_droite - $posx);
+        $useborder=0;
+        $index = 0;
+        // Total HT
+        $pdf->SetFillColor(255,255,255);
+        $pdf->SetXY($posx, $tab_top + 0);
+        $pdf->SetFont('','', $default_font_size - 2);
+        $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);
+
+        $pdf->SetXY($posx, $tab_top + $tab_hl);
+        $pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
+        if (! empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
+            $pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl*3);
+        }
+
+        return ($tab_hl*7);
+    }
+
+
+    /**
+     *   	Define Array Column Field
      *
-	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	int								Return height of bottom margin including footer text
-	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
-	{
-		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
-	}
-
-	/**
-	 *	Show area for the customer to sign
-	 *
-	 *	@param	PDF			$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
-	 */
-	private function drawSignatureArea(&$pdf, $object, $posy, $outputlangs)
-	{
-		global $conf;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-		$tab_top = $posy + 4;
-		$tab_hl = 4;
-
-		$posx = 120;
-		$largcol = ($this->page_largeur - $this->marge_droite - $posx);
-		$useborder=0;
-		$index = 0;
-		// Total HT
-		$pdf->SetFillColor(255,255,255);
-		$pdf->SetXY($posx, $tab_top + 0);
-		$pdf->SetFont('','', $default_font_size - 2);
-		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);
-
-		$pdf->SetXY($posx, $tab_top + $tab_hl);
-		$pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
-		if (! empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
-			$pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl*3);
-		}
-
-		return ($tab_hl*7);
-	}
-
-
-	/**
-	 *   	Define Array Column Field
-	 *
-	 *   	@param	object			$object			common object
-	 *   	@param	Translate		$outputlangs	langs
-	 *      @param	int				$hidedetails	Do not show line details
-	 *      @param	int				$hidedesc		Do not show desc
-	 *      @param	int				$hideref		Do not show ref
-	 *      @return	null
-	 */
+     *   	@param	object			$object			common object
+     *   	@param	Translate		$outputlangs	langs
+     *      @param	int				$hidedetails	Do not show line details
+     *      @param	int				$hidedesc		Do not show desc
+     *      @param	int				$hideref		Do not show ref
+     *      @return	null
+     */
     function defineColumnField($object,$outputlangs,$hidedetails=0,$hidedesc=0,$hideref=0)
     {
-	    global $conf, $hookmanager;
+        global $conf, $hookmanager;
 
-	    // Default field style for content
-	    $this->defaultContentsFieldsStyle = array(
-	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+        // Default field style for content
+        $this->defaultContentsFieldsStyle = array(
+            'align' => 'R', // R,C,L
+            'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+        );
 
-	    // Default field style for content
-	    $this->defaultTitlesFieldsStyle = array(
-	        'align' => 'C', // R,C,L
-	        'padding' => array(0.5,0,0.5,0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+        // Default field style for content
+        $this->defaultTitlesFieldsStyle = array(
+            'align' => 'C', // R,C,L
+            'padding' => array(0.5,0,0.5,0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+        );
 
-	    /*
+        /*
 	     * For exemple
 	     $this->cols['theColKey'] = array(
 	     'rank' => $rank, // int : use for ordering columns
@@ -1731,158 +1731,158 @@ 
 	     );
 	     */
 
-	    $rank=0; // do not use negative rank
-	    $this->cols['desc'] = array(
-	        'rank' => $rank,
-	        'width' => false, // only for desc
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Designation', // use lang key is usefull in somme case with module
-	            'align' => 'L',
-	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'content' => array(
-	            'align' => 'L',
-	        ),
-	    );
-
-	    $rank = $rank + 10;
-	    $this->cols['photo'] = array(
-	        'rank' => $rank,
-	        'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Photo',
-	            'label' => ' '
-	        ),
-	        'content' => array(
-	            'padding' => array(0,0,0,0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'border-left' => false, // remove left line separator
-	    );
-
-	    if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
-
-
-	    $rank = $rank + 10;
-	    $this->cols['vat'] = array(
-	        'rank' => $rank,
-	        'status' => false,
-	        'width' => 16, // in mm
-	        'title' => array(
-	            'textkey' => 'VAT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $this->cols['vat']['status'] = true;
-	    }
-
-	    $rank = $rank + 10;
-	    $this->cols['subprice'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'PriceUHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-
-	    $rank = $rank + 10;
-	    $this->cols['qty'] = array(
-	        'rank' => $rank,
-	        'width' => 16, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Qty'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-
-	    $rank = $rank + 10;
-	    $this->cols['progress'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Progress'
-	        ),
-	        'border-left' => false, // add left line separator
-	    );
-
-	    if($this->situationinvoice)
-	    {
-	        $this->cols['progress']['status'] = true;
-	    }
-
-	    $rank = $rank + 10;
-	    $this->cols['unit'] = array(
-	        'rank' => $rank,
-	        'width' => 11, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Unit'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if($conf->global->PRODUCT_USE_UNITS){
-	        $this->cols['unit']['status'] = true;
-	    }
-
-	    $rank = $rank + 10;
-	    $this->cols['discount'] = array(
-	        'rank' => $rank,
-	        'width' => 13, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'ReductionShort'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($this->atleastonediscount){
-	        $this->cols['discount']['status'] = true;
-	    }
-
-	    $rank = $rank + 10;
-	    $this->cols['totalexcltax'] = array(
-	        'rank' => $rank,
-	        'width' => 26, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-
-
-	    $parameters=array(
-	        'object' => $object,
-	        'outputlangs' => $outputlangs,
-	        'hidedetails' => $hidedetails,
-	        'hidedesc' => $hidedesc,
-	        'hideref' => $hideref
-	    );
-
-	    $reshook=$hookmanager->executeHooks('defineColumnField',$parameters,$this);    // Note that $object may have been modified by hook
-	    if ($reshook < 0)
-	    {
-	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
-	    {
-	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
-	        $this->cols = $hookmanager->resArray;
-	    }
-	}
+        $rank=0; // do not use negative rank
+        $this->cols['desc'] = array(
+            'rank' => $rank,
+            'width' => false, // only for desc
+            'status' => true,
+            'title' => array(
+                'textkey' => 'Designation', // use lang key is usefull in somme case with module
+                'align' => 'L',
+                // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+                // 'label' => ' ', // the final label
+                'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+            ),
+            'content' => array(
+                'align' => 'L',
+            ),
+        );
+
+        $rank = $rank + 10;
+        $this->cols['photo'] = array(
+            'rank' => $rank,
+            'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+            'status' => false,
+            'title' => array(
+                'textkey' => 'Photo',
+                'label' => ' '
+            ),
+            'content' => array(
+                'padding' => array(0,0,0,0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+            ),
+            'border-left' => false, // remove left line separator
+        );
+
+        if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto))
+        {
+            $this->cols['photo']['status'] = true;
+        }
+
+
+        $rank = $rank + 10;
+        $this->cols['vat'] = array(
+            'rank' => $rank,
+            'status' => false,
+            'width' => 16, // in mm
+            'title' => array(
+                'textkey' => 'VAT'
+            ),
+            'border-left' => true, // add left line separator
+        );
+
+        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+        {
+            $this->cols['vat']['status'] = true;
+        }
+
+        $rank = $rank + 10;
+        $this->cols['subprice'] = array(
+            'rank' => $rank,
+            'width' => 19, // in mm
+            'status' => true,
+            'title' => array(
+                'textkey' => 'PriceUHT'
+            ),
+            'border-left' => true, // add left line separator
+        );
+
+        $rank = $rank + 10;
+        $this->cols['qty'] = array(
+            'rank' => $rank,
+            'width' => 16, // in mm
+            'status' => true,
+            'title' => array(
+                'textkey' => 'Qty'
+            ),
+            'border-left' => true, // add left line separator
+        );
+
+        $rank = $rank + 10;
+        $this->cols['progress'] = array(
+            'rank' => $rank,
+            'width' => 19, // in mm
+            'status' => false,
+            'title' => array(
+                'textkey' => 'Progress'
+            ),
+            'border-left' => false, // add left line separator
+        );
+
+        if($this->situationinvoice)
+        {
+            $this->cols['progress']['status'] = true;
+        }
+
+        $rank = $rank + 10;
+        $this->cols['unit'] = array(
+            'rank' => $rank,
+            'width' => 11, // in mm
+            'status' => false,
+            'title' => array(
+                'textkey' => 'Unit'
+            ),
+            'border-left' => true, // add left line separator
+        );
+        if($conf->global->PRODUCT_USE_UNITS){
+            $this->cols['unit']['status'] = true;
+        }
+
+        $rank = $rank + 10;
+        $this->cols['discount'] = array(
+            'rank' => $rank,
+            'width' => 13, // in mm
+            'status' => false,
+            'title' => array(
+                'textkey' => 'ReductionShort'
+            ),
+            'border-left' => true, // add left line separator
+        );
+        if ($this->atleastonediscount){
+            $this->cols['discount']['status'] = true;
+        }
+
+        $rank = $rank + 10;
+        $this->cols['totalexcltax'] = array(
+            'rank' => $rank,
+            'width' => 26, // in mm
+            'status' => true,
+            'title' => array(
+                'textkey' => 'TotalHT'
+            ),
+            'border-left' => true, // add left line separator
+        );
+
+
+        $parameters=array(
+            'object' => $object,
+            'outputlangs' => $outputlangs,
+            'hidedetails' => $hidedetails,
+            'hidedesc' => $hidedesc,
+            'hideref' => $hideref
+        );
+
+        $reshook=$hookmanager->executeHooks('defineColumnField',$parameters,$this);    // Note that $object may have been modified by hook
+        if ($reshook < 0)
+        {
+            setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+        }
+        elseif (empty($reshook))
+        {
+            $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+        }
+        else
+        {
+            $this->cols = $hookmanager->resArray;
+        }
+    }
 }

Spacing +474 added lines, -474 removed lines

@@ -44,10 +44,10 @@ 
 	public $db;
 	public $name;
 	public $description;
-	public $update_main_doc_field;	// Save the name of generated file as the main doc when generating a doc with this template
+	public $update_main_doc_field; // Save the name of generated file as the main doc when generating a doc with this template
 	public $type;
 
-	public $phpmin = array(4,3,0); // Minimum version of PHP required by module
+	public $phpmin = array(4, 3, 0); // Minimum version of PHP required by module
 	public $version = 'development';
 
 	public $page_largeur;
@@ -58,7 +58,7 @@ 
 	public	$marge_haute;
 	public	$marge_basse;
 
-	public $emetteur;	// Objet societe qui emet
+	public $emetteur; // Objet societe qui emet
 
 
 	/**
@@ -68,7 +68,7 @@ 
 	 */
 	public function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		// Translations
 		$langs->loadLangs(array("main", "bills"));
@@ -76,46 +76,46 @@ 
 		$this->db = $db;
 		$this->name = "cyan";
 		$this->description = $langs->trans('DocModelCyanDescription');
-		$this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Dimension page
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   //Support add of a watermark on drafts
-
-		$this->franchise=!$mysoc->tva_assuj;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Affiche mode reglement
+		$this->option_condreg = 1; // Affiche conditions reglement
+		$this->option_codeproduitservice = 1; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 1; //Support add of a watermark on drafts
+
+		$this->franchise = !$mysoc->tva_assuj;
 
 		// Get source company
-		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+		$this->emetteur = $mysoc;
+		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 
 		// Define position of columns
-		$this->posxdesc=$this->marge_gauche+1;
+		$this->posxdesc = $this->marge_gauche + 1;
 
 
 
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
+		$this->tva = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -130,14 +130,14 @@ 
      *  @param		int			$hideref			Do not show ref
      *  @return     int             				1=OK, 0=KO
 	 */
-	public function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
 	  // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblignes;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -149,52 +149,52 @@ 
 		$nblignes = count($object->lines);
 
 		// Loop on each lines to detect if there is at least one image to show
-		$realpatharray=array();
+		$realpatharray = array();
 		$this->atleastonephoto = false;
-		if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
+		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
 		{
 			$objphoto = new Product($this->db);
 
-			for ($i = 0 ; $i < $nblignes ; $i++)
+			for ($i = 0; $i < $nblignes; $i++)
 			{
 				if (empty($object->lines[$i]->fk_product)) continue;
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
                 //var_dump($objphoto->ref);exit;
-				if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 				{
-					$pdir[0] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";
-					$pdir[1] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
+					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				}
 				else
 				{
-					$pdir[0] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
-					$pdir[1] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";	// alternative
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
 
 				$arephoto = false;
 				foreach ($pdir as $midir)
 				{
-					if (! $arephoto)
+					if (!$arephoto)
 					{
 						$dir = $conf->product->dir_output.'/'.$midir;
 
-						foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
 						{
 							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
 							{
 								if ($obj['photo_vignette'])
 								{
-									$filename= $obj['photo_vignette'];
+									$filename = $obj['photo_vignette'];
 								}
 								else
 								{
-									$filename=$obj['photo'];
+									$filename = $obj['photo'];
 								}
 							}
 							else
 							{
-								$filename=$obj['photo'];
+								$filename = $obj['photo'];
 							}
 
 							$realpath = $dir.$filename;
@@ -204,11 +204,11 @@ 
 					}
 				}
 
-				if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
 
 		if ($conf->propal->multidir_output[$conf->entity])
 		{
@@ -220,20 +220,20 @@ 
 			if ($object->specimen)
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
-				$file = $dir . "/SPECIMEN.pdf";
+				$file = $dir."/SPECIMEN.pdf";
 			}
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->propal->multidir_output[$object->entity] . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
+				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
+				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -241,20 +241,20 @@ 
 			if (file_exists($dir))
 			{
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Create pdf instance
-                $pdf=pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1,0);
+                $pdf = pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+	            $pdf->SetAutoPageBreak(1, 0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -263,28 +263,28 @@ 
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("PdfCommercialProposalTitle"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Does we have at least one line with discount $this->atleastonediscount
 				foreach ($object->lines as $line) {
-				    if ($line->remise_percent){
+				    if ($line->remise_percent) {
 				        $this->atleastonediscount = true;
 				        break;
 				    }
@@ -294,23 +294,23 @@ 
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 
-                $heightforinfotot = 40;	// Height reserved to output the info and total part
-                $heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE)?(pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature"))+10):0;
-                $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-                $heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)?12:22);	// Height reserved to output the footer (value include bottom margin)
+                $heightforinfotot = 40; // Height reserved to output the info and total part
+                $heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE) ? (pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature")) + 10) : 0;
+                $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+                $heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
                 //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
 
-	            $tab_top = 90+$top_shift;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
+	            $tab_top = 90 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 
 				// Incoterm
@@ -322,39 +322,39 @@ 
 					{
 						$tab_top -= 2;
 
-						$pdf->SetFont('','', $default_font_size - 1);
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
 						$nexY = $pdf->GetY();
-						$height_incoterms=$nexY-$tab_top;
+						$height_incoterms = $nexY - $tab_top;
 
 						// Rect prend une longueur en 3eme param
-						$pdf->SetDrawColor(192,192,192);
-						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
+						$pdf->SetDrawColor(192, 192, 192);
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
 
-						$tab_top = $nexY+6;
+						$tab_top = $nexY + 6;
 					}
 				}
 
 				// Affiche notes
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
-				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
 				{
 					// Get first sale rep
 					if (is_object($object->thirdparty))
 					{
-						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
-						$salerepobj=new User($this->db);
+						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
+						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
-				if (! empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
+				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
 				{
-				    $tmpuser=new User($this->db);
+				    $tmpuser = new User($this->db);
 				    $tmpuser->fetch($object->user_author_id);
-				    $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs);
-				    if ($tmpuser->email) $notetoshow.=',  Mail: '.$tmpuser->email;
-				    if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
+				    $notetoshow .= 'Affaire suivi par '.$tmpuser->getFullName($langs);
+				    if ($tmpuser->email) $notetoshow .= ',  Mail: '.$tmpuser->email;
+				    if ($tmpuser->office_phone) $notetoshow .= ', Tel: '.$tmpuser->office_phone;
 				}
 
 				$pagenb = $pdf->getPage();
@@ -362,23 +362,23 @@ 
 				{
 					$tab_top -= 2;
 
-				    $tab_width = $this->page_largeur-$this->marge_gauche-$this->marge_droite;
+				    $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
 				    $pageposbeforenote = $pagenb;
 
-					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 
 
 					$pdf->startTransaction();
 
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 					// Description
-					$pageposafternote=$pdf->getPage();
+					$pageposafternote = $pdf->getPage();
 					$posyafter = $pdf->GetY();
 
-					if($pageposafternote>$pageposbeforenote )
+					if ($pageposafternote > $pageposbeforenote)
 					{
 					    $pdf->rollbackTransaction(true);
 
@@ -386,7 +386,7 @@ 
 					    while ($pagenb < $pageposafternote) {
 					        $pdf->AddPage();
 					        $pagenb++;
-					        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+					        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 					        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					        // $this->_pagefoot($pdf,$object,$outputlangs,1);
 					        $pdf->setTopMargin($tab_top_newpage);
@@ -397,15 +397,15 @@ 
 					    // back to start
 					    $pdf->setPage($pageposbeforenote);
 					    $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-					    $pdf->SetFont('','', $default_font_size - 1);
-					    $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-					    $pageposafternote=$pdf->getPage();
+					    $pdf->SetFont('', '', $default_font_size - 1);
+					    $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					    $pageposafternote = $pdf->getPage();
 
 					    $posyafter = $pdf->GetY();
 
-					    if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20)))	// There is no space left for total+free text
+					    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
 					    {
-					        $pdf->AddPage('','',true);
+					        $pdf->AddPage('', '', true);
 					        $pagenb++;
 					        $pageposafternote++;
 					        $pdf->setPage($pageposafternote);
@@ -422,47 +422,47 @@ 
 					        $pdf->setPage($i);
 
 
-					        $pdf->SetDrawColor(128,128,128);
+					        $pdf->SetDrawColor(128, 128, 128);
 					        // Draw note frame
-					        if($i>$pageposbeforenote){
+					        if ($i > $pageposbeforenote) {
 					            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-					            $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note + 1);
+					            $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
 					        }
-					        else{
+					        else {
 					            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-					            $pdf->Rect($this->marge_gauche, $tab_top-1, $tab_width, $height_note + 1);
+					            $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 					        }
 
 					        // Add footer
-					        $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-					        $this->_pagefoot($pdf,$object,$outputlangs,1);
+					        $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					        $this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 					        $i++;
 					    }
 
 					    // apply note frame to last page
 					    $pdf->setPage($pageposafternote);
-					    if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+					    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 					    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					    $height_note=$posyafter-$tab_top_newpage;
-					    $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note+1);
+					    $height_note = $posyafter - $tab_top_newpage;
+					    $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
 					}
 					else // No pagebreak
 					{
 					    $pdf->commitTransaction();
 					    $posyafter = $pdf->GetY();
-					    $height_note=$posyafter-$tab_top;
-					    $pdf->Rect($this->marge_gauche, $tab_top-1, $tab_width, $height_note+1);
+					    $height_note = $posyafter - $tab_top;
+					    $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-					    if($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20)) )
+					    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
 					    {
 					        // not enough space, need to add page
-					        $pdf->AddPage('','',true);
+					        $pdf->AddPage('', '', true);
 					        $pagenb++;
 					        $pageposafternote++;
 					        $pdf->setPage($pageposafternote);
-					        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+					        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 					        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 
 					        $posyafter = $tab_top_newpage;
@@ -470,11 +470,11 @@ 
 					}
 
 					$tab_height = $tab_height - $height_note;
-					$tab_top = $posyafter +6;
+					$tab_top = $posyafter + 6;
 				}
 				else
 				{
-					$height_note=0;
+					$height_note = 0;
 				}
 
 				$iniY = $tab_top + 7;
@@ -482,112 +482,112 @@ 
 				$nexY = $tab_top + 7;
 
 				// Use new auto collum system
-				$this->prepareArrayColumnField($object,$outputlangs,$hidedetails,$hidedesc,$hideref);
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 				// Loop on each lines
-				$pageposbeforeprintlines=$pdf->getPage();
+				$pageposbeforeprintlines = $pdf->getPage();
 				$pagenb = $pageposbeforeprintlines;
 				for ($i = 0; $i < $nblignes; $i++)
 				{
 					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
-					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
-					$showpricebeforepagebreak=1;
-					$posYAfterImage=0;
-					$posYAfterDescription=0;
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
+					$posYAfterDescription = 0;
 
-					if($this->getColumnStatus('photo'))
+					if ($this->getColumnStatus('photo'))
 					{
     					// We start with Photo of product line
-    					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// If photo too high, we moved completely on new page
+    					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// If photo too high, we moved completely on new page
     					{
-    						$pdf->AddPage('','',true);
-    						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+    						$pdf->AddPage('', '', true);
+    						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
     						//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-    						$pdf->setPage($pageposbefore+1);
+    						$pdf->setPage($pageposbefore + 1);
 
     						$curY = $tab_top_newpage;
-    						$showpricebeforepagebreak=0;
+    						$showpricebeforepagebreak = 0;
     					}
 
 
     					if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
     					{
-    						$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
+    						$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
     						// $pdf->Image does not increase value return by getY, so we save it manually
-    						$posYAfterImage=$curY+$imglinesize['height'];
+    						$posYAfterImage = $curY + $imglinesize['height'];
     					}
 					}
 
 					// Description of product line
-					if($this->getColumnStatus('desc'))
+					if ($this->getColumnStatus('desc'))
 					{
     					$pdf->startTransaction();
-    					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->getColumnContentWidth('desc'),3,$this->getColumnContentXStart('desc'),$curY,$hideref,$hidedesc);
-    					$pageposafter=$pdf->getPage();
+    					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+    					$pageposafter = $pdf->getPage();
     					if ($pageposafter > $pageposbefore)	// There is a pagebreak
     					{
     						$pdf->rollbackTransaction(true);
-    						$pageposafter=$pageposbefore;
+    						$pageposafter = $pageposbefore;
     						//print $pageposafter.'-'.$pageposbefore;exit;
-    						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-    						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->getColumnContentWidth('desc'),3,$this->getColumnContentXStart('desc'),$curY,$hideref,$hidedesc);
+    						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+    						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
 
-    						$pageposafter=$pdf->getPage();
-    						$posyafter=$pdf->GetY();
+    						$pageposafter = $pdf->getPage();
+    						$posyafter = $pdf->GetY();
     						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-    						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// There is no space left for total+free text
+    						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// There is no space left for total+free text
     						{
-    							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+    							if ($i == ($nblignes - 1))	// No more lines, and no space left to show total, so we create a new page
     							{
-    								$pdf->AddPage('','',true);
-    								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+    								$pdf->AddPage('', '', true);
+    								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
     								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-    								$pdf->setPage($pageposafter+1);
+    								$pdf->setPage($pageposafter + 1);
     							}
     						}
     						else
     						{
     							// We found a page break
-    							$showpricebeforepagebreak=0;
+    							$showpricebeforepagebreak = 0;
     						}
     					}
     					else	// No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
-    					$posYAfterDescription=$pdf->GetY();
+    					$posYAfterDescription = $pdf->GetY();
 					}
 
 					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
+					$pageposafter = $pdf->getPage();
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// VAT Rate
 					if ($this->getColumnStatus('vat'))
 					{
 					    $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 					    $this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
-					    $nexY = max($pdf->GetY(),$nexY);
+					    $nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Unit price before discount
@@ -595,7 +595,7 @@ 
 					{
 					    $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					    $this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
-					    $nexY = max($pdf->GetY(),$nexY);
+					    $nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Quantity
@@ -604,7 +604,7 @@ 
 					{
 					    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 					    $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
-					    $nexY = max($pdf->GetY(),$nexY);
+					    $nexY = max($pdf->GetY(), $nexY);
 					}
 
 
@@ -613,7 +613,7 @@ 
 					{
 					    $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 					    $this->printStdColumnContent($pdf, $curY, 'unit', $unit);
-					    $nexY = max($pdf->GetY(),$nexY);
+					    $nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Discount on line
@@ -621,7 +621,7 @@ 
 					{
 					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 					    $this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
-					    $nexY = max($pdf->GetY(),$nexY);
+					    $nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total HT line
@@ -629,11 +629,11 @@ 
 					{
 					    $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					    $this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
-					    $nexY = max($pdf->GetY(),$nexY);
+					    $nexY = max($pdf->GetY(), $nexY);
 					}
 
 
-					$parameters=array(
+					$parameters = array(
 					    'object' => $object,
 					    'i' => $i,
 					    'pdf' =>& $pdf,
@@ -642,59 +642,59 @@ 
 					    'outputlangs' => $outputlangs,
 					    'hidedetails' => $hidedetails
 					);
-					$reshook=$hookmanager->executeHooks('printPDFline',$parameters,$this);    // Note that $object may have been modified by hook
+					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
 
 
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne=$object->lines[$i]->total_tva;
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					else $tvaligne = $object->lines[$i]->total_tva;
 
-					$localtax1ligne=$object->lines[$i]->total_localtax1;
-					$localtax2ligne=$object->lines[$i]->total_localtax2;
-					$localtax1_rate=$object->lines[$i]->localtax1_tx;
-					$localtax2_rate=$object->lines[$i]->localtax2_tx;
-					$localtax1_type=$object->lines[$i]->localtax1_type;
-					$localtax2_type=$object->lines[$i]->localtax2_type;
+					$localtax1ligne = $object->lines[$i]->total_localtax1;
+					$localtax2ligne = $object->lines[$i]->total_localtax2;
+					$localtax1_rate = $object->lines[$i]->localtax1_tx;
+					$localtax2_rate = $object->lines[$i]->localtax2_tx;
+					$localtax1_type = $object->lines[$i]->localtax1_type;
+					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
 
-					$vatrate=(string) $object->lines[$i]->tva_tx;
+					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
-					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
-					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
+					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
+						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
 				    // retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
-						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
-						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
+					if (!isset($this->tva[$vatrate]))				$this->tva[$vatrate] = 0;
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
 
 					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-					$nexY+=2;    // Passe espace entre les lignes
+					$nexY += 2; // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -708,13 +708,13 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
 					    if ($pagenb == $pageposafter)
 						{
@@ -724,10 +724,10 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
@@ -737,19 +737,19 @@ 
 				if ($pagenb == $pageposbeforeprintlines)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
 
 				// Affiche zone infos
-				$posy=$this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+				$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
 				// Affiche zone totaux
-				$posy=$this->drawTotalTable($pdf, $object, 0, $bottomlasttab, $outputlangs);
+				$posy = $this->drawTotalTable($pdf, $object, 0, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
 				/*
@@ -762,21 +762,21 @@ 
 				// Customer signature area
 				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
 				{
-				    $posy=$this->drawSignatureArea($pdf, $object, $posy, $outputlangs);
+				    $posy = $this->drawSignatureArea($pdf, $object, $posy, $outputlangs);
 				}
 
 				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				//If propal merge product PDF is active
 				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
 
-					$already_merged = array ();
-					foreach ( $object->lines as $line ) {
-						if (! empty($line->fk_product) && ! (in_array($line->fk_product, $already_merged))) {
+					$already_merged = array();
+					foreach ($object->lines as $line) {
+						if (!empty($line->fk_product) && !(in_array($line->fk_product, $already_merged))) {
 							// Find the desire PDF
 							$filetomerge = new Propalmergepdfproduct($this->db);
 
@@ -791,48 +791,48 @@ 
 							$product = new Product($this->db);
 							$product->fetch($line->fk_product);
 
-							if ($product->entity!=$conf->entity) {
-								$entity_product_file=$product->entity;
+							if ($product->entity != $conf->entity) {
+								$entity_product_file = $product->entity;
 							} else {
-								$entity_product_file=$conf->entity;
+								$entity_product_file = $conf->entity;
 							}
 
 							// If PDF is selected and file is not empty
 							if (count($filetomerge->lines) > 0) {
-								foreach ( $filetomerge->lines as $linefile ) {
-									if (! empty($linefile->id) && ! empty($linefile->file_name)) {
+								foreach ($filetomerge->lines as $linefile) {
+									if (!empty($linefile->id) && !empty($linefile->file_name)) {
 
 
-										if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+										if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 										{
-											if (! empty($conf->product->enabled)) {
-												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
-											} elseif (! empty($conf->service->enabled)) {
-												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+											if (!empty($conf->product->enabled)) {
+												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
+											} elseif (!empty($conf->service->enabled)) {
+												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
 										}
 										else
 										{
-											if (! empty($conf->product->enabled)) {
-												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
-											} elseif (! empty($conf->service->enabled)) {
-												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
+											if (!empty($conf->product->enabled)) {
+												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
+											} elseif (!empty($conf->service->enabled)) {
+												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											}
 										}
 
-										dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG);
+										dol_syslog(get_class($this).':: upload_dir='.$filetomerge_dir, LOG_DEBUG);
 
-										$infile = $filetomerge_dir . '/' . $linefile->file_name;
+										$infile = $filetomerge_dir.'/'.$linefile->file_name;
 										if (file_exists($infile) && is_readable($infile)) {
 											$pagecount = $pdf->setSourceFile($infile);
-											for($i = 1; $i <= $pagecount; $i ++) {
+											for ($i = 1; $i <= $pagecount; $i++) {
 												$tplIdx = $pdf->importPage($i);
-												if ($tplIdx!==false) {
+												if ($tplIdx !== false) {
 													$s = $pdf->getTemplatesize($tplIdx);
 													$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 													$pdf->useTemplate($tplIdx);
 												} else {
-													setEventMessages(null, array($infile.' cannot be added, probably protected PDF'),'warnings');
+													setEventMessages(null, array($infile.' cannot be added, probably protected PDF'), 'warnings');
 												}
 											}
 										}
@@ -845,30 +845,30 @@ 
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				//Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Pas d'erreur
+				return 1; // Pas d'erreur
 			}
 			else
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
+			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -900,66 +900,66 @@ 
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
 		{
-			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
 
-			$posy=$pdf->GetY()+4;
+			$posy = $pdf->GetY() + 4;
 		}
 
-		$posxval=52;
+		$posxval = 52;
 
         // Show shipping date
-        if (! empty($object->date_livraison))
+        if (!empty($object->date_livraison))
 		{
             $outputlangs->load("sendings");
-			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
+			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
-            $posy=$pdf->GetY()+1;
+            $posy = $pdf->GetY() + 1;
 		}
         elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
-			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
-			$lib_availability=str_replace('\n',"\n",$lib_availability);
+			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset($object->availability);
+			$lib_availability = str_replace('\n', "\n", $lib_availability);
 			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
 
-			$posy=$pdf->GetY()+1;
+			$posy = $pdf->GetY() + 1;
 		}
 
 		// Show payments conditions
 		if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
 		{
-			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
 			$pdf->MultiCell(43, 4, $titre, 0, 'L');
 
-			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
-			$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
-			$pdf->MultiCell(67, 4, $lib_condition_paiement,0,'L');
+			$lib_condition_paiement = $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) != ('PaymentCondition'.$object->cond_reglement_code) ? $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) : $outputlangs->convToOutputCharset($object->cond_reglement_doc);
+			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
+			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
-			$posy=$pdf->GetY()+3;
+			$posy = $pdf->GetY() + 3;
 		}
 
 		if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMMODE))
@@ -985,25 +985,25 @@ 
 			&& $object->mode_reglement_code != 'CHQ'
 			&& $object->mode_reglement_code != 'VIR')
 			{
-				$pdf->SetFont('','B', $default_font_size - 2);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
 				$pdf->MultiCell(80, 5, $titre, 0, 'L');
-				$pdf->SetFont('','', $default_font_size - 2);
+				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posxval, $posy);
-				$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
-				$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
+				$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
+				$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
 
-				$posy=$pdf->GetY()+2;
+				$posy = $pdf->GetY() + 2;
 			}
 
 			// Show payment mode CHQ
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
 			{
 				// Si mode reglement non force ou si force a CHQ
-				if (! empty($conf->global->FACTURE_CHQ_NUMBER))
+				if (!empty($conf->global->FACTURE_CHQ_NUMBER))
 				{
-					$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
+					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
 					{
@@ -1011,31 +1011,31 @@ 
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
-						$posy=$pdf->GetY()+1;
+						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+						$posy = $pdf->GetY() + 1;
 
 			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 			            {
 							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
+							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
+							$posy = $pdf->GetY() + 2;
 			            }
 					}
 					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
 					{
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
-						$posy=$pdf->GetY()+1;
+						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+						$posy = $pdf->GetY() + 1;
 
 			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 			            {
 							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
+							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
+							$posy = $pdf->GetY() + 2;
 			            }
 					}
 				}
@@ -1044,19 +1044,19 @@ 
 			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
 			{
-				if (! empty($object->fk_account) || ! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
+				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
 				{
-					$bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
-					if (! empty($object->fk_bank)) $bankid=$object->fk_bank;   // For backward compatibility when object->fk_account is forced with object->fk_bank
+					$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+					if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
-					$curx=$this->marge_gauche;
-					$cury=$posy;
+					$curx = $this->marge_gauche;
+					$cury = $posy;
 
-					$posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+					$posy = pdf_bank($pdf, $outputlangs, $curx, $cury, $account, 0, $default_font_size);
 
-					$posy+=2;
+					$posy += 2;
 				}
 			}
 		}
@@ -1077,43 +1077,43 @@ 
 	 */
 	private function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-			$col2x-=20;
+			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
 
-		$useborder=0;
+		$useborder = 0;
 		$index = 0;
 
 		// Total HT
-		$pdf->SetFillColor(255,255,255);
+		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
 		$total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
+		$pdf->SetFillColor(248, 248, 248);
 
 		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
-		$this->atleastoneratenotnull=0;
+		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 		{
-			$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
+			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
 			}
@@ -1122,28 +1122,28 @@ 
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+					foreach ($this->localtax1 as $localtax_type => $localtax_rate)
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
 
-						foreach( $localtax_rate as $tvakey => $tvaval )
+						foreach ($localtax_rate as $tvakey => $tvaval)
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey != 0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
+								$tvacompl = '';
+								if (preg_match('/\*/', $tvakey))
 								{
-									$tvakey=str_replace('*','',$tvakey);
+									$tvakey = str_replace('*', '', $tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
+								$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1154,13 +1154,13 @@ 
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+					foreach ($this->localtax2 as $localtax_type => $localtax_rate)
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
 
-						foreach( $localtax_rate as $tvakey => $tvaval )
+						foreach ($localtax_rate as $tvakey => $tvaval)
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey != 0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
@@ -1169,15 +1169,15 @@ 
 								$index++;
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
+								$tvacompl = '';
+								if (preg_match('/\*/', $tvakey))
 								{
-									$tvakey=str_replace('*','',$tvakey);
+									$tvakey = str_replace('*', '', $tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
 								$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
+								$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1186,7 +1186,7 @@ 
 					}
 				//}
 				// VAT
-				foreach($this->tva as $tvakey => $tvaval)
+				foreach ($this->tva as $tvakey => $tvaval)
 				{
 					if ($tvakey != 0)    // On affiche pas taux 0
 					{
@@ -1195,15 +1195,15 @@ 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-						$tvacompl='';
-						if (preg_match('/\*/',$tvakey))
+						$tvacompl = '';
+						if (preg_match('/\*/', $tvakey))
 						{
-							$tvakey=str_replace('*','',$tvakey);
+							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
-						$totalvat =$outputlangs->transcountrynoentities("TotalVAT",$mysoc->country_code).' ';
-						$totalvat.=vatrate($tvakey,1).$tvacompl;
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
+						$totalvat .= vatrate($tvakey, 1).$tvacompl;
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1213,11 +1213,11 @@ 
 				//Local tax 1 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+					foreach ($this->localtax1 as $localtax_type => $localtax_rate)
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
 
-						foreach( $localtax_rate as $tvakey => $tvaval )
+						foreach ($localtax_rate as $tvakey => $tvaval)
 						{
 							if ($tvakey != 0)    // On affiche pas taux 0
 							{
@@ -1226,16 +1226,16 @@ 
 								$index++;
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
+								$tvacompl = '';
+								if (preg_match('/\*/', $tvakey))
 								{
-									$tvakey=str_replace('*','',$tvakey);
+									$tvakey = str_replace('*', '', $tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
+								$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
 
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
+								$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 							}
@@ -1245,11 +1245,11 @@ 
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+					foreach ($this->localtax2 as $localtax_type => $localtax_rate)
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
 
-						foreach( $localtax_rate as $tvakey => $tvaval )
+						foreach ($localtax_rate as $tvakey => $tvaval)
 						{
 						    // retrieve global local tax
 							if ($tvakey != 0)    // On affiche pas taux 0
@@ -1259,16 +1259,16 @@ 
 								$index++;
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
+								$tvacompl = '';
+								if (preg_match('/\*/', $tvakey))
 								{
-									$tvakey=str_replace('*','',$tvakey);
+									$tvakey = str_replace('*', '', $tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
+								$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
 
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
+								$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1280,16 +1280,16 @@ 
 				// Total TTC
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->SetFillColor(224,224,224);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->SetFillColor(224, 224, 224);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 
 		/*
 		$resteapayer = $object->total_ttc - $deja_regle;
@@ -1301,7 +1301,7 @@ 
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
@@ -1323,16 +1323,16 @@ 
 			*/
 
 			$index++;
-			$pdf->SetTextColor(0,0,60);
-			$pdf->SetFillColor(224,224,224);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
 
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetTextColor(0, 0, 0);
 		}
 
 		$index++;
@@ -1352,61 +1352,61 @@ 
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
 		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','', $default_font_size - 2);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
-			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
-		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Output Rect
-		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
 
 
 		foreach ($this->cols as $colKey => $colDef)
 		{
-		    if(!$this->getColumnStatus($colKey)) continue;
+		    if (!$this->getColumnStatus($colKey)) continue;
 
 		    // get title label
-		    $colDef['title']['label'] = !empty($colDef['title']['label'])?$colDef['title']['label']:$outputlangs->transnoentities($colDef['title']['textkey']);
+		    $colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
 
 		    // Add column separator
-		    if(!empty($colDef['border-left'])){
+		    if (!empty($colDef['border-left'])) {
 		        $pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
 		    }
 
 		    if (empty($hidetop))
 		    {
-		      $pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0] );
+		      $pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0]);
 
-		      $textWidth = $colDef['width'] - $colDef['title']['padding'][3] -$colDef['title']['padding'][1];
-		      $pdf->MultiCell($textWidth,2,$colDef['title']['label'],'',$colDef['title']['align']);
+		      $textWidth = $colDef['width'] - $colDef['title']['padding'][3] - $colDef['title']['padding'][1];
+		      $pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
 		    }
 		}
 
-		if (empty($hidetop)){
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+		if (empty($hidetop)) {
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line prend une position y en 2eme param et 4eme param
 		}
 	}
 
@@ -1421,7 +1421,7 @@ 
 	 */
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$outputlangs->load("main");
 		$outputlangs->load("bills");
@@ -1430,106 +1430,106 @@ 
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		//  Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
+		if ($object->statut == 0 && (!empty($conf->global->PROPALE_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
+            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
 		}
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+			$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 			if ($this->emetteur->logo)
 			{
 				if (is_readable($logo))
 				{
-				    $height=pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+				    $height = pdf_getHeightForLogo($logo);
+				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				}
 				else
 				{
-					$pdf->SetTextColor(200,0,0);
-					$pdf->SetFont('','B',$default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+					$pdf->SetTextColor(200, 0, 0);
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
 			else
 			{
-				$text=$this->emetteur->name;
+				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
 		}
 
-		$pdf->SetFont('','B',$default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$title=$outputlangs->transnoentities("PdfCommercialProposalTitle");
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("PdfCommercialProposalTitle");
 		$pdf->MultiCell(100, 4, $title, '', 'R');
 
-		$pdf->SetFont('','B',$default_font_size);
+		$pdf->SetFont('', 'B', $default_font_size);
 
-		$posy+=5;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
 
-		$posy+=1;
-		$pdf->SetFont('','', $default_font_size - 2);
+		$posy += 1;
+		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if ($object->ref_client)
 		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
+		$posy += 4;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dol_print_date($object->fin_validite,"day",false,$outputlangs,true), '', 'R');
+		$posy += 4;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : ".dol_print_date($object->fin_validite, "day", false, $outputlangs, true), '', 'R');
 
 		if ($object->thirdparty->code_client)
 		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 		    if (count($arrayidcontact) > 0)
 		    {
-		        $usertmp=new User($this->db);
+		        $usertmp = new User($this->db);
 		        $usertmp->fetch($arrayidcontact[0]);
-                $posy+=4;
-                $pdf->SetXY($posx,$posy);
-		        $pdf->SetTextColor(0,0,60);
+                $posy += 4;
+                $pdf->SetXY($posx, $posy);
+		        $pdf->SetTextColor(0, 0, 60);
 		        $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
 		    }
 		}
 
-		$posy+=2;
+		$posy += 2;
 
 		$top_shift = 0;
 		// Show list of linked objects
@@ -1543,53 +1543,53 @@ 
 		if ($showaddress)
 		{
 			// Sender properties
-			$carac_emetteur='';
+			$carac_emetteur = '';
 		 	// Add internal contact of proposal if defined
-			$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 		 	if (count($arrayidcontact) > 0)
 		 	{
 		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname=($outputlangs->transnoentities("FromContactName")!='FromContactName'?$outputlangs->transnoentities("FromContactName"):$outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+		 		$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
+		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
 		 	}
 
 		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
-			$posy=42+$top_shift;
-		 	$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
+			$posy = 42 + $top_shift;
+		 	$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			$hautcadre = 40;
 
 			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
+			$pdf->SetTextColor(0, 0, 60);
 
 			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
+			$posy = $pdf->getY();
 
 			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 
 			// If CUSTOMER contact defined, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+			$usecontact = false;
+			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 			if (count($arrayidcontact) > 0)
 			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
 			//Recipient name
@@ -1600,38 +1600,38 @@ 
 				$thirdparty = $object->thirdparty;
 			}
 
-			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->thirdparty,($usecontact?$object->contact:''),$usecontact,'target',$object);
+			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
-			$widthrecbox=100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42+$top_shift;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			$widthrecbox = 100;
+			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			$posy = 42 + $top_shift;
+			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
 			// Show recipient frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx+2,$posy-5);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx + 2, $posy - 5);
 			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
 		}
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 		return $top_shift;
 	}
 
@@ -1644,11 +1644,11 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
 	/**
@@ -1669,21 +1669,21 @@ 
 
 		$posx = 120;
 		$largcol = ($this->page_largeur - $this->marge_droite - $posx);
-		$useborder=0;
+		$useborder = 0;
 		$index = 0;
 		// Total HT
-		$pdf->SetFillColor(255,255,255);
+		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($posx, $tab_top + 0);
-		$pdf->SetFont('','', $default_font_size - 2);
+		$pdf->SetFont('', '', $default_font_size - 2);
 		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);
 
 		$pdf->SetXY($posx, $tab_top + $tab_hl);
-		$pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
-		if (! empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
-			$pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl*3);
+		$pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
+		if (!empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
+			$pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl * 3);
 		}
 
-		return ($tab_hl*7);
+		return ($tab_hl * 7);
 	}
 
 
@@ -1697,20 +1697,20 @@ 
 	 *      @param	int				$hideref		Do not show ref
 	 *      @return	null
 	 */
-    function defineColumnField($object,$outputlangs,$hidedetails=0,$hidedesc=0,$hideref=0)
+    function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
     {
 	    global $conf, $hookmanager;
 
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
 	    $this->defaultTitlesFieldsStyle = array(
 	        'align' => 'C', // R,C,L
-	        'padding' => array(0.5,0,0.5,0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    /*
@@ -1731,7 +1731,7 @@ 
 	     );
 	     */
 
-	    $rank=0; // do not use negative rank
+	    $rank = 0; // do not use negative rank
 	    $this->cols['desc'] = array(
 	        'rank' => $rank,
 	        'width' => false, // only for desc
@@ -1741,7 +1741,7 @@ 
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
@@ -1751,19 +1751,19 @@ 
 	    $rank = $rank + 10;
 	    $this->cols['photo'] = array(
 	        'rank' => $rank,
-	        'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+	        'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 	        'status' => false,
 	        'title' => array(
 	            'textkey' => 'Photo',
 	            'label' => ' '
 	        ),
 	        'content' => array(
-	            'padding' => array(0,0,0,0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	            'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'border-left' => false, // remove left line separator
 	    );
 
-	    if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto))
+	    if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto))
 	    {
 	        $this->cols['photo']['status'] = true;
 	    }
@@ -1818,7 +1818,7 @@ 
 	        'border-left' => false, // add left line separator
 	    );
 
-	    if($this->situationinvoice)
+	    if ($this->situationinvoice)
 	    {
 	        $this->cols['progress']['status'] = true;
 	    }
@@ -1833,7 +1833,7 @@ 
 	        ),
 	        'border-left' => true, // add left line separator
 	    );
-	    if($conf->global->PRODUCT_USE_UNITS){
+	    if ($conf->global->PRODUCT_USE_UNITS) {
 	        $this->cols['unit']['status'] = true;
 	    }
 
@@ -1847,7 +1847,7 @@ 
 	        ),
 	        'border-left' => true, // add left line separator
 	    );
-	    if ($this->atleastonediscount){
+	    if ($this->atleastonediscount) {
 	        $this->cols['discount']['status'] = true;
 	    }
 
@@ -1863,7 +1863,7 @@ 
 	    );
 
 
-	    $parameters=array(
+	    $parameters = array(
 	        'object' => $object,
 	        'outputlangs' => $outputlangs,
 	        'hidedetails' => $hidedetails,
@@ -1871,7 +1871,7 @@ 
 	        'hideref' => $hideref
 	    );
 
-	    $reshook=$hookmanager->executeHooks('defineColumnField',$parameters,$this);    // Note that $object may have been modified by hook
+	    $reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

Braces +199 added lines, -103 removed lines

@@ -104,7 +104,10 @@ 
 
 		// Get source company
 		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default, if was not defined
 
 		// Define position of columns
 		$this->posxdesc=$this->marge_gauche+1;
@@ -135,9 +138,13 @@ 
 	  // phpcs:enable
 		global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -157,7 +164,9 @@ 
 
 			for ($i = 0 ; $i < $nblignes ; $i++)
 			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+				if (empty($object->lines[$i]->fk_product)) {
+				    continue;
+				}
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
                 //var_dump($objphoto->ref);exit;
@@ -165,8 +174,7 @@ 
 				{
 					$pdir[0] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";
 					$pdir[1] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
-				}
-				else
+				} else
 				{
 					$pdir[0] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
 					$pdir[1] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";	// alternative
@@ -181,18 +189,18 @@ 
 
 						foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
 						{
-							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {
+							    // If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
 							{
 								if ($obj['photo_vignette'])
 								{
 									$filename= $obj['photo_vignette'];
-								}
-								else
+							}
+								} else
 								{
 									$filename=$obj['photo'];
 								}
-							}
-							else
+							} else
 							{
 								$filename=$obj['photo'];
 							}
@@ -204,11 +212,15 @@ 
 					}
 				}
 
-				if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+				if ($realpath && $arephoto) {
+				    $realpatharray[$i]=$realpath;
+				}
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		if (count($realpatharray) == 0) {
+		    $this->posxpicture=$this->posxtva;
+		}
 
 		if ($conf->propal->multidir_output[$conf->entity])
 		{
@@ -221,8 +233,7 @@ 
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity] . "/" . $objectref;
@@ -278,7 +289,9 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+				    $pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
@@ -294,7 +307,9 @@ 
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (! empty($tplidx)) {
+				    $pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 
                 $heightforinfotot = 40;	// Height reserved to output the info and total part
@@ -345,7 +360,9 @@ 
 						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj=new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (! empty($salerepobj->signature)) {
+						    $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 				if (! empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
@@ -353,8 +370,12 @@ 
 				    $tmpuser=new User($this->db);
 				    $tmpuser->fetch($object->user_author_id);
 				    $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs);
-				    if ($tmpuser->email) $notetoshow.=',  Mail: '.$tmpuser->email;
-				    if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone;
+				    if ($tmpuser->email) {
+				        $notetoshow.=',  Mail: '.$tmpuser->email;
+				    }
+				    if ($tmpuser->office_phone) {
+				        $notetoshow.=', Tel: '.$tmpuser->office_phone;
+				    }
 				}
 
 				$pagenb = $pdf->getPage();
@@ -386,8 +407,12 @@ 
 					    while ($pagenb < $pageposafternote) {
 					        $pdf->AddPage();
 					        $pagenb++;
-					        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-					        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					        if (! empty($tplidx)) {
+					            $pdf->useTemplate($tplidx);
+					        }
+					        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+					            $this->_pagehead($pdf, $object, 0, $outputlangs);
+					        }
 					        // $this->_pagefoot($pdf,$object,$outputlangs,1);
 					        $pdf->setTopMargin($tab_top_newpage);
 					        // The only function to edit the bottom margin of current page to set it.
@@ -403,9 +428,11 @@ 
 
 					    $posyafter = $pdf->GetY();
 
-					    if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20)))	// There is no space left for total+free text
+					    if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20))) {
+					        // There is no space left for total+free text
 					    {
 					        $pdf->AddPage('','',true);
+					    }
 					        $pagenb++;
 					        $pageposafternote++;
 					        $pdf->setPage($pageposafternote);
@@ -427,8 +454,7 @@ 
 					        if($i>$pageposbeforenote){
 					            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 					            $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note + 1);
-					        }
-					        else{
+					        } else{
 					            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 					            $pdf->Rect($this->marge_gauche, $tab_top-1, $tab_width, $height_note + 1);
 					        }
@@ -442,12 +468,15 @@ 
 
 					    // apply note frame to last page
 					    $pdf->setPage($pageposafternote);
-					    if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-					    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					    if (! empty($tplidx)) {
+					        $pdf->useTemplate($tplidx);
+					    }
+					    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+					        $this->_pagehead($pdf, $object, 0, $outputlangs);
+					    }
 					    $height_note=$posyafter-$tab_top_newpage;
 					    $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note+1);
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 					    $pdf->commitTransaction();
 					    $posyafter = $pdf->GetY();
@@ -462,8 +491,12 @@ 
 					        $pagenb++;
 					        $pageposafternote++;
 					        $pdf->setPage($pageposafternote);
-					        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-					        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					        if (! empty($tplidx)) {
+					            $pdf->useTemplate($tplidx);
+					        }
+					        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+					            $this->_pagehead($pdf, $object, 0, $outputlangs);
+					        }
 
 					        $posyafter = $tab_top_newpage;
 					    }
@@ -471,8 +504,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $posyafter +6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -495,7 +527,9 @@ 
 
 					// Define size of image if we need it
 					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					if (! empty($realpatharray[$i])) {
+					    $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
@@ -508,10 +542,14 @@ 
 					if($this->getColumnStatus('photo'))
 					{
     					// We start with Photo of product line
-    					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// If photo too high, we moved completely on new page
+    					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot))) {
+    					    // If photo too high, we moved completely on new page
     					{
     						$pdf->AddPage('','',true);
-    						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+    					}
+    						if (! empty($tplidx)) {
+    						    $pdf->useTemplate($tplidx);
+    						}
     						//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
     						$pdf->setPage($pageposbefore+1);
 
@@ -534,9 +572,11 @@ 
     					$pdf->startTransaction();
     					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->getColumnContentWidth('desc'),3,$this->getColumnContentXStart('desc'),$curY,$hideref,$hidedesc);
     					$pageposafter=$pdf->getPage();
-    					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+    					if ($pageposafter > $pageposbefore) {
+    					    // There is a pagebreak
     					{
     						$pdf->rollbackTransaction(true);
+    					}
     						$pageposafter=$pageposbefore;
     						//print $pageposafter.'-'.$pageposbefore;exit;
     						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
@@ -545,23 +585,25 @@ 
     						$pageposafter=$pdf->getPage();
     						$posyafter=$pdf->GetY();
     						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-    						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot)))	// There is no space left for total+free text
+    						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforsignature+$heightforinfotot))) {
+    						    // There is no space left for total+free text
     						{
     							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
     							{
     								$pdf->AddPage('','',true);
-    								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+    						}
+    								if (! empty($tplidx)) {
+    								    $pdf->useTemplate($tplidx);
+    								}
     								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
     								$pdf->setPage($pageposafter+1);
     							}
-    						}
-    						else
+    						} else
     						{
     							// We found a page break
     							$showpricebeforepagebreak=0;
     						}
-    					}
-    					else	// No pagebreak
+    					} else	// No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
@@ -647,8 +689,11 @@ 
 
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne=$object->lines[$i]->total_tva;
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) {
+					    $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+					} else {
+					    $tvaligne=$object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
@@ -657,32 +702,48 @@ 
 					$localtax1_type=$object->lines[$i]->localtax1_type;
 					$localtax2_type=$object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+					if ($object->remise_percent) {
+					    $tvaligne-=($tvaligne*$object->remise_percent)/100;
+					}
+					if ($object->remise_percent) {
+					    $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+					}
+					if ($object->remise_percent) {
+					    $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+					}
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
-					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
+					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) {
+					    // and there is local tax
 					{
 						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
+					}
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
 				    // retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
-						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
-						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+					if ($localtax1_type && $localtax1ligne != 0) {
+											$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
+											$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]=0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+					    $vatrate.='*';
+					}
+					if (! isset($this->tva[$vatrate])) {
+					    $this->tva[$vatrate]=0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) {
+					    $nexY=$posYAfterImage;
+					}
 
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
@@ -703,8 +764,7 @@ 
 						if ($pagenb == $pageposbeforeprintlines)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
@@ -712,24 +772,29 @@ 
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
 					    if ($pagenb == $pageposafter)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (! empty($tplidx)) {
+						    $pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -738,8 +803,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
@@ -767,7 +831,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				//If propal merge product PDF is active
 				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
@@ -810,8 +876,7 @@ 
 											} elseif (! empty($conf->service->enabled)) {
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
 											}
-										}
-										else
+										} else
 										{
 											if (! empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
@@ -853,20 +918,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+								@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Pas d'erreur
-			}
-			else
+			} else
 			{
 				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
 			return 0;
@@ -928,10 +992,11 @@ 
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy=$pdf->GetY()+1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability) {
+            // Show availability conditions
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
+        }
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
@@ -1047,7 +1112,10 @@ 
 				if (! empty($object->fk_account) || ! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
 				{
 					$bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
-					if (! empty($object->fk_bank)) $bankid=$object->fk_bank;   // For backward compatibility when object->fk_account is forced with object->fk_bank
+					if (! empty($object->fk_bank)) {
+					    $bankid=$object->fk_bank;
+					}
+					// For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
@@ -1086,10 +1154,12 @@ 
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 			$col2x-=20;
 		}
+		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
 
 		$useborder=0;
@@ -1116,23 +1186,26 @@ 
 			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
+			} else
 			{
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey!=0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1156,17 +1229,21 @@ 
 				//{
 					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey!=0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1188,9 +1265,11 @@ 
 				// VAT
 				foreach($this->tva as $tvakey => $tvaval)
 				{
-					if ($tvakey != 0)    // On affiche pas taux 0
+					if ($tvakey != 0) {
+					    // On affiche pas taux 0
 					{
 						$this->atleastoneratenotnull++;
+					}
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1215,15 +1294,19 @@ 
 				//{
 					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2','4','6'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey != 0)    // On affiche pas taux 0
+							if ($tvakey != 0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1247,16 +1330,20 @@ 
 				//{
 					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2','4','6'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
 						    // retrieve global local tax
-							if ($tvakey != 0)    // On affiche pas taux 0
+							if ($tvakey != 0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1358,7 +1445,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+		    $hidetop=-1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1374,7 +1463,9 @@ 
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+			    $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128,128,128);
@@ -1386,7 +1477,9 @@ 
 
 		foreach ($this->cols as $colKey => $colDef)
 		{
-		    if(!$this->getColumnStatus($colKey)) continue;
+		    if(!$this->getColumnStatus($colKey)) {
+		        continue;
+		    }
 
 		    // get title label
 		    $colDef['title']['label'] = !empty($colDef['title']['label'])?$colDef['title']['label']:$outputlangs->transnoentities($colDef['title']['textkey']);
@@ -1456,16 +1549,14 @@ 
 				{
 				    $height=pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-				}
-				else
+				} else
 				{
 					$pdf->SetTextColor(200,0,0);
 					$pdf->SetFont('','B',$default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
+			} else
 			{
 				$text=$this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -1558,7 +1649,9 @@ 
 			// Show sender
 			$posy=42+$top_shift;
 		 	$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->page_largeur-$this->marge_droite-80;
+			}
 			$hautcadre=40;
 
 			// Show sender frame
@@ -1606,10 +1699,15 @@ 
 
 			// Show recipient
 			$widthrecbox=100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+			if ($this->page_largeur < 210) {
+			    $widthrecbox=84;
+			}
+			// To work with US executive format
 			$posy=42+$top_shift;
 			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0,0,0);
@@ -1875,12 +1973,10 @@ 
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
+	    } else
 	    {
 	        $this->cols = $hookmanager->resArray;
 	    }

dolibarr/htdocs/core/modules/propale/modules_propale.php

Indentation +96 added lines, -96 removed lines

@@ -36,33 +36,33 @@ 
  */
 abstract class ModelePDFPropales extends CommonDocGenerator
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of active generation modules
-	 *
+    /**
+     *  Return list of active generation modules
+     *
      *  @param	DoliDB	$db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
-	 */
-	static function liste_modeles($db,$maxfilenamelength=0)
-	{
+     */
+    static function liste_modeles($db,$maxfilenamelength=0)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type='propal';
-		$liste=array();
+        $type='propal';
+        $liste=array();
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $liste=getListOfModels($db,$type,$maxfilenamelength);
 
-		return $liste;
-	}
+        return $liste;
+    }
 }
 
 
@@ -71,83 +71,83 @@ 
  */
 abstract class ModeleNumRefPropales
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	/**
-	 * Return if a module can be used or not
-	 *
-	 * @return	boolean     true if module can be used
-	 */
-	function isEnabled()
-	{
-		return true;
-	}
-
-	/**
-	 *  Renvoi la description par defaut du modele de numerotation
-	 *
-	 * 	@return     string      Texte descripif
-	 */
-	function info()
-	{
-		global $langs;
-		$langs->load("propale");
-		return $langs->trans("NoDescription");
-	}
-
-	/**
-	 * 	Renvoi un exemple de numerotation
-	 *
-	 *  @return     string      Example
-	 */
-	function getExample()
-	{
-		global $langs;
-		$langs->load("propale");
-		return $langs->trans("NoExample");
-	}
-
-	/**
-	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *  de conflits qui empechera cette numerotation de fonctionner.
-	 *
-	 *  @return     boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		return true;
-	}
-
-	/**
-	 * 	Renvoi prochaine valeur attribuee
-	 *
-	 *	@param		Societe		$objsoc     Object third party
-	 *	@param		Propal		$propal		Object commercial proposal
-	 *	@return     string      Valeur
-	 */
-	function getNextValue($objsoc,$propal)
-	{
-		global $langs;
-		return $langs->trans("NotAvailable");
-	}
-
-	/**
-	 *  Renvoi version du module numerotation
-	 *
-	 *  @return     string      Valeur
-	 */
-	function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
-		return $langs->trans("NotAvailable");
-	}
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    /**
+     * Return if a module can be used or not
+     *
+     * @return	boolean     true if module can be used
+     */
+    function isEnabled()
+    {
+        return true;
+    }
+
+    /**
+     *  Renvoi la description par defaut du modele de numerotation
+     *
+     * 	@return     string      Texte descripif
+     */
+    function info()
+    {
+        global $langs;
+        $langs->load("propale");
+        return $langs->trans("NoDescription");
+    }
+
+    /**
+     * 	Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+        global $langs;
+        $langs->load("propale");
+        return $langs->trans("NoExample");
+    }
+
+    /**
+     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *  @return     boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        return true;
+    }
+
+    /**
+     * 	Renvoi prochaine valeur attribuee
+     *
+     *	@param		Societe		$objsoc     Object third party
+     *	@param		Propal		$propal		Object commercial proposal
+     *	@return     string      Valeur
+     */
+    function getNextValue($objsoc,$propal)
+    {
+        global $langs;
+        return $langs->trans("NotAvailable");
+    }
+
+    /**
+     *  Renvoi version du module numerotation
+     *
+     *  @return     string      Valeur
+     */
+    function getVersion()
+    {
+        global $langs;
+        $langs->load("admin");
+
+        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+        if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
+        return $langs->trans("NotAvailable");
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';   // Requis car utilise dans les classes qui heritent
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requis car utilise dans les classes qui heritent
 
 
 /**
@@ -39,7 +39,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -50,16 +50,16 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
-	static function liste_modeles($db,$maxfilenamelength=0)
+	static function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;
 
-		$type='propal';
-		$liste=array();
+		$type = 'propal';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -74,7 +74,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * Return if a module can be used or not
@@ -128,7 +128,7 @@ 
 	 *	@param		Propal		$propal		Object commercial proposal
 	 *	@return     string      Valeur
 	 */
-	function getNextValue($objsoc,$propal)
+	function getNextValue($objsoc, $propal)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");

Braces +12 added lines, -4 removed lines

@@ -142,10 +142,18 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+		    return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+		    return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+		    return DOL_VERSION;
+		}
+		if ($this->version) {
+		    return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

dolibarr/htdocs/core/modules/propale/mod_propale_saphir.php

Indentation +75 added lines, -75 removed lines

@@ -33,28 +33,28 @@ 
  */
 class mod_propale_saphir extends ModeleNumRefPropales
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	/**
+    /**
      * @var string Error code (or message)
      */
     public $error = '';
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Saphir';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Saphir';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Saphir';
+    /**
+     * @var string model name
+     */
+    public $name='Saphir';
 
 
     /**
@@ -62,39 +62,39 @@ 
      *
      *  @return     string      Texte descripif
      */
-	function info()
+    function info()
     {
-    	global $conf, $langs;
+        global $conf, $langs;
 
-		$langs->load("bills");
+        $langs->load("bills");
 
-		$form = new Form($this->db);
+        $form = new Form($this->db);
 
-		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstpropal" value="PROPALE_SAPHIR_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="updateMask">';
+        $texte.= '<input type="hidden" name="maskconstpropal" value="PROPALE_SAPHIR_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Proposal"),$langs->transnoentities("Proposal"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Proposal"),$langs->transnoentities("Proposal"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Proposal"),$langs->transnoentities("Proposal"));
+        $tooltip.=$langs->trans("GenericMaskCodes2");
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Proposal"),$langs->transnoentities("Proposal"));
+        $tooltip.=$langs->trans("GenericMaskCodes5");
 
-		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskpropal" value="'.$conf->global->PROPALE_SAPHIR_MASK.'">',$tooltip,1,1).'</td>';
+        // Parametrage du prefix
+        $texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+        $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskpropal" value="'.$conf->global->PROPALE_SAPHIR_MASK.'">',$tooltip,1,1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+        $texte.= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
+        return $texte;
     }
 
     /**
@@ -104,52 +104,52 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$old_code_type=$mysoc->typent_code;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$mysoc->typent_code='TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
-		$mysoc->typent_code=$old_code_type;
-
-		if (! $numExample)
-		{
-			$numExample = 'NotConfigured';
-		}
-		return $numExample;
+            global $conf,$langs,$mysoc;
+
+        $old_code_client=$mysoc->code_client;
+        $old_code_type=$mysoc->typent_code;
+        $mysoc->code_client='CCCCCCCCCC';
+        $mysoc->typent_code='TTTTTTTTTT';
+            $numExample = $this->getNextValue($mysoc,'');
+        $mysoc->code_client=$old_code_client;
+        $mysoc->typent_code=$old_code_type;
+
+        if (! $numExample)
+        {
+            $numExample = 'NotConfigured';
+        }
+        return $numExample;
     }
 
-	/**
-	 *  Return next value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	Propal		$propal		Object commercial proposal
-	 *  @return string      			Value if OK, 0 if KO
-	 */
-	function getNextValue($objsoc,$propal)
-	{
-		global $db,$conf;
+    /**
+     *  Return next value
+     *
+     *  @param	Societe		$objsoc     Object third party
+     * 	@param	Propal		$propal		Object commercial proposal
+     *  @return string      			Value if OK, 0 if KO
+     */
+    function getNextValue($objsoc,$propal)
+    {
+        global $db,$conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
 
-		// On defini critere recherche compteur
-		$mask = $conf->global->PROPALE_SAPHIR_MASK;
+        // On defini critere recherche compteur
+        $mask = $conf->global->PROPALE_SAPHIR_MASK;
 
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return 0;
-		}
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return 0;
+        }
 
-		// Get entities
-		$entity = getEntity('proposalnumber', 1, $propal);
+        // Get entities
+        $entity = getEntity('proposalnumber', 1, $propal);
 
-		$date = $propal->date;
+        $date = $propal->date;
 
-		$numFinal=get_next_value($db,$mask,'propal','ref','',$objsoc,$date,'next',false,null,$entity);
+        $numFinal=get_next_value($db,$mask,'propal','ref','',$objsoc,$date,'next',false,null,$entity);
 
-		return  $numFinal;
-	}
+        return  $numFinal;
+    }
 }

Spacing +36 added lines, -36 removed lines

@@ -25,7 +25,7 @@ 
  * \brief      File that contains the numbering module rules Saphir
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/propale/modules_propale.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 
 
 /**
@@ -37,7 +37,7 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
      * @var string Error code (or message)
@@ -49,12 +49,12 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Saphir';
+	public $nom = 'Saphir';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Saphir';
+	public $name = 'Saphir';
 
 
     /**
@@ -71,28 +71,28 @@ 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstpropal" value="PROPALE_SAPHIR_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Proposal"),$langs->transnoentities("Proposal"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Proposal"),$langs->transnoentities("Proposal"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstpropal" value="PROPALE_SAPHIR_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Proposal"), $langs->transnoentities("Proposal"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Proposal"), $langs->transnoentities("Proposal"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskpropal" value="'.$conf->global->PROPALE_SAPHIR_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskpropal" value="'.$conf->global->PROPALE_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -104,17 +104,17 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
+     	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$old_code_type=$mysoc->typent_code;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$mysoc->typent_code='TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
-		$mysoc->typent_code=$old_code_type;
+    	$old_code_client = $mysoc->code_client;
+    	$old_code_type = $mysoc->typent_code;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$mysoc->typent_code = 'TTTTTTTTTT';
+     	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = 'NotConfigured';
 		}
@@ -128,18 +128,18 @@ 
 	 * 	@param	Propal		$propal		Object commercial proposal
 	 *  @return string      			Value if OK, 0 if KO
 	 */
-	function getNextValue($objsoc,$propal)
+	function getNextValue($objsoc, $propal)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
 		$mask = $conf->global->PROPALE_SAPHIR_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
@@ -148,7 +148,7 @@ 
 
 		$date = $propal->date;
 
-		$numFinal=get_next_value($db,$mask,'propal','ref','',$objsoc,$date,'next',false,null,$entity);
+		$numFinal = get_next_value($db, $mask, 'propal', 'ref', '', $objsoc, $date, 'next', false, null, $entity);
 
 		return  $numFinal;
 	}

dolibarr/htdocs/core/modules/propale/mod_propale_marbre.php

Indentation +119 added lines, -119 removed lines

@@ -31,30 +31,30 @@ 
  */
 class mod_propale_marbre extends ModeleNumRefPropales
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	public $prefix='PR';
+    public $prefix='PR';
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Marbre';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Marbre';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Marbre';
+    /**
+     * @var string model name
+     */
+    public $name='Marbre';
 
 
     /**
@@ -64,109 +64,109 @@ 
      */
     function info()
     {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+        global $langs;
+            return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+    }
+
+
+    /**
+     *  Return an example of numbering module values
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+        return $this->prefix."0501-0001";
     }
 
 
-	/**
-	 *  Return an example of numbering module values
-	 *
-	 *  @return     string      Example
-	 */
-	function getExample()
-	{
-		return $this->prefix."0501-0001";
-	}
-
-
-	/**
-	 *  Test si les numeros deje en vigueur dans la base ne provoquent pas de
-	 *  de conflits qui empechera cette numerotation de fonctionner.
-	 *
-	 *  @return     boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		global $conf,$langs,$db;
-
-		$pryymm=''; $max='';
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."propal";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $pryymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-
-		if (! $pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$pryymm))
-		{
-			return true;
-		}
-		else
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
-			return false;
-		}
-	}
-
-	/**
-	 *  Return next value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	Propal		$propal		Object commercial proposal
-	 *  @return string      			Next value
-	 */
-	function getNextValue($objsoc,$propal)
-	{
-		global $db,$conf;
-
-		// D'abord on recupere la valeur max
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."propal";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity IN (".getEntity('proposalnumber', 1, $propal).")";
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-			return -1;
-		}
-
-		$date = time();
-		$yymm = strftime("%y%m",$date);
-
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
-
-		dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$yymm."-".$num);
-		return $this->prefix.$yymm."-".$num;
-	}
-
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc      	Object third party
-	 * 	@param	Object		$objforref		Object for number to search
-	 *  @return string      				Next free value
-	 */
-	function getNumRef($objsoc,$objforref)
-	{
-		return $this->getNextValue($objsoc,$objforref);
-	}
+    /**
+     *  Test si les numeros deje en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *  @return     boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        global $conf,$langs,$db;
+
+        $pryymm=''; $max='';
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."propal";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $pryymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+
+        if (! $pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$pryymm))
+        {
+            return true;
+        }
+        else
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel',$max);
+            return false;
+        }
+    }
+
+    /**
+     *  Return next value
+     *
+     *  @param	Societe		$objsoc     Object third party
+     * 	@param	Propal		$propal		Object commercial proposal
+     *  @return string      			Next value
+     */
+    function getNextValue($objsoc,$propal)
+    {
+        global $db,$conf;
+
+        // D'abord on recupere la valeur max
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
+        $sql.= " FROM ".MAIN_DB_PREFIX."propal";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity IN (".getEntity('proposalnumber', 1, $propal).")";
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+            return -1;
+        }
+
+        $date = time();
+        $yymm = strftime("%y%m",$date);
+
+        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+        else $num = sprintf("%04s",$max+1);
+
+        dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$yymm."-".$num);
+        return $this->prefix.$yymm."-".$num;
+    }
+
+    /**
+     *  Return next free value
+     *
+     *  @param	Societe		$objsoc      	Object third party
+     * 	@param	Object		$objforref		Object for number to search
+     *  @return string      				Next free value
+     */
+    function getNumRef($objsoc,$objforref)
+    {
+        return $this->getNextValue($objsoc,$objforref);
+    }
 }

Spacing +31 added lines, -31 removed lines

@@ -23,7 +23,7 @@ 
  *		\brief      File of class to manage commercial proposal numbering rules Marbre
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/propale/modules_propale.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 
 
 /**
@@ -35,26 +35,26 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix='PR';
+	public $prefix = 'PR';
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Marbre';
+	public $nom = 'Marbre';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Marbre';
+	public $name = 'Marbre';
 
 
     /**
@@ -65,7 +65,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -88,31 +88,31 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$pryymm=''; $max='';
+		$pryymm = ''; $max = '';
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."propal";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."propal";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $pryymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $pryymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
 
-		if (! $pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$pryymm))
+		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm))
 		{
 			return true;
 		}
 		else
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 	}
@@ -124,23 +124,23 @@ 
 	 * 	@param	Propal		$propal		Object commercial proposal
 	 *  @return string      			Next value
 	 */
-	function getNextValue($objsoc,$propal)
+	function getNextValue($objsoc, $propal)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."propal";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity IN (".getEntity('proposalnumber', 1, $propal).")";
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."propal";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity IN (".getEntity('proposalnumber', 1, $propal).")";
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -149,10 +149,10 @@ 
 		}
 
 		$date = time();
-		$yymm = strftime("%y%m",$date);
+		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -165,8 +165,8 @@ 
 	 * 	@param	Object		$objforref		Object for number to search
 	 *  @return string      				Next free value
 	 */
-	function getNumRef($objsoc,$objforref)
+	function getNumRef($objsoc, $objforref)
 	{
-		return $this->getNextValue($objsoc,$objforref);
+		return $this->getNextValue($objsoc, $objforref);
 	}
 }

Braces +14 added lines, -8 removed lines

@@ -108,8 +108,7 @@ 
 		if (! $pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$pryymm))
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
@@ -139,10 +138,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
@@ -151,8 +152,13 @@ 
 		$date = time();
 		$yymm = strftime("%y%m",$date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) {
+		    $num=$max+1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+		    $num = sprintf("%04s",$max+1);
+		}
 
 		dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;