alxarafe / alixar

dolibarr/htdocs/core/modules/security/generate/modules_genpassword.php

Indentation +14 added lines, -14 removed lines

@@ -31,9 +31,9 @@ 
 abstract class ModeleGenPassword
 {
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     /**
      * 		Return if a module can be used or not
@@ -68,23 +68,23 @@ 
         return $langs->trans("NoExample");
     }
 
-	/**
-	 * 		Build new password
-	 *
- 	 *      @return     string      Return a new generated password
-	 */
+    /**
+     * 		Build new password
+     *
+     *      @return     string      Return a new generated password
+     */
     function getNewGeneratedPassword()
     {
         global $langs;
         return $langs->trans("NotAvailable");
     }
 
-	/**
-	 * 		Validate a password
-	 *
-	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
-	 */
+    /**
+     * 		Validate a password
+     *
+     *		@param		string	$password	Password to check
+     *      @return     int					0 if KO, >0 if OK
+     */
     function validatePassword($password)
     {
         return 1;

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     /**
      * 		Return if a module can be used or not

dolibarr/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php

Indentation +97 added lines, -97 removed lines

@@ -31,108 +31,108 @@
  */
 class modGeneratePassStandard extends ModeleGenPassword
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	public $length;
+    public $length;
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	public $conf;
-	public $lang;
-	public $user;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db			Database handler
-	 *	@param		Conf		$conf		Handler de conf
-	 *	@param		Translate	$langs		Handler de langue
-	 *	@param		User		$user		Handler du user connecte
-	 */
-	function __construct($db, $conf, $langs, $user)
-	{
-		$this->id = "standard";
-		$this->length = 8;
-
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
-	}
-
-	/**
-	 *		Return description of module
-	 *
- 	 *      @return     string      Description of module
-	 */
-	function getDescription()
-	{
-		global $langs;
-		return $langs->trans("PasswordGenerationStandard");
-	}
-
-	/**
-	 * 		Return an example of password generated by this module
-	 *
- 	 *      @return     string      Example of password
-	 */
-	function getExample()
-	{
-		return $this->getNewGeneratedPassword();
-	}
-
-	/**
-	 * 		Build new password
-	 *
- 	 *      @return     string      Return a new generated password
-	 */
-	function getNewGeneratedPassword()
-	{
-		// start with a blank password
-		$password = "";
-
-		// define possible characters
-		$possible = "0123456789bcdfghjkmnpqrstvwxyz";
-
-		// set up a counter
-		$i = 0;
-
-		// add random characters to $password until $length is reached
-		while ($i < $this->length)
-		{
-
-			// pick a random character from the possible ones
-			$char = substr($possible, mt_rand(0, dol_strlen($possible)-1), 1);
-
-			// we don't want this character if it's already in the password
-			if (!strstr($password, $char))
-			{
-				$password .= $char;
-				$i++;
-			}
-		}
-
-		// done!
-		return $password;
-	}
-
-	/**
-	 * 		Validate a password
-	 *
-	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
-	 */
-	function validatePassword($password)
-	{
-		if (dol_strlen($password) < $this->length) return 0;
-		return 1;
-	}
+    public $conf;
+    public $lang;
+    public $user;
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db			Database handler
+     *	@param		Conf		$conf		Handler de conf
+     *	@param		Translate	$langs		Handler de langue
+     *	@param		User		$user		Handler du user connecte
+     */
+    function __construct($db, $conf, $langs, $user)
+    {
+        $this->id = "standard";
+        $this->length = 8;
+
+        $this->db=$db;
+        $this->conf=$conf;
+        $this->langs=$langs;
+        $this->user=$user;
+    }
+
+    /**
+     *		Return description of module
+     *
+     *      @return     string      Description of module
+     */
+    function getDescription()
+    {
+        global $langs;
+        return $langs->trans("PasswordGenerationStandard");
+    }
+
+    /**
+     * 		Return an example of password generated by this module
+     *
+     *      @return     string      Example of password
+     */
+    function getExample()
+    {
+        return $this->getNewGeneratedPassword();
+    }
+
+    /**
+     * 		Build new password
+     *
+     *      @return     string      Return a new generated password
+     */
+    function getNewGeneratedPassword()
+    {
+        // start with a blank password
+        $password = "";
+
+        // define possible characters
+        $possible = "0123456789bcdfghjkmnpqrstvwxyz";
+
+        // set up a counter
+        $i = 0;
+
+        // add random characters to $password until $length is reached
+        while ($i < $this->length)
+        {
+
+            // pick a random character from the possible ones
+            $char = substr($possible, mt_rand(0, dol_strlen($possible)-1), 1);
+
+            // we don't want this character if it's already in the password
+            if (!strstr($password, $char))
+            {
+                $password .= $char;
+                $i++;
+            }
+        }
+
+        // done!
+        return $password;
+    }
+
+    /**
+     * 		Validate a password
+     *
+     *		@param		string	$password	Password to check
+     *      @return     int					0 if KO, >0 if OK
+     */
+    function validatePassword($password)
+    {
+        if (dol_strlen($password) < $this->length) return 0;
+        return 1;
+    }
 }
 

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
  *		\brief      File to manage password generation according to standard rule
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassword.php';
 
 
 /**
@@ -61,10 +61,10 @@ 
 		$this->id = "standard";
 		$this->length = 8;
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->langs = $langs;
+		$this->user = $user;
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 		{
 
 			// pick a random character from the possible ones
-			$char = substr($possible, mt_rand(0, dol_strlen($possible)-1), 1);
+			$char = substr($possible, mt_rand(0, dol_strlen($possible) - 1), 1);
 
 			// we don't want this character if it's already in the password
 			if (!strstr($password, $char))

Braces +3 added lines, -1 removed lines

@@ -131,7 +131,9 @@
 	 */
 	function validatePassword($password)
 	{
-		if (dol_strlen($password) < $this->length) return 0;
+		if (dol_strlen($password) < $this->length) {
+		    return 0;
+		}
 		return 1;
 	}
 }

dolibarr/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php

Indentation +188 added lines, -188 removed lines

@@ -33,198 +33,198 @@
  */
 class modGeneratePassPerso extends ModeleGenPassword
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
-
-	public $length;
-	public $length2; // didn't overright display
-	public $NbMaj;
-	public $NbNum;
-	public $NbSpe;
-	public $NbRepeat;
-	public $WithoutAmbi;
-
-	/**
+    /**
+     * @var int ID
+     */
+    public $id;
+
+    public $length;
+    public $length2; // didn't overright display
+    public $NbMaj;
+    public $NbNum;
+    public $NbSpe;
+    public $NbRepeat;
+    public $WithoutAmbi;
+
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	public $conf;
-	public $lang;
-	public $user;
-
-	public $Maj;
-	public $Min;
-	public $Nb;
-	public $Spe;
-	public $Ambi;
-	public $All;
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db			Database handler
-	 *	@param		Conf		$conf		Handler de conf
-	 *	@param		Translate	$langs		Handler de langue
-	 *	@param		User		$user		Handler du user connecte
-	 */
-	function __construct($db, $conf, $langs, $user)
-	{
-		$this->id = "Perso";
-		$this->length = $langs->trans("SetupPerso");
-
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
-
-		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
-			// default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
-			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
-		}
-
-		$this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-		$this->Min = strtolower($this->Maj);
-		$this->Nb = "0123456789";
-		$this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
-		$this->Ambi = array("1","I","l","|","O","0");
-
-		$tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
-		$this->length2 = $tabConf[0];
-		$this->NbMaj = $tabConf[1];
-		$this->NbNum = $tabConf[2];
-		$this->NbSpe = $tabConf[3];
-		$this->NbRepeat = $tabConf[4];
-		$this->WithoutAmbi = $tabConf[5];
-
-		if ($this->WithoutAmbi)
-		{
-			$this->Maj = str_replace($this->Ambi,"",$this->Maj);
-			$this->Min = str_replace($this->Ambi,"",$this->Min);
-			$this->Nb  = str_replace($this->Ambi,"",$this->Nb);
-			$this->Spe = str_replace($this->Ambi,"",$this->Spe);
-		}
-
-		$pattern = $this->Min . (! empty($this->NbMaj)?$this->Maj:'') . (! empty($this->NbNum)?$this->Nb:'') . (! empty($this->NbSpe)?$this->Spe:'');
-		$this->All = str_shuffle($pattern);
-
-		//$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
-		//$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe;
-		//$this->All =  $this->Spe;
-	}
-
-	/**
-	 *		Return description of module
-	 *
-	 *      @return     string      Description of text
-	 */
-	function getDescription()
-	{
-		global $langs;
-		return $langs->trans("PasswordGenerationPerso");
-	}
-
-	/**
-	 * 		Return an example of password generated by this module
-	 *
-	 *      @return     string      Example of password
-	 */
-	function getExample()
-	{
-		return $this->getNewGeneratedPassword();
-	}
-
-	/**
-	 * 		Build new password
-	 *
-	 *      @return     string      Return a new generated password
-	 */
-	function getNewGeneratedPassword()
-	{
-		$pass = "";
-		for($i=0; $i<$this->NbMaj; $i++){ // Y
-			$pass .= $this->Maj[mt_rand(0,strlen($this->Maj) - 1)];
-		}
-
-		for($i=0; $i<$this->NbNum; $i++){ // X
-			$pass .= $this->Nb[mt_rand(0,strlen($this->Nb) - 1)];
-		}
-
-		for($i=0; $i<$this->NbSpe; $i++){ // @
-			$pass .= $this->Spe[mt_rand(0,strlen($this->Spe) - 1)];
-		}
-
-		for($i=strlen($pass);$i<$this->length2; $i++){ // y
-			$pass .= $this->All[mt_rand(0,strlen($this->All) -1)];
-		}
-
-		$pass = str_shuffle($pass);
-
-		if ($this->validatePassword($pass))
-		{
-			return $pass;
-		}
-
-		return $this->getNewGeneratedPassword();
-	}
-
-	/**
-	 * 		Validate a password
-	 *
-	 *		@param		string	$password	Password to check
-	 *      @return     int					0 if KO, >0 if OK
-	 */
-	function validatePassword($password)
-	{
-		$password_a = str_split($password);
-		$maj = str_split($this->Maj);
-		$num = str_split($this->Nb);
-		$spe = str_split($this->Spe);
-
-		if(count(array_intersect($password_a, $maj)) < $this->NbMaj){
-			return 0;
-		}
-
-		if(count(array_intersect($password_a, $num)) < $this->NbNum){
-			return 0;
-		}
-
-		if(count(array_intersect($password_a, $spe)) < $this->NbSpe){
-			return 0;
-		}
-
-		if(!$this->consecutiveInterationSameCharacter($password)){
-			return 0;
-		}
-
-		return 1;
-	}
-
-	/**
-	 * 		consecutive iterations of the same character
-	 *
-	 *		@param		string	$password	Password to check
-	 *      @return     int					0 if KO, >0 if OK
-	 */
+    public $conf;
+    public $lang;
+    public $user;
+
+    public $Maj;
+    public $Min;
+    public $Nb;
+    public $Spe;
+    public $Ambi;
+    public $All;
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db			Database handler
+     *	@param		Conf		$conf		Handler de conf
+     *	@param		Translate	$langs		Handler de langue
+     *	@param		User		$user		Handler du user connecte
+     */
+    function __construct($db, $conf, $langs, $user)
+    {
+        $this->id = "Perso";
+        $this->length = $langs->trans("SetupPerso");
+
+        $this->db=$db;
+        $this->conf=$conf;
+        $this->langs=$langs;
+        $this->user=$user;
+
+        if (empty($conf->global->USER_PASSWORD_PATTERN)) {
+            // default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
+            dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
+        }
+
+        $this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        $this->Min = strtolower($this->Maj);
+        $this->Nb = "0123456789";
+        $this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
+        $this->Ambi = array("1","I","l","|","O","0");
+
+        $tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
+        $this->length2 = $tabConf[0];
+        $this->NbMaj = $tabConf[1];
+        $this->NbNum = $tabConf[2];
+        $this->NbSpe = $tabConf[3];
+        $this->NbRepeat = $tabConf[4];
+        $this->WithoutAmbi = $tabConf[5];
+
+        if ($this->WithoutAmbi)
+        {
+            $this->Maj = str_replace($this->Ambi,"",$this->Maj);
+            $this->Min = str_replace($this->Ambi,"",$this->Min);
+            $this->Nb  = str_replace($this->Ambi,"",$this->Nb);
+            $this->Spe = str_replace($this->Ambi,"",$this->Spe);
+        }
+
+        $pattern = $this->Min . (! empty($this->NbMaj)?$this->Maj:'') . (! empty($this->NbNum)?$this->Nb:'') . (! empty($this->NbSpe)?$this->Spe:'');
+        $this->All = str_shuffle($pattern);
+
+        //$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
+        //$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe;
+        //$this->All =  $this->Spe;
+    }
+
+    /**
+     *		Return description of module
+     *
+     *      @return     string      Description of text
+     */
+    function getDescription()
+    {
+        global $langs;
+        return $langs->trans("PasswordGenerationPerso");
+    }
+
+    /**
+     * 		Return an example of password generated by this module
+     *
+     *      @return     string      Example of password
+     */
+    function getExample()
+    {
+        return $this->getNewGeneratedPassword();
+    }
+
+    /**
+     * 		Build new password
+     *
+     *      @return     string      Return a new generated password
+     */
+    function getNewGeneratedPassword()
+    {
+        $pass = "";
+        for($i=0; $i<$this->NbMaj; $i++){ // Y
+            $pass .= $this->Maj[mt_rand(0,strlen($this->Maj) - 1)];
+        }
+
+        for($i=0; $i<$this->NbNum; $i++){ // X
+            $pass .= $this->Nb[mt_rand(0,strlen($this->Nb) - 1)];
+        }
+
+        for($i=0; $i<$this->NbSpe; $i++){ // @
+            $pass .= $this->Spe[mt_rand(0,strlen($this->Spe) - 1)];
+        }
+
+        for($i=strlen($pass);$i<$this->length2; $i++){ // y
+            $pass .= $this->All[mt_rand(0,strlen($this->All) -1)];
+        }
+
+        $pass = str_shuffle($pass);
+
+        if ($this->validatePassword($pass))
+        {
+            return $pass;
+        }
+
+        return $this->getNewGeneratedPassword();
+    }
+
+    /**
+     * 		Validate a password
+     *
+     *		@param		string	$password	Password to check
+     *      @return     int					0 if KO, >0 if OK
+     */
+    function validatePassword($password)
+    {
+        $password_a = str_split($password);
+        $maj = str_split($this->Maj);
+        $num = str_split($this->Nb);
+        $spe = str_split($this->Spe);
+
+        if(count(array_intersect($password_a, $maj)) < $this->NbMaj){
+            return 0;
+        }
+
+        if(count(array_intersect($password_a, $num)) < $this->NbNum){
+            return 0;
+        }
+
+        if(count(array_intersect($password_a, $spe)) < $this->NbSpe){
+            return 0;
+        }
+
+        if(!$this->consecutiveInterationSameCharacter($password)){
+            return 0;
+        }
+
+        return 1;
+    }
+
+    /**
+     * 		consecutive iterations of the same character
+     *
+     *		@param		string	$password	Password to check
+     *      @return     int					0 if KO, >0 if OK
+     */
     function consecutiveInterationSameCharacter($password)
     {
-		$last = "";
-		$count = 0;
-		$char = str_split($password);
-		foreach($char as $c){
-			if($c != $last){
-				$last = $c;
-				$count = 0;
-			}else{
-				$count++;
-			}
-
-			if($count >= $this->NbRepeat) {
-				return 0;
-			}
-		}
-		return 1;
-	}
+        $last = "";
+        $count = 0;
+        $char = str_split($password);
+        foreach($char as $c){
+            if($c != $last){
+                $last = $c;
+                $count = 0;
+            }else{
+                $count++;
+            }
+
+            if($count >= $this->NbRepeat) {
+                return 0;
+            }
+        }
+        return 1;
+    }
 }

Spacing +29 added lines, -29 removed lines

@@ -24,7 +24,7 @@ 
  *      \brief      File to manage no password generation.
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassword.php';
 
 
 /**
@@ -75,23 +75,23 @@ 
 		$this->id = "Perso";
 		$this->length = $langs->trans("SetupPerso");
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->langs = $langs;
+		$this->user = $user;
 
 		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
 			// default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
-			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
+			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1', 'chaine', 0, '', $conf->entity);
 		}
 
 		$this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 		$this->Min = strtolower($this->Maj);
 		$this->Nb = "0123456789";
 		$this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
-		$this->Ambi = array("1","I","l","|","O","0");
+		$this->Ambi = array("1", "I", "l", "|", "O", "0");
 
-		$tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
+		$tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN);
 		$this->length2 = $tabConf[0];
 		$this->NbMaj = $tabConf[1];
 		$this->NbNum = $tabConf[2];
@@ -101,13 +101,13 @@ 
 
 		if ($this->WithoutAmbi)
 		{
-			$this->Maj = str_replace($this->Ambi,"",$this->Maj);
-			$this->Min = str_replace($this->Ambi,"",$this->Min);
-			$this->Nb  = str_replace($this->Ambi,"",$this->Nb);
-			$this->Spe = str_replace($this->Ambi,"",$this->Spe);
+			$this->Maj = str_replace($this->Ambi, "", $this->Maj);
+			$this->Min = str_replace($this->Ambi, "", $this->Min);
+			$this->Nb  = str_replace($this->Ambi, "", $this->Nb);
+			$this->Spe = str_replace($this->Ambi, "", $this->Spe);
 		}
 
-		$pattern = $this->Min . (! empty($this->NbMaj)?$this->Maj:'') . (! empty($this->NbNum)?$this->Nb:'') . (! empty($this->NbSpe)?$this->Spe:'');
+		$pattern = $this->Min.(!empty($this->NbMaj) ? $this->Maj : '').(!empty($this->NbNum) ? $this->Nb : '').(!empty($this->NbSpe) ? $this->Spe : '');
 		$this->All = str_shuffle($pattern);
 
 		//$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
@@ -144,20 +144,20 @@ 
 	function getNewGeneratedPassword()
 	{
 		$pass = "";
-		for($i=0; $i<$this->NbMaj; $i++){ // Y
-			$pass .= $this->Maj[mt_rand(0,strlen($this->Maj) - 1)];
+		for ($i = 0; $i < $this->NbMaj; $i++) { // Y
+			$pass .= $this->Maj[mt_rand(0, strlen($this->Maj) - 1)];
 		}
 
-		for($i=0; $i<$this->NbNum; $i++){ // X
-			$pass .= $this->Nb[mt_rand(0,strlen($this->Nb) - 1)];
+		for ($i = 0; $i < $this->NbNum; $i++) { // X
+			$pass .= $this->Nb[mt_rand(0, strlen($this->Nb) - 1)];
 		}
 
-		for($i=0; $i<$this->NbSpe; $i++){ // @
-			$pass .= $this->Spe[mt_rand(0,strlen($this->Spe) - 1)];
+		for ($i = 0; $i < $this->NbSpe; $i++) { // @
+			$pass .= $this->Spe[mt_rand(0, strlen($this->Spe) - 1)];
 		}
 
-		for($i=strlen($pass);$i<$this->length2; $i++){ // y
-			$pass .= $this->All[mt_rand(0,strlen($this->All) -1)];
+		for ($i = strlen($pass); $i < $this->length2; $i++) { // y
+			$pass .= $this->All[mt_rand(0, strlen($this->All) - 1)];
 		}
 
 		$pass = str_shuffle($pass);
@@ -183,19 +183,19 @@ 
 		$num = str_split($this->Nb);
 		$spe = str_split($this->Spe);
 
-		if(count(array_intersect($password_a, $maj)) < $this->NbMaj){
+		if (count(array_intersect($password_a, $maj)) < $this->NbMaj) {
 			return 0;
 		}
 
-		if(count(array_intersect($password_a, $num)) < $this->NbNum){
+		if (count(array_intersect($password_a, $num)) < $this->NbNum) {
 			return 0;
 		}
 
-		if(count(array_intersect($password_a, $spe)) < $this->NbSpe){
+		if (count(array_intersect($password_a, $spe)) < $this->NbSpe) {
 			return 0;
 		}
 
-		if(!$this->consecutiveInterationSameCharacter($password)){
+		if (!$this->consecutiveInterationSameCharacter($password)) {
 			return 0;
 		}
 
@@ -213,15 +213,15 @@ 
 		$last = "";
 		$count = 0;
 		$char = str_split($password);
-		foreach($char as $c){
-			if($c != $last){
+		foreach ($char as $c) {
+			if ($c != $last) {
 				$last = $c;
 				$count = 0;
-			}else{
+			} else {
 				$count++;
 			}
 
-			if($count >= $this->NbRepeat) {
+			if ($count >= $this->NbRepeat) {
 				return 0;
 			}
 		}

Braces +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
 			if($c != $last){
 				$last = $c;
 				$count = 0;
-			}else{
+			} else{
 				$count++;
 			}
 

dolibarr/htdocs/core/modules/security/generate/modGeneratePassNone.class.php

Indentation +64 added lines, -64 removed lines

@@ -31,82 +31,82 @@
  */
 class modGeneratePassNone extends ModeleGenPassword
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	public $length;
+    public $length;
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	public $conf;
-	public $lang;
-	public $user;
+    public $conf;
+    public $lang;
+    public $user;
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db			Database handler
-	 *	@param		Conf		$conf		Handler de conf
-	 *	@param		Translate	$langs		Handler de langue
-	 *	@param		User		$user		Handler du user connecte
-	 */
-	function __construct($db, $conf, $langs, $user)
-	{
-		$this->id = "none";
-		$this->length = 0;
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db			Database handler
+     *	@param		Conf		$conf		Handler de conf
+     *	@param		Translate	$langs		Handler de langue
+     *	@param		User		$user		Handler du user connecte
+     */
+    function __construct($db, $conf, $langs, $user)
+    {
+        $this->id = "none";
+        $this->length = 0;
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
-	}
+        $this->db=$db;
+        $this->conf=$conf;
+        $this->langs=$langs;
+        $this->user=$user;
+    }
 
-	/**
-	 *		Return description of module
-	 *
- 	 *      @return     string      Description of text
-	 */
-	function getDescription()
-	{
-		global $langs;
-		return $langs->trans("PasswordGenerationNone");
-	}
+    /**
+     *		Return description of module
+     *
+     *      @return     string      Description of text
+     */
+    function getDescription()
+    {
+        global $langs;
+        return $langs->trans("PasswordGenerationNone");
+    }
 
-	/**
-	 * 		Return an example of password generated by this module
-	 *
- 	 *      @return     string      Example of password
-	 */
-	function getExample()
-	{
-		return $this->langs->trans("None");
-	}
+    /**
+     * 		Return an example of password generated by this module
+     *
+     *      @return     string      Example of password
+     */
+    function getExample()
+    {
+        return $this->langs->trans("None");
+    }
 
-	/**
-	 * 		Build new password
-	 *
- 	 *      @return     string      Return a new generated password
-	 */
-	function getNewGeneratedPassword()
-	{
-		return "";
-	}
+    /**
+     * 		Build new password
+     *
+     *      @return     string      Return a new generated password
+     */
+    function getNewGeneratedPassword()
+    {
+        return "";
+    }
 
-	/**
-	 * 		Validate a password
-	 *
-	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
-	 */
-	function validatePassword($password)
-	{
-		return 1;
-	}
+    /**
+     * 		Validate a password
+     *
+     *		@param		string	$password	Password to check
+     *      @return     int					0 if KO, >0 if OK
+     */
+    function validatePassword($password)
+    {
+        return 1;
+    }
 }
 

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
  *      \brief      File to manage no password generation.
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassword.php';
 
 
 /**
@@ -61,10 +61,10 @@ 
 		$this->id = "none";
 		$this->length = 0;
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->langs = $langs;
+		$this->user = $user;
 	}
 
 	/**

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

Indentation +202 added lines, -202 removed lines

@@ -33,223 +33,223 @@
  */
 class modApi extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
         global $langs,$conf;
 
         $this->db = $db;
 
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 2610;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'api';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$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));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "REST interface";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Can be enabled / disabled only in the main company with superadmin account
-		$this->core_enabled = 1;
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='technic';
-
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/api/temp");
-		$this->dirs = array('/api/temp');
-
-		// Config pages. Put here list of php page, stored into api/admin directory, to use to setup module.
-		$this->config_page_url = array("index.php@api");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// 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();	// List of modules id this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->langfiles = array("other");
-
-		// 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();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@api:$user->rights->api->read:/api/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 2610;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'api';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $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));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "REST interface";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Can be enabled / disabled only in the main company with superadmin account
+        $this->core_enabled = 1;
+        // Name of image file used for this module.
+        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+        $this->picto='technic';
+
+        $this->module_parts = array();
+
+        // Data directories to create when module is enabled.
+        // Example: this->dirs = array("/api/temp");
+        $this->dirs = array('/api/temp');
+
+        // Config pages. Put here list of php page, stored into api/admin directory, to use to setup module.
+        $this->config_page_url = array("index.php@api");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// 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();	// List of modules id this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->langfiles = array("other");
+
+        // 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();
+
+        // Array to add new pages in new tabs
+        // Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@api:$user->rights->api->read:/api/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
         //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@api:$user->rights->othermodule->read:/api/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
         //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
+        // where objecttype can be
+        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+        // 'contact'          to add a tab in contact view
+        // 'contract'         to add a tab in contract view
+        // 'group'            to add a tab in group view
+        // 'intervention'     to add a tab in intervention view
+        // 'invoice'          to add a tab in customer invoice view
+        // 'invoice_supplier' to add a tab in supplier invoice view
+        // 'member'           to add a tab in fundation member view
+        // 'opensurveypoll'	  to add a tab in opensurvey poll view
+        // 'order'            to add a tab in customer order view
+        // 'order_supplier'   to add a tab in supplier order view
+        // 'payment'		  to add a tab in payment view
+        // 'payment_supplier' to add a tab in supplier payment view
+        // 'product'          to add a tab in product view
+        // 'propal'           to add a tab in propal view
+        // 'project'          to add a tab in project view
+        // 'stock'            to add a tab in stock view
+        // 'thirdparty'       to add a tab in third party view
+        // 'user'             to add a tab in user view
         $this->tabs = array();
 
         // Dictionaries
-	    if (! isset($conf->api->enabled))
+        if (! isset($conf->api->enabled))
         {
-        	$conf->api=new stdClass();
-        	$conf->api->enabled=0;
+            $conf->api=new stdClass();
+            $conf->api->enabled=0;
         }
-		$this->dictionaries=array();
+        $this->dictionaries=array();
 
         // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
         $this->boxes = array();			// List of boxes
-		// Example:
-		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>0,			                // Put 0 if this is a top menu
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'Api top menu',
-		//							'mainmenu'=>'api',
-		//							'leftmenu'=>'api',
-		//							'url'=>'/api/pagetop.php',
-		//							'langs'=>'mylangfile@api',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->api->enabled',	// Define condition to show or hide menu entry. Use '$conf->api->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->api->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'Api left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'api',
-		//							'url'=>'/api/pagelevel2.php',
-		//							'langs'=>'mylangfile@api',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->api->enabled',  // Define condition to show or hide menu entry. Use '$conf->api->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->api->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-
-
-		// Exports
-		$r=1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // Example:
+        //$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
+
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
+
+        // Add here list of permission defined by an id, a label, a boolean and two constant strings.
+        // Example:
+        // $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+        // $this->rights[$r][1] = 'Permision label';	// Permission label
+        // $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        // $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        // $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        // $r++;
+
+
+        // Main menu entries
+        $this->menu = array();			// List of menus to add
+        $r=0;
+
+        // Add here entries to declare new menus
+        //
+        // Example to declare a new Top Menu entry and its Left menu entry:
+        // $this->menu[$r]=array(	'fk_menu'=>0,			                // Put 0 if this is a top menu
+        //							'type'=>'top',			                // This is a Top menu entry
+        //							'titre'=>'Api top menu',
+        //							'mainmenu'=>'api',
+        //							'leftmenu'=>'api',
+        //							'url'=>'/api/pagetop.php',
+        //							'langs'=>'mylangfile@api',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+        //							'position'=>100,
+        //							'enabled'=>'$conf->api->enabled',	// Define condition to show or hide menu entry. Use '$conf->api->enabled' if entry must be visible if module is enabled.
+        //							'perms'=>'1',			                // Use 'perms'=>'$user->rights->api->level1->level2' if you want your menu with a permission rules
+        //							'target'=>'',
+        //							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+        // $r++;
+        //
+        // Example to declare a Left Menu entry into an existing Top menu entry:
+        // $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        //							'type'=>'left',			                // This is a Left menu entry
+        //							'titre'=>'Api left menu',
+        //							'mainmenu'=>'xxx',
+        //							'leftmenu'=>'api',
+        //							'url'=>'/api/pagelevel2.php',
+        //							'langs'=>'mylangfile@api',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+        //							'position'=>100,
+        //							'enabled'=>'$conf->api->enabled',  // Define condition to show or hide menu entry. Use '$conf->api->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+        //							'perms'=>'1',			                // Use 'perms'=>'$user->rights->api->level1->level2' if you want your menu with a permission rules
+        //							'target'=>'',
+        //							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+        // $r++;
+
+
+        // Exports
+        $r=1;
+
+        // Example:
+        // $this->export_code[$r]=$this->rights_class.'_'.$r;
+        // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
         // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-		// $this->export_permission[$r]=array(array("facture","facture","export"));
-		// $this->export_fields_array[$r]=array(
-		//	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
-		//	's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
-		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
-		//	'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
-		//	'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
-		//	'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
-		//	'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
-		//);
-		// $this->export_entities_array[$r]=array(
-		//	's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
-		//	's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
-		//	'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",
-		//	'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",
-		//	'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",
-		//	'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
-		//);
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+        // $this->export_permission[$r]=array(array("facture","facture","export"));
+        // $this->export_fields_array[$r]=array(
+        //	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
+        //	's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
+        //	's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
+        //	'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
+        //	'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
+        //	'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
+        //	'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
+        //);
+        // $this->export_entities_array[$r]=array(
+        //	's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
+        //	's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
+        //	'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",
+        //	'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",
+        //	'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",
+        //	'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
+        //);
+        // $this->export_sql_start[$r]='SELECT DISTINCT ';
+        // $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+        // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+        // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+        // $this->export_sql_order[$r] .=' ORDER BY s.nom';
+        // $r++;
+    }
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-
-		$result=$this->_load_tables('/api/sql/');
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted.
-	 *
-	 *      @param string $options Options when enabling module ('', 'noboxes')
-	 *      @return int 1 if OK, 0 if KO
-	 */
-	function remove($options = '')
-	{
-		// Remove old constants with entity fields different of 0
-		$sql = array(
-			"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('MAIN_MODULE_API', 1),
-			"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('API_PRODUCTION_MODE', 1)
-		);
-
-		return $this->_remove($sql, $options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        $sql = array();
+
+        $result=$this->_load_tables('/api/sql/');
+
+        return $this->_init($sql, $options);
+    }
+
+    /**
+     *		Function called when module is disabled.
+     *      Remove from database constants, boxes and permissions from Dolibarr database.
+     *		Data directories are not deleted.
+     *
+     *      @param string $options Options when enabling module ('', 'noboxes')
+     *      @return int 1 if OK, 0 if KO
+     */
+    function remove($options = '')
+    {
+        // Remove old constants with entity fields different of 0
+        $sql = array(
+            "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('MAIN_MODULE_API', 1),
+            "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('API_PRODUCTION_MODE', 1)
+        );
+
+        return $this->_remove($sql, $options);
+    }
 }
 

Spacing +21 added lines, -21 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    api
  *  \brief      Description and activation file for module Api
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -40,7 +40,7 @@ 
 	 */
 	function __construct($db)
 	{
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->db = $db;
 
@@ -54,7 +54,7 @@ 
 		// It is used to group modules in module setup page
 		$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));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "REST interface";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
@@ -66,7 +66,7 @@ 
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='technic';
+		$this->picto = 'technic';
 
 		$this->module_parts = array();
 
@@ -78,11 +78,11 @@ 
 		$this->config_page_url = array("index.php@api");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// 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();	// List of modules id this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // 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(); // List of modules id this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 		$this->langfiles = array("other");
 
 		// Constants
@@ -119,22 +119,22 @@ 
         $this->tabs = array();
 
         // Dictionaries
-	    if (! isset($conf->api->enabled))
+	    if (!isset($conf->api->enabled))
         {
-        	$conf->api=new stdClass();
-        	$conf->api->enabled=0;
+        	$conf->api = new stdClass();
+        	$conf->api->enabled = 0;
         }
-		$this->dictionaries=array();
+		$this->dictionaries = array();
 
         // Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array();			// List of boxes
+        $this->boxes = array(); // List of boxes
 		// Example:
 		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
@@ -147,8 +147,8 @@ 
 
 
 		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
+		$this->menu = array(); // List of menus to add
+		$r = 0;
 
 		// Add here entries to declare new menus
 		//
@@ -184,7 +184,7 @@ 
 
 
 		// Exports
-		$r=1;
+		$r = 1;
 
 		// Example:
 		// $this->export_code[$r]=$this->rights_class.'_'.$r;
@@ -224,11 +224,11 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		$sql = array();
 
-		$result=$this->_load_tables('/api/sql/');
+		$result = $this->_load_tables('/api/sql/');
 
 		return $this->_init($sql, $options);
 	}

dolibarr/htdocs/core/modules/facture/doc/pdf_sponge.modules.php

Indentation +1852 added lines, -1852 removed lines

@@ -43,17 +43,17 @@ 
  */
 class pdf_sponge extends ModelePDFFactures
 {
-     /**
-     * @var DoliDb Database handler
-     */
+        /**
+         * @var DoliDb Database handler
+         */
     public $db;
 
-	/**
+    /**
      * @var string model name
      */
     public $name;
 
-	/**
+    /**
      * @var string model description (short text)
      */
     public $description;
@@ -63,101 +63,101 @@ 
      */
     public $update_main_doc_field;
 
-	/**
+    /**
      * @var string document type
      */
     public $type;
 
-	/**
+    /**
      * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+     * e.g.: PHP ≥ 5.3 = array(5, 3)
      */
-	public $phpmin = array(5, 2);
+    public $phpmin = array(5, 2);
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'development';
+    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
-
-	/**
-	 * @var bool Situation invoice type
-	 */
-	public $situationinvoice;
-
-	/**
-	 * @var float X position for the situation progress column
-	 */
-	public $posxprogress;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf,$langs,$mysoc;
-
-		// Translations
-		$langs->loadLangs(array("main", "bills"));
-
-		$this->db = $db;
-		$this->name = "sponge";
-		$this->description = $langs->trans('PDFSpongeDescription');
-		$this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
-
-		// Dimensiont 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 = 1;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 1;             // 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; // used for notes ans other stuff
-
-		//  Use new system for position of columns, view  $this->defineColumnField()
-
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
-		$this->situationinvoice=false;
-	}
+    public $marge_gauche;
+    public $marge_droite;
+    public $marge_haute;
+    public $marge_basse;
+
+    public $emetteur;	// Objet societe qui emet
+
+    /**
+     * @var bool Situation invoice type
+     */
+    public $situationinvoice;
+
+    /**
+     * @var float X position for the situation progress column
+     */
+    public $posxprogress;
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf,$langs,$mysoc;
+
+        // Translations
+        $langs->loadLangs(array("main", "bills"));
+
+        $this->db = $db;
+        $this->name = "sponge";
+        $this->description = $langs->trans('PDFSpongeDescription');
+        $this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
+
+        // Dimensiont 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 = 1;                // Affiche si il y a eu escompte
+        $this->option_credit_note = 1;             // 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; // used for notes ans other stuff
+
+        //  Use new system for position of columns, view  $this->defineColumnField()
+
+        $this->tva=array();
+        $this->localtax1=array();
+        $this->localtax2=array();
+        $this->atleastoneratenotnull=0;
+        $this->atleastonediscount=0;
+        $this->situationinvoice=false;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -171,1682 +171,1682 @@ 
      *  @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';
-
-	    // Translations
-	    $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
-
-	    $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_INVOICES_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->facture->dir_output)
-	    {
-	        $object->fetch_thirdparty();
-
-	        $deja_regle = $object->getSommePaiement(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-	        $amount_credit_notes_included = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-	        $amount_deposits_included = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-
-	        // Definition of $dir and $file
-	        if ($object->specimen)
-	        {
-	            $dir = $conf->facture->dir_output;
-	            $file = $dir . "/SPECIMEN.pdf";
-	        }
-	        else
-	        {
-	            $objectref = dol_sanitizeFileName($object->ref);
-	            $dir = $conf->facture->dir_output . "/" . $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
-
-	            // Set nblignes with the new facture lines content after hook
-	            $nblignes = count($object->lines);
-	            $nbpayments = count($object->getListOfPayments());
-
-	            // Create pdf instance
-	            $pdf=pdf_getInstance($this->format);
-	            $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1,0);
-
-	            $heightforinfotot = 50+(4*$nbpayments);	// Height reserved to output the info and total part and payment part
-	            $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)
-
-	            if (class_exists('TCPDF'))
-	            {
-	                $pdf->setPrintHeader(false);
-	                $pdf->setPrintFooter(false);
-	            }
-	            $pdf->SetFont(pdf_getPDFFont($outputlangs));
-
-	            // Set path to the background PDF File
+     */
+    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';
+
+        // Translations
+        $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
+
+        $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_INVOICES_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->facture->dir_output)
+        {
+            $object->fetch_thirdparty();
+
+            $deja_regle = $object->getSommePaiement(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+            $amount_credit_notes_included = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+            $amount_deposits_included = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+
+            // Definition of $dir and $file
+            if ($object->specimen)
+            {
+                $dir = $conf->facture->dir_output;
+                $file = $dir . "/SPECIMEN.pdf";
+            }
+            else
+            {
+                $objectref = dol_sanitizeFileName($object->ref);
+                $dir = $conf->facture->dir_output . "/" . $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
+
+                // Set nblignes with the new facture lines content after hook
+                $nblignes = count($object->lines);
+                $nbpayments = count($object->getListOfPayments());
+
+                // Create pdf instance
+                $pdf=pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+                $pdf->SetAutoPageBreak(1,0);
+
+                $heightforinfotot = 50+(4*$nbpayments);	// Height reserved to output the info and total part and payment part
+                $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)
+
+                if (class_exists('TCPDF'))
+                {
+                    $pdf->setPrintHeader(false);
+                    $pdf->setPrintFooter(false);
+                }
+                $pdf->SetFont(pdf_getPDFFont($outputlangs));
+
+                // Set path to the background PDF File
                 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);
-
-	            $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-	            $pdf->SetSubject($outputlangs->transnoentities("PdfInvoiceTitle"));
-	            $pdf->SetCreator("Dolibarr ".DOL_VERSION);
-	            $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-	            $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$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;
-	               }
-	            }
-
-
-	            // Situation invoice handling
-	            if ($object->situation_cycle_ref)
-	            {
-	                $this->situationinvoice = true;
-	            }
-
-	            // New page
-	            $pdf->AddPage();
-	            if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-	            $pagenb++;
-
-	            $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_height = 130-$top_shift;
-	            $tab_height_newpage = 150;
-	            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
-
-	            // 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 = max($pdf->GetY(),$nexY);
-	                    $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;
-	                    $height_incoterms += 4;
-	                }
-	            }
-
-	            // 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);
-	                }
-	            }
-
-	            $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;
-
-	            // 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+$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+$heightforinfotot)))	// If photo too high, we moved completely on new page
-    	                {
-    	                    $pdf->AddPage('','',true);
-    	                    if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                    $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+$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);
-    	                            $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);
-	                }
-
-	                // Situation progress
-	                if ($this->getColumnStatus('progress'))
-	                {
-	                    $progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
-	                    $this->printStdColumnContent($pdf, $curY, 'progress', $progress);
-	                    $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
-
-
-
-	                $sign=1;
-	                if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-	                // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-	                $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-	                if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
-	                {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                } else {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
-	                    else $tvaligne= $sign * $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;
-
-	                        $nexY = max($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 - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-	                $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
-	            else
-	            {
-	                $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
-	                $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
-
-	            // Affiche zone infos
-	            $posy=$this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
-
-	            // Affiche zone totaux
-	            $posy=$this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
-
-	            // Affiche zone versements
-	            if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-	            {
-	                $posy=$this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
-	            }
-
-	            // Pied de page
-	            $this->_pagefoot($pdf,$object,$outputlangs);
-	            if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
-
-	            $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;   // No error
-	        }
-	        else
-	        {
-	            $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-	            return 0;
-	        }
-	    }
-	    else
-	    {
-	        $this->error=$langs->transnoentities("ErrorConstantNotDefined","FAC_OUTPUTDIR");
-	        return 0;
-	    }
-	}
-
-
-	/**
-	 *  Show payments table
-	 *
+                {
+                    $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);
+
+                $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+                $pdf->SetSubject($outputlangs->transnoentities("PdfInvoiceTitle"));
+                $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+                $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+                $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$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;
+                    }
+                }
+
+
+                // Situation invoice handling
+                if ($object->situation_cycle_ref)
+                {
+                    $this->situationinvoice = true;
+                }
+
+                // New page
+                $pdf->AddPage();
+                if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                $pagenb++;
+
+                $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_height = 130-$top_shift;
+                $tab_height_newpage = 150;
+                if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
+
+                // 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 = max($pdf->GetY(),$nexY);
+                        $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;
+                        $height_incoterms += 4;
+                    }
+                }
+
+                // 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);
+                    }
+                }
+
+                $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;
+
+                // 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+$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+$heightforinfotot)))	// If photo too high, we moved completely on new page
+                        {
+                            $pdf->AddPage('','',true);
+                            if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                            $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+$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);
+                                    $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);
+                    }
+
+                    // Situation progress
+                    if ($this->getColumnStatus('progress'))
+                    {
+                        $progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
+                        $this->printStdColumnContent($pdf, $curY, 'progress', $progress);
+                        $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
+
+
+
+                    $sign=1;
+                    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+                    // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+                    $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+                    if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
+                    {
+                        if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+                        else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+                    } else {
+                        if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
+                        else $tvaligne= $sign * $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;
+
+                            $nexY = max($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 - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+                else
+                {
+                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+
+                // Affiche zone infos
+                $posy=$this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+
+                // Affiche zone totaux
+                $posy=$this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+                // Affiche zone versements
+                if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
+                {
+                    $posy=$this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
+                }
+
+                // Pied de page
+                $this->_pagefoot($pdf,$object,$outputlangs);
+                if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+                $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;   // No error
+            }
+            else
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$langs->transnoentities("ErrorConstantNotDefined","FAC_OUTPUTDIR");
+            return 0;
+        }
+    }
+
+
+    /**
+     *  Show payments table
+     *
      *  @param	PDF			$pdf           Object PDF
      *  @param  Object		$object         Object invoice
      *  @param  int			$posy           Position y in PDF
      *  @param  Translate	$outputlangs    Object langs for output
      *  @return int             			<0 if KO, >0 if OK
-	 */
-	function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
-	{
-		global $conf;
+     */
+    function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
+    {
+        global $conf;
 
         $sign=1;
         if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
         $tab3_posx = 120;
-		$tab3_top = $posy + 8;
-		$tab3_width = 80;
-		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$tab3_posx -= 20;
-		}
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
-
-		$pdf->SetFont('','', $default_font_size - 3);
-		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
-
-		$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
-
-		$pdf->SetFont('','', $default_font_size - 4);
-		$pdf->SetXY($tab3_posx, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+21, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+40, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+58, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
-
-		$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
-
-		$y=0;
-
-		$pdf->SetFont('','', $default_font_size - 4);
-
-
-		// Loop on each deposits and credit notes included
-		$sql = "SELECT re.rowid, re.amount_ht, re.multicurrency_amount_ht, re.amount_tva, re.multicurrency_amount_tva,  re.amount_ttc, re.multicurrency_amount_ttc,";
-		$sql.= " re.description, re.fk_facture_source,";
-		$sql.= " f.type, f.datef";
-		$sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re, ".MAIN_DB_PREFIX ."facture as f";
-		$sql.= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			$invoice=new Facture($this->db);
-			while ($i < $num)
-			{
-				$y+=3;
-				$obj = $this->db->fetch_object($resql);
-
-				if ($obj->type == 2) $text=$outputlangs->trans("CreditNote");
-				elseif ($obj->type == 3) $text=$outputlangs->trans("Deposit");
-				else $text=$outputlangs->trans("UnknownType");
-
-				$invoice->fetch($obj->fk_facture_source);
-
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, price(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
-
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
-
-				$i++;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-
-		// Loop on each payment
-		// TODO Call getListOfPaymentsgetListOfPayments instead of hard coded sql
-		$sql = "SELECT p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
-		$sql.= " cp.code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
-		$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
-		//$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = 1";
-		$sql.= " ORDER BY p.datep";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num) {
-				$y+=3;
-				$row = $this->db->fetch_object($resql);
-
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, price($sign * (($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
-				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
-
-				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
-				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
-
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
-
-				$i++;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *   Show miscellaneous information (payment mode, payment term, ...)
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
-	 */
-	private 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 payments conditions
-		if ($object->type != 2 && ($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 ($object->type != 2)
-		{
-			// Check a payment mode is defined
-			if (empty($object->mode_reglement_code)
-			&& empty($conf->global->FACTURE_CHQ_NUMBER)
-			&& empty($conf->global->FACTURE_RIB_NUMBER))
-			{
-				$this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
-			}
-			// Avoid having any valid PDF with setup that is not complete
-			elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))
-				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank)))
-			{
-				$outputlangs->load("errors");
-
-				$pdf->SetXY($this->marge_gauche, $posy);
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup",$object->mode_reglement_code);
-				$pdf->MultiCell(80, 3, $this->error,0,'L',0);
-				$pdf->SetTextColor(0,0,0);
-
-				$posy=$pdf->GetY()+1;
-			}
-
-			// 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);
-
-					$curx=$this->marge_gauche;
-					$cury=$posy;
-
-					$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;
+        $tab3_top = $posy + 8;
+        $tab3_width = 80;
+        $tab3_height = 4;
+        if ($this->page_largeur < 210) // To work with US executive format
+        {
+            $tab3_posx -= 20;
+        }
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        $title=$outputlangs->transnoentities("PaymentsAlreadyDone");
+        if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+
+        $pdf->SetFont('','', $default_font_size - 3);
+        $pdf->SetXY($tab3_posx, $tab3_top - 4);
+        $pdf->MultiCell(60, 3, $title, 0, 'L', 0);
+
+        $pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
+
+        $pdf->SetFont('','', $default_font_size - 4);
+        $pdf->SetXY($tab3_posx, $tab3_top);
+        $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
+        $pdf->SetXY($tab3_posx+21, $tab3_top);
+        $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
+        $pdf->SetXY($tab3_posx+40, $tab3_top);
+        $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+        $pdf->SetXY($tab3_posx+58, $tab3_top);
+        $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
+
+        $pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
+
+        $y=0;
+
+        $pdf->SetFont('','', $default_font_size - 4);
+
+
+        // Loop on each deposits and credit notes included
+        $sql = "SELECT re.rowid, re.amount_ht, re.multicurrency_amount_ht, re.amount_tva, re.multicurrency_amount_tva,  re.amount_ttc, re.multicurrency_amount_ttc,";
+        $sql.= " re.description, re.fk_facture_source,";
+        $sql.= " f.type, f.datef";
+        $sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re, ".MAIN_DB_PREFIX ."facture as f";
+        $sql.= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i=0;
+            $invoice=new Facture($this->db);
+            while ($i < $num)
+            {
+                $y+=3;
+                $obj = $this->db->fetch_object($resql);
+
+                if ($obj->type == 2) $text=$outputlangs->trans("CreditNote");
+                elseif ($obj->type == 3) $text=$outputlangs->trans("Deposit");
+                else $text=$outputlangs->trans("UnknownType");
+
+                $invoice->fetch($obj->fk_facture_source);
+
+                $pdf->SetXY($tab3_posx, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, price(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+40, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, $text, 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
+
+                $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+
+                $i++;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+
+        // Loop on each payment
+        // TODO Call getListOfPaymentsgetListOfPayments instead of hard coded sql
+        $sql = "SELECT p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
+        $sql.= " cp.code";
+        $sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
+        $sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
+        //$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = 1";
+        $sql.= " ORDER BY p.datep";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num) {
+                $y+=3;
+                $row = $this->db->fetch_object($resql);
+
+                $pdf->SetXY($tab3_posx, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, price($sign * (($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+40, $tab3_top+$y);
+                $oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
+
+                $pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+                $pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
+
+                $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+
+                $i++;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *   Show miscellaneous information (payment mode, payment term, ...)
+     *
+     *   @param		PDF			$pdf     		Object PDF
+     *   @param		Object		$object			Object to show
+     *   @param		int			$posy			Y
+     *   @param		Translate	$outputlangs	Langs object
+     *   @return	void
+     */
+    private 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 payments conditions
+        if ($object->type != 2 && ($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 ($object->type != 2)
+        {
+            // Check a payment mode is defined
+            if (empty($object->mode_reglement_code)
+            && empty($conf->global->FACTURE_CHQ_NUMBER)
+            && empty($conf->global->FACTURE_RIB_NUMBER))
+            {
+                $this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
+            }
+            // Avoid having any valid PDF with setup that is not complete
+            elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))
+                || ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank)))
+            {
+                $outputlangs->load("errors");
+
+                $pdf->SetXY($this->marge_gauche, $posy);
+                $pdf->SetTextColor(200,0,0);
+                $pdf->SetFont('','B', $default_font_size - 2);
+                $this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup",$object->mode_reglement_code);
+                $pdf->MultiCell(80, 3, $this->error,0,'L',0);
+                $pdf->SetTextColor(0,0,0);
+
+                $posy=$pdf->GetY()+1;
+            }
+
+            // 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);
+
+                    $curx=$this->marge_gauche;
+                    $cury=$posy;
+
+                    $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;
 
         $sign=1;
         if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
         $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($sign * ($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
-			{
-			    // FIXME amount of vat not supported with multicurrency
-
-				//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);
-							}
-						}
-					}
+        $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($sign * ($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
+            {
+                // FIXME amount of vat not supported with multicurrency
+
+                //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
-				// Situations totals migth be wrong on huge amounts
-				if ($object->situation_cycle_ref && $object->situation_counter > 1) {
-
-					$sum_pdf_tva = 0;
-					foreach($this->tva as $tvakey => $tvaval){
-						$sum_pdf_tva+=$tvaval; // sum VAT amounts to compare to object
-					}
-
-					if($sum_pdf_tva!=$object->total_tva) { // apply coef to recover the VAT object amount (the good one)
-						$coef_fix_tva = $object->total_tva / $sum_pdf_tva;
-
-						foreach($this->tva as $tvakey => $tvaval) {
-							$this->tva[$tvakey]=$tvaval * $coef_fix_tva;
-						}
-					}
-				}
-
-				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);
-							}
-						}
-					//}
-				}
-
-				// Revenue stamp
-				if (price2num($object->revenuestamp) != 0)
-				{
-					$index++;
-					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
-
-					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, '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($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
-			}
-		}
-
-		$pdf->SetTextColor(0,0,0);
-
-		$creditnoteamount=$object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-		$depositsamount=$object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-		//print "x".$creditnoteamount."-".$depositsamount;exit;
-		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if ($object->paye) $resteapayer=0;
-
-		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-		{
-			// Already paid + Deposits
-			$index++;
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
-
-			// Credit note
-			if ($creditnoteamount)
-			{
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("CreditNotes"), 0, 'L', 0);
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
-			}
-
-			// Escompte
-			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
-			{
-				$index++;
-				$pdf->SetFillColor(255,255,255);
-
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
-
-				$resteapayer=0;
-			}
-
-			$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;
-
-		// Translations
-		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
-
-		// Show Draft Watermark
-		if($object->statut==Facture::STATUS_DRAFT && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
+                // VAT
+                // Situations totals migth be wrong on huge amounts
+                if ($object->situation_cycle_ref && $object->situation_counter > 1) {
+
+                    $sum_pdf_tva = 0;
+                    foreach($this->tva as $tvakey => $tvaval){
+                        $sum_pdf_tva+=$tvaval; // sum VAT amounts to compare to object
+                    }
+
+                    if($sum_pdf_tva!=$object->total_tva) { // apply coef to recover the VAT object amount (the good one)
+                        $coef_fix_tva = $object->total_tva / $sum_pdf_tva;
+
+                        foreach($this->tva as $tvakey => $tvaval) {
+                            $this->tva[$tvakey]=$tvaval * $coef_fix_tva;
+                        }
+                    }
+                }
+
+                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);
+                            }
+                        }
+                    //}
+                }
+
+                // Revenue stamp
+                if (price2num($object->revenuestamp) != 0)
+                {
+                    $index++;
+                    $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+                    $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
+
+                    $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                    $pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, '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($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+            }
+        }
+
+        $pdf->SetTextColor(0,0,0);
+
+        $creditnoteamount=$object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+        $depositsamount=$object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+        //print "x".$creditnoteamount."-".$depositsamount;exit;
+        $resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
+        if ($object->paye) $resteapayer=0;
+
+        if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
         {
-		      pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
+            // Already paid + Deposits
+            $index++;
+            $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
+            $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
+
+            // Credit note
+            if ($creditnoteamount)
+            {
+                $index++;
+                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("CreditNotes"), 0, 'L', 0);
+                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
+            }
+
+            // Escompte
+            if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
+            {
+                $index++;
+                $pdf->SetFillColor(255,255,255);
+
+                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
+                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
+
+                $resteapayer=0;
+            }
+
+            $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);
         }
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+        $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;
 
-		$w = 110;
+        // Force to disable hidetop and hidebottom
+        $hidebottom=0;
+        if ($hidetop) $hidetop=-1;
 
-		$posy=$this->marge_haute;
+        $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;
+
+        // Translations
+        $outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+        // Show Draft Watermark
+        if($object->statut==Facture::STATUS_DRAFT && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
+        {
+                pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
+        }
+
+        $pdf->SetTextColor(0,0,60);
+        $pdf->SetFont('','B', $default_font_size + 3);
+
+        $w = 110;
+
+        $posy=$this->marge_haute;
         $posx=$this->page_largeur-$this->marge_droite-$w;
 
-		$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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
-				}
-			}
-			else
-			{
-				$text=$this->emetteur->name;
-				$pdf->MultiCell($w, 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("PdfInvoiceTitle");
-		if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
-		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
-		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
-		$pdf->MultiCell($w, 3, $title, '', 'R');
-
-		$pdf->SetFont('','B',$default_font_size);
-
-		$posy+=5;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$textref=$outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == Facture::STATUS_DRAFT)
-		{
-			$pdf->SetTextColor(128,0,0);
-			$textref.=' - '.$outputlangs->transnoentities("NotValidated");
-		}
-		$pdf->MultiCell($w, 4, $textref, '', '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($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
-		}
-
-		$objectidnext=$object->getIdReplacingInvoice('validated');
-		if ($object->type == 0 && $objectidnext)
-		{
-			$objectreplacing=new Facture($this->db);
-			$objectreplacing->fetch($objectidnext);
-
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
-		}
-		if ($object->type == 1)
-		{
-			$objectreplaced=new Facture($this->db);
-			$objectreplaced->fetch($object->fk_facture_source);
-
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
-		}
-		if ($object->type == 2 && !empty($object->fk_facture_source))
-		{
-			$objectreplaced=new Facture($this->db);
-			$objectreplaced->fetch($object->fk_facture_source);
-
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
-		}
-
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
-
-		if (! empty($conf->global->INVOICE_POINTOFTAX_DATE))
-		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : " . dol_print_date($object->date_pointoftax,"day",false,$outputlangs), '', 'R');
-		}
-
-		if ($object->type != 2)
-		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
-		}
-
-		if ($object->thirdparty->code_client)
-		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 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]);
+        $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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+                    $pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+                }
+            }
+            else
+            {
+                $text=$this->emetteur->name;
+                $pdf->MultiCell($w, 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("PdfInvoiceTitle");
+        if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
+        if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
+        if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
+        if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
+        if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
+        $pdf->MultiCell($w, 3, $title, '', 'R');
+
+        $pdf->SetFont('','B',$default_font_size);
+
+        $posy+=5;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $textref=$outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref);
+        if ($object->statut == Facture::STATUS_DRAFT)
+        {
+            $pdf->SetTextColor(128,0,0);
+            $textref.=' - '.$outputlangs->transnoentities("NotValidated");
+        }
+        $pdf->MultiCell($w, 4, $textref, '', '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($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+        }
+
+        $objectidnext=$object->getIdReplacingInvoice('validated');
+        if ($object->type == 0 && $objectidnext)
+        {
+            $objectreplacing=new Facture($this->db);
+            $objectreplacing->fetch($objectidnext);
+
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
+        }
+        if ($object->type == 1)
+        {
+            $objectreplaced=new Facture($this->db);
+            $objectreplaced->fetch($object->fk_facture_source);
+
+            $posy+=4;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
+        }
+        if ($object->type == 2 && !empty($object->fk_facture_source))
+        {
+            $objectreplaced=new Facture($this->db);
+            $objectreplaced->fetch($object->fk_facture_source);
+
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
+        }
+
+        $posy+=4;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
+
+        if (! empty($conf->global->INVOICE_POINTOFTAX_DATE))
+        {
+            $posy+=4;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : " . dol_print_date($object->date_pointoftax,"day",false,$outputlangs), '', 'R');
+        }
+
+        if ($object->type != 2)
+        {
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
+        }
+
+        if ($object->thirdparty->code_client)
+        {
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 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($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
-		}
-
-		$posy+=1;
-
-		$top_shift = 0;
-		// Show list of linked objects
-		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
-			$top_shift = $pdf->getY() - $current_y;
-		}
-
-		if ($showaddress)
-		{
-			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
-
-			// Show sender
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posy+=$top_shift;
-			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-
-			$hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
-			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
-
-
-			// 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($widthrecbox, $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($widthrecbox-2, 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($widthrecbox-2, 4, $carac_emetteur, 0, 'L');
-
-			// If BILLING contact defined on invoice, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','BILLING');
-			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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posy+=$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, 2, $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
+                $pdf->SetTextColor(0,0,60);
+                $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+            }
+        }
+
+        $posy+=1;
+
+        $top_shift = 0;
+        // Show list of linked objects
+        $current_y = $pdf->getY();
+        $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
+        if ($current_y < $pdf->getY())
+        {
+            $top_shift = $pdf->getY() - $current_y;
+        }
+
+        if ($showaddress)
+        {
+            // Sender properties
+            $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+
+            // Show sender
+            $posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+            $posy+=$top_shift;
+            $posx=$this->marge_gauche;
+            if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+
+            $hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+            $widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+
+
+            // 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($widthrecbox, $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($widthrecbox-2, 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($widthrecbox-2, 4, $carac_emetteur, 0, 'L');
+
+            // If BILLING contact defined on invoice, we use it
+            $usecontact=false;
+            $arrayidcontact=$object->getIdContact('external','BILLING');
+            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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+            if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+            $posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+            $posy+=$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, 2, $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,'INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+    }
+
+    /**
+     *   	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,'INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
-	}
-
-	/**
-	 *   	Define Array Column Field
-	 *
-	 *   	@param	object			$object    		common object
-	 *   	@param	outputlangs		$outputlangs    langs
+     *   	@param	object			$object    		common object
+     *   	@param	outputlangs		$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
-	 */
+     *      @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
@@ -1864,24 +1864,24 @@ 
 	    );
 	    */
 
-	    $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=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',
+            ),
+        );
 
-	    // PHOTO
+        // PHOTO
         $rank = $rank + 10;
         $this->cols['photo'] = array(
             'rank' => $rank,
@@ -1897,126 +1897,126 @@ 
             'border-left' => false, // remove left line separator
         );
 
-	    if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
+        if (! empty($conf->global->MAIN_GENERATE_INVOICES_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
-	    );
+        $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;
-	    }
+        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['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['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' => 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' => true, // add left line separator
+        );
 
-	    if($this->situationinvoice)
-	    {
-	        $this->cols['progress']['status'] = true;
-	    }
+        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
-	    );
+        $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;
-	    }
-	}
+        $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 +525 added lines, -525 removed lines

@@ -88,7 +88,7 @@ 
 	public $marge_haute;
 	public $marge_basse;
 
-	public $emetteur;	// Objet societe qui emet
+	public $emetteur; // Objet societe qui emet
 
 	/**
 	 * @var bool Situation invoice type
@@ -108,7 +108,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		// Translations
 		$langs->loadLangs(array("main", "bills"));
@@ -116,47 +116,47 @@ 
 		$this->db = $db;
 		$this->name = "sponge";
 		$this->description = $langs->trans('PDFSpongeDescription');
-		$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
 
 		// Dimensiont 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 = 1;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 1;             // 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 = 1; // Affiche si il y a eu escompte
+		$this->option_credit_note = 1; // 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; // used for notes ans other stuff
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
 
 		//  Use new system for position of columns, view  $this->defineColumnField()
 
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
-		$this->situationinvoice=false;
+		$this->tva = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
+		$this->situationinvoice = false;
 	}
 
 
@@ -172,14 +172,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';
 
 	    // Translations
 	    $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
@@ -187,52 +187,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_INVOICES_WITH_PICTURE))
+	    if (!empty($conf->global->MAIN_GENERATE_INVOICES_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;
@@ -242,7 +242,7 @@ 
 	                }
 	            }
 
-	            if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+	            if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
 	        }
 	    }
 
@@ -260,19 +260,19 @@ 
 	        if ($object->specimen)
 	        {
 	            $dir = $conf->facture->dir_output;
-	            $file = $dir . "/SPECIMEN.pdf";
+	            $file = $dir."/SPECIMEN.pdf";
 	        }
 	        else
 	        {
 	            $objectref = dol_sanitizeFileName($object->ref);
-	            $dir = $conf->facture->dir_output . "/" . $objectref;
-	            $file = $dir . "/" . $objectref . ".pdf";
+	            $dir = $conf->facture->dir_output."/".$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;
 	            }
 	        }
@@ -280,28 +280,28 @@ 
 	        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
 
 	            // Set nblignes with the new facture lines content after hook
 	            $nblignes = count($object->lines);
 	            $nbpayments = count($object->getListOfPayments());
 
 	            // 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);
 
-	            $heightforinfotot = 50+(4*$nbpayments);	// Height reserved to output the info and total part and payment part
-	            $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 = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
+	            $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)
 
 	            if (class_exists('TCPDF'))
 	            {
@@ -311,28 +311,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("PdfInvoiceTitle"));
 	            $pdf->SetCreator("Dolibarr ".DOL_VERSION);
 	            $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 	            $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$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;
 	               }
@@ -347,17 +347,17 @@ 
 
 	            // New page
 	            $pdf->AddPage();
-	            if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+	            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 	            $pagenb++;
 
 	            $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_height = 130-$top_shift;
+	            $tab_top = 90 + $top_shift;
+	            $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+	            $tab_height = 130 - $top_shift;
 	            $tab_height_newpage = 150;
 	            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
 
@@ -370,31 +370,31 @@ 
 	                {
 						$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 = max($pdf->GetY(),$nexY);
-	                    $height_incoterms=$nexY-$tab_top;
+	                    $pdf->SetFont('', '', $default_font_size - 1);
+	                    $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+	                    $nexY = max($pdf->GetY(), $nexY);
+	                    $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;
 	                    $height_incoterms += 4;
 	                }
 	            }
 
 	            // 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);
 	                }
 	            }
 
@@ -403,23 +403,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);
 
@@ -427,7 +427,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);
@@ -438,15 +438,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);
@@ -463,47 +463,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;
@@ -511,11 +511,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;
@@ -523,48 +523,48 @@ 
 	            $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+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-	                $pageposbefore=$pdf->getPage();
+	                $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $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+$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 + $heightforinfotot)))	// If photo too high, we moved completely on new page
     	                {
-    	                    $pdf->AddPage('','',true);
-    	                    if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                    $pdf->setPage($pageposbefore+1);
+    	                    $pdf->AddPage('', '', true);
+    	                    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+    	                    $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'];
     	                }
 	                }
 
@@ -572,59 +572,59 @@ 
 	                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);
-    	                    $pageposafter=$pdf->getPage();
-    	                    $posyafter=$pdf->GetY();
+    	                    $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+$heightforinfotot)))	// There is no space left for total+free text
+    	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $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->setPage($pageposafter+1);
+    	                            $pdf->AddPage('', '', true);
+    	                            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+    	                            $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
@@ -632,7 +632,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
@@ -641,7 +641,7 @@ 
 	                {
 	                    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 	                    $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
-	                    $nexY = max($pdf->GetY(),$nexY);
+	                    $nexY = max($pdf->GetY(), $nexY);
 	                }
 
 	                // Situation progress
@@ -649,7 +649,7 @@ 
 	                {
 	                    $progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
 	                    $this->printStdColumnContent($pdf, $curY, 'progress', $progress);
-	                    $nexY = max($pdf->GetY(),$nexY);
+	                    $nexY = max($pdf->GetY(), $nexY);
 	                }
 
 	                // Unit
@@ -657,7 +657,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
@@ -665,7 +665,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
@@ -673,11 +673,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,
@@ -686,12 +686,12 @@ 
 	                    '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
 
 
 
-	                $sign=1;
-	                if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	                $sign = 1;
+	                if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 	                // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 	                $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 	                if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
@@ -699,55 +699,55 @@ 
 	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 	                    else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 	                } else {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
-	                    else $tvaligne= $sign * $object->lines[$i]->total_tva;
+	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+	                    else $tvaligne = $sign * $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;
 
-	                        $nexY = max($nexY,$posYAfterImage);
+	                        $nexY = max($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)
@@ -761,14 +761,14 @@ 
 	                            {
 	                                $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)
 	                            {
@@ -778,10 +778,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);
 	                        }
@@ -791,56 +791,56 @@ 
 	            if ($pagenb == $pageposbeforeprintlines)
 	            {
 	                $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-	                $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 	            }
 	            else
 	            {
 	                $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
-	                $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $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, $deja_regle, $bottomlasttab, $outputlangs);
+	            $posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 	            // Affiche zone versements
 	            if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
 	            {
-	                $posy=$this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
+	                $posy = $this->drawPaymentsTable($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();
 
 	            $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;   // No error
+	                return 1; // No error
 	        }
 	        else
 	        {
-	            $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+	            $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 	            return 0;
 	        }
 	    }
 	    else
 	    {
-	        $this->error=$langs->transnoentities("ErrorConstantNotDefined","FAC_OUTPUTDIR");
+	        $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
 	        return 0;
 	    }
 	}
@@ -859,8 +859,8 @@ 
 	{
 		global $conf;
 
-        $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+        $sign = 1;
+        if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
         $tab3_posx = 120;
 		$tab3_top = $posy + 8;
@@ -873,113 +873,113 @@ 
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		$title = $outputlangs->transnoentities("PaymentsAlreadyDone");
+		if ($object->type == 2) $title = $outputlangs->transnoentities("PaymentsBackAlreadyDone");
 
-		$pdf->SetFont('','', $default_font_size - 3);
+		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
 		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
 
-		$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
+		$pdf->line($tab3_posx, $tab3_top, $tab3_posx + $tab3_width, $tab3_top);
 
-		$pdf->SetFont('','', $default_font_size - 4);
+		$pdf->SetFont('', '', $default_font_size - 4);
 		$pdf->SetXY($tab3_posx, $tab3_top);
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+21, $tab3_top);
+		$pdf->SetXY($tab3_posx + 21, $tab3_top);
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+40, $tab3_top);
+		$pdf->SetXY($tab3_posx + 40, $tab3_top);
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+58, $tab3_top);
+		$pdf->SetXY($tab3_posx + 58, $tab3_top);
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
 
-		$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
+		$pdf->line($tab3_posx, $tab3_top - 1 + $tab3_height, $tab3_posx + $tab3_width, $tab3_top - 1 + $tab3_height);
 
-		$y=0;
+		$y = 0;
 
-		$pdf->SetFont('','', $default_font_size - 4);
+		$pdf->SetFont('', '', $default_font_size - 4);
 
 
 		// Loop on each deposits and credit notes included
 		$sql = "SELECT re.rowid, re.amount_ht, re.multicurrency_amount_ht, re.amount_tva, re.multicurrency_amount_tva,  re.amount_ttc, re.multicurrency_amount_ttc,";
-		$sql.= " re.description, re.fk_facture_source,";
-		$sql.= " f.type, f.datef";
-		$sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re, ".MAIN_DB_PREFIX ."facture as f";
-		$sql.= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
-		$resql=$this->db->query($sql);
+		$sql .= " re.description, re.fk_facture_source,";
+		$sql .= " f.type, f.datef";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i=0;
-			$invoice=new Facture($this->db);
+			$i = 0;
+			$invoice = new Facture($this->db);
 			while ($i < $num)
 			{
-				$y+=3;
+				$y += 3;
 				$obj = $this->db->fetch_object($resql);
 
-				if ($obj->type == 2) $text=$outputlangs->trans("CreditNote");
-				elseif ($obj->type == 3) $text=$outputlangs->trans("Deposit");
-				else $text=$outputlangs->trans("UnknownType");
+				if ($obj->type == 2) $text = $outputlangs->trans("CreditNote");
+				elseif ($obj->type == 3) $text = $outputlangs->trans("Deposit");
+				else $text = $outputlangs->trans("UnknownType");
 
 				$invoice->fetch($obj->fk_facture_source);
 
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx, $tab3_top + $y);
+				$pdf->MultiCell(20, 3, dol_print_date($obj->datef, 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, price(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
 
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 
 				$i++;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 
 		// Loop on each payment
 		// TODO Call getListOfPaymentsgetListOfPayments instead of hard coded sql
 		$sql = "SELECT p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
-		$sql.= " cp.code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
-		$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
+		$sql .= " cp.code";
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
+		$sql .= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
 		//$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = 1";
-		$sql.= " ORDER BY p.datep";
+		$sql .= " ORDER BY p.datep";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i=0;
+			$i = 0;
 			while ($i < $num) {
-				$y+=3;
+				$y += 3;
 				$row = $this->db->fetch_object($resql);
 
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx, $tab3_top + $y);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, price($sign * (($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
-				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
+				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
+				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
 				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
 				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
 
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 
 				$i++;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1000,35 +1000,35 @@ 
 
 		$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 payments conditions
 		if ($object->type != 2 && ($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 ($object->type != 2)
@@ -1047,13 +1047,13 @@ 
 				$outputlangs->load("errors");
 
 				$pdf->SetXY($this->marge_gauche, $posy);
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup",$object->mode_reglement_code);
-				$pdf->MultiCell(80, 3, $this->error,0,'L',0);
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup", $object->mode_reglement_code);
+				$pdf->MultiCell(80, 3, $this->error, 0, 'L', 0);
+				$pdf->SetTextColor(0, 0, 0);
 
-				$posy=$pdf->GetY()+1;
+				$posy = $pdf->GetY() + 1;
 			}
 
 			// Show payment mode
@@ -1061,26 +1061,26 @@ 
 			&& $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)
 					{
@@ -1088,31 +1088,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;
 			            }
 					}
 				}
@@ -1121,19 +1121,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;
 				}
 			}
 		}
@@ -1154,47 +1154,47 @@ 
 	 */
 	private function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
-        $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+        $sign = 1;
+        if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
         $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($sign * ($total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($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
 			}
@@ -1205,29 +1205,29 @@ 
 				//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);
@@ -1238,13 +1238,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++;
 
@@ -1253,15 +1253,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 = $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);
@@ -1276,20 +1276,20 @@ 
 				if ($object->situation_cycle_ref && $object->situation_counter > 1) {
 
 					$sum_pdf_tva = 0;
-					foreach($this->tva as $tvakey => $tvaval){
-						$sum_pdf_tva+=$tvaval; // sum VAT amounts to compare to object
+					foreach ($this->tva as $tvakey => $tvaval) {
+						$sum_pdf_tva += $tvaval; // sum VAT amounts to compare to object
 					}
 
-					if($sum_pdf_tva!=$object->total_tva) { // apply coef to recover the VAT object amount (the good one)
+					if ($sum_pdf_tva != $object->total_tva) { // apply coef to recover the VAT object amount (the good one)
 						$coef_fix_tva = $object->total_tva / $sum_pdf_tva;
 
-						foreach($this->tva as $tvakey => $tvaval) {
-							$this->tva[$tvakey]=$tvaval * $coef_fix_tva;
+						foreach ($this->tva as $tvakey => $tvaval) {
+							$this->tva[$tvakey] = $tvaval * $coef_fix_tva;
 						}
 					}
 				}
 
-				foreach($this->tva as $tvakey => $tvaval)
+				foreach ($this->tva as $tvakey => $tvaval)
 				{
 					if ($tvakey != 0)    // On affiche pas taux 0
 					{
@@ -1298,15 +1298,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);
@@ -1316,11 +1316,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
 							{
@@ -1329,16 +1329,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.=vatrate(abs($tvakey),1).$tvacompl;
+								$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$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);
 							}
@@ -1348,11 +1348,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
@@ -1362,16 +1362,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);
@@ -1385,7 +1385,7 @@ 
 				{
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
@@ -1394,29 +1394,29 @@ 
 				// 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($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 
-		$creditnoteamount=$object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-		$depositsamount=$object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+		$creditnoteamount = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+		$depositsamount = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if ($object->paye) $resteapayer=0;
+		if ($object->paye) $resteapayer = 0;
 
 		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
 		{
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
 
@@ -1425,7 +1425,7 @@ 
 			{
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("CreditNotes"), 0, 'L', 0);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("CreditNotes"), 0, 'L', 0);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
 			}
@@ -1434,26 +1434,26 @@ 
 			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
 			{
 				$index++;
-				$pdf->SetFillColor(255,255,255);
+				$pdf->SetFillColor(255, 255, 255);
 
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
 
-				$resteapayer=0;
+				$resteapayer = 0;
 			}
 
 			$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++;
@@ -1473,61 +1473,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
 		}
 	}
 
@@ -1549,162 +1549,162 @@ 
 
 		$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==Facture::STATUS_DRAFT && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
+		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
         {
-		      pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
+		      pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_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);
 
 		$w = 110;
 
-		$posy=$this->marge_haute;
-        $posx=$this->page_largeur-$this->marge_droite-$w;
+		$posy = $this->marge_haute;
+        $posx = $this->page_largeur - $this->marge_droite - $w;
 
-		$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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+					$pdf->SetTextColor(200, 0, 0);
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
 			else
 			{
-				$text=$this->emetteur->name;
+				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 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("PdfInvoiceTitle");
-		if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
-		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
-		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("PdfInvoiceTitle");
+		if ($object->type == 1) $title = $outputlangs->transnoentities("InvoiceReplacement");
+		if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir");
+		if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit");
+		if ($object->type == 4) $title = $outputlangs->transnoentities("InvoiceProForma");
+		if ($this->situationinvoice) $title = $outputlangs->transnoentities("InvoiceSituation");
 		$pdf->MultiCell($w, 3, $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);
-		$textref=$outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref);
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
 		if ($object->statut == Facture::STATUS_DRAFT)
 		{
-			$pdf->SetTextColor(128,0,0);
-			$textref.=' - '.$outputlangs->transnoentities("NotValidated");
+			$pdf->SetTextColor(128, 0, 0);
+			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
 		$pdf->MultiCell($w, 4, $textref, '', '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($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		$objectidnext=$object->getIdReplacingInvoice('validated');
+		$objectidnext = $object->getIdReplacingInvoice('validated');
 		if ($object->type == 0 && $objectidnext)
 		{
-			$objectreplacing=new Facture($this->db);
+			$objectreplacing = new Facture($this->db);
 			$objectreplacing->fetch($objectidnext);
 
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
 		}
 		if ($object->type == 1)
 		{
-			$objectreplaced=new Facture($this->db);
+			$objectreplaced = new Facture($this->db);
 			$objectreplaced->fetch($object->fk_facture_source);
 
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
 		}
 		if ($object->type == 2 && !empty($object->fk_facture_source))
 		{
-			$objectreplaced=new Facture($this->db);
+			$objectreplaced = new Facture($this->db);
 			$objectreplaced->fetch($object->fk_facture_source);
 
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
 		}
 
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
+		$posy += 4;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : ".dol_print_date($object->date, "day", false, $outputlangs), '', 'R');
 
-		if (! empty($conf->global->INVOICE_POINTOFTAX_DATE))
+		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE))
 		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : " . dol_print_date($object->date_pointoftax,"day",false,$outputlangs), '', 'R');
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : ".dol_print_date($object->date_pointoftax, "day", false, $outputlangs), '', 'R');
 		}
 
 		if ($object->type != 2)
 		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
 		}
 
 		if ($object->thirdparty->code_client)
 		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 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($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
 		    }
 		}
 
-		$posy+=1;
+		$posy += 1;
 
 		$top_shift = 0;
 		// Show list of linked objects
@@ -1721,43 +1721,43 @@ 
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posy+=$top_shift;
-			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
 
-			$hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
-			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
 
 
 			// 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($widthrecbox, $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->MultiCell($widthrecbox-2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox - 2, 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($widthrecbox-2, 4, $carac_emetteur, 0, 'L');
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
 
 			// If BILLING contact defined on invoice, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','BILLING');
+			$usecontact = false;
+			$arrayidcontact = $object->getIdContact('external', 'BILLING');
 			if (count($arrayidcontact) > 0)
 			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
 			//Recipient name
@@ -1768,39 +1768,39 @@ 
 				$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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posy+=$top_shift;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $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->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, 2, $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;
 	}
 
@@ -1813,11 +1813,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,'INVOICE_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, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
 	/**
@@ -1830,20 +1830,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
 	    );
 
 	    /*
@@ -1864,7 +1864,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
@@ -1874,7 +1874,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',
@@ -1885,19 +1885,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_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
+	    if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
 	    {
 	        $this->cols['photo']['status'] = true;
 	    }
@@ -1952,7 +1952,7 @@ 
 	        'border-left' => true, // add left line separator
 	    );
 
-	    if($this->situationinvoice)
+	    if ($this->situationinvoice)
 	    {
 	        $this->cols['progress']['status'] = true;
 	    }
@@ -1967,7 +1967,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;
 	    }
 
@@ -1981,7 +1981,7 @@ 
 	        ),
 	        'border-left' => true, // add left line separator
 	    );
-	    if ($this->atleastonediscount){
+	    if ($this->atleastonediscount) {
 	        $this->cols['discount']['status'] = true;
 	    }
 
@@ -1997,7 +1997,7 @@ 
 	    );
 
 
-	    $parameters=array(
+	    $parameters = array(
 	        'object' => $object,
 	        'outputlangs' => $outputlangs,
 	        'hidedetails' => $hidedetails,
@@ -2005,7 +2005,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 +233 added lines, -116 removed lines

@@ -144,7 +144,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; // used for notes ans other stuff
@@ -177,9 +180,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';
+	    }
 
 	    // Translations
 	    $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
@@ -195,7 +202,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;
@@ -203,8 +212,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
@@ -219,18 +227,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'];
 	                        }
@@ -242,7 +250,9 @@ 
 	                }
 	            }
 
-	            if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+	            if ($realpath && $arephoto) {
+	                $realpatharray[$i]=$realpath;
+	            }
 	        }
 	    }
 
@@ -261,8 +271,7 @@ 
 	        {
 	            $dir = $conf->facture->dir_output;
 	            $file = $dir . "/SPECIMEN.pdf";
-	        }
-	        else
+	        } else
 	        {
 	            $objectref = dol_sanitizeFileName($object->ref);
 	            $dir = $conf->facture->dir_output . "/" . $objectref;
@@ -326,7 +335,9 @@ 
 	            $pdf->SetCreator("Dolibarr ".DOL_VERSION);
 	            $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 	            $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$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
 
@@ -347,7 +358,9 @@ 
 
 	            // New page
 	            $pdf->AddPage();
-	            if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+	            if (! empty($tplidx)) {
+	                $pdf->useTemplate($tplidx);
+	            }
 	            $pagenb++;
 
 	            $top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
@@ -359,7 +372,9 @@ 
 	            $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
 	            $tab_height = 130-$top_shift;
 	            $tab_height_newpage = 150;
-	            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
+	            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+	                $tab_height_newpage -= $top_shift;
+	            }
 
 	            // Incoterm
 	            $height_incoterms = 0;
@@ -394,7 +409,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);
+	                    }
 	                }
 	            }
 
@@ -427,8 +444,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.
@@ -444,9 +465,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);
@@ -468,8 +491,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);
 	                        }
@@ -483,12 +505,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();
@@ -503,8 +528,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;
 	                    }
@@ -512,8 +541,7 @@ 
 
 	                $tab_height = $tab_height - $height_note;
 	                $tab_top = $posyafter +6;
-	            }
-	            else
+	            } else
 	            {
 	                $height_note=0;
 	            }
@@ -537,7 +565,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+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
@@ -550,10 +580,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+$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+$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);
+    	                    }
     	                    $pdf->setPage($pageposbefore+1);
 
     	                    $curY = $tab_top_newpage;
@@ -574,9 +608,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.
@@ -584,22 +620,24 @@ 
     	                    $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+$heightforinfotot)))	// There is no space left for total+free text
+    	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$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);
+    	                            }
     	                            $pdf->setPage($pageposafter+1);
     	                        }
-    	                    }
-    	                    else
+    	                    } else
     	                    {
     	                        // We found a page break
     	                        $showpricebeforepagebreak=0;
     	                    }
-    	                }
-    	                else	// No pagebreak
+    	                } else	// No pagebreak
     	                {
     	                    $pdf->commitTransaction();
     	                }
@@ -691,16 +729,24 @@ 
 
 
 	                $sign=1;
-	                if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	                if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	                    $sign=-1;
+	                }
 	                // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 	                $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-	                if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
+	                if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) {
+	                    // Compute progress from previous situation
 	                {
 	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 	                } else {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
-	                    else $tvaligne= $sign * $object->lines[$i]->total_tva;
+	                        $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+	                    }
+	                } else {
+	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) {
+	                        $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
+	                    } else {
+	                        $tvaligne= $sign * $object->lines[$i]->total_tva;
+	                    }
 	                }
 
 	                $localtax1ligne=$object->lines[$i]->total_localtax1;
@@ -710,29 +756,43 @@ 
 	                $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;
 
 	                        $nexY = max($nexY,$posYAfterImage);
@@ -756,8 +816,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);
 	                            }
@@ -765,7 +824,9 @@ 
 	                            $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)
@@ -773,17 +834,20 @@ 
 	                            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);
+	                            }
 	                        }
 	            }
 
@@ -792,8 +856,7 @@ 
 	            {
 	                $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 	                $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
-	            else
+	            } else
 	            {
 	                $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 	                $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -813,7 +876,9 @@ 
 
 	            // Pied de page
 	            $this->_pagefoot($pdf,$object,$outputlangs);
-	            if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+	            if (method_exists($pdf,'AliasNbPages')) {
+	                $pdf->AliasNbPages();
+	            }
 
 	            $pdf->Close();
 
@@ -825,20 +890,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;   // No error
-	        }
-	        else
+	        } else
 	        {
 	            $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 	            return 0;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->error=$langs->transnoentities("ErrorConstantNotDefined","FAC_OUTPUTDIR");
 	        return 0;
@@ -860,21 +924,27 @@ 
 		global $conf;
 
         $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+            $sign=-1;
+        }
 
         $tab3_posx = 120;
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 			$tab3_posx -= 20;
 		}
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		if ($object->type == 2) {
+		    $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		}
 
 		$pdf->SetFont('','', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
@@ -916,9 +986,13 @@ 
 				$y+=3;
 				$obj = $this->db->fetch_object($resql);
 
-				if ($obj->type == 2) $text=$outputlangs->trans("CreditNote");
-				elseif ($obj->type == 3) $text=$outputlangs->trans("Deposit");
-				else $text=$outputlangs->trans("UnknownType");
+				if ($obj->type == 2) {
+				    $text=$outputlangs->trans("CreditNote");
+				} elseif ($obj->type == 3) {
+				    $text=$outputlangs->trans("Deposit");
+				} else {
+				    $text=$outputlangs->trans("UnknownType");
+				}
 
 				$invoice->fetch($obj->fk_facture_source);
 
@@ -935,8 +1009,7 @@ 
 
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -976,8 +1049,7 @@ 
 
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -1124,7 +1196,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);
 
@@ -1157,7 +1232,9 @@ 
 		global $conf,$mysoc;
 
         $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+            $sign=-1;
+        }
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1167,10 +1244,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;
@@ -1197,8 +1276,7 @@ 
 			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
+			} else
 			{
 			    // FIXME amount of vat not supported with multicurrency
 
@@ -1207,15 +1285,19 @@ 
 				//{
 					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='';
@@ -1240,17 +1322,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='';
@@ -1291,9 +1377,11 @@ 
 
 				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);
@@ -1318,15 +1406,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='';
@@ -1350,16 +1442,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='';
@@ -1409,7 +1505,9 @@ 
 		$depositsamount=$object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if ($object->paye) $resteapayer=0;
+		if ($object->paye) {
+		    $resteapayer=0;
+		}
 
 		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
 		{
@@ -1479,7 +1577,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);
@@ -1495,7 +1595,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);
@@ -1507,7 +1609,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']);
@@ -1577,16 +1681,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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
+			} else
 			{
 				$text=$this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -1597,11 +1699,21 @@ 
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$title=$outputlangs->transnoentities("PdfInvoiceTitle");
-		if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
-		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
-		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
+		if ($object->type == 1) {
+		    $title=$outputlangs->transnoentities("InvoiceReplacement");
+		}
+		if ($object->type == 2) {
+		    $title=$outputlangs->transnoentities("InvoiceAvoir");
+		}
+		if ($object->type == 3) {
+		    $title=$outputlangs->transnoentities("InvoiceDeposit");
+		}
+		if ($object->type == 4) {
+		    $title=$outputlangs->transnoentities("InvoiceProForma");
+		}
+		if ($this->situationinvoice) {
+		    $title=$outputlangs->transnoentities("InvoiceSituation");
+		}
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('','B',$default_font_size);
@@ -1724,7 +1836,9 @@ 
 			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy+=$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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -1774,11 +1888,16 @@ 
 
 			// Show recipient
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy+=$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);
@@ -2009,12 +2128,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/facture/doc/doc_generic_invoice_odt.modules.php

Indentation +461 added lines, -461 removed lines

@@ -39,487 +39,487 @@
  */
 class doc_generic_invoice_odt extends ModelePDFFactures
 {
-	/**
-	 * 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/ODS templates";
-		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'FACTURE_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 FACTURE_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);    // Par defaut, si n'etait pas defini
-	}
-
-
-	/**
-	 * 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/ODS templates";
+        $this->description = $langs->trans("DocumentModelOdt");
+        $this->scandir = 'FACTURE_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 FACTURE_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);    // Par defaut, si n'etait pas defini
+    }
+
+
+    /**
+     * 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="FACTURE_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		// List of directories area
-		$texte.= '<tr><td valign="middle">';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->FACTURE_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->FACTURE_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->FACTURE_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="FACTURE_ADDON_PDF_ODT_PATH">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
+
+        // List of directories area
+        $texte.= '<tr><td valign="middle">';
+        $texttitle=$langs->trans("ListOfDirectories");
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->FACTURE_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->FACTURE_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->FACTURE_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).'">';
-		}
+                }
+                $texte.='<div id="div_'.get_class($this).'">';
+        }
 
-		$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;
-	}
+        return $texte;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to build a document on disk using the generic odt module.
-	 *
-	 *	@param		Facture		$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		Facture		$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->facture->dir_output)
-		{
-			// If $object is id instead of object
-			if (! is_object($object))
-			{
-				$id = $object;
-				$object = new Facture($this->db);
-				$result=$object->fetch($id);
-				if ($result < 0)
-				{
-					dol_print_error($this->db,$object->error);
-					return -1;
-				}
-			}
-
-			$dir = $conf->facture->dir_output;
-			$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;
-				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
-				//print "newdir=".$dir;
-				//print "newfile=".$newfile;
-				//print "file=".$file;
-				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
-
-				dol_mkdir($conf->facture->dir_temp);
-
-
-				// If BILLING contact defined on invoice, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','BILLING');
-				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 BILLING contact and we dont use it as recipient we store the contact object for later use
-						$contactobject = $object->contact;
-					}
-				} else {
-					$socobject = $object->thirdparty;
-				}
-
-				// Fetch info for linked propal
-				$object->fetchObjectLinked('','','','');
-				//print_r($object->linkedObjects['propal']); exit;
-
-				$propal_object = $object->linkedObjects['propal'][0];
-
-				// 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_tva
-				);
-				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='INVOICE_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->facture->dir_temp,
-						'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;
-
-
-				// 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_propal=is_object($propal_object)?$this->get_substitutionarray_object($propal_object,$outputlangs,'propal'):array();
-				$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_propal,$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
-
-				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key)) // Image
-						{
-							//var_dump($value);exit;
-							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->facture->dir_output)
+        {
+            // If $object is id instead of object
+            if (! is_object($object))
+            {
+                $id = $object;
+                $object = new Facture($this->db);
+                $result=$object->fetch($id);
+                if ($result < 0)
+                {
+                    dol_print_error($this->db,$object->error);
+                    return -1;
+                }
+            }
+
+            $dir = $conf->facture->dir_output;
+            $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;
+                //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
+                //print "newdir=".$dir;
+                //print "newfile=".$newfile;
+                //print "file=".$file;
+                //print "conf->societe->dir_temp=".$conf->societe->dir_temp;
+
+                dol_mkdir($conf->facture->dir_temp);
+
+
+                // If BILLING contact defined on invoice, we use it
+                $usecontact=false;
+                $arrayidcontact=$object->getIdContact('external','BILLING');
+                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 BILLING contact and we dont use it as recipient we store the contact object for later use
+                        $contactobject = $object->contact;
+                    }
+                } else {
+                    $socobject = $object->thirdparty;
+                }
+
+                // Fetch info for linked propal
+                $object->fetchObjectLinked('','','','');
+                //print_r($object->linkedObjects['propal']); exit;
+
+                $propal_object = $object->linkedObjects['propal'][0];
+
+                // 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_tva
+                );
+                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='INVOICE_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->facture->dir_temp,
+                        '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;
+
+
+                // 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_propal=is_object($propal_object)?$this->get_substitutionarray_object($propal_object,$outputlangs,'propal'):array();
+                $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_propal,$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
+
+                //var_dump($tmparray); exit;
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        if (preg_match('/logo$/',$key)) // Image
+                        {
+                            //var_dump($value);exit;
+                            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 +143 added lines, -143 removed lines

@@ -68,37 +68,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/ODS templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'FACTURE_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'FACTURE_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 FACTURE_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 FACTURE_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);    // Par defaut, si n'etait pas defini
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
 	}
 
 
@@ -113,79 +113,79 @@ 
 		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="FACTURE_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$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="FACTURE_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td valign="middle">';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->FACTURE_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td valign="middle">';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->FACTURE_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->FACTURE_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->FACTURE_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->FACTURE_ADDON_PDF_ODT_PATH))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->FACTURE_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).'">';
 		}
 
-		$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;
 	}
@@ -202,10 +202,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))
 		{
@@ -214,17 +214,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"));
@@ -232,28 +232,28 @@ 
 		if ($conf->facture->dir_output)
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new Facture($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->facture->dir_output;
 			$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;
 				}
 			}
@@ -261,26 +261,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;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
@@ -291,19 +291,19 @@ 
 
 
 				// If BILLING contact defined on invoice, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','BILLING');
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'BILLING');
 				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)) {
+				if (!empty($usecontact)) {
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
+					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
 						$socobject = $object->contact;
 					else {
 						$socobject = $object->thirdparty;
@@ -315,13 +315,13 @@ 
 				}
 
 				// Fetch info for linked propal
-				$object->fetchObjectLinked('','','','');
+				$object->fetchObjectLinked('', '', '', '');
 				//print_r($object->linkedObjects['propal']); exit;
 
 				$propal_object = $object->linkedObjects['propal'][0];
 
 				// Make substitution
-				$substitutionarray=array(
+				$substitutionarray = array(
 				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
@@ -330,15 +330,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='INVOICE_FREE_TEXT';
-				if (! empty($conf->global->$paramfreetext))
+				$newfreetext = '';
+				$paramfreetext = 'INVOICE_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
@@ -348,7 +348,7 @@ 
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->facture->dir_temp,
-						'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' => '}'
 						)
@@ -356,7 +356,7 @@ 
 				}
 				catch (Exception $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
 				}
@@ -378,29 +378,29 @@ 
 
 				// 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_propal=is_object($propal_object)?$this->get_substitutionarray_object($propal_object,$outputlangs,'propal'):array();
-				$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_propal = is_object($propal_object) ? $this->get_substitutionarray_object($propal_object, $outputlangs, 'propal') : array();
+				$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_propal,$array_other,$array_thirdparty_contact);
+				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_propal, $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
 
 				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/', $key)) // Image
 						{
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
@@ -423,7 +423,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;
@@ -433,22 +433,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);
 								}
@@ -458,36 +458,36 @@ 
 						$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');
 					}
-					catch(OdfException $e)
+					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
+				$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();
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
@@ -496,26 +496,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

@@ -98,7 +98,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// Par defaut, si n'etait pas defini
 	}
 
 
@@ -136,11 +139,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");
@@ -222,7 +228,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';
 
@@ -246,7 +254,9 @@ 
 
 			$dir = $conf->facture->dir_output;
 			$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))
@@ -273,10 +283,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;
 				}
@@ -303,9 +314,9 @@ 
 				$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 {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+											$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
@@ -353,8 +364,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -370,8 +380,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);
 				}
@@ -387,7 +396,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_propal,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -400,18 +411,19 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							//var_dump($value);exit;
 							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);
 					}
@@ -422,8 +434,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;
@@ -443,12 +454,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);
 								}
@@ -457,8 +466,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -471,8 +479,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -486,13 +493,12 @@ 
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -504,16 +510,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/facture/doc/pdf_crabe.modules.php

Indentation +1683 added lines, -1683 removed lines

@@ -43,17 +43,17 @@ 
  */
 class pdf_crabe extends ModelePDFFactures
 {
-     /**
-     * @var DoliDb Database handler
-     */
+        /**
+         * @var DoliDb Database handler
+         */
     public $db;
 
-	/**
+    /**
      * @var string model name
      */
     public $name;
 
-	/**
+    /**
      * @var string model description (short text)
      */
     public $description;
@@ -63,163 +63,163 @@ 
      */
     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;
-
-	/**
-	 * @var bool Situation invoice type
-	 */
-	public $situationinvoice;
-
-	/**
-	 * @var float X position for the situation progress column
-	 */
-	public $posxprogress;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
-
-		// Translations
-		$langs->loadLangs(array("main", "bills"));
-
-		$this->db = $db;
-		$this->name = "crabe";
-		$this->description = $langs->trans('PDFCrabeDescription');
-		$this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
-
-		// Dimensiont 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 = 1;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 1;             // 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->posxprogress=126; // Only displayed for situation invoices
-		$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->posxprogress-=20;
-		    $this->postotalht-=20;
-		}
-
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
-		$this->situationinvoice=false;
-	}
+    public $marge_basse;
+
+    /**
+     * Issuer
+     * @var Company object that emits
+     */
+    public $emetteur;
+
+    /**
+     * @var bool Situation invoice type
+     */
+    public $situationinvoice;
+
+    /**
+     * @var float X position for the situation progress column
+     */
+    public $posxprogress;
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
+
+        // Translations
+        $langs->loadLangs(array("main", "bills"));
+
+        $this->db = $db;
+        $this->name = "crabe";
+        $this->description = $langs->trans('PDFCrabeDescription');
+        $this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
+
+        // Dimensiont 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 = 1;                // Affiche si il y a eu escompte
+        $this->option_credit_note = 1;             // 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->posxprogress=126; // Only displayed for situation invoices
+        $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->posxprogress-=20;
+            $this->postotalht-=20;
+        }
+
+        $this->tva=array();
+        $this->localtax1=array();
+        $this->localtax2=array();
+        $this->atleastoneratenotnull=0;
+        $this->atleastonediscount=0;
+        $this->situationinvoice=false;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *  Function to build pdf onto disk
      *
      *  @param		Object		$object				Object to generate
@@ -229,104 +229,104 @@ 
      *  @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;
-
-		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", "bills", "products", "dict", "companies"));
-
-		$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_INVOICES_WITH_PICTURE))
-		{
-			for ($i = 0 ; $i < $nblignes ; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
-
-				$objphoto = new Product($this->db);
-				$objphoto->fetch($object->lines[$i]->fk_product);
-
-				$pdir = get_exdir($object->lines[$i]->fk_product,2,0,0,$objphoto,'product') . $object->lines[$i]->fk_product ."/photos/";
-				$dir = $conf->product->dir_output.'/'.$pdir;
-
-				$realpath='';
-				foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
-				{
-					$filename=$obj['photo'];
-					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
-					$realpath = $dir.$filename;
-					break;
-				}
-
-				if ($realpath) $realpatharray[$i]=$realpath;
-			}
-		}
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
-
-		if ($conf->facture->dir_output)
-		{
-			$object->fetch_thirdparty();
-
-			$deja_regle = $object->getSommePaiement(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_credit_notes_included = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_deposits_included = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-
-			// Definition of $dir and $file
-			if ($object->specimen)
-			{
-				$dir = $conf->facture->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
-			{
-				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->facture->dir_output . "/" . $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
-
-				// Set nblignes with the new facture lines content after hook
-				$nblignes = count($object->lines);
-				$nbpayments = count($object->getListOfPayments());
-
-				// Create pdf instance
-				$pdf=pdf_getInstance($this->format);
+        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';
+
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
+
+        $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_INVOICES_WITH_PICTURE))
+        {
+            for ($i = 0 ; $i < $nblignes ; $i++)
+            {
+                if (empty($object->lines[$i]->fk_product)) continue;
+
+                $objphoto = new Product($this->db);
+                $objphoto->fetch($object->lines[$i]->fk_product);
+
+                $pdir = get_exdir($object->lines[$i]->fk_product,2,0,0,$objphoto,'product') . $object->lines[$i]->fk_product ."/photos/";
+                $dir = $conf->product->dir_output.'/'.$pdir;
+
+                $realpath='';
+                foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+                {
+                    $filename=$obj['photo'];
+                    //if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
+                    $realpath = $dir.$filename;
+                    break;
+                }
+
+                if ($realpath) $realpatharray[$i]=$realpath;
+            }
+        }
+        if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+
+        if ($conf->facture->dir_output)
+        {
+            $object->fetch_thirdparty();
+
+            $deja_regle = $object->getSommePaiement(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+            $amount_credit_notes_included = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+            $amount_deposits_included = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+
+            // Definition of $dir and $file
+            if ($object->specimen)
+            {
+                $dir = $conf->facture->dir_output;
+                $file = $dir . "/SPECIMEN.pdf";
+            }
+            else
+            {
+                $objectref = dol_sanitizeFileName($object->ref);
+                $dir = $conf->facture->dir_output . "/" . $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
+
+                // Set nblignes with the new facture lines content after hook
+                $nblignes = count($object->lines);
+                $nbpayments = count($object->getListOfPayments());
+
+                // Create pdf instance
+                $pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
                 $pdf->SetAutoPageBreak(1,0);
 
                 $heightforinfotot = 50+(4*$nbpayments);	// Height reserved to output the info and total part and payment part
-		        $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;
+                $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 (class_exists('TCPDF'))
                 {
@@ -338,1514 +338,1514 @@ 
                 // Set path to the background PDF File
                 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);
+                    $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);
-
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("PdfInvoiceTitle"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$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
-
-				// 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))    // retreive space not used by discount
-				{
-					$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;
-				}
-
-				$progress_width = 0;
-				// Situation invoice handling
-				if ($object->situation_cycle_ref)
-				{
-					$this->situationinvoice = true;
-					$progress_width = 18;
-					$this->posxtva -= $progress_width;
-					$this->posxup -= $progress_width;
-					$this->posxqty -= $progress_width;
-					if(empty($conf->global->PRODUCT_USE_UNITS)) {
-						$this->posxprogress += $progress_width;
-					}
-					/*$this->posxdiscount -= $progress_width;
+                $pdf->Open();
+                $pagenb=0;
+                $pdf->SetDrawColor(128,128,128);
+
+                $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+                $pdf->SetSubject($outputlangs->transnoentities("PdfInvoiceTitle"));
+                $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+                $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+                $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$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
+
+                // 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))    // retreive space not used by discount
+                {
+                    $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;
+                }
+
+                $progress_width = 0;
+                // Situation invoice handling
+                if ($object->situation_cycle_ref)
+                {
+                    $this->situationinvoice = true;
+                    $progress_width = 18;
+                    $this->posxtva -= $progress_width;
+                    $this->posxup -= $progress_width;
+                    $this->posxqty -= $progress_width;
+                    if(empty($conf->global->PRODUCT_USE_UNITS)) {
+                        $this->posxprogress += $progress_width;
+                    }
+                    /*$this->posxdiscount -= $progress_width;
 					$this->posxprogress -= $progress_width;*/
-				}
-
-				// New page
-				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				$pagenb++;
-
-				$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);
-
-				// 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 ($notetoshow)
-				{
-					$tab_top -= 2;
-
-					$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;
-
-					// 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;
-				}
-
-				$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+$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+$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-$progress_width,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-$progress_width,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+$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 ($this->situationinvoice)
-					{
-						$pdf->MultiCell($this->posxprogress-$this->posxqty-0.8, 4, $qty, 0, 'R');
-					}
-					else 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');
-					}
-
-					// Situation progress
-					if ($this->situationinvoice)
-					{
-						$progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
-						$pdf->SetXY($this->posxprogress, $curY);
-						if($conf->global->PRODUCT_USE_UNITS)
-						{
-							$pdf->MultiCell($this->posxunit-$this->posxprogress-1, 3, $progress, 0, 'R');
-						}
-						else if ($this->atleastonediscount)
-						{
-							$pdf->MultiCell($this->posxdiscount-$this->posxprogress-1, 3, $progress, 0, 'R');
-						}
-						else
-						{
-							$pdf->MultiCell($this->postotalht-$this->posxprogress-1, 3, $progress, 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
-					if ($object->lines[$i]->remise_percent)
-					{
+                }
+
+                // New page
+                $pdf->AddPage();
+                if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                $pagenb++;
+
+                $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);
+
+                // 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 ($notetoshow)
+                {
+                    $tab_top -= 2;
+
+                    $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;
+
+                    // 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;
+                }
+
+                $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+$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+$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-$progress_width,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-$progress_width,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+$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 ($this->situationinvoice)
+                    {
+                        $pdf->MultiCell($this->posxprogress-$this->posxqty-0.8, 4, $qty, 0, 'R');
+                    }
+                    else 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');
+                    }
+
+                    // Situation progress
+                    if ($this->situationinvoice)
+                    {
+                        $progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
+                        $pdf->SetXY($this->posxprogress, $curY);
+                        if($conf->global->PRODUCT_USE_UNITS)
+                        {
+                            $pdf->MultiCell($this->posxunit-$this->posxprogress-1, 3, $progress, 0, 'R');
+                        }
+                        else if ($this->atleastonediscount)
+                        {
+                            $pdf->MultiCell($this->posxdiscount-$this->posxprogress-1, 3, $progress, 0, 'R');
+                        }
+                        else
+                        {
+                            $pdf->MultiCell($this->postotalht-$this->posxprogress-1, 3, $progress, 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
+                    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);
-
-
-					$sign=1;
-					if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
-					{
-						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-					} else {
-						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
-						else $tvaligne= $sign * $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 - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-
-				// Affiche zone infos
-				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
-
-				// Affiche zone totaux
-				$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
-
-				// Affiche zone versements
-				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-				{
-					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
-				}
-
-				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
-
-				$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;   // No error
-			}
-			else
-			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$langs->transnoentities("ErrorConstantNotDefined","FAC_OUTPUTDIR");
-			return 0;
-		}
-	}
+                        $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);
+
+
+                    $sign=1;
+                    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+                    // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+                    $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+                    if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
+                    {
+                        if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+                        else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+                    } else {
+                        if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
+                        else $tvaligne= $sign * $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 - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+                else
+                {
+                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+
+                // Affiche zone infos
+                $posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+
+                // Affiche zone totaux
+                $posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+                // Affiche zone versements
+                if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
+                {
+                    $posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
+                }
+
+                // Pied de page
+                $this->_pagefoot($pdf,$object,$outputlangs);
+                if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+                $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;   // No error
+            }
+            else
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$langs->transnoentities("ErrorConstantNotDefined","FAC_OUTPUTDIR");
+            return 0;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Show payments table
-	 *
+    /**
+     *  Show payments table
+     *
      *  @param	PDF			$pdf           Object PDF
      *  @param  Object		$object         Object invoice
      *  @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
-		global $conf;
+        global $conf;
 
         $sign=1;
         if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
         $tab3_posx = 120;
-		$tab3_top = $posy + 8;
-		$tab3_width = 80;
-		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$tab3_posx -= 20;
-		}
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
-
-		$pdf->SetFont('','', $default_font_size - 3);
-		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
-
-		$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
-
-		$pdf->SetFont('','', $default_font_size - 4);
-		$pdf->SetXY($tab3_posx, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+21, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+40, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+58, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
-
-		$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
-
-		$y=0;
-
-		$pdf->SetFont('','', $default_font_size - 4);
-
-
-		// Loop on each discount available (deposits and credit notes and excess of payment included)
-		$sql = "SELECT re.rowid, re.amount_ht, re.multicurrency_amount_ht, re.amount_tva, re.multicurrency_amount_tva,  re.amount_ttc, re.multicurrency_amount_ttc,";
-		$sql.= " re.description, re.fk_facture_source,";
-		$sql.= " f.type, f.datef";
-		$sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re, ".MAIN_DB_PREFIX ."facture as f";
-		$sql.= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			$invoice=new Facture($this->db);
-			while ($i < $num)
-			{
-				$y+=3;
-				$obj = $this->db->fetch_object($resql);
-
-				if ($obj->type == 2) $text=$outputlangs->transnoentities("CreditNote");
-				elseif ($obj->type == 3) $text=$outputlangs->transnoentities("Deposit");
-				elseif ($obj->type == 0) $text=$outputlangs->transnoentities("ExcessReceived");
-				else $text=$outputlangs->transnoentities("UnknownType");
-
-				$invoice->fetch($obj->fk_facture_source);
-
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, price(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
-
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
-
-				$i++;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-
-		// Loop on each payment
-		// TODO Call getListOfPaymentsgetListOfPayments instead of hard coded sql
-		$sql = "SELECT p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
-		$sql.= " cp.code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
-		$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
-		//$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = 1";
-		$sql.= " ORDER BY p.datep";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num) {
-				$y+=3;
-				$row = $this->db->fetch_object($resql);
-
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, price($sign * (($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
-				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
-
-				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
-				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
-
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
-
-				$i++;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
+        $tab3_top = $posy + 8;
+        $tab3_width = 80;
+        $tab3_height = 4;
+        if ($this->page_largeur < 210) // To work with US executive format
+        {
+            $tab3_posx -= 20;
+        }
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        $title=$outputlangs->transnoentities("PaymentsAlreadyDone");
+        if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+
+        $pdf->SetFont('','', $default_font_size - 3);
+        $pdf->SetXY($tab3_posx, $tab3_top - 4);
+        $pdf->MultiCell(60, 3, $title, 0, 'L', 0);
+
+        $pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
+
+        $pdf->SetFont('','', $default_font_size - 4);
+        $pdf->SetXY($tab3_posx, $tab3_top);
+        $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
+        $pdf->SetXY($tab3_posx+21, $tab3_top);
+        $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
+        $pdf->SetXY($tab3_posx+40, $tab3_top);
+        $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+        $pdf->SetXY($tab3_posx+58, $tab3_top);
+        $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
+
+        $pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
+
+        $y=0;
+
+        $pdf->SetFont('','', $default_font_size - 4);
+
+
+        // Loop on each discount available (deposits and credit notes and excess of payment included)
+        $sql = "SELECT re.rowid, re.amount_ht, re.multicurrency_amount_ht, re.amount_tva, re.multicurrency_amount_tva,  re.amount_ttc, re.multicurrency_amount_ttc,";
+        $sql.= " re.description, re.fk_facture_source,";
+        $sql.= " f.type, f.datef";
+        $sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re, ".MAIN_DB_PREFIX ."facture as f";
+        $sql.= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i=0;
+            $invoice=new Facture($this->db);
+            while ($i < $num)
+            {
+                $y+=3;
+                $obj = $this->db->fetch_object($resql);
+
+                if ($obj->type == 2) $text=$outputlangs->transnoentities("CreditNote");
+                elseif ($obj->type == 3) $text=$outputlangs->transnoentities("Deposit");
+                elseif ($obj->type == 0) $text=$outputlangs->transnoentities("ExcessReceived");
+                else $text=$outputlangs->transnoentities("UnknownType");
+
+                $invoice->fetch($obj->fk_facture_source);
+
+                $pdf->SetXY($tab3_posx, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, price(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+40, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, $text, 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
+
+                $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+
+                $i++;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+
+        // Loop on each payment
+        // TODO Call getListOfPaymentsgetListOfPayments instead of hard coded sql
+        $sql = "SELECT p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
+        $sql.= " cp.code";
+        $sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
+        $sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
+        //$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = 1";
+        $sql.= " ORDER BY p.datep";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num) {
+                $y+=3;
+                $row = $this->db->fetch_object($resql);
+
+                $pdf->SetXY($tab3_posx, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+                $pdf->MultiCell(20, 3, price($sign * (($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+40, $tab3_top+$y);
+                $oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
+
+                $pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+                $pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
+
+                $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+
+                $i++;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Show miscellaneous information (payment mode, payment term, ...)
-	 *
-	 *   @param		PDF			$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		PDF			$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);
-
-		$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 payments conditions
-		if ($object->type != 2 && ($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 ($object->type != 2)
-		{
-			// Check a payment mode is defined
-			if (empty($object->mode_reglement_code)
-			&& empty($conf->global->FACTURE_CHQ_NUMBER)
-			&& empty($conf->global->FACTURE_RIB_NUMBER))
-			{
-				$this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
-			}
-			// Avoid having any valid PDF with setup that is not complete
-			elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))
-				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank)))
-			{
-				$outputlangs->load("errors");
-
-				$pdf->SetXY($this->marge_gauche, $posy);
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup",$object->mode_reglement_code);
-				$pdf->MultiCell(80, 3, $this->error,0,'L',0);
-				$pdf->SetTextColor(0,0,0);
-
-				$posy=$pdf->GetY()+1;
-			}
-
-			// 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);
-
-					$curx=$this->marge_gauche;
-					$cury=$posy;
-
-					$posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
-
-					$posy+=2;
-				}
-			}
-		}
-
-		return $posy;
-	}
+        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 payments conditions
+        if ($object->type != 2 && ($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 ($object->type != 2)
+        {
+            // Check a payment mode is defined
+            if (empty($object->mode_reglement_code)
+            && empty($conf->global->FACTURE_CHQ_NUMBER)
+            && empty($conf->global->FACTURE_RIB_NUMBER))
+            {
+                $this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
+            }
+            // Avoid having any valid PDF with setup that is not complete
+            elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))
+                || ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank)))
+            {
+                $outputlangs->load("errors");
+
+                $pdf->SetXY($this->marge_gauche, $posy);
+                $pdf->SetTextColor(200,0,0);
+                $pdf->SetFont('','B', $default_font_size - 2);
+                $this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup",$object->mode_reglement_code);
+                $pdf->MultiCell(80, 3, $this->error,0,'L',0);
+                $pdf->SetTextColor(0,0,0);
+
+                $posy=$pdf->GetY()+1;
+            }
+
+            // 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);
+
+                    $curx=$this->marge_gauche;
+                    $cury=$posy;
+
+                    $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+
+                    $posy+=2;
+                }
+            }
+        }
+
+        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;
+        global $conf,$mysoc;
 
         $sign=1;
         if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
         $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($sign * ($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
-			{
-			    // FIXME amount of vat not supported with multicurrency
-
-				//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);
-							}
-						}
-					}
+        $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($sign * ($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
+            {
+                // FIXME amount of vat not supported with multicurrency
+
+                //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
-				// Situations totals migth be wrong on huge amounts
-				if ($object->situation_cycle_ref && $object->situation_counter > 1) {
-
-					$sum_pdf_tva = 0;
-					foreach($this->tva as $tvakey => $tvaval){
-						$sum_pdf_tva+=$tvaval; // sum VAT amounts to compare to object
-					}
-
-					if($sum_pdf_tva!=$object->total_tva) { // apply coef to recover the VAT object amount (the good one)
-						$coef_fix_tva = $object->total_tva / $sum_pdf_tva;
-
-						foreach($this->tva as $tvakey => $tvaval) {
-							$this->tva[$tvakey]=$tvaval * $coef_fix_tva;
-						}
-					}
-				}
-
-				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);
-							}
-						}
-					//}
-				}
-
-				// Revenue stamp
-				if (price2num($object->revenuestamp) != 0)
-				{
-					$index++;
-					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
-
-					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, '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($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
-			}
-		}
-
-		$pdf->SetTextColor(0,0,0);
-		$creditnoteamount=$object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);	// Warning, this also include excess received
-		$depositsamount=$object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-		//print "x".$creditnoteamount."-".$depositsamount;exit;
-		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if ($object->paye) $resteapayer=0;
-
-		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-		{
-			// Already paid + Deposits
-			$index++;
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
-
-			// Credit note
-			if ($creditnoteamount)
-			{
-				$labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $labeltouse, 0, 'L', 0);
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
-			}
-
-			// Escompte
-			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
-			{
-				$index++;
-				$pdf->SetFillColor(255,255,255);
-
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
-
-				$resteapayer=0;
-			}
-
-			$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_INVOICES_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))
-			{
-				$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($this->situationinvoice)
-			{
-				$pdf->MultiCell($this->posxprogress-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-			}
-			else 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 ($this->situationinvoice) {
-			$pdf->line($this->posxprogress - 1, $tab_top, $this->posxprogress - 1, $tab_top + $tab_height);
-
-			if (empty($hidetop)) {
-
-				$pdf->SetXY($this->posxprogress, $tab_top+1);
-
-				if($conf->global->PRODUCT_USE_UNITS)
-				{
-					$pdf->MultiCell($this->posxunit-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
-				}
-				else if ($this->atleastonediscount)
-				{
-					$pdf->MultiCell($this->posxdiscount-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
-				}
-				else
-				{
-					$pdf->MultiCell($this->postotalht-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','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->situationinvoice)
-		{
-			$pdf->line($this->postotalht+4, $tab_top, $this->postotalht+4, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-				$pdf->SetXY($this->postotalht-19, $tab_top+1);
-				$pdf->MultiCell(30,2, $outputlangs->transnoentities("Situation"),'','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", "bills", "propal", "companies"));
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
-
-		// Show Draft Watermark
-		if($object->statut==Facture::STATUS_DRAFT && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
+                // VAT
+                // Situations totals migth be wrong on huge amounts
+                if ($object->situation_cycle_ref && $object->situation_counter > 1) {
+
+                    $sum_pdf_tva = 0;
+                    foreach($this->tva as $tvakey => $tvaval){
+                        $sum_pdf_tva+=$tvaval; // sum VAT amounts to compare to object
+                    }
+
+                    if($sum_pdf_tva!=$object->total_tva) { // apply coef to recover the VAT object amount (the good one)
+                        $coef_fix_tva = $object->total_tva / $sum_pdf_tva;
+
+                        foreach($this->tva as $tvakey => $tvaval) {
+                            $this->tva[$tvakey]=$tvaval * $coef_fix_tva;
+                        }
+                    }
+                }
+
+                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);
+                            }
+                        }
+                    //}
+                }
+
+                // Revenue stamp
+                if (price2num($object->revenuestamp) != 0)
+                {
+                    $index++;
+                    $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+                    $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
+
+                    $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                    $pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, '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($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+            }
+        }
+
+        $pdf->SetTextColor(0,0,0);
+        $creditnoteamount=$object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);	// Warning, this also include excess received
+        $depositsamount=$object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+        //print "x".$creditnoteamount."-".$depositsamount;exit;
+        $resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
+        if ($object->paye) $resteapayer=0;
+
+        if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
+        {
+            // Already paid + Deposits
+            $index++;
+            $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
+            $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+            $pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
+
+            // Credit note
+            if ($creditnoteamount)
+            {
+                $labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
+                $index++;
+                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $labeltouse, 0, 'L', 0);
+                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
+            }
+
+            // Escompte
+            if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
+            {
+                $index++;
+                $pdf->SetFillColor(255,255,255);
+
+                $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
+                $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+                $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
+
+                $resteapayer=0;
+            }
+
+            $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_INVOICES_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_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
+            $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+            if (empty($hidetop))
+            {
+                $pdf->SetXY($this->posxtva-3, $tab_top+1);
+                $pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
+            }
         }
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+        $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($this->situationinvoice)
+            {
+                $pdf->MultiCell($this->posxprogress-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+            }
+            else 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');
+            }
+        }
 
-		$w = 110;
+        if ($this->situationinvoice) {
+            $pdf->line($this->posxprogress - 1, $tab_top, $this->posxprogress - 1, $tab_top + $tab_height);
 
-		$posy=$this->marge_haute;
+            if (empty($hidetop)) {
+
+                $pdf->SetXY($this->posxprogress, $tab_top+1);
+
+                if($conf->global->PRODUCT_USE_UNITS)
+                {
+                    $pdf->MultiCell($this->posxunit-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
+                }
+                else if ($this->atleastonediscount)
+                {
+                    $pdf->MultiCell($this->posxdiscount-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
+                }
+                else
+                {
+                    $pdf->MultiCell($this->postotalht-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','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->situationinvoice)
+        {
+            $pdf->line($this->postotalht+4, $tab_top, $this->postotalht+4, $tab_top + $tab_height);
+            if (empty($hidetop))
+            {
+                $pdf->SetXY($this->postotalht-19, $tab_top+1);
+                $pdf->MultiCell(30,2, $outputlangs->transnoentities("Situation"),'','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", "bills", "propal", "companies"));
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+        // Show Draft Watermark
+        if($object->statut==Facture::STATUS_DRAFT && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
+        {
+                pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
+        }
+
+        $pdf->SetTextColor(0,0,60);
+        $pdf->SetFont('','B', $default_font_size + 3);
+
+        $w = 110;
+
+        $posy=$this->marge_haute;
         $posx=$this->page_largeur-$this->marge_droite-$w;
 
-		$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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
-				}
-			}
-			else
-			{
-				$text=$this->emetteur->name;
-				$pdf->MultiCell($w, 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("PdfInvoiceTitle");
-		if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
-		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
-		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
-		$pdf->MultiCell($w, 3, $title, '', 'R');
-
-		$pdf->SetFont('','B',$default_font_size);
-
-		$posy+=5;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$textref=$outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == Facture::STATUS_DRAFT)
-		{
-			$pdf->SetTextColor(128,0,0);
-			$textref.=' - '.$outputlangs->transnoentities("NotValidated");
-		}
-		$pdf->MultiCell($w, 4, $textref, '', '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($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
-		}
-
-		$objectidnext=$object->getIdReplacingInvoice('validated');
-		if ($object->type == 0 && $objectidnext)
-		{
-			$objectreplacing=new Facture($this->db);
-			$objectreplacing->fetch($objectidnext);
-
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
-		}
-		if ($object->type == 1)
-		{
-			$objectreplaced=new Facture($this->db);
-			$objectreplaced->fetch($object->fk_facture_source);
-
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
-		}
-		if ($object->type == 2 && !empty($object->fk_facture_source))
-		{
-			$objectreplaced=new Facture($this->db);
-			$objectreplaced->fetch($object->fk_facture_source);
-
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
-		}
-
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
-
-		if (! empty($conf->global->INVOICE_POINTOFTAX_DATE))
-		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : " . dol_print_date($object->date_pointoftax,"day",false,$outputlangs), '', 'R');
-		}
-
-		if ($object->type != 2)
-		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
-		}
-
-		if ($object->thirdparty->code_client)
-		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 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]);
+        $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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+                    $pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+                }
+            }
+            else
+            {
+                $text=$this->emetteur->name;
+                $pdf->MultiCell($w, 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("PdfInvoiceTitle");
+        if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
+        if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
+        if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
+        if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
+        if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
+        $pdf->MultiCell($w, 3, $title, '', 'R');
+
+        $pdf->SetFont('','B',$default_font_size);
+
+        $posy+=5;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $textref=$outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref);
+        if ($object->statut == Facture::STATUS_DRAFT)
+        {
+            $pdf->SetTextColor(128,0,0);
+            $textref.=' - '.$outputlangs->transnoentities("NotValidated");
+        }
+        $pdf->MultiCell($w, 4, $textref, '', '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($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+        }
+
+        $objectidnext=$object->getIdReplacingInvoice('validated');
+        if ($object->type == 0 && $objectidnext)
+        {
+            $objectreplacing=new Facture($this->db);
+            $objectreplacing->fetch($objectidnext);
+
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
+        }
+        if ($object->type == 1)
+        {
+            $objectreplaced=new Facture($this->db);
+            $objectreplaced->fetch($object->fk_facture_source);
+
+            $posy+=4;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
+        }
+        if ($object->type == 2 && !empty($object->fk_facture_source))
+        {
+            $objectreplaced=new Facture($this->db);
+            $objectreplaced->fetch($object->fk_facture_source);
+
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
+        }
+
+        $posy+=4;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
+
+        if (! empty($conf->global->INVOICE_POINTOFTAX_DATE))
+        {
+            $posy+=4;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : " . dol_print_date($object->date_pointoftax,"day",false,$outputlangs), '', 'R');
+        }
+
+        if ($object->type != 2)
+        {
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
+        }
+
+        if ($object->thirdparty->code_client)
+        {
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($w, 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($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
-		}
-
-		$posy+=1;
-
-		$top_shift = 0;
-		// Show list of linked objects
-		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
-			$top_shift = $pdf->getY() - $current_y;
-		}
-
-		if ($showaddress)
-		{
-			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
-
-			// Show sender
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posy+=$top_shift;
-			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-
-			$hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
-			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
-
-
-			// 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($widthrecbox, $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($widthrecbox-2, 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($widthrecbox-2, 4, $carac_emetteur, 0, 'L');
-
-
-
-			// If BILLING contact defined on invoice, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','BILLING');
-			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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posy+=$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, 2, $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
+                $pdf->SetTextColor(0,0,60);
+                $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+            }
+        }
+
+        $posy+=1;
+
+        $top_shift = 0;
+        // Show list of linked objects
+        $current_y = $pdf->getY();
+        $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
+        if ($current_y < $pdf->getY())
+        {
+            $top_shift = $pdf->getY() - $current_y;
+        }
+
+        if ($showaddress)
+        {
+            // Sender properties
+            $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+
+            // Show sender
+            $posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+            $posy+=$top_shift;
+            $posx=$this->marge_gauche;
+            if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+
+            $hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+            $widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+
+
+            // 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($widthrecbox, $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($widthrecbox-2, 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($widthrecbox-2, 4, $carac_emetteur, 0, 'L');
+
+
+
+            // If BILLING contact defined on invoice, we use it
+            $usecontact=false;
+            $arrayidcontact=$object->getIdContact('external','BILLING');
+            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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+            if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+            $posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+            $posy+=$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, 2, $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,'INVOICE_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,'INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+    }
 }

Spacing +540 added lines, -540 removed lines

@@ -147,74 +147,74 @@ 
 		$this->db = $db;
 		$this->name = "crabe";
 		$this->description = $langs->trans('PDFCrabeDescription');
-		$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
 
 		// Dimensiont 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 = 1;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 1;             // 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 = 1; // Affiche si il y a eu escompte
+		$this->option_credit_note = 1; // 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->posxprogress=126; // Only displayed for situation invoices
-		$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->posxprogress = 126; // Only displayed for situation invoices
+		$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->posxprogress-=20;
-		    $this->postotalht-=20;
+		    $this->posxpicture -= 20;
+		    $this->posxtva -= 20;
+		    $this->posxup -= 20;
+		    $this->posxqty -= 20;
+		    $this->posxunit -= 20;
+		    $this->posxdiscount -= 20;
+		    $this->posxprogress -= 20;
+		    $this->postotalht -= 20;
 		}
 
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
-		$this->situationinvoice=false;
+		$this->tva = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
+		$this->situationinvoice = false;
 	}
 
 
@@ -230,14 +230,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", "bills", "products", "dict", "companies"));
@@ -245,32 +245,32 @@ 
 		$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_INVOICES_WITH_PICTURE))
+		$realpatharray = array();
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
 		{
-			for ($i = 0 ; $i < $nblignes ; $i++)
+			for ($i = 0; $i < $nblignes; $i++)
 			{
 				if (empty($object->lines[$i]->fk_product)) continue;
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				$pdir = get_exdir($object->lines[$i]->fk_product,2,0,0,$objphoto,'product') . $object->lines[$i]->fk_product ."/photos/";
+				$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 				$dir = $conf->product->dir_output.'/'.$pdir;
 
-				$realpath='';
-				foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+				$realpath = '';
+				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
 				{
-					$filename=$obj['photo'];
+					$filename = $obj['photo'];
 					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
 					$realpath = $dir.$filename;
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i]=$realpath;
+				if ($realpath) $realpatharray[$i] = $realpath;
 			}
 		}
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
 
 		if ($conf->facture->dir_output)
 		{
@@ -284,19 +284,19 @@ 
 			if ($object->specimen)
 			{
 				$dir = $conf->facture->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
+				$file = $dir."/SPECIMEN.pdf";
 			}
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->facture->dir_output . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
+				$dir = $conf->facture->dir_output."/".$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;
 				}
 			}
@@ -304,29 +304,29 @@ 
 			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
 
 				// Set nblignes with the new facture lines content after hook
 				$nblignes = count($object->lines);
 				$nbpayments = count($object->getListOfPayments());
 
 				// 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);
 
-                $heightforinfotot = 50+(4*$nbpayments);	// Height reserved to output the info and total part and payment part
-		        $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 = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
+		        $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 (class_exists('TCPDF'))
                 {
@@ -336,27 +336,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("PdfInvoiceTitle"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$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)
 					{
@@ -365,11 +365,11 @@ 
 				}
 				if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS))    // retreive space not used by discount
 				{
-					$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;
 				}
 
@@ -382,7 +382,7 @@ 
 					$this->posxtva -= $progress_width;
 					$this->posxup -= $progress_width;
 					$this->posxqty -= $progress_width;
-					if(empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (empty($conf->global->PRODUCT_USE_UNITS)) {
 						$this->posxprogress += $progress_width;
 					}
 					/*$this->posxdiscount -= $progress_width;
@@ -391,16 +391,16 @@ 
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 
 				$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)
@@ -410,50 +410,50 @@ 
 					{
 						$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 ($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;
@@ -464,104 +464,104 @@ 
 				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+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $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+$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 + $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-$progress_width,3,$curX,$curY,$hideref,$hidedesc);
-					$pageposafter=$pdf->getPage();
+					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX - $progress_width, 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-$progress_width,3,$curX,$curY,$hideref,$hidedesc);
-						$pageposafter=$pdf->getPage();
-						$posyafter=$pdf->GetY();
+						$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 - $progress_width, 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+$heightforinfotot)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $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);
@@ -570,15 +570,15 @@ 
 
 					if ($this->situationinvoice)
 					{
-						$pdf->MultiCell($this->posxprogress-$this->posxqty-0.8, 4, $qty, 0, 'R');
+						$pdf->MultiCell($this->posxprogress - $this->posxqty - 0.8, 4, $qty, 0, 'R');
 					}
-					else if($conf->global->PRODUCT_USE_UNITS)
+					else 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');
 					}
 
 					// Situation progress
@@ -586,44 +586,44 @@ 
 					{
 						$progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxprogress, $curY);
-						if($conf->global->PRODUCT_USE_UNITS)
+						if ($conf->global->PRODUCT_USE_UNITS)
 						{
-							$pdf->MultiCell($this->posxunit-$this->posxprogress-1, 3, $progress, 0, 'R');
+							$pdf->MultiCell($this->posxunit - $this->posxprogress - 1, 3, $progress, 0, 'R');
 						}
 						else if ($this->atleastonediscount)
 						{
-							$pdf->MultiCell($this->posxdiscount-$this->posxprogress-1, 3, $progress, 0, 'R');
+							$pdf->MultiCell($this->posxdiscount - $this->posxprogress - 1, 3, $progress, 0, 'R');
 						}
 						else
 						{
-							$pdf->MultiCell($this->postotalht-$this->posxprogress-1, 3, $progress, 0, 'R');
+							$pdf->MultiCell($this->postotalht - $this->posxprogress - 1, 3, $progress, 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
 					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);
 
 
-					$sign=1;
-					if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+					$sign = 1;
+					if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
@@ -631,55 +631,55 @@ 
 						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 					} else {
-						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
-						else $tvaligne= $sign * $object->lines[$i]->total_tva;
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						else $tvaligne = $sign * $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)
@@ -693,13 +693,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)
 						{
@@ -709,10 +709,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);
 					}
@@ -722,56 +722,56 @@ 
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $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, $deja_regle, $bottomlasttab, $outputlangs);
+				$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
 				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
 				{
-					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
+					$posy = $this->_tableau_versements($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();
 
 				$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;   // No error
+				return 1; // No error
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->transnoentities("ErrorConstantNotDefined","FAC_OUTPUTDIR");
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -792,8 +792,8 @@ 
         // phpcs:enable
 		global $conf;
 
-        $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+        $sign = 1;
+        if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
         $tab3_posx = 120;
 		$tab3_top = $posy + 8;
@@ -806,114 +806,114 @@ 
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		$title = $outputlangs->transnoentities("PaymentsAlreadyDone");
+		if ($object->type == 2) $title = $outputlangs->transnoentities("PaymentsBackAlreadyDone");
 
-		$pdf->SetFont('','', $default_font_size - 3);
+		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
 		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
 
-		$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
+		$pdf->line($tab3_posx, $tab3_top, $tab3_posx + $tab3_width, $tab3_top);
 
-		$pdf->SetFont('','', $default_font_size - 4);
+		$pdf->SetFont('', '', $default_font_size - 4);
 		$pdf->SetXY($tab3_posx, $tab3_top);
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+21, $tab3_top);
+		$pdf->SetXY($tab3_posx + 21, $tab3_top);
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+40, $tab3_top);
+		$pdf->SetXY($tab3_posx + 40, $tab3_top);
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+58, $tab3_top);
+		$pdf->SetXY($tab3_posx + 58, $tab3_top);
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
 
-		$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
+		$pdf->line($tab3_posx, $tab3_top - 1 + $tab3_height, $tab3_posx + $tab3_width, $tab3_top - 1 + $tab3_height);
 
-		$y=0;
+		$y = 0;
 
-		$pdf->SetFont('','', $default_font_size - 4);
+		$pdf->SetFont('', '', $default_font_size - 4);
 
 
 		// Loop on each discount available (deposits and credit notes and excess of payment included)
 		$sql = "SELECT re.rowid, re.amount_ht, re.multicurrency_amount_ht, re.amount_tva, re.multicurrency_amount_tva,  re.amount_ttc, re.multicurrency_amount_ttc,";
-		$sql.= " re.description, re.fk_facture_source,";
-		$sql.= " f.type, f.datef";
-		$sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re, ".MAIN_DB_PREFIX ."facture as f";
-		$sql.= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
-		$resql=$this->db->query($sql);
+		$sql .= " re.description, re.fk_facture_source,";
+		$sql .= " f.type, f.datef";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i=0;
-			$invoice=new Facture($this->db);
+			$i = 0;
+			$invoice = new Facture($this->db);
 			while ($i < $num)
 			{
-				$y+=3;
+				$y += 3;
 				$obj = $this->db->fetch_object($resql);
 
-				if ($obj->type == 2) $text=$outputlangs->transnoentities("CreditNote");
-				elseif ($obj->type == 3) $text=$outputlangs->transnoentities("Deposit");
-				elseif ($obj->type == 0) $text=$outputlangs->transnoentities("ExcessReceived");
-				else $text=$outputlangs->transnoentities("UnknownType");
+				if ($obj->type == 2) $text = $outputlangs->transnoentities("CreditNote");
+				elseif ($obj->type == 3) $text = $outputlangs->transnoentities("Deposit");
+				elseif ($obj->type == 0) $text = $outputlangs->transnoentities("ExcessReceived");
+				else $text = $outputlangs->transnoentities("UnknownType");
 
 				$invoice->fetch($obj->fk_facture_source);
 
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx, $tab3_top + $y);
+				$pdf->MultiCell(20, 3, dol_print_date($obj->datef, 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, price(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
 
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 
 				$i++;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 
 		// Loop on each payment
 		// TODO Call getListOfPaymentsgetListOfPayments instead of hard coded sql
 		$sql = "SELECT p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
-		$sql.= " cp.code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
-		$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
+		$sql .= " cp.code";
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
+		$sql .= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
 		//$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = 1";
-		$sql.= " ORDER BY p.datep";
+		$sql .= " ORDER BY p.datep";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i=0;
+			$i = 0;
 			while ($i < $num) {
-				$y+=3;
+				$y += 3;
 				$row = $this->db->fetch_object($resql);
 
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx, $tab3_top + $y);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, price($sign * (($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
-				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
+				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
+				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
 				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
 				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
 
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 
 				$i++;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -936,35 +936,35 @@ 
 
 		$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 payments conditions
 		if ($object->type != 2 && ($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 ($object->type != 2)
@@ -983,13 +983,13 @@ 
 				$outputlangs->load("errors");
 
 				$pdf->SetXY($this->marge_gauche, $posy);
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup",$object->mode_reglement_code);
-				$pdf->MultiCell(80, 3, $this->error,0,'L',0);
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup", $object->mode_reglement_code);
+				$pdf->MultiCell(80, 3, $this->error, 0, 'L', 0);
+				$pdf->SetTextColor(0, 0, 0);
 
-				$posy=$pdf->GetY()+1;
+				$posy = $pdf->GetY() + 1;
 			}
 
 			// Show payment mode
@@ -997,26 +997,26 @@ 
 			&& $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)
 					{
@@ -1024,31 +1024,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;
 			            }
 					}
 				}
@@ -1057,19 +1057,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;
 				}
 			}
 		}
@@ -1092,47 +1092,47 @@ 
 	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
-        $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+        $sign = 1;
+        if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
         $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($sign * ($total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($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
 			}
@@ -1143,29 +1143,29 @@ 
 				//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);
@@ -1176,13 +1176,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++;
 
@@ -1191,15 +1191,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 = $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);
@@ -1214,20 +1214,20 @@ 
 				if ($object->situation_cycle_ref && $object->situation_counter > 1) {
 
 					$sum_pdf_tva = 0;
-					foreach($this->tva as $tvakey => $tvaval){
-						$sum_pdf_tva+=$tvaval; // sum VAT amounts to compare to object
+					foreach ($this->tva as $tvakey => $tvaval) {
+						$sum_pdf_tva += $tvaval; // sum VAT amounts to compare to object
 					}
 
-					if($sum_pdf_tva!=$object->total_tva) { // apply coef to recover the VAT object amount (the good one)
+					if ($sum_pdf_tva != $object->total_tva) { // apply coef to recover the VAT object amount (the good one)
 						$coef_fix_tva = $object->total_tva / $sum_pdf_tva;
 
-						foreach($this->tva as $tvakey => $tvaval) {
-							$this->tva[$tvakey]=$tvaval * $coef_fix_tva;
+						foreach ($this->tva as $tvakey => $tvaval) {
+							$this->tva[$tvakey] = $tvaval * $coef_fix_tva;
 						}
 					}
 				}
 
-				foreach($this->tva as $tvakey => $tvaval)
+				foreach ($this->tva as $tvakey => $tvaval)
 				{
 					if ($tvakey != 0)    // On affiche pas taux 0
 					{
@@ -1236,15 +1236,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);
@@ -1254,11 +1254,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
 							{
@@ -1267,16 +1267,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.=vatrate(abs($tvakey),1).$tvacompl;
+								$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+								$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$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);
 							}
@@ -1286,11 +1286,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
@@ -1300,16 +1300,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);
@@ -1323,7 +1323,7 @@ 
 				{
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
@@ -1332,28 +1332,28 @@ 
 				// 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($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
-		$pdf->SetTextColor(0,0,0);
-		$creditnoteamount=$object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);	// Warning, this also include excess received
-		$depositsamount=$object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+		$pdf->SetTextColor(0, 0, 0);
+		$creditnoteamount = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
+		$depositsamount = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if ($object->paye) $resteapayer=0;
+		if ($object->paye) $resteapayer = 0;
 
 		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
 		{
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
 
@@ -1363,7 +1363,7 @@ 
 				$labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $labeltouse, 0, 'L', 0);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $labeltouse, 0, 'L', 0);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
 			}
@@ -1372,26 +1372,26 @@ 
 			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
 			{
 				$index++;
-				$pdf->SetFillColor(255,255,255);
+				$pdf->SetFillColor(255, 255, 255);
 
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
 
-				$resteapayer=0;
+				$resteapayer = 0;
 			}
 
 			$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++;
@@ -1411,48 +1411,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_INVOICES_WITH_PICTURE))
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_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);
@@ -1462,37 +1462,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))
 			{
-				$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);
+			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 
-			if($this->situationinvoice)
+			if ($this->situationinvoice)
 			{
-				$pdf->MultiCell($this->posxprogress-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+				$pdf->MultiCell($this->posxprogress - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 			}
-			else if($conf->global->PRODUCT_USE_UNITS)
+			else 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');
 			}
 		}
 
@@ -1501,24 +1501,24 @@ 
 
 			if (empty($hidetop)) {
 
-				$pdf->SetXY($this->posxprogress, $tab_top+1);
+				$pdf->SetXY($this->posxprogress, $tab_top + 1);
 
-				if($conf->global->PRODUCT_USE_UNITS)
+				if ($conf->global->PRODUCT_USE_UNITS)
 				{
-					$pdf->MultiCell($this->posxunit-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
+					$pdf->MultiCell($this->posxunit - $this->posxprogress, 2, $outputlangs->transnoentities("Progress"), '', 'C');
 				}
 				else if ($this->atleastonediscount)
 				{
-					$pdf->MultiCell($this->posxdiscount-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
+					$pdf->MultiCell($this->posxdiscount - $this->posxprogress, 2, $outputlangs->transnoentities("Progress"), '', 'C');
 				}
 				else
 				{
-					$pdf->MultiCell($this->postotalht-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
+					$pdf->MultiCell($this->postotalht - $this->posxprogress, 2, $outputlangs->transnoentities("Progress"), '', '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);
@@ -1527,23 +1527,23 @@ 
 			}
 		}
 
-		$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->situationinvoice)
 		{
-			$pdf->line($this->postotalht+4, $tab_top, $this->postotalht+4, $tab_top + $tab_height);
+			$pdf->line($this->postotalht + 4, $tab_top, $this->postotalht + 4, $tab_top + $tab_height);
 			if (empty($hidetop))
 			{
-				$pdf->SetXY($this->postotalht-19, $tab_top+1);
-				$pdf->MultiCell(30,2, $outputlangs->transnoentities("Situation"),'','C');
+				$pdf->SetXY($this->postotalht - 19, $tab_top + 1);
+				$pdf->MultiCell(30, 2, $outputlangs->transnoentities("Situation"), '', 'C');
 			}
 		}
 
@@ -1553,8 +1553,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');
 		}
 	}
 
@@ -1576,162 +1576,162 @@ 
 
 		$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==Facture::STATUS_DRAFT && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
+		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
         {
-		      pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
+		      pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_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);
 
 		$w = 110;
 
-		$posy=$this->marge_haute;
-        $posx=$this->page_largeur-$this->marge_droite-$w;
+		$posy = $this->marge_haute;
+        $posx = $this->page_largeur - $this->marge_droite - $w;
 
-		$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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+					$pdf->SetTextColor(200, 0, 0);
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			}
 			else
 			{
-				$text=$this->emetteur->name;
+				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 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("PdfInvoiceTitle");
-		if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
-		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
-		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("PdfInvoiceTitle");
+		if ($object->type == 1) $title = $outputlangs->transnoentities("InvoiceReplacement");
+		if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir");
+		if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit");
+		if ($object->type == 4) $title = $outputlangs->transnoentities("InvoiceProForma");
+		if ($this->situationinvoice) $title = $outputlangs->transnoentities("InvoiceSituation");
 		$pdf->MultiCell($w, 3, $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);
-		$textref=$outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref);
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
 		if ($object->statut == Facture::STATUS_DRAFT)
 		{
-			$pdf->SetTextColor(128,0,0);
-			$textref.=' - '.$outputlangs->transnoentities("NotValidated");
+			$pdf->SetTextColor(128, 0, 0);
+			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
 		$pdf->MultiCell($w, 4, $textref, '', '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($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		$objectidnext=$object->getIdReplacingInvoice('validated');
+		$objectidnext = $object->getIdReplacingInvoice('validated');
 		if ($object->type == 0 && $objectidnext)
 		{
-			$objectreplacing=new Facture($this->db);
+			$objectreplacing = new Facture($this->db);
 			$objectreplacing->fetch($objectidnext);
 
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
 		}
 		if ($object->type == 1)
 		{
-			$objectreplaced=new Facture($this->db);
+			$objectreplaced = new Facture($this->db);
 			$objectreplaced->fetch($object->fk_facture_source);
 
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
 		}
 		if ($object->type == 2 && !empty($object->fk_facture_source))
 		{
-			$objectreplaced=new Facture($this->db);
+			$objectreplaced = new Facture($this->db);
 			$objectreplaced->fetch($object->fk_facture_source);
 
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
 		}
 
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
+		$posy += 4;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : ".dol_print_date($object->date, "day", false, $outputlangs), '', 'R');
 
-		if (! empty($conf->global->INVOICE_POINTOFTAX_DATE))
+		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE))
 		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : " . dol_print_date($object->date_pointoftax,"day",false,$outputlangs), '', 'R');
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : ".dol_print_date($object->date_pointoftax, "day", false, $outputlangs), '', 'R');
 		}
 
 		if ($object->type != 2)
 		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
 		}
 
 		if ($object->thirdparty->code_client)
 		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 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($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
 		    }
 		}
 
-		$posy+=1;
+		$posy += 1;
 
 		$top_shift = 0;
 		// Show list of linked objects
@@ -1748,45 +1748,45 @@ 
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posy+=$top_shift;
-			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
 
-			$hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
-			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
 
 
 			// 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($widthrecbox, $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->MultiCell($widthrecbox-2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox - 2, 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($widthrecbox-2, 4, $carac_emetteur, 0, 'L');
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
 
 
 
 			// If BILLING contact defined on invoice, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','BILLING');
+			$usecontact = false;
+			$arrayidcontact = $object->getIdContact('external', 'BILLING');
 			if (count($arrayidcontact) > 0)
 			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
 			//Recipient name
@@ -1797,39 +1797,39 @@ 
 				$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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-			$posy+=$top_shift;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $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->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, 2, $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;
 	}
 
@@ -1842,10 +1842,10 @@ 
 	 *      @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,'INVOICE_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, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }

Braces +230 added lines, -117 removed lines

@@ -175,7 +175,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;
@@ -185,8 +188,7 @@ 
 			$this->posxup=118;
 			$this->posxqty=135;
 			$this->posxunit=151;
-		}
-		else
+		} else
 		{
 			$this->posxtva=110;
 			$this->posxup=126;
@@ -195,11 +197,15 @@ 
 		$this->posxdiscount=162;
 		$this->posxprogress=126; // Only displayed for situation invoices
 		$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;
@@ -235,9 +241,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", "bills", "products", "dict", "companies"));
@@ -250,7 +260,9 @@ 
 		{
 			for ($i = 0 ; $i < $nblignes ; $i++)
 			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+				if (empty($object->lines[$i]->fk_product)) {
+				    continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -267,10 +279,14 @@ 
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i]=$realpath;
+				if ($realpath) {
+				    $realpatharray[$i]=$realpath;
+				}
 			}
 		}
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		if (count($realpatharray) == 0) {
+		    $this->posxpicture=$this->posxtva;
+		}
 
 		if ($conf->facture->dir_output)
 		{
@@ -285,8 +301,7 @@ 
 			{
 				$dir = $conf->facture->dir_output;
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->facture->dir_output . "/" . $objectref;
@@ -326,7 +341,9 @@ 
                 $heightforinfotot = 50+(4*$nbpayments);	// Height reserved to output the info and total part and payment part
 		        $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;
+	            }
 
                 if (class_exists('TCPDF'))
                 {
@@ -351,7 +368,9 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$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
 
@@ -363,9 +382,11 @@ 
 						$this->atleastonediscount++;
 					}
 				}
-				if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS))    // retreive space not used by discount
+				if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS)) {
+				    // retreive space not used by discount
 				{
 					$this->posxpicture+=($this->postotalht - $this->posxdiscount);
+				}
 					$this->posxtva+=($this->postotalht - $this->posxdiscount);
 					$this->posxup+=($this->postotalht - $this->posxdiscount);
 					$this->posxqty+=($this->postotalht - $this->posxdiscount);
@@ -391,7 +412,9 @@ 
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (! empty($tplidx)) {
+				    $pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
@@ -433,7 +456,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 ($notetoshow)
@@ -469,7 +494,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+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
@@ -480,11 +507,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+$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+$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;
@@ -505,9 +538,11 @@ 
 					$pdf->startTransaction();
 					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX-$progress_width,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.
@@ -515,23 +550,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+$heightforinfotot)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$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();
 					}
@@ -571,12 +610,10 @@ 
 					if ($this->situationinvoice)
 					{
 						$pdf->MultiCell($this->posxprogress-$this->posxqty-0.8, 4, $qty, 0, 'R');
-					}
-					else if($conf->global->PRODUCT_USE_UNITS)
+					} else 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');
 					}
@@ -589,12 +626,10 @@ 
 						if($conf->global->PRODUCT_USE_UNITS)
 						{
 							$pdf->MultiCell($this->posxunit-$this->posxprogress-1, 3, $progress, 0, 'R');
-						}
-						else if ($this->atleastonediscount)
+						} else if ($this->atleastonediscount)
 						{
 							$pdf->MultiCell($this->posxdiscount-$this->posxprogress-1, 3, $progress, 0, 'R');
-						}
-						else
+						} else
 						{
 							$pdf->MultiCell($this->postotalht-$this->posxprogress-1, 3, $progress, 0, 'R');
 						}
@@ -623,16 +658,24 @@ 
 
 
 					$sign=1;
-					if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+					if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+					    $sign=-1;
+					}
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
+					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) {
+					    // Compute progress from previous situation
 					{
 						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 					} else {
-						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
-						else $tvaligne= $sign * $object->lines[$i]->total_tva;
+						    $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						}
+					} else {
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) {
+						    $tvaligne= $sign * $object->lines[$i]->multicurrency_total_tva;
+						} else {
+						    $tvaligne= $sign * $object->lines[$i]->total_tva;
+						}
 					}
 
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
@@ -642,32 +685,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))
@@ -688,8 +747,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);
 						}
@@ -697,24 +755,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);
+						}
 					}
 				}
 
@@ -723,8 +786,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -744,7 +806,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -756,20 +820,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;   // No error
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->transnoentities("ErrorConstantNotDefined","FAC_OUTPUTDIR");
 			return 0;
@@ -793,21 +856,27 @@ 
 		global $conf;
 
         $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+            $sign=-1;
+        }
 
         $tab3_posx = 120;
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 			$tab3_posx -= 20;
 		}
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		if ($object->type == 2) {
+		    $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		}
 
 		$pdf->SetFont('','', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
@@ -849,10 +918,15 @@ 
 				$y+=3;
 				$obj = $this->db->fetch_object($resql);
 
-				if ($obj->type == 2) $text=$outputlangs->transnoentities("CreditNote");
-				elseif ($obj->type == 3) $text=$outputlangs->transnoentities("Deposit");
-				elseif ($obj->type == 0) $text=$outputlangs->transnoentities("ExcessReceived");
-				else $text=$outputlangs->transnoentities("UnknownType");
+				if ($obj->type == 2) {
+				    $text=$outputlangs->transnoentities("CreditNote");
+				} elseif ($obj->type == 3) {
+				    $text=$outputlangs->transnoentities("Deposit");
+				} elseif ($obj->type == 0) {
+				    $text=$outputlangs->transnoentities("ExcessReceived");
+				} else {
+				    $text=$outputlangs->transnoentities("UnknownType");
+				}
 
 				$invoice->fetch($obj->fk_facture_source);
 
@@ -869,8 +943,7 @@ 
 
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -910,8 +983,7 @@ 
 
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -1060,7 +1132,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);
 
@@ -1095,7 +1170,9 @@ 
 		global $conf,$mysoc;
 
         $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+            $sign=-1;
+        }
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1105,10 +1182,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;
@@ -1135,8 +1214,7 @@ 
 			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
+			} else
 			{
 			    // FIXME amount of vat not supported with multicurrency
 
@@ -1145,15 +1223,19 @@ 
 				//{
 					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='';
@@ -1178,17 +1260,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='';
@@ -1229,9 +1315,11 @@ 
 
 				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);
@@ -1256,15 +1344,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='';
@@ -1288,16 +1380,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='';
@@ -1346,7 +1442,9 @@ 
 		$depositsamount=$object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if ($object->paye) $resteapayer=0;
+		if ($object->paye) {
+		    $resteapayer=0;
+		}
 
 		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
 		{
@@ -1417,7 +1515,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);
@@ -1433,7 +1533,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);
@@ -1485,12 +1587,10 @@ 
 			if($this->situationinvoice)
 			{
 				$pdf->MultiCell($this->posxprogress-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-			}
-			else if($conf->global->PRODUCT_USE_UNITS)
+			} else 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');
 			}
@@ -1506,12 +1606,10 @@ 
 				if($conf->global->PRODUCT_USE_UNITS)
 				{
 					$pdf->MultiCell($this->posxunit-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
-				}
-				else if ($this->atleastonediscount)
+				} else if ($this->atleastonediscount)
 				{
 					$pdf->MultiCell($this->posxdiscount-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
-				}
-				else
+				} else
 				{
 					$pdf->MultiCell($this->postotalht-$this->posxprogress,2, $outputlangs->transnoentities("Progress"),'','C');
 				}
@@ -1604,16 +1702,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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
+			} else
 			{
 				$text=$this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -1624,11 +1720,21 @@ 
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$title=$outputlangs->transnoentities("PdfInvoiceTitle");
-		if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
-		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
-		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
+		if ($object->type == 1) {
+		    $title=$outputlangs->transnoentities("InvoiceReplacement");
+		}
+		if ($object->type == 2) {
+		    $title=$outputlangs->transnoentities("InvoiceAvoir");
+		}
+		if ($object->type == 3) {
+		    $title=$outputlangs->transnoentities("InvoiceDeposit");
+		}
+		if ($object->type == 4) {
+		    $title=$outputlangs->transnoentities("InvoiceProForma");
+		}
+		if ($this->situationinvoice) {
+		    $title=$outputlangs->transnoentities("InvoiceSituation");
+		}
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('','B',$default_font_size);
@@ -1751,7 +1857,9 @@ 
 			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy+=$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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -1803,11 +1911,16 @@ 
 
 			// Show recipient
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy+=$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/facture/mod_facture_mars.php

Indentation +173 added lines, -173 removed lines

@@ -30,160 +30,160 @@ 
  */
 class mod_facture_mars extends ModeleNumRefFactures
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
-
-	public $prefixinvoice='FA';
-
-	public $prefixreplacement='FR';
-
-	public $prefixdeposit='AC';
-
-	public $prefixcreditnote='AV';
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-
-	/**
-	 * Constructor
-	 */
-	function __construct()
-	{
-		if (! empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX))
-		{
-			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX;
-		}
-	}
-
-	/**
-	 *  Renvoi la description du modele de numerotation
-	 *
-	 *  @return     string      Texte descripif
-	 */
-	function info()
-	{
-		global $langs;
-		$langs->load("bills");
-		return $langs->trans('MarsNumRefModelDesc1',$this->prefixinvoice,$this->prefixreplacement,$this->prefixdeposit,$this->prefixcreditnote);
-	}
-
-	/**
-	 *  Renvoi un exemple de numerotation
-	 *
-	 *  @return     string      Example
-	 */
-	function getExample()
-	{
-		return $this->prefixinvoice."0501-0001";
-	}
-
-	/**
-	 *  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()
-	{
-		global $langs,$conf,$db;
-
-		$langs->load("bills");
-
-		// Check invoice num
-		$fayymm=''; $max='';
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($fayymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$fayymm))
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
-			return false;
-		}
-
-		// Check credit note num
-		$fayymm='';
-
-		$posindice=8;
-		$sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($fayymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$fayymm))
-		{
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Return next value not used or last value used
-	 *
-	 * @param	Societe		$objsoc		Object third party
-	 * @param   Facture		$invoice	Object invoice
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+
+    public $prefixinvoice='FA';
+
+    public $prefixreplacement='FR';
+
+    public $prefixdeposit='AC';
+
+    public $prefixcreditnote='AV';
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        if (! empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX))
+        {
+            $this->prefixinvoice = $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX;
+        }
+    }
+
+    /**
+     *  Renvoi la description du modele de numerotation
+     *
+     *  @return     string      Texte descripif
+     */
+    function info()
+    {
+        global $langs;
+        $langs->load("bills");
+        return $langs->trans('MarsNumRefModelDesc1',$this->prefixinvoice,$this->prefixreplacement,$this->prefixdeposit,$this->prefixcreditnote);
+    }
+
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+        return $this->prefixinvoice."0501-0001";
+    }
+
+    /**
+     *  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()
+    {
+        global $langs,$conf,$db;
+
+        $langs->load("bills");
+
+        // Check invoice num
+        $fayymm=''; $max='';
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED) as max";	// This is standard SQL
+        $sql.= " FROM ".MAIN_DB_PREFIX."facture";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($fayymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel',$max);
+            return false;
+        }
+
+        // Check credit note num
+        $fayymm='';
+
+        $posindice=8;
+        $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max";	// This is standard SQL
+        $sql.= " FROM ".MAIN_DB_PREFIX."facture";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($fayymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+        {
+            $this->error=$langs->trans('ErrorNumRefModel',$max);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return next value not used or last value used
+     *
+     * @param	Societe		$objsoc		Object third party
+     * @param   Facture		$invoice	Object invoice
      * @param   string		$mode       'next' for next value or 'last' for last value
-	 * @return  string       			Value
-	 */
-	function getNextValue($objsoc, $invoice, $mode='next')
-	{
-		global $db;
-
-		$prefix=$this->prefixinvoice;
-
-		if ($invoice->type == 1) $prefix=$this->prefixreplacement;
-		else if ($invoice->type == 2) $prefix=$this->prefixcreditnote;
-		else if ($invoice->type == 3) $prefix=$this->prefixdeposit;
-		else $prefix=$this->prefixinvoice;
-
-		// 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."facture";
-		$sql.= " WHERE ref LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
-
-		$resql=$db->query($sql);
-		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			return -1;
-		}
-
-		if ($mode == 'last')
-		{
-    		if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max);
+     * @return  string       			Value
+     */
+    function getNextValue($objsoc, $invoice, $mode='next')
+    {
+        global $db;
+
+        $prefix=$this->prefixinvoice;
+
+        if ($invoice->type == 1) $prefix=$this->prefixreplacement;
+        else if ($invoice->type == 2) $prefix=$this->prefixcreditnote;
+        else if ($invoice->type == 3) $prefix=$this->prefixdeposit;
+        else $prefix=$this->prefixinvoice;
+
+        // 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."facture";
+        $sql.= " WHERE ref LIKE '".$prefix."____-%'";
+        $sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+
+        $resql=$db->query($sql);
+        dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            return -1;
+        }
+
+        if ($mode == 'last')
+        {
+            if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+            else $num = sprintf("%04s",$max);
 
             $ref='';
             $sql = "SELECT ref as ref";
@@ -201,32 +201,32 @@ 
             else dol_print_error($db);
 
             return $ref;
-		}
-		else if ($mode == 'next')
-		{
-			$date=$invoice->date;	// This is invoice date (not creation 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);
-
-    		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-    		return $prefix.$yymm."-".$num;
-		}
-		else dol_print_error('','Bad parameter for getNextValue');
-	}
-
-	/**
-	 * Return next free value
-	 *
+        }
+        else if ($mode == 'next')
+        {
+            $date=$invoice->date;	// This is invoice date (not creation 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);
+
+            dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+            return $prefix.$yymm."-".$num;
+        }
+        else dol_print_error('','Bad parameter for getNextValue');
+    }
+
+    /**
+     * Return next free value
+     *
      * @param	Societe		$objsoc     	Object third party
      * @param	string		$objforref		Object for number to search
      * @param   string		$mode       	'next' for next value or 'last' for last value
      * @return  string      				Next free value
-	 */
-	function getNumRef($objsoc,$objforref,$mode='next')
-	{
-		return $this->getNextValue($objsoc,$objforref,$mode);
-	}
+     */
+    function getNumRef($objsoc,$objforref,$mode='next')
+    {
+        return $this->getNextValue($objsoc,$objforref,$mode);
+    }
 }
 

Spacing +57 added lines, -57 removed lines

@@ -23,7 +23,7 @@ 
  *	\ingroup    facture
  *	\brief      File containing class for numbering module Mars
  */
-require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 
 /**
  * 	Classe du modele de numerotation de reference de facture Mars
@@ -34,20 +34,20 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefixinvoice='FA';
+	public $prefixinvoice = 'FA';
 
-	public $prefixreplacement='FR';
+	public $prefixreplacement = 'FR';
 
-	public $prefixdeposit='AC';
+	public $prefixdeposit = 'AC';
 
-	public $prefixcreditnote='AV';
+	public $prefixcreditnote = 'AV';
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -55,7 +55,7 @@ 
 	 */
 	function __construct()
 	{
-		if (! empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX))
+		if (!empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX))
 		{
 			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX;
 		}
@@ -70,7 +70,7 @@ 
 	{
 		global $langs;
 		$langs->load("bills");
-		return $langs->trans('MarsNumRefModelDesc1',$this->prefixinvoice,$this->prefixreplacement,$this->prefixdeposit,$this->prefixcreditnote);
+		return $langs->trans('MarsNumRefModelDesc1', $this->prefixinvoice, $this->prefixreplacement, $this->prefixdeposit, $this->prefixcreditnote);
 	}
 
 	/**
@@ -91,50 +91,50 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $langs,$conf,$db;
+		global $langs, $conf, $db;
 
 		$langs->load("bills");
 
 		// Check invoice num
-		$fayymm=''; $max='';
+		$fayymm = ''; $max = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($fayymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+		if ($fayymm && !preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i', $fayymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
 		// Check credit note num
-		$fayymm='';
+		$fayymm = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$posindice = 8;
+		$sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($fayymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+		if ($fayymm && !preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i', $fayymm))
 		{
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -149,31 +149,31 @@ 
      * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return  string       			Value
 	 */
-	function getNextValue($objsoc, $invoice, $mode='next')
+	function getNextValue($objsoc, $invoice, $mode = 'next')
 	{
 		global $db;
 
-		$prefix=$this->prefixinvoice;
+		$prefix = $this->prefixinvoice;
 
-		if ($invoice->type == 1) $prefix=$this->prefixreplacement;
-		else if ($invoice->type == 2) $prefix=$this->prefixcreditnote;
-		else if ($invoice->type == 3) $prefix=$this->prefixdeposit;
-		else $prefix=$this->prefixinvoice;
+		if ($invoice->type == 1) $prefix = $this->prefixreplacement;
+		else if ($invoice->type == 2) $prefix = $this->prefixcreditnote;
+		else if ($invoice->type == 3) $prefix = $this->prefixdeposit;
+		else $prefix = $this->prefixinvoice;
 
 		// 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."facture";
-		$sql.= " WHERE ref LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$prefix."____-%'";
+		$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -182,17 +182,17 @@ 
 
 		if ($mode == 'last')
 		{
-    		if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max);
+    		if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    		else $num = sprintf("%04s", $max);
 
-            $ref='';
+            $ref = '';
             $sql = "SELECT ref as ref";
-            $sql.= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql.= " WHERE ref LIKE '".$prefix."____-".$num."'";
-            $sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
+            $sql .= " WHERE ref LIKE '".$prefix."____-".$num."'";
+            $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 
             dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-            $resql=$db->query($sql);
+            $resql = $db->query($sql);
             if ($resql)
             {
                 $obj = $db->fetch_object($resql);
@@ -204,16 +204,16 @@ 
 		}
 		else if ($mode == 'next')
 		{
-			$date=$invoice->date;	// This is invoice date (not creation date)
-    		$yymm = strftime("%y%m",$date);
+			$date = $invoice->date; // This is invoice date (not creation 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 ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
 		}
-		else dol_print_error('','Bad parameter for getNextValue');
+		else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
 	/**
@@ -224,9 +224,9 @@ 
      * @param   string		$mode       	'next' for next value or 'last' for last value
      * @return  string      				Next free value
 	 */
-	function getNumRef($objsoc,$objforref,$mode='next')
+	function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
-		return $this->getNextValue($objsoc,$objforref,$mode);
+		return $this->getNextValue($objsoc, $objforref, $mode);
 	}
 }
 

Braces +37 added lines, -17 removed lines

@@ -155,10 +155,15 @@ 
 
 		$prefix=$this->prefixinvoice;
 
-		if ($invoice->type == 1) $prefix=$this->prefixreplacement;
-		else if ($invoice->type == 2) $prefix=$this->prefixcreditnote;
-		else if ($invoice->type == 3) $prefix=$this->prefixdeposit;
-		else $prefix=$this->prefixinvoice;
+		if ($invoice->type == 1) {
+		    $prefix=$this->prefixreplacement;
+		} else if ($invoice->type == 2) {
+		    $prefix=$this->prefixcreditnote;
+		} else if ($invoice->type == 3) {
+		    $prefix=$this->prefixdeposit;
+		} else {
+		    $prefix=$this->prefixinvoice;
+		}
 
 		// D'abord on recupere la valeur max
 		$posindice=8;
@@ -172,18 +177,25 @@ 
 		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
 		{
 			return -1;
 		}
 
 		if ($mode == 'last')
 		{
-    		if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max);
+    		if ($max >= (pow(10, 4) - 1)) {
+    		    $num=$max;
+    		}
+    		// If counter > 9999, we do not format on 4 chars, we take number as it is
+    		else {
+    		    $num = sprintf("%04s",$max);
+    		}
 
             $ref='';
             $sql = "SELECT ref as ref";
@@ -196,24 +208,32 @@ 
             if ($resql)
             {
                 $obj = $db->fetch_object($resql);
-                if ($obj) $ref = $obj->ref;
+                if ($obj) {
+                    $ref = $obj->ref;
+                }
+            } else {
+                dol_print_error($db);
             }
-            else dol_print_error($db);
 
             return $ref;
-		}
-		else if ($mode == 'next')
+		} else if ($mode == 'next')
 		{
 			$date=$invoice->date;	// This is invoice date (not creation 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 ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
+		} else {
+		    dol_print_error('','Bad parameter for getNextValue');
 		}
-		else dol_print_error('','Bad parameter for getNextValue');
 	}
 
 	/**