alxarafe / alixar

dolibarr/htdocs/core/class/google.class.php

Indentation +45 added lines, -45 removed lines

@@ -26,63 +26,63 @@
  */
 class GoogleAPI
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	public $key;
+    public $key;
 
-	/**
-	 * Constructor
-	 *
-	 * @param 	DoliDB		$db			Database handler
-	 * @param	string		$key		Google key
-	 */
-	function __construct($db,$key)
-	{
-		$this->db=$db;
-		$this->key=$key;
-	}
+    /**
+     * Constructor
+     *
+     * @param 	DoliDB		$db			Database handler
+     * @param	string		$key		Google key
+     */
+    function __construct($db,$key)
+    {
+        $this->db=$db;
+        $this->key=$key;
+    }
 
 
-	/**
-	 *  Return geo coordinates of an address
-	 *
-	 *  @param	string	$address	Address
-	 * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
-	 *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
-	 *	@return	string				Coordinates
-	 */
-	function getGeoCoordinatesOfAddress($address)
-	{
-		global $conf;
+    /**
+     *  Return geo coordinates of an address
+     *
+     *  @param	string	$address	Address
+     * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
+     *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
+     *	@return	string				Coordinates
+     */
+    function getGeoCoordinatesOfAddress($address)
+    {
+        global $conf;
 
-		$i=0;
+        $i=0;
 
-		// Desired address
-		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
+        // Desired address
+        $urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
 
-		// Retrieve the URL contents
-		$page = file_get_contents($urladdress);
+        // Retrieve the URL contents
+        $page = file_get_contents($urladdress);
 
-		$code = strstr($page, '<coordinates>');
-		$code = strstr($code, '>');
-		$val=strpos($code, "<");
-		$code = substr($code, 1, $val-1);
-		//print $code;
-		//print "<br>";
-		$latitude = substr($code, 0, strpos($code, ","));
-		$longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
+        $code = strstr($page, '<coordinates>');
+        $code = strstr($code, '>');
+        $val=strpos($code, "<");
+        $code = substr($code, 1, $val-1);
+        //print $code;
+        //print "<br>";
+        $latitude = substr($code, 0, strpos($code, ","));
+        $longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
 
-		// Output the coordinates
-		//echo "Longitude: $longitude ',' Latitude: $latitude";
+        // Output the coordinates
+        //echo "Longitude: $longitude ',' Latitude: $latitude";
 
-		$i++;
-	}
+        $i++;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	public $key;
 
@@ -44,10 +44,10 @@ 
 	 * @param 	DoliDB		$db			Database handler
 	 * @param	string		$key		Google key
 	 */
-	function __construct($db,$key)
+	function __construct($db, $key)
 	{
-		$this->db=$db;
-		$this->key=$key;
+		$this->db = $db;
+		$this->key = $key;
 	}
 
 
@@ -63,7 +63,7 @@ 
 	{
 		global $conf;
 
-		$i=0;
+		$i = 0;
 
 		// Desired address
 		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
@@ -73,12 +73,12 @@ 
 
 		$code = strstr($page, '<coordinates>');
 		$code = strstr($code, '>');
-		$val=strpos($code, "<");
-		$code = substr($code, 1, $val-1);
+		$val = strpos($code, "<");
+		$code = substr($code, 1, $val - 1);
 		//print $code;
 		//print "<br>";
 		$latitude = substr($code, 0, strpos($code, ","));
-		$longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
+		$longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);
 
 		// Output the coordinates
 		//echo "Longitude: $longitude ',' Latitude: $latitude";

dolibarr/htdocs/core/class/commoninvoice.class.php

Indentation +698 added lines, -698 removed lines

@@ -61,624 +61,624 @@ 
      */
     const TYPE_SITUATION = 5;
 
-	/**
-	 * Draft status
-	 */
-	const STATUS_DRAFT = 0;
-
-	/**
-	 * Validated (need to be paid)
-	 */
-	const STATUS_VALIDATED = 1;
-
-	/**
-	 * Classified paid.
-	 * If paid partially, $this->close_code can be:
-	 * - CLOSECODE_DISCOUNTVAT
-	 * - CLOSECODE_BADDEBT
-	 * If paid completelly, this->close_code will be null
-	 */
-	const STATUS_CLOSED = 2;
-
-	/**
-	 * Classified abandoned and no payment done.
-	 * $this->close_code can be:
-	 * - CLOSECODE_BADDEBT
-	 * - CLOSECODE_ABANDONED
-	 * - CLOSECODE_REPLACED
-	 */
-	const STATUS_ABANDONED = 3;
-
-
-	/**
-	 * 	Return remain amount to pay. Property ->id and ->total_ttc must be set.
-	 *  This does not include open direct debit requests.
-	 *
-	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		double						Remain of amount to pay
-	 */
-	function getRemainToPay($multicurrency=0)
-	{
-	    $alreadypaid=0;
-	    $alreadypaid+=$this->getSommePaiement($multicurrency);
-	    $alreadypaid+=$this->getSumDepositsUsed($multicurrency);
-	    $alreadypaid+=$this->getSumCreditNotesUsed($multicurrency);
-    	return $this->total_ttc - $alreadypaid;
-	}
-
-	/**
-	 * 	Return amount of payments already done
-	 *
-	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		int						Amount of payment already done, <0 if KO
-	 */
-	function getSommePaiement($multicurrency=0)
-	{
-		$table='paiement_facture';
-		$field='fk_facture';
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-		{
-			$table='paiementfourn_facturefourn';
-			$field='fk_facturefourn';
-		}
-
-		$sql = 'SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql.= ' WHERE '.$field.' = '.$this->id;
-
-		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$this->db->free($resql);
-			if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 *    	Return amount (with tax) of all deposits invoices used by invoice.
+    /**
+     * Draft status
+     */
+    const STATUS_DRAFT = 0;
+
+    /**
+     * Validated (need to be paid)
+     */
+    const STATUS_VALIDATED = 1;
+
+    /**
+     * Classified paid.
+     * If paid partially, $this->close_code can be:
+     * - CLOSECODE_DISCOUNTVAT
+     * - CLOSECODE_BADDEBT
+     * If paid completelly, this->close_code will be null
+     */
+    const STATUS_CLOSED = 2;
+
+    /**
+     * Classified abandoned and no payment done.
+     * $this->close_code can be:
+     * - CLOSECODE_BADDEBT
+     * - CLOSECODE_ABANDONED
+     * - CLOSECODE_REPLACED
+     */
+    const STATUS_ABANDONED = 3;
+
+
+    /**
+     * 	Return remain amount to pay. Property ->id and ->total_ttc must be set.
+     *  This does not include open direct debit requests.
+     *
+     *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+     *	@return		double						Remain of amount to pay
+     */
+    function getRemainToPay($multicurrency=0)
+    {
+        $alreadypaid=0;
+        $alreadypaid+=$this->getSommePaiement($multicurrency);
+        $alreadypaid+=$this->getSumDepositsUsed($multicurrency);
+        $alreadypaid+=$this->getSumCreditNotesUsed($multicurrency);
+        return $this->total_ttc - $alreadypaid;
+    }
+
+    /**
+     * 	Return amount of payments already done
+     *
+     *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+     *	@return		int						Amount of payment already done, <0 if KO
+     */
+    function getSommePaiement($multicurrency=0)
+    {
+        $table='paiement_facture';
+        $field='fk_facture';
+        if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+        {
+            $table='paiementfourn_facturefourn';
+            $field='fk_facturefourn';
+        }
+
+        $sql = 'SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$table;
+        $sql.= ' WHERE '.$field.' = '.$this->id;
+
+        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $this->db->free($resql);
+            if ($multicurrency) return $obj->multicurrency_amount;
+            else return $obj->amount;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    /**
+     *    	Return amount (with tax) of all deposits invoices used by invoice.
      *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
-	 *
-	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of deposits amount otherwise
-	 */
-	function getSumDepositsUsed($multicurrency=0)
-	{
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-	    {
-	        // TODO
-	       return 0;
-	    }
-
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-	    $discountstatic=new DiscountAbsolute($this->db);
-	    $result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
-	    if ($result >= 0)
-	    {
-	        return $result;
-	    }
-	    else
-	    {
-	        $this->error=$discountstatic->error;
-	        return -1;
-	    }
-	}
-
-	/**
-	 *    	Return amount (with tax) of all credit notes invoices + excess received used by invoice
-	 *
-	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
-	 */
-	function getSumCreditNotesUsed($multicurrency=0)
-	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-	    $discountstatic=new DiscountAbsolute($this->db);
-	    $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
-	    if ($result >= 0)
-	    {
-	        return $result;
-	    }
-	    else
-	    {
-	        $this->error=$discountstatic->error;
-	        return -1;
-	    }
-	}
-
-	/**
-	 *	Renvoie tableau des ids de facture avoir issus de la facture
-	 *
-	 *	@return		array		Tableau d'id de factures avoirs
-	 */
-	function getListIdAvoirFromInvoice()
-	{
-		$idarray=array();
-
-		$sql = 'SELECT rowid';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE fk_facture_source = '.$this->id;
-		$sql.= ' AND type = 2';
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$row = $this->db->fetch_row($resql);
-				$idarray[]=$row[0];
-				$i++;
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-		return $idarray;
-	}
-
-	/**
-	 *	Renvoie l'id de la facture qui la remplace
-	 *
-	 *	@param		string	$option		filtre sur statut ('', 'validated', ...)
-	 *	@return		int					<0 si KO, 0 si aucune facture ne remplace, id facture sinon
-	 */
-	function getIdReplacingInvoice($option='')
-	{
-		$sql = 'SELECT rowid';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE fk_facture_source = '.$this->id;
-		$sql.= ' AND type < 2';
-		if ($option == 'validated') $sql.= ' AND fk_statut = 1';
-		// PROTECTION BAD DATA
-		// Au cas ou base corrompue et qu'il y a une facture de remplacement validee
-		// et une autre non, on donne priorite a la validee.
-		// Ne devrait pas arriver (sauf si acces concurrentiel et que 2 personnes
-		// ont cree en meme temps une facture de remplacement pour la meme facture)
-		$sql.= ' ORDER BY fk_statut DESC';
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
-				// Si il y en a
-				return $obj->rowid;
-			}
-			else
-			{
-				// Si aucune facture ne remplace
-				return 0;
-			}
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-	/**
-	 *  Return list of payments
-	 *
-	 *	@param		string	$filtertype		1 to filter on type of payment == 'PRE'
-	 *  @return     array					Array with list of payments
-	 */
-	function getListOfPayments($filtertype='')
-	{
-		$retarray=array();
-
-		$table='paiement_facture';
-		$table2='paiement';
-		$field='fk_facture';
-		$field2='fk_paiement';
-		$sharedentity='facture';
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-		{
-			$table='paiementfourn_facturefourn';
-			$table2='paiementfourn';
-			$field='fk_facturefourn';
-			$field2='fk_paiementfourn';
-			$sharedentity='facture_fourn';
-		}
-
-		$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
-		$sql.= ' WHERE pf.'.$field.' = '.$this->id;
-		//$sql.= ' WHERE pf.'.$field.' = 1';
-		$sql.= ' AND pf.'.$field2.' = p.rowid';
-		$sql.= ' AND p.fk_paiement = t.id';
-		$sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';
-		if ($filtertype) $sql.=" AND t.code='PRE'";
-
-		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-				$retarray[]=array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
-				$i++;
-			}
-			$this->db->free($resql);
-			return $retarray;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_print_error($this->db);
-			return array();
-		}
-	}
+     *
+     * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+     *		@return		int						<0 if KO, Sum of deposits amount otherwise
+     */
+    function getSumDepositsUsed($multicurrency=0)
+    {
+        if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+        {
+            // TODO
+            return 0;
+        }
+
+        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+        $discountstatic=new DiscountAbsolute($this->db);
+        $result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
+        if ($result >= 0)
+        {
+            return $result;
+        }
+        else
+        {
+            $this->error=$discountstatic->error;
+            return -1;
+        }
+    }
+
+    /**
+     *    	Return amount (with tax) of all credit notes invoices + excess received used by invoice
+     *
+     * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+     *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
+     */
+    function getSumCreditNotesUsed($multicurrency=0)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+        $discountstatic=new DiscountAbsolute($this->db);
+        $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
+        if ($result >= 0)
+        {
+            return $result;
+        }
+        else
+        {
+            $this->error=$discountstatic->error;
+            return -1;
+        }
+    }
+
+    /**
+     *	Renvoie tableau des ids de facture avoir issus de la facture
+     *
+     *	@return		array		Tableau d'id de factures avoirs
+     */
+    function getListIdAvoirFromInvoice()
+    {
+        $idarray=array();
+
+        $sql = 'SELECT rowid';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' WHERE fk_facture_source = '.$this->id;
+        $sql.= ' AND type = 2';
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $row = $this->db->fetch_row($resql);
+                $idarray[]=$row[0];
+                $i++;
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $idarray;
+    }
+
+    /**
+     *	Renvoie l'id de la facture qui la remplace
+     *
+     *	@param		string	$option		filtre sur statut ('', 'validated', ...)
+     *	@return		int					<0 si KO, 0 si aucune facture ne remplace, id facture sinon
+     */
+    function getIdReplacingInvoice($option='')
+    {
+        $sql = 'SELECT rowid';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' WHERE fk_facture_source = '.$this->id;
+        $sql.= ' AND type < 2';
+        if ($option == 'validated') $sql.= ' AND fk_statut = 1';
+        // PROTECTION BAD DATA
+        // Au cas ou base corrompue et qu'il y a une facture de remplacement validee
+        // et une autre non, on donne priorite a la validee.
+        // Ne devrait pas arriver (sauf si acces concurrentiel et que 2 personnes
+        // ont cree en meme temps une facture de remplacement pour la meme facture)
+        $sql.= ' ORDER BY fk_statut DESC';
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            if ($obj)
+            {
+                // Si il y en a
+                return $obj->rowid;
+            }
+            else
+            {
+                // Si aucune facture ne remplace
+                return 0;
+            }
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /**
+     *  Return list of payments
+     *
+     *	@param		string	$filtertype		1 to filter on type of payment == 'PRE'
+     *  @return     array					Array with list of payments
+     */
+    function getListOfPayments($filtertype='')
+    {
+        $retarray=array();
+
+        $table='paiement_facture';
+        $table2='paiement';
+        $field='fk_facture';
+        $field2='fk_paiement';
+        $sharedentity='facture';
+        if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+        {
+            $table='paiementfourn_facturefourn';
+            $table2='paiementfourn';
+            $field='fk_facturefourn';
+            $field2='fk_paiementfourn';
+            $sharedentity='facture_fourn';
+        }
+
+        $sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
+        $sql.= ' WHERE pf.'.$field.' = '.$this->id;
+        //$sql.= ' WHERE pf.'.$field.' = 1';
+        $sql.= ' AND pf.'.$field2.' = p.rowid';
+        $sql.= ' AND p.fk_paiement = t.id';
+        $sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';
+        if ($filtertype) $sql.=" AND t.code='PRE'";
+
+        dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+                $retarray[]=array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
+                $i++;
+            }
+            $this->db->free($resql);
+            return $retarray;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_print_error($this->db);
+            return array();
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return if an invoice can be deleted
-	 *	Rule is:
-	 *  If invoice is draft and has a temporary ref -> yes (1)
-	 *  If hidden option INVOICE_CAN_NEVER_BE_REMOVED is on -> no (0)
-	 *  If invoice is dispatched in bookkeeping -> no (-1)
-	 *  If invoice has a definitive ref, is not last and INVOICE_CAN_ALWAYS_BE_REMOVED off -> no (-2)
-	 *  If invoice not last in a cycle -> no (-3)
-	 *  If there is payment -> no (-4)
-	 *  Otherwise -> yes (2)
-	 *
-	 *  @return    int         <=0 if no, >0 if yes
-	 */
-	function is_erasable()
-	{
+    /**
+     *  Return if an invoice can be deleted
+     *	Rule is:
+     *  If invoice is draft and has a temporary ref -> yes (1)
+     *  If hidden option INVOICE_CAN_NEVER_BE_REMOVED is on -> no (0)
+     *  If invoice is dispatched in bookkeeping -> no (-1)
+     *  If invoice has a definitive ref, is not last and INVOICE_CAN_ALWAYS_BE_REMOVED off -> no (-2)
+     *  If invoice not last in a cycle -> no (-3)
+     *  If there is payment -> no (-4)
+     *  Otherwise -> yes (2)
+     *
+     *  @return    int         <=0 if no, >0 if yes
+     */
+    function is_erasable()
+    {
         // phpcs:enable
-		global $conf;
-
-		// We check if invoice is a temporary number (PROVxxxx)
-		$tmppart = substr($this->ref, 1, 4);
-
-		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') // If draft invoice and ref not yet defined
-		{
-			return 1;
-		}
-
-		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
-
-		// If not a draft invoice and not temporary invoice
-		if ($tmppart !== 'PROV')
-		{
-			$ventilExportCompta = $this->getVentilExportCompta();
-			if ($ventilExportCompta != 0) return -1;
-
-			// Get last number of validated invoice
-			if ($this->element != 'invoice_supplier')
-			{
-				if (empty($this->thirdparty)) $this->fetch_thirdparty();	// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
-				$maxref = $this->getNextNumRef($this->thirdparty,'last');
-
-				// If there is no invoice into the reset range and not already dispatched, we can delete
-				// If invoice to delete is last one and not already dispatched, we can delete
-				if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) return -2;
-
-				// TODO If there is payment in bookkeeping, check payment is not dispatched in accounting
-				// ...
-
-				if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))
-				{
-					$last = $this->is_last_in_cycle();
-					if (! $last) return -3;
-				}
-			}
-		}
-
-		// Test if there is at least one payment. If yes, refuse to delete.
-		if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) return -4;
-
-		return 2;
-	}
-
-	/**
-	 *	Return if an invoice was dispatched into bookkeeping
-	 *
-	 *	@return     int         <0 if KO, 0=no, 1=yes
-	 */
-	public function getVentilExportCompta()
-	{
-		$alreadydispatched = 0;
-
-		$type = 'customer_invoice';
-		if ($this->element == 'invoice_supplier') $type = 'supplier_invoice';
-
-		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$this->id;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
-				$alreadydispatched = $obj->nb;
-			}
-		}
-		else
-		{
-			$this->error = $this->db->lasterror();
-			return -1;
-		}
-
-		if ($alreadydispatched)
-		{
-			return 1;
-		}
-		return 0;
-	}
-
-
-	/**
-	 *	Return label of type of invoice
-	 *
-	 *	@return     string        Label of type of invoice
-	 */
-	function getLibType()
-	{
-		global $langs;
+        global $conf;
+
+        // We check if invoice is a temporary number (PROVxxxx)
+        $tmppart = substr($this->ref, 1, 4);
+
+        if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') // If draft invoice and ref not yet defined
+        {
+            return 1;
+        }
+
+        if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
+
+        // If not a draft invoice and not temporary invoice
+        if ($tmppart !== 'PROV')
+        {
+            $ventilExportCompta = $this->getVentilExportCompta();
+            if ($ventilExportCompta != 0) return -1;
+
+            // Get last number of validated invoice
+            if ($this->element != 'invoice_supplier')
+            {
+                if (empty($this->thirdparty)) $this->fetch_thirdparty();	// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
+                $maxref = $this->getNextNumRef($this->thirdparty,'last');
+
+                // If there is no invoice into the reset range and not already dispatched, we can delete
+                // If invoice to delete is last one and not already dispatched, we can delete
+                if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) return -2;
+
+                // TODO If there is payment in bookkeeping, check payment is not dispatched in accounting
+                // ...
+
+                if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))
+                {
+                    $last = $this->is_last_in_cycle();
+                    if (! $last) return -3;
+                }
+            }
+        }
+
+        // Test if there is at least one payment. If yes, refuse to delete.
+        if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) return -4;
+
+        return 2;
+    }
+
+    /**
+     *	Return if an invoice was dispatched into bookkeeping
+     *
+     *	@return     int         <0 if KO, 0=no, 1=yes
+     */
+    public function getVentilExportCompta()
+    {
+        $alreadydispatched = 0;
+
+        $type = 'customer_invoice';
+        if ($this->element == 'invoice_supplier') $type = 'supplier_invoice';
+
+        $sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$this->id;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            if ($obj)
+            {
+                $alreadydispatched = $obj->nb;
+            }
+        }
+        else
+        {
+            $this->error = $this->db->lasterror();
+            return -1;
+        }
+
+        if ($alreadydispatched)
+        {
+            return 1;
+        }
+        return 0;
+    }
+
+
+    /**
+     *	Return label of type of invoice
+     *
+     *	@return     string        Label of type of invoice
+     */
+    function getLibType()
+    {
+        global $langs;
         if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
         elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
         elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
         elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
         elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma");           // Not used.
         elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
-		return $langs->trans("Unknown");
-	}
-
-	/**
-	 *  Return label of object status
-	 *
-	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
-	 *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
-	 *  @return     string			        Label of status
-	 */
-	function getLibStatut($mode=0, $alreadypaid=-1)
-	{
-		return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type);
-	}
+        return $langs->trans("Unknown");
+    }
+
+    /**
+     *  Return label of object status
+     *
+     *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+     *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+     *  @return     string			        Label of status
+     */
+    function getLibStatut($mode=0, $alreadypaid=-1)
+    {
+        return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return label of a status
-	 *
-	 *	@param    	int  	$paye          	Status field paye
-	 *	@param      int		$status        	Id status
-	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
-	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, -1 otherwise)
-	 *	@param		int		$type			Type invoice
-	 *	@return     string        			Label of status
-	 */
-	function LibStatut($paye, $status, $mode=0, $alreadypaid=-1, $type=0)
-	{
+    /**
+     *	Return label of a status
+     *
+     *	@param    	int  	$paye          	Status field paye
+     *	@param      int		$status        	Id status
+     *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
+     *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, -1 otherwise)
+     *	@param		int		$type			Type invoice
+     *	@return     string        			Label of status
+     */
+    function LibStatut($paye, $status, $mode=0, $alreadypaid=-1, $type=0)
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load('bills');
-
-		//print "$paye,$status,$mode,$alreadypaid,$type";
-		if ($mode == 0)
-		{
-			$prefix='';
-			if (! $paye)
-			{
-				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return $langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
-				else return $langs->trans('Bill'.$prefix.'StatusPaid');
-			}
-		}
-		elseif ($mode == 1)
-		{
-			$prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return $langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');
-				else return $langs->trans('Bill'.$prefix.'StatusPaid');
-			}
-		}
-		elseif ($mode == 2)
-		{
-			$prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
-			}
-		}
-		elseif ($mode == 3)
-		{
-			$prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6');
-			}
-		}
-		elseif ($mode == 4)
-		{
-			$prefix='';
-			if (! $paye)
-			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
-			}
-		}
-		elseif ($mode == 5 || $mode == 6)
-		{
-			$prefix='';
-			if ($mode == 5) $prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
-				elseif ($alreadypaid <= 0)
-				{
-				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
-				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
-				}
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'),'statut6');
-			}
-		}
-	}
+        global $langs;
+        $langs->load('bills');
+
+        //print "$paye,$status,$mode,$alreadypaid,$type";
+        if ($mode == 0)
+        {
+            $prefix='';
+            if (! $paye)
+            {
+                if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+                elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
+                else return $langs->trans('Bill'.$prefix.'StatusStarted');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
+                elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
+                else return $langs->trans('Bill'.$prefix.'StatusPaid');
+            }
+        }
+        elseif ($mode == 1)
+        {
+            $prefix='Short';
+            if (! $paye)
+            {
+                if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+                elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
+                else return $langs->trans('Bill'.$prefix.'StatusStarted');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+                elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');
+                else return $langs->trans('Bill'.$prefix.'StatusPaid');
+            }
+        }
+        elseif ($mode == 2)
+        {
+            $prefix='Short';
+            if (! $paye)
+            {
+                if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+                elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
+                else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+                elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
+                else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
+            }
+        }
+        elseif ($mode == 3)
+        {
+            $prefix='Short';
+            if (! $paye)
+            {
+                if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+                elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
+                else return img_picto($langs->trans('BillStatusStarted'),'statut3');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
+                elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6');
+                else return img_picto($langs->trans('BillStatusPaid'),'statut6');
+            }
+        }
+        elseif ($mode == 4)
+        {
+            $prefix='';
+            if (! $paye)
+            {
+                if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+                elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
+                else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
+                elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
+                else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
+            }
+        }
+        elseif ($mode == 5 || $mode == 6)
+        {
+            $prefix='';
+            if ($mode == 5) $prefix='Short';
+            if (! $paye)
+            {
+                if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+                elseif ($alreadypaid <= 0)
+                {
+                    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
+                    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
+                }
+                else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
+                elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
+                else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'),'statut6');
+            }
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Renvoi une date limite de reglement de facture en fonction des
-	 *	conditions de reglements de la facture et date de facturation.
-	 *
-	 *	@param      integer	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
-	 *  @return     date     			       	Date limite de reglement si ok, <0 si ko
-	 */
-	function calculate_date_lim_reglement($cond_reglement=0)
-	{
+    /**
+     *	Renvoi une date limite de reglement de facture en fonction des
+     *	conditions de reglements de la facture et date de facturation.
+     *
+     *	@param      integer	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
+     *  @return     date     			       	Date limite de reglement si ok, <0 si ko
+     */
+    function calculate_date_lim_reglement($cond_reglement=0)
+    {
         // phpcs:enable
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
+        if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
+        if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
 
-		$cdr_nbjour=0;
+        $cdr_nbjour=0;
         $cdr_type=0;
         $cdr_decalage=0;
 
-		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
-		$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
-		if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
-		else {
-			$sqltemp.= " WHERE c.entity IN (".getEntity('c_payment_term').")";
-			$sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
-		}
-
-		dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
-		$resqltemp=$this->db->query($sqltemp);
-		if ($resqltemp)
-		{
-			if ($this->db->num_rows($resqltemp))
-			{
-				$obj = $this->db->fetch_object($resqltemp);
-				$cdr_nbjour = $obj->nbjour;
-				$cdr_type = $obj->type_cdr;
-				$cdr_decalage = $obj->decalage;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			return -1;
-		}
-		$this->db->free($resqltemp);
-
-		/* Definition de la date limite */
-
-		// 0 : ajout du nombre de jours
-		if ($cdr_type == 0)
-		{
-			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
-
-			$datelim += ($cdr_decalage * 3600 * 24);
-		}
-		// 1 : application de la regle "fin de mois"
-		elseif ($cdr_type == 1)
-		{
-			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
-
-			$mois=date('m', $datelim);
-			$annee=date('Y', $datelim);
-			if ($mois == 12)
-			{
-				$mois = 1;
-				$annee += 1;
-			}
-			else
-			{
-				$mois += 1;
-			}
-			// On se deplace au debut du mois suivant, et on retire un jour
-			$datelim=dol_mktime(12,0,0,$mois,1,$annee);
-			$datelim -= (3600 * 24);
-
-			$datelim += ($cdr_decalage * 3600 * 24);
-		}
-		// 2 : application de la règle, le N du mois courant ou suivant
-		elseif ($cdr_type == 2 && !empty($cdr_decalage))
-		{
-			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
-
-			$date_piece = dol_mktime(0, 0, 0, date('m', $datelim),date('d', $datelim),date('Y', $datelim)); // Sans les heures minutes et secondes
-			$date_lim_current = dol_mktime(0, 0, 0, date('m', $datelim), $cdr_decalage, date('Y', $datelim)); // Sans les heures minutes et secondes
-			$date_lim_next = dol_time_plus_duree($date_lim_current, 1, 'm');	// Add 1 month
-
-			$diff = $date_piece - $date_lim_current;
-
-			if ($diff < 0) $datelim = $date_lim_current;
-			else $datelim = $date_lim_next;
-		}
-		else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
-
-		return $datelim;
-	}
+        $sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
+        $sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
+        if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
+        else {
+            $sqltemp.= " WHERE c.entity IN (".getEntity('c_payment_term').")";
+            $sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
+        }
+
+        dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
+        $resqltemp=$this->db->query($sqltemp);
+        if ($resqltemp)
+        {
+            if ($this->db->num_rows($resqltemp))
+            {
+                $obj = $this->db->fetch_object($resqltemp);
+                $cdr_nbjour = $obj->nbjour;
+                $cdr_type = $obj->type_cdr;
+                $cdr_decalage = $obj->decalage;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            return -1;
+        }
+        $this->db->free($resqltemp);
+
+        /* Definition de la date limite */
+
+        // 0 : ajout du nombre de jours
+        if ($cdr_type == 0)
+        {
+            $datelim = $this->date + ($cdr_nbjour * 3600 * 24);
+
+            $datelim += ($cdr_decalage * 3600 * 24);
+        }
+        // 1 : application de la regle "fin de mois"
+        elseif ($cdr_type == 1)
+        {
+            $datelim = $this->date + ($cdr_nbjour * 3600 * 24);
+
+            $mois=date('m', $datelim);
+            $annee=date('Y', $datelim);
+            if ($mois == 12)
+            {
+                $mois = 1;
+                $annee += 1;
+            }
+            else
+            {
+                $mois += 1;
+            }
+            // On se deplace au debut du mois suivant, et on retire un jour
+            $datelim=dol_mktime(12,0,0,$mois,1,$annee);
+            $datelim -= (3600 * 24);
+
+            $datelim += ($cdr_decalage * 3600 * 24);
+        }
+        // 2 : application de la règle, le N du mois courant ou suivant
+        elseif ($cdr_type == 2 && !empty($cdr_decalage))
+        {
+            $datelim = $this->date + ($cdr_nbjour * 3600 * 24);
+
+            $date_piece = dol_mktime(0, 0, 0, date('m', $datelim),date('d', $datelim),date('Y', $datelim)); // Sans les heures minutes et secondes
+            $date_lim_current = dol_mktime(0, 0, 0, date('m', $datelim), $cdr_decalage, date('Y', $datelim)); // Sans les heures minutes et secondes
+            $date_lim_next = dol_time_plus_duree($date_lim_current, 1, 'm');	// Add 1 month
+
+            $diff = $date_piece - $date_lim_current;
+
+            if ($diff < 0) $datelim = $date_lim_current;
+            else $datelim = $date_lim_next;
+        }
+        else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
+
+        return $datelim;
+    }
 }
 
 
@@ -690,105 +690,105 @@ 
  */
 abstract class CommonInvoiceLine extends CommonObjectLine
 {
-	/**
-	 * Quantity
-	 * @var double
-	 */
-	public $qty;
-
-	/**
-	 * Unit price before taxes
-	 * @var float
-	 */
-	public $subprice;
-
-	/**
-	 * Type of the product. 0 for product 1 for service
-	 * @var int
-	 */
-	public $product_type = 0;
-
-	/**
-	 * Id of corresponding product
-	 * @var int
-	 */
-	public $fk_product;
-
-	/**
-	 * VAT code
-	 * @var string
-	 */
-	public $vat_src_code;
-
-	/**
-	 * VAT %
-	 * @var float
-	 */
-	public $tva_tx;
-
-	/**
-	 * Local tax 1 %
-	 * @var float
-	 */
-	public $localtax1_tx;
-
-	/**
-	 * Local tax 2 %
-	 * @var float
-	 */
-	public $localtax2_tx;
-
-	/**
-	 * Percent of discount
-	 * @var float
-	 */
-	public $remise_percent;
-
-	/**
-	 * Total amount before taxes
-	 * @var float
-	 */
-	public $total_ht;
-
-	/**
-	 * Total VAT amount
-	 * @var float
-	 */
-	public $total_tva;
-
-	/**
-	 * Total local tax 1 amount
-	 * @var float
-	 */
-	public $total_localtax1;
-
-	/**
-	 * Total local tax 2 amount
-	 * @var float
-	 */
-	public $total_localtax2;
-
-	/**
-	 * Total amount with taxes
-	 * @var float
-	 */
-	public $total_ttc;
-
-	/**
-	 * Liste d'options cumulables:
-	 * Bit 0:	0 si TVA normal - 1 si TVA NPR
-	 * Bit 1:	0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
-	 * @var int
-	 */
-	public $info_bits = 0;
-
-	/**
-	 *  Constructor
-	 *
-	 *  @param	DoliDB		$db		Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
+    /**
+     * Quantity
+     * @var double
+     */
+    public $qty;
+
+    /**
+     * Unit price before taxes
+     * @var float
+     */
+    public $subprice;
+
+    /**
+     * Type of the product. 0 for product 1 for service
+     * @var int
+     */
+    public $product_type = 0;
+
+    /**
+     * Id of corresponding product
+     * @var int
+     */
+    public $fk_product;
+
+    /**
+     * VAT code
+     * @var string
+     */
+    public $vat_src_code;
+
+    /**
+     * VAT %
+     * @var float
+     */
+    public $tva_tx;
+
+    /**
+     * Local tax 1 %
+     * @var float
+     */
+    public $localtax1_tx;
+
+    /**
+     * Local tax 2 %
+     * @var float
+     */
+    public $localtax2_tx;
+
+    /**
+     * Percent of discount
+     * @var float
+     */
+    public $remise_percent;
+
+    /**
+     * Total amount before taxes
+     * @var float
+     */
+    public $total_ht;
+
+    /**
+     * Total VAT amount
+     * @var float
+     */
+    public $total_tva;
+
+    /**
+     * Total local tax 1 amount
+     * @var float
+     */
+    public $total_localtax1;
+
+    /**
+     * Total local tax 2 amount
+     * @var float
+     */
+    public $total_localtax2;
+
+    /**
+     * Total amount with taxes
+     * @var float
+     */
+    public $total_ttc;
+
+    /**
+     * Liste d'options cumulables:
+     * Bit 0:	0 si TVA normal - 1 si TVA NPR
+     * Bit 1:	0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
+     * @var int
+     */
+    public $info_bits = 0;
+
+    /**
+     *  Constructor
+     *
+     *  @param	DoliDB		$db		Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        $this->db = $db;
+    }
 }

Spacing +131 added lines, -131 removed lines

@@ -23,7 +23,7 @@ 
  *       \brief      File of the superclass of invoices classes (customer and supplier)
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * 	Superclass for invoices classes
@@ -97,12 +97,12 @@ 
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *	@return		double						Remain of amount to pay
 	 */
-	function getRemainToPay($multicurrency=0)
+	function getRemainToPay($multicurrency = 0)
 	{
-	    $alreadypaid=0;
-	    $alreadypaid+=$this->getSommePaiement($multicurrency);
-	    $alreadypaid+=$this->getSumDepositsUsed($multicurrency);
-	    $alreadypaid+=$this->getSumCreditNotesUsed($multicurrency);
+	    $alreadypaid = 0;
+	    $alreadypaid += $this->getSommePaiement($multicurrency);
+	    $alreadypaid += $this->getSumDepositsUsed($multicurrency);
+	    $alreadypaid += $this->getSumCreditNotesUsed($multicurrency);
     	return $this->total_ttc - $alreadypaid;
 	}
 
@@ -112,22 +112,22 @@ 
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *	@return		int						Amount of payment already done, <0 if KO
 	 */
-	function getSommePaiement($multicurrency=0)
+	function getSommePaiement($multicurrency = 0)
 	{
-		$table='paiement_facture';
-		$field='fk_facture';
+		$table = 'paiement_facture';
+		$field = 'fk_facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
-			$table='paiementfourn_facturefourn';
-			$field='fk_facturefourn';
+			$table = 'paiementfourn_facturefourn';
+			$field = 'fk_facturefourn';
 		}
 
 		$sql = 'SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql.= ' WHERE '.$field.' = '.$this->id;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+		$sql .= ' WHERE '.$field.' = '.$this->id;
 
 		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -137,7 +137,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -149,7 +149,7 @@ 
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *		@return		int						<0 if KO, Sum of deposits amount otherwise
 	 */
-	function getSumDepositsUsed($multicurrency=0)
+	function getSumDepositsUsed($multicurrency = 0)
 	{
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 	    {
@@ -159,15 +159,15 @@ 
 
 	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic=new DiscountAbsolute($this->db);
-	    $result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
+	    $discountstatic = new DiscountAbsolute($this->db);
+	    $result = $discountstatic->getSumDepositsUsed($this, $multicurrency);
 	    if ($result >= 0)
 	    {
 	        return $result;
 	    }
 	    else
 	    {
-	        $this->error=$discountstatic->error;
+	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
 	}
@@ -178,19 +178,19 @@ 
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
 	 */
-	function getSumCreditNotesUsed($multicurrency=0)
+	function getSumCreditNotesUsed($multicurrency = 0)
 	{
 	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic=new DiscountAbsolute($this->db);
-	    $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
+	    $discountstatic = new DiscountAbsolute($this->db);
+	    $result = $discountstatic->getSumCreditNotesUsed($this, $multicurrency);
 	    if ($result >= 0)
 	    {
 	        return $result;
 	    }
 	    else
 	    {
-	        $this->error=$discountstatic->error;
+	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
 	}
@@ -202,13 +202,13 @@ 
 	 */
 	function getListIdAvoirFromInvoice()
 	{
-		$idarray=array();
+		$idarray = array();
 
 		$sql = 'SELECT rowid';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE fk_facture_source = '.$this->id;
-		$sql.= ' AND type = 2';
-		$resql=$this->db->query($sql);
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' WHERE fk_facture_source = '.$this->id;
+		$sql .= ' AND type = 2';
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -216,7 +216,7 @@ 
 			while ($i < $num)
 			{
 				$row = $this->db->fetch_row($resql);
-				$idarray[]=$row[0];
+				$idarray[] = $row[0];
 				$i++;
 			}
 		}
@@ -233,21 +233,21 @@ 
 	 *	@param		string	$option		filtre sur statut ('', 'validated', ...)
 	 *	@return		int					<0 si KO, 0 si aucune facture ne remplace, id facture sinon
 	 */
-	function getIdReplacingInvoice($option='')
+	function getIdReplacingInvoice($option = '')
 	{
 		$sql = 'SELECT rowid';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE fk_facture_source = '.$this->id;
-		$sql.= ' AND type < 2';
-		if ($option == 'validated') $sql.= ' AND fk_statut = 1';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' WHERE fk_facture_source = '.$this->id;
+		$sql .= ' AND type < 2';
+		if ($option == 'validated') $sql .= ' AND fk_statut = 1';
 		// PROTECTION BAD DATA
 		// Au cas ou base corrompue et qu'il y a une facture de remplacement validee
 		// et une autre non, on donne priorite a la validee.
 		// Ne devrait pas arriver (sauf si acces concurrentiel et que 2 personnes
 		// ont cree en meme temps une facture de remplacement pour la meme facture)
-		$sql.= ' ORDER BY fk_statut DESC';
+		$sql .= ' ORDER BY fk_statut DESC';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -274,43 +274,43 @@ 
 	 *	@param		string	$filtertype		1 to filter on type of payment == 'PRE'
 	 *  @return     array					Array with list of payments
 	 */
-	function getListOfPayments($filtertype='')
+	function getListOfPayments($filtertype = '')
 	{
-		$retarray=array();
+		$retarray = array();
 
-		$table='paiement_facture';
-		$table2='paiement';
-		$field='fk_facture';
-		$field2='fk_paiement';
-		$sharedentity='facture';
+		$table = 'paiement_facture';
+		$table2 = 'paiement';
+		$field = 'fk_facture';
+		$field2 = 'fk_paiement';
+		$sharedentity = 'facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
-			$table='paiementfourn_facturefourn';
-			$table2='paiementfourn';
-			$field='fk_facturefourn';
-			$field2='fk_paiementfourn';
-			$sharedentity='facture_fourn';
+			$table = 'paiementfourn_facturefourn';
+			$table2 = 'paiementfourn';
+			$field = 'fk_facturefourn';
+			$field2 = 'fk_paiementfourn';
+			$sharedentity = 'facture_fourn';
 		}
 
 		$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
-		$sql.= ' WHERE pf.'.$field.' = '.$this->id;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
+		$sql .= ' WHERE pf.'.$field.' = '.$this->id;
 		//$sql.= ' WHERE pf.'.$field.' = 1';
-		$sql.= ' AND pf.'.$field2.' = p.rowid';
-		$sql.= ' AND p.fk_paiement = t.id';
-		$sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';
-		if ($filtertype) $sql.=" AND t.code='PRE'";
+		$sql .= ' AND pf.'.$field2.' = p.rowid';
+		$sql .= ' AND p.fk_paiement = t.id';
+		$sql .= ' AND p.entity IN ('.getEntity($sharedentity).')';
+		if ($filtertype) $sql .= " AND t.code='PRE'";
 
 		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
-		$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)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$retarray[]=array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
+				$retarray[] = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
 				$i++;
 			}
 			$this->db->free($resql);
@@ -318,7 +318,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return array();
 		}
@@ -352,7 +352,7 @@ 
 			return 1;
 		}
 
-		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
+		if (!empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
 
 		// If not a draft invoice and not temporary invoice
 		if ($tmppart !== 'PROV')
@@ -363,8 +363,8 @@ 
 			// Get last number of validated invoice
 			if ($this->element != 'invoice_supplier')
 			{
-				if (empty($this->thirdparty)) $this->fetch_thirdparty();	// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
-				$maxref = $this->getNextNumRef($this->thirdparty,'last');
+				if (empty($this->thirdparty)) $this->fetch_thirdparty(); // We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
+				$maxref = $this->getNextNumRef($this->thirdparty, 'last');
 
 				// If there is no invoice into the reset range and not already dispatched, we can delete
 				// If invoice to delete is last one and not already dispatched, we can delete
@@ -376,7 +376,7 @@ 
 				if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))
 				{
 					$last = $this->is_last_in_cycle();
-					if (! $last) return -3;
+					if (!$last) return -3;
 				}
 			}
 		}
@@ -435,7 +435,7 @@ 
         elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
         elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
         elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
-        elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma");           // Not used.
+        elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.
         elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
 		return $langs->trans("Unknown");
 	}
@@ -447,7 +447,7 @@ 
 	 *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
 	 *  @return     string			        Label of status
 	 */
-	function getLibStatut($mode=0, $alreadypaid=-1)
+	function getLibStatut($mode = 0, $alreadypaid = -1)
 	{
 		return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type);
 	}
@@ -463,7 +463,7 @@ 
 	 *	@param		int		$type			Type invoice
 	 *	@return     string        			Label of status
 	 */
-	function LibStatut($paye, $status, $mode=0, $alreadypaid=-1, $type=0)
+	function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -472,8 +472,8 @@ 
 		//print "$paye,$status,$mode,$alreadypaid,$type";
 		if ($mode == 0)
 		{
-			$prefix='';
-			if (! $paye)
+			$prefix = '';
+			if (!$paye)
 			{
 				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
 				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
@@ -483,15 +483,15 @@ 
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
+				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
+				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
 				else return $langs->trans('Bill'.$prefix.'StatusPaid');
 			}
 		}
 		elseif ($mode == 1)
 		{
-			$prefix='Short';
-			if (! $paye)
+			$prefix = 'Short';
+			if (!$paye)
 			{
 				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
 				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
@@ -508,79 +508,79 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			$prefix='Short';
-			if (! $paye)
+			$prefix = 'Short';
+			if (!$paye)
 			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
+				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'), 'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
+				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'), 'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'), 'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
+				else return img_picto($langs->trans('BillStatusStarted'), 'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
+				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'), 'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
+				else return img_picto($langs->trans('BillStatusPaid'), 'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
 			}
 		}
 		elseif ($mode == 3)
 		{
-			$prefix='Short';
-			if (! $paye)
+			$prefix = 'Short';
+			if (!$paye)
 			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3');
+				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'), 'statut0');
+				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'), 'statut5');
+				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9');
+				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'), 'statut1');
+				else return img_picto($langs->trans('BillStatusStarted'), 'statut3');
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6');
+				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6');
+				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'), 'statut6');
+				else return img_picto($langs->trans('BillStatusPaid'), 'statut6');
 			}
 		}
 		elseif ($mode == 4)
 		{
-			$prefix='';
-			if (! $paye)
+			$prefix = '';
+			if (!$paye)
 			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
+				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'), 'statut0').' '.$langs->trans('BillStatusDraft');
+				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'), 'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'), 'statut1').' '.$langs->trans('BillStatusNotPaid');
+				else return img_picto($langs->trans('BillStatusStarted'), 'statut3').' '.$langs->trans('BillStatusStarted');
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
+				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
+				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'), 'statut6').' '.$langs->trans('BillStatusConverted');
+				else return img_picto($langs->trans('BillStatusPaid'), 'statut6').' '.$langs->trans('BillStatusPaid');
 			}
 		}
 		elseif ($mode == 5 || $mode == 6)
 		{
-			$prefix='';
-			if ($mode == 5) $prefix='Short';
-			if (! $paye)
+			$prefix = '';
+			if ($mode == 5) $prefix = 'Short';
+			if (!$paye)
 			{
-				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'), 'statut0');
+				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'), 'statut5');
+				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9');
 				elseif ($alreadypaid <= 0)
 				{
-				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
-				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
+				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'), 'statut1');
+				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'), 'statut1');
 				}
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
+				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'), 'statut3');
 			}
 			else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'),'statut6');
+				if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6');
+				elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'), 'statut6');
+				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'), 'statut6');
 			}
 		}
 	}
@@ -593,26 +593,26 @@ 
 	 *	@param      integer	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
 	 *  @return     date     			       	Date limite de reglement si ok, <0 si ko
 	 */
-	function calculate_date_lim_reglement($cond_reglement=0)
+	function calculate_date_lim_reglement($cond_reglement = 0)
 	{
         // phpcs:enable
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
+		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_code;
+		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_id;
 
-		$cdr_nbjour=0;
-        $cdr_type=0;
-        $cdr_decalage=0;
+		$cdr_nbjour = 0;
+        $cdr_type = 0;
+        $cdr_decalage = 0;
 
 		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
-		$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
-		if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
+		$sqltemp .= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
+		if (is_numeric($cond_reglement)) $sqltemp .= " WHERE c.rowid=".$cond_reglement;
 		else {
-			$sqltemp.= " WHERE c.entity IN (".getEntity('c_payment_term').")";
-			$sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
+			$sqltemp .= " WHERE c.entity IN (".getEntity('c_payment_term').")";
+			$sqltemp .= " AND c.code='".$this->db->escape($cond_reglement)."'";
 		}
 
 		dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
-		$resqltemp=$this->db->query($sqltemp);
+		$resqltemp = $this->db->query($sqltemp);
 		if ($resqltemp)
 		{
 			if ($this->db->num_rows($resqltemp))
@@ -625,7 +625,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 		$this->db->free($resqltemp);
@@ -644,8 +644,8 @@ 
 		{
 			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
 
-			$mois=date('m', $datelim);
-			$annee=date('Y', $datelim);
+			$mois = date('m', $datelim);
+			$annee = date('Y', $datelim);
 			if ($mois == 12)
 			{
 				$mois = 1;
@@ -656,7 +656,7 @@ 
 				$mois += 1;
 			}
 			// On se deplace au debut du mois suivant, et on retire un jour
-			$datelim=dol_mktime(12,0,0,$mois,1,$annee);
+			$datelim = dol_mktime(12, 0, 0, $mois, 1, $annee);
 			$datelim -= (3600 * 24);
 
 			$datelim += ($cdr_decalage * 3600 * 24);
@@ -666,9 +666,9 @@ 
 		{
 			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
 
-			$date_piece = dol_mktime(0, 0, 0, date('m', $datelim),date('d', $datelim),date('Y', $datelim)); // Sans les heures minutes et secondes
+			$date_piece = dol_mktime(0, 0, 0, date('m', $datelim), date('d', $datelim), date('Y', $datelim)); // Sans les heures minutes et secondes
 			$date_lim_current = dol_mktime(0, 0, 0, date('m', $datelim), $cdr_decalage, date('Y', $datelim)); // Sans les heures minutes et secondes
-			$date_lim_next = dol_time_plus_duree($date_lim_current, 1, 'm');	// Add 1 month
+			$date_lim_next = dol_time_plus_duree($date_lim_current, 1, 'm'); // Add 1 month
 
 			$diff = $date_piece - $date_lim_current;
 
@@ -683,7 +683,7 @@ 
 
 
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 
 /**
  *	Parent class of all other business classes for details of elements (invoices, contracts, proposals, orders, ...)

Braces +204 added lines, -117 removed lines

@@ -132,10 +132,12 @@ 
 		{
 			$obj = $this->db->fetch_object($resql);
 			$this->db->free($resql);
-			if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-		}
-		else
+			if ($multicurrency) {
+			    return $obj->multicurrency_amount;
+			} else {
+			    return $obj->amount;
+			}
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -164,8 +166,7 @@ 
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else
+	    } else
 	    {
 	        $this->error=$discountstatic->error;
 	        return -1;
@@ -187,8 +188,7 @@ 
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else
+	    } else
 	    {
 	        $this->error=$discountstatic->error;
 	        return -1;
@@ -219,8 +219,7 @@ 
 				$idarray[]=$row[0];
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -239,7 +238,9 @@ 
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 		$sql.= ' WHERE fk_facture_source = '.$this->id;
 		$sql.= ' AND type < 2';
-		if ($option == 'validated') $sql.= ' AND fk_statut = 1';
+		if ($option == 'validated') {
+		    $sql.= ' AND fk_statut = 1';
+		}
 		// PROTECTION BAD DATA
 		// Au cas ou base corrompue et qu'il y a une facture de remplacement validee
 		// et une autre non, on donne priorite a la validee.
@@ -255,14 +256,12 @@ 
 			{
 				// Si il y en a
 				return $obj->rowid;
-			}
-			else
+			} else
 			{
 				// Si aucune facture ne remplace
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -299,7 +298,9 @@ 
 		$sql.= ' AND pf.'.$field2.' = p.rowid';
 		$sql.= ' AND p.fk_paiement = t.id';
 		$sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';
-		if ($filtertype) $sql.=" AND t.code='PRE'";
+		if ($filtertype) {
+		    $sql.=" AND t.code='PRE'";
+		}
 
 		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -315,8 +316,7 @@ 
 			}
 			$this->db->free($resql);
 			return $retarray;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_print_error($this->db);
@@ -347,28 +347,39 @@ 
 		// We check if invoice is a temporary number (PROVxxxx)
 		$tmppart = substr($this->ref, 1, 4);
 
-		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') // If draft invoice and ref not yet defined
+		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') {
+		    // If draft invoice and ref not yet defined
 		{
 			return 1;
 		}
+		}
 
-		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
+		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) {
+		    return 0;
+		}
 
 		// If not a draft invoice and not temporary invoice
 		if ($tmppart !== 'PROV')
 		{
 			$ventilExportCompta = $this->getVentilExportCompta();
-			if ($ventilExportCompta != 0) return -1;
+			if ($ventilExportCompta != 0) {
+			    return -1;
+			}
 
 			// Get last number of validated invoice
 			if ($this->element != 'invoice_supplier')
 			{
-				if (empty($this->thirdparty)) $this->fetch_thirdparty();	// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
+				if (empty($this->thirdparty)) {
+				    $this->fetch_thirdparty();
+				}
+				// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
 				$maxref = $this->getNextNumRef($this->thirdparty,'last');
 
 				// If there is no invoice into the reset range and not already dispatched, we can delete
 				// If invoice to delete is last one and not already dispatched, we can delete
-				if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) return -2;
+				if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) {
+				    return -2;
+				}
 
 				// TODO If there is payment in bookkeeping, check payment is not dispatched in accounting
 				// ...
@@ -376,13 +387,17 @@ 
 				if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))
 				{
 					$last = $this->is_last_in_cycle();
-					if (! $last) return -3;
+					if (! $last) {
+					    return -3;
+					}
 				}
 			}
 		}
 
 		// Test if there is at least one payment. If yes, refuse to delete.
-		if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) return -4;
+		if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) {
+		    return -4;
+		}
 
 		return 2;
 	}
@@ -397,7 +412,9 @@ 
 		$alreadydispatched = 0;
 
 		$type = 'customer_invoice';
-		if ($this->element == 'invoice_supplier') $type = 'supplier_invoice';
+		if ($this->element == 'invoice_supplier') {
+		    $type = 'supplier_invoice';
+		}
 
 		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$this->id;
 		$resql = $this->db->query($sql);
@@ -408,8 +425,7 @@ 
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else
+		} else
 		{
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -431,12 +447,21 @@ 
 	function getLibType()
 	{
 		global $langs;
-        if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
-        elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
-        elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
-        elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
-        elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma");           // Not used.
-        elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
+        if ($this->type == CommonInvoice::TYPE_STANDARD) {
+            return $langs->trans("InvoiceStandard");
+        } elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) {
+            return $langs->trans("InvoiceReplacement");
+        } elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) {
+            return $langs->trans("InvoiceAvoir");
+        } elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) {
+            return $langs->trans("InvoiceDeposit");
+        } elseif ($this->type == CommonInvoice::TYPE_PROFORMA) {
+            return $langs->trans("InvoiceProForma");
+        }
+        // Not used.
+        elseif ($this->type == CommonInvoice::TYPE_SITUATION) {
+            return $langs->trans("InvoiceSituation");
+        }
 		return $langs->trans("Unknown");
 	}
 
@@ -475,112 +500,167 @@ 
 			$prefix='';
 			if (! $paye)
 			{
-				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return $langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
+				if ($status == 0) {
+				    return $langs->trans('Bill'.$prefix.'StatusDraft');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+				    return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+				    return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+				} elseif ($alreadypaid <= 0) {
+				    return $langs->trans('Bill'.$prefix.'StatusNotPaid');
+				} else {
+				    return $langs->trans('Bill'.$prefix.'StatusStarted');
+				}
+			} else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
-				else return $langs->trans('Bill'.$prefix.'StatusPaid');
+				if ($type == self::TYPE_CREDIT_NOTE) {
+				    return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+				}
+				// credit note
+				elseif ($type == self::TYPE_DEPOSIT) {
+				    return $langs->trans('Bill'.$prefix.'StatusConverted');
+				}
+				// deposit invoice
+				else {
+				    return $langs->trans('Bill'.$prefix.'StatusPaid');
+				}
 			}
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			$prefix='Short';
 			if (! $paye)
 			{
-				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return $langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
+				if ($status == 0) {
+				    return $langs->trans('Bill'.$prefix.'StatusDraft');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+				    return $langs->trans('Bill'.$prefix.'StatusCanceled');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+				    return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+				} elseif ($alreadypaid <= 0) {
+				    return $langs->trans('Bill'.$prefix.'StatusNotPaid');
+				} else {
+				    return $langs->trans('Bill'.$prefix.'StatusStarted');
+				}
+			} else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');
-				else return $langs->trans('Bill'.$prefix.'StatusPaid');
+				if ($type == self::TYPE_CREDIT_NOTE) {
+				    return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+				} elseif ($type == self::TYPE_DEPOSIT) {
+				    return $langs->trans('Bill'.$prefix.'StatusConverted');
+				} else {
+				    return $langs->trans('Bill'.$prefix.'StatusPaid');
+				}
 			}
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			$prefix='Short';
 			if (! $paye)
 			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
+				if ($status == 0) {
+				    return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+				    return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+				    return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+				} elseif ($alreadypaid <= 0) {
+				    return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
+				} else {
+				    return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
+				}
+			} else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
+				if ($type == self::TYPE_CREDIT_NOTE) {
+				    return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+				} elseif ($type == self::TYPE_DEPOSIT) {
+				    return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
+				} else {
+				    return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
+				}
 			}
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			$prefix='Short';
 			if (! $paye)
 			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3');
-			}
-			else
+				if ($status == 0) {
+				    return img_picto($langs->trans('BillStatusDraft'),'statut0');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+				    return img_picto($langs->trans('BillStatusCanceled'),'statut5');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+				    return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+				} elseif ($alreadypaid <= 0) {
+				    return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
+				} else {
+				    return img_picto($langs->trans('BillStatusStarted'),'statut3');
+				}
+			} else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6');
+				if ($type == self::TYPE_CREDIT_NOTE) {
+				    return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
+				} elseif ($type == self::TYPE_DEPOSIT) {
+				    return img_picto($langs->trans('BillStatusConverted'),'statut6');
+				} else {
+				    return img_picto($langs->trans('BillStatusPaid'),'statut6');
+				}
 			}
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			$prefix='';
 			if (! $paye)
 			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
-			}
-			else
+				if ($status == 0) {
+				    return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+				    return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+				    return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+				} elseif ($alreadypaid <= 0) {
+				    return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
+				} else {
+				    return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
+				}
+			} else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
+				if ($type == self::TYPE_CREDIT_NOTE) {
+				    return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
+				} elseif ($type == self::TYPE_DEPOSIT) {
+				    return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
+				} else {
+				    return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
+				}
 			}
-		}
-		elseif ($mode == 5 || $mode == 6)
+		} elseif ($mode == 5 || $mode == 6)
 		{
 			$prefix='';
-			if ($mode == 5) $prefix='Short';
+			if ($mode == 5) {
+			    $prefix='Short';
+			}
 			if (! $paye)
 			{
-				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
-				elseif ($alreadypaid <= 0)
+				if ($status == 0) {
+				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
+				} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+				} elseif ($alreadypaid <= 0)
 				{
-				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
+				    if ($type == self::TYPE_CREDIT_NOTE) {
+				        return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
+				    }
 				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
+				} else {
+				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
 				}
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
-			}
-			else
+			} else
 			{
-				if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'),'statut6');
+				if ($type == self::TYPE_CREDIT_NOTE) {
+				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
+				} elseif ($type == self::TYPE_DEPOSIT) {
+				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
+				} else {
+				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'),'statut6');
+				}
 			}
 		}
 	}
@@ -596,8 +676,12 @@ 
 	function calculate_date_lim_reglement($cond_reglement=0)
 	{
         // phpcs:enable
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
+		if (! $cond_reglement) {
+		    $cond_reglement=$this->cond_reglement_code;
+		}
+		if (! $cond_reglement) {
+		    $cond_reglement=$this->cond_reglement_id;
+		}
 
 		$cdr_nbjour=0;
         $cdr_type=0;
@@ -605,8 +689,9 @@ 
 
 		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
 		$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
-		if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
-		else {
+		if (is_numeric($cond_reglement)) {
+		    $sqltemp.= " WHERE c.rowid=".$cond_reglement;
+		} else {
 			$sqltemp.= " WHERE c.entity IN (".getEntity('c_payment_term').")";
 			$sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
 		}
@@ -622,8 +707,7 @@ 
 				$cdr_type = $obj->type_cdr;
 				$cdr_decalage = $obj->decalage;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -650,8 +734,7 @@ 
 			{
 				$mois = 1;
 				$annee += 1;
-			}
-			else
+			} else
 			{
 				$mois += 1;
 			}
@@ -672,10 +755,14 @@ 
 
 			$diff = $date_piece - $date_lim_current;
 
-			if ($diff < 0) $datelim = $date_lim_current;
-			else $datelim = $date_lim_next;
+			if ($diff < 0) {
+			    $datelim = $date_lim_current;
+			} else {
+			    $datelim = $date_lim_next;
+			}
+		} else {
+		    return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
 		}
-		else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
 
 		return $datelim;
 	}

dolibarr/htdocs/core/class/comment.class.php

Indentation +334 added lines, -334 removed lines

@@ -21,347 +21,347 @@
  */
 class Comment extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='comment';
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='comment';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='comment';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='comment';
 
-	/**
-	 * @var int Field with ID of parent key if this field has a parent
-	 */
-	public $fk_element ='';
+    /**
+     * @var int Field with ID of parent key if this field has a parent
+     */
+    public $fk_element ='';
 
-	public $element_type;
+    public $element_type;
 
-	/**
-	 * @var string description
-	 */
-	public $description;
+    /**
+     * @var string description
+     */
+    public $description;
 
-	public $tms;
+    public $tms;
 
-	public $datec;
+    public $datec;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_user_author;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	public $import_key;
-
-	public $comments = array();
-
-	public $oldcopy;
-
-
-	/**
-	 *  Constructor
-	 *
-	 *  @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *  Create into database
-	 *
-	 *  @param	User	$user        	User that create
-	 *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int 		        	<0 if KO, Id of created object if OK
-	 */
-	function create($user, $notrigger=0)
-	{
-		global $conf, $langs;
-
-		$error=0;
-
-		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."comment (";
-		$sql.= "description";
-		$sql.= ", datec";
-		$sql.= ", fk_element";
-		$sql.= ", element_type";
-		$sql.= ", fk_user_author";
-		$sql.= ", entity";
-		$sql.= ", import_key";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->description)."'";
-		$sql.= ", ".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null');
-		$sql.= ", '".(isset($this->fk_element)?$this->fk_element:"null")."'";
-		$sql.= ", '".$this->db->escape($this->element_type)."'";
-		$sql.= ", '".(isset($this->fk_user_author)?$this->fk_user_author:"null")."'";
-		$sql.= ", ".(!empty($this->entity)?$this->entity:'1');
-		$sql.= ", ".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= ")";
-
-		//var_dump($this->db);
-		//echo $sql;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_comment");
-
-			if (! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_CREATE',$user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return $this->id;
-		}
-	}
-
-
-	/**
-	 *  Load object in memory from database
-	 *
-	 *  @param	int		$id			Id object
-	 *  @param	int		$ref		ref object
-	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
-	 */
-	function fetch($id, $ref='')
-	{
-		global $langs;
-
-		$sql = "SELECT";
-		$sql.= " c.rowid,";
-		$sql.= " c.description,";
-		$sql.= " c.datec,";
-		$sql.= " c.tms,";
-		$sql.= " c.fk_element,";
-		$sql.= " c.element_type,";
-		$sql.= " c.fk_user_author,";
-		$sql.= " c.entity,";
-		$sql.= " c.import_key";
-		$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-		$sql.= " WHERE c.rowid = ".$id;
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num_rows = $this->db->num_rows($resql);
-
-			if ($num_rows)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id					= $obj->rowid;
-				$this->description			= $obj->description;
-				$this->element_type			= $obj->element_type;
-				$this->datec				= $this->db->jdate($obj->datec);
-				$this->tms					= $obj->tms;
-				$this->fk_user_author		= $obj->fk_user_author;
-				$this->fk_element			= $obj->fk_element;
-				$this->entity				= $obj->entity;
-				$this->import_key			= $obj->import_key;
-			}
-
-			$this->db->free($resql);
-
-			if ($num_rows) return 1;
-			else return 0;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Update database
-	 *
-	 *  @param	User	$user        	User that modify
-	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int			         	<=0 if KO, >0 if OK
-	 */
-	function update(User $user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_project=(int) trim($this->fk_element);
-		if (isset($this->fk_user_author)) $this->fk_user_author=(int) trim($this->fk_user_author);
-		if (isset($this->description)) $this->description=trim($this->description);
-
-
-		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_comment SET";
-		$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
-		$sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
-		$sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
-		$sql.= " element_type='".$this->db->escape($this->element_type)."',";
-		$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
-		$sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
-		$sql.= " import_key=".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= " WHERE rowid=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_MODIFY',$user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-
-	/**
-	 *	Delete task from database
-	 *
-	 *	@param	User	$user        	User that delete
-	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-		$error=0;
-
-		$this->db->begin();
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."comment";
-		$sql.= " WHERE rowid=".$this->id;
-
-		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_DELETE',$user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}else{
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-
-	/**
-	 * Load comments linked with current task
-	 *
-	 * @param	string		$element_type		Element type
-	 * @param	int			$fk_element			Id of element
-	 * @return 	array							Comment array
-	 */
-	public function fetchAllFor($element_type, $fk_element)
-	{
-		global $db,$conf;
-		$this->comments = array();
-		if(!empty($element_type) && !empty($fk_element)) {
-			$sql = "SELECT";
-			$sql.= " c.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-			$sql.= " WHERE c.fk_element = ".$fk_element;
-			$sql.= " AND c.element_type = '".$db->escape($element_type)."'";
-			$sql.= " AND c.entity = ".$conf->entity;
-			$sql.= " ORDER BY c.tms DESC";
-
-			dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$num_rows = $db->num_rows($resql);
-				if ($num_rows > 0)
-				{
-					while($obj = $db->fetch_object($resql))
-					{
-						$comment = new self($db);
-						$comment->fetch($obj->rowid);
-						$this->comments[] = $comment;
-					}
-				}
-				$db->free($resql);
-			} else {
-				$this->errors[]="Error ".$this->db->lasterror();
-				return -1;
-			}
-		}
-
-		return count($this->comments);
-	}
+    public $fk_user_author;
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    public $import_key;
+
+    public $comments = array();
+
+    public $oldcopy;
+
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *  Create into database
+     *
+     *  @param	User	$user        	User that create
+     *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
+     *  @return int 		        	<0 if KO, Id of created object if OK
+     */
+    function create($user, $notrigger=0)
+    {
+        global $conf, $langs;
+
+        $error=0;
+
+        // Insert request
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."comment (";
+        $sql.= "description";
+        $sql.= ", datec";
+        $sql.= ", fk_element";
+        $sql.= ", element_type";
+        $sql.= ", fk_user_author";
+        $sql.= ", entity";
+        $sql.= ", import_key";
+        $sql.= ") VALUES (";
+        $sql.= "'".$this->db->escape($this->description)."'";
+        $sql.= ", ".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null');
+        $sql.= ", '".(isset($this->fk_element)?$this->fk_element:"null")."'";
+        $sql.= ", '".$this->db->escape($this->element_type)."'";
+        $sql.= ", '".(isset($this->fk_user_author)?$this->fk_user_author:"null")."'";
+        $sql.= ", ".(!empty($this->entity)?$this->entity:'1');
+        $sql.= ", ".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
+        $sql.= ")";
+
+        //var_dump($this->db);
+        //echo $sql;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_comment");
+
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('TASK_COMMENT_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+    }
+
+
+    /**
+     *  Load object in memory from database
+     *
+     *  @param	int		$id			Id object
+     *  @param	int		$ref		ref object
+     *  @return int 		        <0 if KO, 0 if not found, >0 if OK
+     */
+    function fetch($id, $ref='')
+    {
+        global $langs;
+
+        $sql = "SELECT";
+        $sql.= " c.rowid,";
+        $sql.= " c.description,";
+        $sql.= " c.datec,";
+        $sql.= " c.tms,";
+        $sql.= " c.fk_element,";
+        $sql.= " c.element_type,";
+        $sql.= " c.fk_user_author,";
+        $sql.= " c.entity,";
+        $sql.= " c.import_key";
+        $sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
+        $sql.= " WHERE c.rowid = ".$id;
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num_rows = $this->db->num_rows($resql);
+
+            if ($num_rows)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id					= $obj->rowid;
+                $this->description			= $obj->description;
+                $this->element_type			= $obj->element_type;
+                $this->datec				= $this->db->jdate($obj->datec);
+                $this->tms					= $obj->tms;
+                $this->fk_user_author		= $obj->fk_user_author;
+                $this->fk_element			= $obj->fk_element;
+                $this->entity				= $obj->entity;
+                $this->import_key			= $obj->import_key;
+            }
+
+            $this->db->free($resql);
+
+            if ($num_rows) return 1;
+            else return 0;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Update database
+     *
+     *  @param	User	$user        	User that modify
+     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+     *  @return int			         	<=0 if KO, >0 if OK
+     */
+    function update(User $user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        // Clean parameters
+        if (isset($this->fk_element)) $this->fk_project=(int) trim($this->fk_element);
+        if (isset($this->fk_user_author)) $this->fk_user_author=(int) trim($this->fk_user_author);
+        if (isset($this->description)) $this->description=trim($this->description);
+
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_comment SET";
+        $sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
+        $sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
+        $sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
+        $sql.= " element_type='".$this->db->escape($this->element_type)."',";
+        $sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
+        $sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
+        $sql.= " import_key=".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
+        $sql.= " WHERE rowid=".$this->id;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('TASK_COMMENT_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+
+    /**
+     *	Delete task from database
+     *
+     *	@param	User	$user        	User that delete
+     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+     *	@return	int						<0 if KO, >0 if OK
+     */
+    function delete($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+        $error=0;
+
+        $this->db->begin();
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."comment";
+        $sql.= " WHERE rowid=".$this->id;
+
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('TASK_COMMENT_DELETE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }else{
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+
+    /**
+     * Load comments linked with current task
+     *
+     * @param	string		$element_type		Element type
+     * @param	int			$fk_element			Id of element
+     * @return 	array							Comment array
+     */
+    public function fetchAllFor($element_type, $fk_element)
+    {
+        global $db,$conf;
+        $this->comments = array();
+        if(!empty($element_type) && !empty($fk_element)) {
+            $sql = "SELECT";
+            $sql.= " c.rowid";
+            $sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
+            $sql.= " WHERE c.fk_element = ".$fk_element;
+            $sql.= " AND c.element_type = '".$db->escape($element_type)."'";
+            $sql.= " AND c.entity = ".$conf->entity;
+            $sql.= " ORDER BY c.tms DESC";
+
+            dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
+            $resql=$db->query($sql);
+            if ($resql)
+            {
+                $num_rows = $db->num_rows($resql);
+                if ($num_rows > 0)
+                {
+                    while($obj = $db->fetch_object($resql))
+                    {
+                        $comment = new self($db);
+                        $comment->fetch($obj->rowid);
+                        $this->comments[] = $comment;
+                    }
+                }
+                $db->free($resql);
+            } else {
+                $this->errors[]="Error ".$this->db->lasterror();
+                return -1;
+            }
+        }
+
+        return count($this->comments);
+    }
 }

Spacing +93 added lines, -93 removed lines

@@ -24,17 +24,17 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='comment';
+	public $element = 'comment';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='comment';
+	public $table_element = 'comment';
 
 	/**
 	 * @var int Field with ID of parent key if this field has a parent
 	 */
-	public $fk_element ='';
+	public $fk_element = '';
 
 	public $element_type;
 
@@ -82,30 +82,30 @@ 
 	 *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int 		        	<0 if KO, Id of created object if OK
 	 */
-	function create($user, $notrigger=0)
+	function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."comment (";
-		$sql.= "description";
-		$sql.= ", datec";
-		$sql.= ", fk_element";
-		$sql.= ", element_type";
-		$sql.= ", fk_user_author";
-		$sql.= ", entity";
-		$sql.= ", import_key";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->description)."'";
-		$sql.= ", ".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null');
-		$sql.= ", '".(isset($this->fk_element)?$this->fk_element:"null")."'";
-		$sql.= ", '".$this->db->escape($this->element_type)."'";
-		$sql.= ", '".(isset($this->fk_user_author)?$this->fk_user_author:"null")."'";
-		$sql.= ", ".(!empty($this->entity)?$this->entity:'1');
-		$sql.= ", ".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= ")";
+		$sql .= "description";
+		$sql .= ", datec";
+		$sql .= ", fk_element";
+		$sql .= ", element_type";
+		$sql .= ", fk_user_author";
+		$sql .= ", entity";
+		$sql .= ", import_key";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->escape($this->description)."'";
+		$sql .= ", ".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
+		$sql .= ", '".(isset($this->fk_element) ? $this->fk_element : "null")."'";
+		$sql .= ", '".$this->db->escape($this->element_type)."'";
+		$sql .= ", '".(isset($this->fk_user_author) ? $this->fk_user_author : "null")."'";
+		$sql .= ", ".(!empty($this->entity) ? $this->entity : '1');
+		$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= ")";
 
 		//var_dump($this->db);
 		//echo $sql;
@@ -113,17 +113,17 @@ 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_comment");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_CREATE',$user);
+				$result = $this->call_trigger('TASK_COMMENT_CREATE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -132,13 +132,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -155,25 +155,25 @@ 
 	 *  @param	int		$ref		ref object
 	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
 	 */
-	function fetch($id, $ref='')
+	function fetch($id, $ref = '')
 	{
 		global $langs;
 
 		$sql = "SELECT";
-		$sql.= " c.rowid,";
-		$sql.= " c.description,";
-		$sql.= " c.datec,";
-		$sql.= " c.tms,";
-		$sql.= " c.fk_element,";
-		$sql.= " c.element_type,";
-		$sql.= " c.fk_user_author,";
-		$sql.= " c.entity,";
-		$sql.= " c.import_key";
-		$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-		$sql.= " WHERE c.rowid = ".$id;
+		$sql .= " c.rowid,";
+		$sql .= " c.description,";
+		$sql .= " c.datec,";
+		$sql .= " c.tms,";
+		$sql .= " c.fk_element,";
+		$sql .= " c.element_type,";
+		$sql .= " c.fk_user_author,";
+		$sql .= " c.entity,";
+		$sql .= " c.import_key";
+		$sql .= " FROM ".MAIN_DB_PREFIX."comment as c";
+		$sql .= " WHERE c.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num_rows = $this->db->num_rows($resql);
@@ -182,14 +182,14 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id					= $obj->rowid;
-				$this->description			= $obj->description;
-				$this->element_type			= $obj->element_type;
-				$this->datec				= $this->db->jdate($obj->datec);
-				$this->tms					= $obj->tms;
-				$this->fk_user_author		= $obj->fk_user_author;
+				$this->id = $obj->rowid;
+				$this->description = $obj->description;
+				$this->element_type = $obj->element_type;
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->tms = $obj->tms;
+				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_element			= $obj->fk_element;
-				$this->entity				= $obj->entity;
+				$this->entity = $obj->entity;
 				$this->import_key			= $obj->import_key;
 			}
 
@@ -200,7 +200,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -213,40 +213,40 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int			         	<=0 if KO, >0 if OK
 	 */
-	function update(User $user, $notrigger=0)
+	function update(User $user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_project=(int) trim($this->fk_element);
-		if (isset($this->fk_user_author)) $this->fk_user_author=(int) trim($this->fk_user_author);
-		if (isset($this->description)) $this->description=trim($this->description);
+		if (isset($this->fk_element)) $this->fk_project = (int) trim($this->fk_element);
+		if (isset($this->fk_user_author)) $this->fk_user_author = (int) trim($this->fk_user_author);
+		if (isset($this->description)) $this->description = trim($this->description);
 
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_comment SET";
-		$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
-		$sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
-		$sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
-		$sql.= " element_type='".$this->db->escape($this->element_type)."',";
-		$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
-		$sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
-		$sql.= " import_key=".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " description=".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "null").",";
+		$sql .= " datec=".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql .= " fk_element=".(isset($this->fk_element) ? $this->fk_element : "null").",";
+		$sql .= " element_type='".$this->db->escape($this->element_type)."',";
+		$sql .= " fk_user_author=".(isset($this->fk_user_author) ? $this->fk_user_author : "null").",";
+		$sql .= " entity=".(!empty($this->entity) ? $this->entity : '1').",";
+		$sql .= " import_key=".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_MODIFY',$user);
+				$result = $this->call_trigger('TASK_COMMENT_MODIFY', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -255,13 +255,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -278,27 +278,27 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."comment";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_DELETE',$user);
+				$result = $this->call_trigger('TASK_COMMENT_DELETE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -307,14 +307,14 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
-		}else{
+			return -1 * $error;
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -330,25 +330,25 @@ 
 	 */
 	public function fetchAllFor($element_type, $fk_element)
 	{
-		global $db,$conf;
+		global $db, $conf;
 		$this->comments = array();
-		if(!empty($element_type) && !empty($fk_element)) {
+		if (!empty($element_type) && !empty($fk_element)) {
 			$sql = "SELECT";
-			$sql.= " c.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-			$sql.= " WHERE c.fk_element = ".$fk_element;
-			$sql.= " AND c.element_type = '".$db->escape($element_type)."'";
-			$sql.= " AND c.entity = ".$conf->entity;
-			$sql.= " ORDER BY c.tms DESC";
+			$sql .= " c.rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."comment as c";
+			$sql .= " WHERE c.fk_element = ".$fk_element;
+			$sql .= " AND c.element_type = '".$db->escape($element_type)."'";
+			$sql .= " AND c.entity = ".$conf->entity;
+			$sql .= " ORDER BY c.tms DESC";
 
 			dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-			$resql=$db->query($sql);
+			$resql = $db->query($sql);
 			if ($resql)
 			{
 				$num_rows = $db->num_rows($resql);
 				if ($num_rows > 0)
 				{
-					while($obj = $db->fetch_object($resql))
+					while ($obj = $db->fetch_object($resql))
 					{
 						$comment = new self($db);
 						$comment->fetch($obj->rowid);
@@ -357,7 +357,7 @@ 
 				}
 				$db->free($resql);
 			} else {
-				$this->errors[]="Error ".$this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				return -1;
 			}
 		}

Braces +18 added lines, -12 removed lines

@@ -139,8 +139,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return $this->id;
@@ -195,10 +194,12 @@ 
 
 			$this->db->free($resql);
 
-			if ($num_rows) return 1;
-			else return 0;
-		}
-		else
+			if ($num_rows) {
+			    return 1;
+			} else {
+			    return 0;
+			}
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -219,9 +220,15 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_project=(int) trim($this->fk_element);
-		if (isset($this->fk_user_author)) $this->fk_user_author=(int) trim($this->fk_user_author);
-		if (isset($this->description)) $this->description=trim($this->description);
+		if (isset($this->fk_element)) {
+		    $this->fk_project=(int) trim($this->fk_element);
+		}
+		if (isset($this->fk_user_author)) {
+		    $this->fk_user_author=(int) trim($this->fk_user_author);
+		}
+		if (isset($this->description)) {
+		    $this->description=trim($this->description);
+		}
 
 
 		// Update request
@@ -262,8 +269,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -314,7 +320,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}else{
+		} else{
 			$this->db->commit();
 			return 1;
 		}

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

Indentation +143 added lines, -143 removed lines

@@ -35,15 +35,15 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
      */
     function __construct($db)
     {
@@ -75,7 +75,7 @@ 
             '50' => $langs->trans("ActionRunningShort"),
             '100' => $langs->trans("ActionDoneShort")
         );
-		// +ActionUncomplete
+        // +ActionUncomplete
 
         if (! empty($conf->use_javascript_ajax))
         {
@@ -127,8 +127,8 @@ 
         }
         if (! empty($conf->use_javascript_ajax) || $onlyselect)
         {
-        	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
+            //var_dump($selected);
+            if ($selected == 'done') $selected='100';
             print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
             if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
             foreach($listofstatus as $key => $val)
@@ -136,7 +136,7 @@ 
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
                 if ($key == '50' && $onlyselect == 2)
                 {
-                	print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';
+                    print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';
                 }
             }
             print '</select>';
@@ -144,12 +144,12 @@ 
 
             if (empty($onlyselect))
             {
-	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
-    	        print '<span class="hideonsmartphone hideifna">%</span>';
+                print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
+                print '<span class="hideonsmartphone hideifna">%</span>';
             }
         }
         else
-		{
+        {
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
         }
     }
@@ -179,18 +179,18 @@ 
         $sortorder='DESC,DESC';
 
         $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+        if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
+            if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
+            elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
+            elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
+            elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
+            elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
+            elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
+            elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
             elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
             elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
             elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
@@ -203,111 +203,111 @@ 
             if ($typeelement == 'project') $projectid = $object->id;
 
             $newcardbutton='';
-			if (! empty($conf->agenda->enabled))
-			{
-				$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:($socid>0?'&socid='.$socid:'')).($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
-				$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-				$newcardbutton.= '</a>';
-			}
-
-        	print '<!-- formactions->showactions -->'."\n";
-        	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
-
-        	$page=0; $param='';
-
-        	$total = 0;
-
-        	print '<div class="div-table-responsive-no-min">';
-        	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
-        	print '<tr class="liste_titre">';
-        	print getTitleFieldOfList('Ref',   0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('By',    0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Type',  0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Date',  0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('',      0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
-        	print '</tr>';
-        	print "\n";
-
-        	$userstatic = new User($this->db);
-
-        	if (count($listofactions))
-        	{
-	        	$cursorevent = 0;
-	        	foreach($listofactions as $action)
-	        	{
-	        		if ($max && $cursorevent >= $max) break;
-
-	        		$ref=$action->getNomUrl(1,-1);
-	        		$label=$action->getNomUrl(0,38);
-
-	        		print '<tr class="oddeven">';
-	        		// Ref
-					print '<td>'.$ref.'</td>';
-					// Onwer
-	        		print '<td>';
-	        		if (! empty($action->userownerid))
-	        		{
-	        			$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
-	        			print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
-	        		}
-	        		print '</td>';
-					// Type
-	        		print '<td>';
-					$imgpicto='';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-					{
-						if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
-						else {
-							if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
-						}
-					}
-					print $imgpicto;
-	        		print $action->type_short ? $action->type_short : $action->type;
-	        		print '</td>';
-	        		// Label
-	        		print '<td>'.$label.'</td>';
-	        		// Date
-	        		print '<td align="center">'.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
-	        		if ($action->datef)
-	        		{
-		        		$tmpa=dol_getdate($action->datep);
-		        		$tmpb=dol_getdate($action->datef);
-		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
-		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
-		        		}
-		        		else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
-	        		}
-	        		print '</td>';
-	        		print '<td align="right">';
-	        		if (! empty($action->author->id))
-	        		{
-	        			print $action->getLibStatut(3);
-	        		}
-	        		print '</td>';
-	        		print '</tr>';
-
-	        		$cursorevent++;
-	        	}
-        	}
-        	else
-        	{
-        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        	}
-
-        	if ($max && $num > $max)
-        	{
-        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
-        	}
-
-        	print '</table>';
-        	print '</div>';
+            if (! empty($conf->agenda->enabled))
+            {
+                $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:($socid>0?'&socid='.$socid:'')).($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
+                $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+                $newcardbutton.= '</a>';
+            }
+
+            print '<!-- formactions->showactions -->'."\n";
+            print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
+
+            $page=0; $param='';
+
+            $total = 0;
+
+            print '<div class="div-table-responsive-no-min">';
+            print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
+            print '<tr class="liste_titre">';
+            print getTitleFieldOfList('Ref',   0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('By',    0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('Type',  0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('Date',  0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('',      0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
+            print '</tr>';
+            print "\n";
+
+            $userstatic = new User($this->db);
+
+            if (count($listofactions))
+            {
+                $cursorevent = 0;
+                foreach($listofactions as $action)
+                {
+                    if ($max && $cursorevent >= $max) break;
+
+                    $ref=$action->getNomUrl(1,-1);
+                    $label=$action->getNomUrl(0,38);
+
+                    print '<tr class="oddeven">';
+                    // Ref
+                    print '<td>'.$ref.'</td>';
+                    // Onwer
+                    print '<td>';
+                    if (! empty($action->userownerid))
+                    {
+                        $userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
+                        print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
+                    }
+                    print '</td>';
+                    // Type
+                    print '<td>';
+                    $imgpicto='';
+                    if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+                    {
+                        if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
+                        else {
+                            if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+                        }
+                    }
+                    print $imgpicto;
+                    print $action->type_short ? $action->type_short : $action->type;
+                    print '</td>';
+                    // Label
+                    print '<td>'.$label.'</td>';
+                    // Date
+                    print '<td align="center">'.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
+                    if ($action->datef)
+                    {
+                        $tmpa=dol_getdate($action->datep);
+                        $tmpb=dol_getdate($action->datef);
+                        if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
+                        {
+                            if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+                        }
+                        else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
+                    }
+                    print '</td>';
+                    print '<td align="right">';
+                    if (! empty($action->author->id))
+                    {
+                        print $action->getLibStatut(3);
+                    }
+                    print '</td>';
+                    print '</tr>';
+
+                    $cursorevent++;
+                }
+            }
+            else
+            {
+                print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            }
+
+            if ($max && $num > $max)
+            {
+                print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
+            }
+
+            print '</table>';
+            print '</div>';
         }
 
         return $num;
@@ -338,27 +338,27 @@ 
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
         $caction=new CActionComm($this->db);
 
-       	// Suggest a list with manual events or all auto events
-       	$arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
-       	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
-       	//asort($arraylist);
+            // Suggest a list with manual events or all auto events
+            $arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+            array_unshift($arraylist,'&nbsp;');     // Add empty line at start
+            //asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+            if ($selected == 'manual') $selected='AC_OTH';
+            if ($selected == 'auto')   $selected='AC_OTH_AUTO';
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+            if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
 
-       	$out='';
+            $out='';
 
-		if (! empty($multiselect))
-		{
-	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
-			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
-		}
-		else
-		{
-			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
-		}
+        if (! empty($multiselect))
+        {
+            if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+            $out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
+        }
+        else
+        {
+            $out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
+        }
 
         if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
         {

Spacing +76 added lines, -76 removed lines

@@ -37,7 +37,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -64,10 +64,10 @@ 
      *  @param  string  $morecss        More css on select field
      * 	@return	void
      */
-    function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100')
+    function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100')
     {
         // phpcs:enable
-        global $langs,$conf;
+        global $langs, $conf;
 
         $listofstatus = array(
             '-1' => $langs->trans("ActionNotApplicable"),
@@ -77,7 +77,7 @@ 
         );
 		// +ActionUncomplete
 
-        if (! empty($conf->use_javascript_ajax))
+        if (!empty($conf->use_javascript_ajax))
         {
             print "\n";
             print "<script type=\"text/javascript\">
@@ -98,7 +98,7 @@ 
                 function select_status() {
                     var defaultvalue = $('#select' + htmlname).val();
                     var percentage = $('input[name=percentage]');
-                    var selected = '".(isset($selected)?$selected:'')."';
+                    var selected = '".(isset($selected) ? $selected : '')."';
                     var value = (selected>0?selected:(defaultvalue>=0?defaultvalue:''));
 
                     percentage.val(value);
@@ -125,13 +125,13 @@ 
                 }
                 </script>\n";
         }
-        if (! empty($conf->use_javascript_ajax) || $onlyselect)
+        if (!empty($conf->use_javascript_ajax) || $onlyselect)
         {
         	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
-            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
-            if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
-            foreach($listofstatus as $key => $val)
+        	if ($selected == 'done') $selected = '100';
+            print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
+            if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'></option>';
+            foreach ($listofstatus as $key => $val)
             {
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
                 if ($key == '50' && $onlyselect == 2)
@@ -140,17 +140,17 @@ 
                 }
             }
             print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit=0;
+            if ($selected == 0 || $selected == 100) $canedit = 0;
 
             if (empty($onlyselect))
             {
-	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
+	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
         }
         else
 		{
-            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
+            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';
         }
     }
 
@@ -168,64 +168,64 @@ 
      *  @param	string	$morehtmlright			More html text on right of title line
      *	@return	int								<0 if KO, >=0 if OK
      */
-    function showactions($object, $typeelement, $socid=0, $forceshowtitle=0, $morecss='listactions', $max=0, $moreparambacktopage='', $morehtmlright='')
+    function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlright = '')
     {
-        global $langs,$conf,$user;
+        global $langs, $conf, $user;
         global $bc;
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-        $sortfield='a.datep,a.id';
-        $sortorder='DESC,DESC';
+        $sortfield = 'a.datep,a.id';
+        $sortorder = 'DESC,DESC';
 
-        $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+        $listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
+		if (!is_array($listofactions)) dol_print_error($this->db, 'FailedToGetActions');
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
-
-            $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
+        	if ($typeelement == 'invoice')               $title = $langs->trans('ActionsOnBill');
+        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title = $langs->trans('ActionsOnBill');
+        	elseif ($typeelement == 'propal')            $title = $langs->trans('ActionsOnPropal');
+        	elseif ($typeelement == 'supplier_proposal') $title = $langs->trans('ActionsOnSupplierProposal');
+        	elseif ($typeelement == 'order')             $title = $langs->trans('ActionsOnOrder');
+        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title = $langs->trans('ActionsOnOrder');
+        	elseif ($typeelement == 'shipping')          $title = $langs->trans('ActionsOnShipping');
+            elseif ($typeelement == 'fichinter')         $title = $langs->trans('ActionsOnFicheInter');
+            elseif ($typeelement == 'project')           $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            elseif ($typeelement == 'task')              $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            elseif ($typeelement == 'member')            $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            else $title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
+
+            $urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');
 
             $projectid = $object->fk_project;
             if ($typeelement == 'project') $projectid = $object->id;
 
-            $newcardbutton='';
-			if (! empty($conf->agenda->enabled))
+            $newcardbutton = '';
+			if (!empty($conf->agenda->enabled))
 			{
-				$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:($socid>0?'&socid='.$socid:'')).($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
-				$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-				$newcardbutton.= '</a>';
+				$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(), 'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid > 0 ? '&socid='.$object->socid : ($socid > 0 ? '&socid='.$socid : '')).($projectid > 0 ? '&projectid='.$projectid : '').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
+				$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+				$newcardbutton .= '</a>';
 			}
 
         	print '<!-- formactions->showactions -->'."\n";
         	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
 
-        	$page=0; $param='';
+        	$page = 0; $param = '';
 
         	$total = 0;
 
         	print '<div class="div-table-responsive-no-min">';
-        	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
+        	print '<table class="noborder'.($morecss ? ' '.$morecss : '').'" width="100%">';
         	print '<tr class="liste_titre">';
-        	print getTitleFieldOfList('Ref',   0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('By',    0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Type',  0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
         	print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Date',  0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('',      0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
         	print '</tr>';
         	print "\n";
 
@@ -234,37 +234,37 @@ 
         	if (count($listofactions))
         	{
 	        	$cursorevent = 0;
-	        	foreach($listofactions as $action)
+	        	foreach ($listofactions as $action)
 	        	{
 	        		if ($max && $cursorevent >= $max) break;
 
-	        		$ref=$action->getNomUrl(1,-1);
-	        		$label=$action->getNomUrl(0,38);
+	        		$ref = $action->getNomUrl(1, -1);
+	        		$label = $action->getNomUrl(0, 38);
 
 	        		print '<tr class="oddeven">';
 	        		// Ref
 					print '<td>'.$ref.'</td>';
 					// Onwer
 	        		print '<td>';
-	        		if (! empty($action->userownerid))
+	        		if (!empty($action->userownerid))
 	        		{
-	        			$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
+	        			$userstatic->fetch($action->userownerid); // TODO Introduce a cache on users fetched
 	        			print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
 	        		}
 	        		print '</td>';
 					// Type
 	        		print '<td>';
-					$imgpicto='';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+					$imgpicto = '';
+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 					{
-						if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
+						if ($action->type_picto) $imgpicto = img_picto('', $action->type_picto);
 						else {
-							if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+							if ($action->type_code == 'AC_RDV')       $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_TEL')   $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_FAX')   $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_EMAIL') $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_INT')   $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+							elseif (!preg_match('/_AUTO/', $action->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
 						}
 					}
 					print $imgpicto;
@@ -276,8 +276,8 @@ 
 	        		print '<td align="center">'.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
 	        		if ($action->datef)
 	        		{
-		        		$tmpa=dol_getdate($action->datep);
-		        		$tmpb=dol_getdate($action->datef);
+		        		$tmpa = dol_getdate($action->datep);
+		        		$tmpb = dol_getdate($action->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
 		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
@@ -286,7 +286,7 @@ 
 	        		}
 	        		print '</td>';
 	        		print '<td align="right">';
-	        		if (! empty($action->author->id))
+	        		if (!empty($action->author->id))
 	        		{
 	        			print $action->getLibStatut(3);
 	        		}
@@ -327,42 +327,42 @@ 
      *  @param  int             $nooutput       1=No output
      * 	@return	string
      */
-    function select_type_actions($selected='', $htmlname='actioncode', $excludetype='', $onlyautoornot=0, $hideinfohelp=0, $multiselect=0, $nooutput=0)
+    function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0)
     {
         // phpcs:enable
-        global $langs,$user,$form,$conf;
+        global $langs, $user, $form, $conf;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (!is_object($form)) $form = new Form($this->db);
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-        $caction=new CActionComm($this->db);
+        $caction = new CActionComm($this->db);
 
        	// Suggest a list with manual events or all auto events
-       	$arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
-       	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
+       	$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+       	array_unshift($arraylist, '&nbsp;'); // Add empty line at start
        	//asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+       	if ($selected == 'manual') $selected = 'AC_OTH';
+       	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+       	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
 
-       	$out='';
+       	$out = '';
 
-		if (! empty($multiselect))
+		if (!empty($multiselect))
 		{
 	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
-			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
+			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		}
 		else
 		{
-			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
+			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
 		}
 
         if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
         {
-            $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
+            $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);
         }
 
         if ($nooutput) return $out;

Braces +87 added lines, -41 removed lines

@@ -128,9 +128,13 @@ 
         if (! empty($conf->use_javascript_ajax) || $onlyselect)
         {
         	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
+        	if ($selected == 'done') {
+        	    $selected='100';
+        	}
             print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
-            if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
+            if ($showempty) {
+                print '<option value=""'.($selected == ''?' selected':'').'></option>';
+            }
             foreach($listofstatus as $key => $val)
             {
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
@@ -140,15 +144,16 @@ 
                 }
             }
             print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit=0;
+            if ($selected == 0 || $selected == 100) {
+                $canedit=0;
+            }
 
             if (empty($onlyselect))
             {
 	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
-        }
-        else
+        } else
 		{
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
         }
@@ -179,28 +184,45 @@ 
         $sortorder='DESC,DESC';
 
         $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+		if (! is_array($listofactions)) {
+		    dol_print_error($this->db,'FailedToGetActions');
+		}
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
+        	if ($typeelement == 'invoice') {
+        	    $title=$langs->trans('ActionsOnBill');
+        	} elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') {
+        	    $title=$langs->trans('ActionsOnBill');
+        	} elseif ($typeelement == 'propal') {
+        	    $title=$langs->trans('ActionsOnPropal');
+        	} elseif ($typeelement == 'supplier_proposal') {
+        	    $title=$langs->trans('ActionsOnSupplierProposal');
+        	} elseif ($typeelement == 'order') {
+        	    $title=$langs->trans('ActionsOnOrder');
+        	} elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') {
+        	    $title=$langs->trans('ActionsOnOrder');
+        	} elseif ($typeelement == 'shipping') {
+        	    $title=$langs->trans('ActionsOnShipping');
+        	} elseif ($typeelement == 'fichinter') {
+                $title=$langs->trans('ActionsOnFicheInter');
+            } elseif ($typeelement == 'project') {
+                $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } elseif ($typeelement == 'task') {
+                $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } elseif ($typeelement == 'member') {
+                $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } else {
+                $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
+            }
 
             $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
 
             $projectid = $object->fk_project;
-            if ($typeelement == 'project') $projectid = $object->id;
+            if ($typeelement == 'project') {
+                $projectid = $object->id;
+            }
 
             $newcardbutton='';
 			if (! empty($conf->agenda->enabled))
@@ -236,7 +258,9 @@ 
 	        	$cursorevent = 0;
 	        	foreach($listofactions as $action)
 	        	{
-	        		if ($max && $cursorevent >= $max) break;
+	        		if ($max && $cursorevent >= $max) {
+	        		    break;
+	        		}
 
 	        		$ref=$action->getNomUrl(1,-1);
 	        		$label=$action->getNomUrl(0,38);
@@ -257,14 +281,22 @@ 
 					$imgpicto='';
 					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 					{
-						if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
-						else {
-							if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+						if ($action->type_picto) {
+						    $imgpicto=img_picto('', $action->type_picto);
+						} else {
+							if ($action->type_code == 'AC_RDV') {
+							    $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_TEL') {
+							    $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_FAX') {
+							    $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_EMAIL') {
+							    $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_INT') {
+							    $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif (! preg_match('/_AUTO/', $action->type_code)) {
+							    $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+							}
 						}
 					}
 					print $imgpicto;
@@ -280,9 +312,12 @@ 
 		        		$tmpb=dol_getdate($action->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) {
+		        			    print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+		        			}
+		        		} else {
+		        		    print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
 		        		}
-		        		else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
 	        		}
 	        		print '</td>';
 	        		print '<td align="right">';
@@ -295,8 +330,7 @@ 
 
 	        		$cursorevent++;
 	        	}
-        	}
-        	else
+        	} else
         	{
         		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         	}
@@ -332,7 +366,9 @@ 
         // phpcs:enable
         global $langs,$user,$form,$conf;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (! is_object($form)) {
+            $form=new Form($this->db);
+        }
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -343,19 +379,26 @@ 
        	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
        	//asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+       	if ($selected == 'manual') {
+       	    $selected='AC_OTH';
+       	}
+       	if ($selected == 'auto') {
+       	    $selected='AC_OTH_AUTO';
+       	}
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) {
+       	    unset($arraylist['AC_OTH_AUTO']);
+       	}
 
        	$out='';
 
 		if (! empty($multiselect))
 		{
-	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+	        if (!is_array($selected) && !empty($selected)) {
+	            $selected = explode(',', $selected);
+	        }
 			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
-		}
-		else
+		} else
 		{
 			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
 		}
@@ -365,8 +408,11 @@ 
             $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
         }
 
-        if ($nooutput) return $out;
-        else print $out;
+        if ($nooutput) {
+            return $out;
+        } else {
+            print $out;
+        }
         return '';
     }
 }

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

Indentation +56 added lines, -56 removed lines

@@ -28,75 +28,75 @@
  */
 class FormCron extends Form
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Display On Off selector
-	 *
-	 * @param   string 	$htmlname		Html control name
-	 * @param   integer 	$selected		selected value
-	 * @param   integer	$readonly		Select is read only or not
-	 * @return	string					HTML select field
-	 */
-	function select_typejob($htmlname,$selected=0,$readonly=0)
-	{
+    /**
+     * Display On Off selector
+     *
+     * @param   string 	$htmlname		Html control name
+     * @param   integer 	$selected		selected value
+     * @param   integer	$readonly		Select is read only or not
+     * @return	string					HTML select field
+     */
+    function select_typejob($htmlname,$selected=0,$readonly=0)
+    {
         // phpcs:enable
-		global $langs;
+        global $langs;
 
-		$langs->load('cron@cron');
-		if (!empty($readonly)) {
-			if ($selected=='command') {
-				$out= $langs->trans('CronType_command');
-				$out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-				$out.= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
-				$out.='</SELECT>';
-			} elseif ($selected=='method') {
-				$out= $langs->trans('CronType_method');
-				$out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-				$out.= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
-				$out.='</SELECT>';
-			}
-		}else {
+        $langs->load('cron@cron');
+        if (!empty($readonly)) {
+            if ($selected=='command') {
+                $out= $langs->trans('CronType_command');
+                $out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+                $out.= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
+                $out.='</SELECT>';
+            } elseif ($selected=='method') {
+                $out= $langs->trans('CronType_method');
+                $out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+                $out.= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
+                $out.='</SELECT>';
+            }
+        }else {
 
-		$out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
+        $out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
 
-		if ($selected=='command') {
-			$selected_attr=' selected ';
-		} else {
-			$selected_attr='';
-		}
-		$out.= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
+        if ($selected=='command') {
+            $selected_attr=' selected ';
+        } else {
+            $selected_attr='';
+        }
+        $out.= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
 
-		if ($selected=='method') {
-			$selected_attr=' selected ';
-		} else {
-			$selected_attr='';
-		}
-		$out.= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
+        if ($selected=='method') {
+            $selected_attr=' selected ';
+        } else {
+            $selected_attr='';
+        }
+        $out.= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
 
-		$out.='</SELECT>';
-		}
+        $out.='</SELECT>';
+        }
 
-		return $out;
-	}
+        return $out;
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -36,7 +36,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *	Constructor
@@ -58,43 +58,43 @@ 
 	 * @param   integer	$readonly		Select is read only or not
 	 * @return	string					HTML select field
 	 */
-	function select_typejob($htmlname,$selected=0,$readonly=0)
+	function select_typejob($htmlname, $selected = 0, $readonly = 0)
 	{
         // phpcs:enable
 		global $langs;
 
 		$langs->load('cron@cron');
 		if (!empty($readonly)) {
-			if ($selected=='command') {
-				$out= $langs->trans('CronType_command');
-				$out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-				$out.= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
-				$out.='</SELECT>';
-			} elseif ($selected=='method') {
-				$out= $langs->trans('CronType_method');
-				$out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-				$out.= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
-				$out.='</SELECT>';
+			if ($selected == 'command') {
+				$out = $langs->trans('CronType_command');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
+				$out .= '</SELECT>';
+			} elseif ($selected == 'method') {
+				$out = $langs->trans('CronType_method');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
+				$out .= '</SELECT>';
 			}
-		}else {
+		} else {
 
-		$out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
+		$out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
 
-		if ($selected=='command') {
-			$selected_attr=' selected ';
+		if ($selected == 'command') {
+			$selected_attr = ' selected ';
 		} else {
-			$selected_attr='';
+			$selected_attr = '';
 		}
-		$out.= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
+		$out .= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
 
-		if ($selected=='method') {
-			$selected_attr=' selected ';
+		if ($selected == 'method') {
+			$selected_attr = ' selected ';
 		} else {
-			$selected_attr='';
+			$selected_attr = '';
 		}
-		$out.= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
+		$out .= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
 
-		$out.='</SELECT>';
+		$out .= '</SELECT>';
 		}
 
 		return $out;

Braces +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 				$out.= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
 				$out.='</SELECT>';
 			}
-		}else {
+		} else {
 
 		$out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
 

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

Indentation +21 added lines, -21 removed lines

@@ -27,33 +27,33 @@
  */
 class FormMailing extends Form
 {
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
-
-	/**
-	 * Output a select with destinaries status
-	 *
-	 * @param string   $selectedid     The selected id
-	 * @param string   $htmlname       Name of controm
-	 * @param integer  $show_empty     Show empty option
-	 * @return string HTML select
-	 */
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
+
+    /**
+     * Output a select with destinaries status
+     *
+     * @param string   $selectedid     The selected id
+     * @param string   $htmlname       Name of controm
+     * @param integer  $show_empty     Show empty option
+     * @return string HTML select
+     */
     public function selectDestinariesStatus($selectedid='', $htmlname='dest_status', $show_empty=0)
     {
 
-		global $langs;
-		$langs->load("mails");
+        global $langs;
+        $langs->load("mails");
 
-		require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
-		$mailing = new Mailing($this->db);
+        require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+        $mailing = new Mailing($this->db);
 
-		$options = array();
+        $options = array();
 
-		if ($show_empty) {
-			$options[-2] = '';   // Note -1 is used for error
-		}
+        if ($show_empty) {
+            $options[-2] = '';   // Note -1 is used for error
+        }
 
         $options = $options + $mailing->statut_dest;
 

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
  *  \ingroup    core
  *	\brief      File of predefined functions for HTML forms for mailing module
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 /**
  *  Class to offer components to list and upload files
@@ -40,7 +40,7 @@ 
 	 * @param integer  $show_empty     Show empty option
 	 * @return string HTML select
 	 */
-    public function selectDestinariesStatus($selectedid='', $htmlname='dest_status', $show_empty=0)
+    public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0)
     {
 
 		global $langs;
@@ -52,7 +52,7 @@ 
 		$options = array();
 
 		if ($show_empty) {
-			$options[-2] = '';   // Note -1 is used for error
+			$options[-2] = ''; // Note -1 is used for error
 		}
 
         $options = $options + $mailing->statut_dest;

dolibarr/htdocs/core/class/doleditor.class.php

Braces +26 added lines, -9 removed lines

@@ -70,8 +70,12 @@ 
 
     	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
-    	if (! $rows) $rows=round($height/20);
-    	if (! $cols) $cols=($width?round($width/6):80);
+    	if (! $rows) {
+    	    $rows=round($height/20);
+    	}
+    	if (! $cols) {
+    	    $cols=($width?round($width/6):80);
+    	}
 		$shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
 
         // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
@@ -81,8 +85,12 @@ 
         $this->readonly=$readonly;
 
         // Check if extended editor is ok. If not we force textarea
-        if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
-		if ($okforextendededitor === 'ace') $this->tool='ace';
+        if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) {
+            $this->tool = 'textarea';
+        }
+		if ($okforextendededitor === 'ace') {
+		    $this->tool='ace';
+		}
         //if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
 
         // Define content and some properties
@@ -100,7 +108,9 @@ 
         	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
         	$this->editor->Value	= $content;
         	$this->editor->Height   = $height;
-        	if (! empty($width)) $this->editor->Width = $width;
+        	if (! empty($width)) {
+        	    $this->editor->Width = $width;
+        	}
         	$this->editor->ToolbarSet = $shorttoolbarname;         // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
         	$this->editor->Config['AutoDetectLanguage'] = 'true';  // Language of user (browser)
         	$this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In';
@@ -163,9 +173,11 @@ 
     	$found=0;
 		$out='';
 
-        if ($this->tool == 'fckeditor') // not used anymore
+        if ($this->tool == 'fckeditor') {
+            // not used anymore
         {
 			$found=1;
+        }
             $this->editor->Create();
         }
         if (in_array($this->tool,array('textarea','ckeditor')))
@@ -179,7 +191,9 @@ 
 
             if ($this->tool == 'ckeditor' && ! empty($conf->use_javascript_ajax))
             {
-            	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
+            	if (! defined('REQUIRE_CKEDITOR')) {
+            	    define('REQUIRE_CKEDITOR','1');
+            	}
 
             	if (! empty($conf->global->FCKEDITOR_SKIN)) {
 					$skin = $conf->global->FCKEDITOR_SKIN;
@@ -343,7 +357,10 @@ 
             $out.= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
         }
 
-        if ($noprint) return $out;
-        else print $out;
+        if ($noprint) {
+            return $out;
+        } else {
+            print $out;
+        }
     }
 }

Indentation +107 added lines, -107 removed lines

@@ -30,19 +30,19 @@ 
 {
     var $tool;      // Store the selected tool
 
-	// If using fckeditor
-	var $editor;
+    // If using fckeditor
+    var $editor;
 
-	// If not using fckeditor
-	var $content;
-	var $htmlname;
-	var $toolbarname;
-	var $toolbarstartexpanded;
-	var $rows;
-	var $cols;
-	var $height;
-	var $width;
-	var $readonly;
+    // If not using fckeditor
+    var $content;
+    var $htmlname;
+    var $toolbarname;
+    var $toolbarstartexpanded;
+    var $rows;
+    var $cols;
+    var $height;
+    var $width;
+    var $readonly;
 
 
     /**
@@ -57,22 +57,22 @@ 
      *                       		             			'In' each window has its own toolbar
      *                              		      			'Out:name' share toolbar into the div called 'name'
      *      @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
-	 *		@param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
-	 *      @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
-	 *      												Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
+     *		@param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
+     *      @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
+     *      												Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
      *      @param  int		$rows                   		Size of rows for textarea tool
-	 *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
-	 *      @param	int		$readonly						0=Read/Edit, 1=Read only
-	 */
+     *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
+     *      @param	int		$readonly						0=Read/Edit, 1=Read only
+     */
     function __construct($htmlname, $content, $width='', $height=200, $toolbarname='Basic', $toolbarlocation='In', $toolbarstartexpanded=false, $uselocalbrowser=true, $okforextendededitor=true, $rows=0, $cols=0, $readonly=0)
     {
-    	global $conf,$langs;
+        global $conf,$langs;
 
-    	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
+        dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
-    	if (! $rows) $rows=round($height/20);
-    	if (! $cols) $cols=($width?round($width/6):80);
-		$shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
+        if (! $rows) $rows=round($height/20);
+        if (! $cols) $cols=($width?round($width/6):80);
+        $shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
 
         // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
         $defaulteditor='ckeditor';
@@ -82,7 +82,7 @@ 
 
         // Check if extended editor is ok. If not we force textarea
         if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
-		if ($okforextendededitor === 'ace') $this->tool='ace';
+        if ($okforextendededitor === 'ace') $this->tool='ace';
         //if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
 
         // Define content and some properties
@@ -91,50 +91,50 @@ 
             $content=dol_htmlentitiesbr($content);  // If content is not HTML, we convert to HTML.
         }
         if ($this->tool == 'fckeditor')
-    	{
-        	require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
-
-    		$content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
-
-        	$this->editor = new FCKeditor($htmlname);
-        	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
-        	$this->editor->Value	= $content;
-        	$this->editor->Height   = $height;
-        	if (! empty($width)) $this->editor->Width = $width;
-        	$this->editor->ToolbarSet = $shorttoolbarname;         // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
-        	$this->editor->Config['AutoDetectLanguage'] = 'true';  // Language of user (browser)
-        	$this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In';
-        	$this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
-
-    		// Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
-    		// Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
-    		// Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
-        	$modulepart='fckeditor';
-    		$this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
-    		$this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
-
-        	$this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
-        	$this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
-
-        	if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
-        	{
-        		$this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js';
-        		$this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/';
-    		}
-    	}
-
-    	// Define some properties
+        {
+            require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
+
+            $content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
+
+            $this->editor = new FCKeditor($htmlname);
+            $this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
+            $this->editor->Value	= $content;
+            $this->editor->Height   = $height;
+            if (! empty($width)) $this->editor->Width = $width;
+            $this->editor->ToolbarSet = $shorttoolbarname;         // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
+            $this->editor->Config['AutoDetectLanguage'] = 'true';  // Language of user (browser)
+            $this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In';
+            $this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
+
+            // Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
+            // Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
+            // Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
+            $modulepart='fckeditor';
+            $this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
+            $this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
+
+            $this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
+            $this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
+
+            if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
+            {
+                $this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js';
+                $this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/';
+            }
+        }
+
+        // Define some properties
         if (in_array($this->tool,array('textarea','ckeditor','ace')))
         {
-    	    $this->content				= $content;
-    	    $this->htmlname 			= $htmlname;
-    	    $this->toolbarname			= $shorttoolbarname;
-    	    $this->toolbarstartexpanded = $toolbarstartexpanded;
+            $this->content				= $content;
+            $this->htmlname 			= $htmlname;
+            $this->toolbarname			= $shorttoolbarname;
+            $this->toolbarstartexpanded = $toolbarstartexpanded;
             $this->rows					= max(ROWS_3,$rows);
             $this->cols					= (preg_match('/%/',$cols)?$cols:max(40,$cols));	// If $cols is a percent, we keep it, otherwise, we take max
             $this->height				= $height;
             $this->width				= $width;
-    	}
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -152,20 +152,20 @@ 
     function Create($noprint=0, $morejs='', $disallowAnyContent=true, $titlecontent='', $option='')
     {
         // phpcs:enable
-    	global $conf,$langs;
+        global $conf,$langs;
 
-    	$fullpage=false;
-    	if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
-    	{
-    	   $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT);      // Only predefined list of html tags are allowed or all
-    	}
+        $fullpage=false;
+        if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
+        {
+            $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT);      // Only predefined list of html tags are allowed or all
+        }
 
-    	$found=0;
-		$out='';
+        $found=0;
+        $out='';
 
         if ($this->tool == 'fckeditor') // not used anymore
         {
-			$found=1;
+            $found=1;
             $this->editor->Create();
         }
         if (in_array($this->tool,array('textarea','ckeditor')))
@@ -179,12 +179,12 @@ 
 
             if ($this->tool == 'ckeditor' && ! empty($conf->use_javascript_ajax))
             {
-            	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
+                if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
 
-            	if (! empty($conf->global->FCKEDITOR_SKIN)) {
-					$skin = $conf->global->FCKEDITOR_SKIN;
-				} else {
-					// $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
+                if (! empty($conf->global->FCKEDITOR_SKIN)) {
+                    $skin = $conf->global->FCKEDITOR_SKIN;
+                } else {
+                    // $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
 
                     /**
                      * Alixar:
@@ -195,10 +195,10 @@ 
                     $skin = CKEDITOR_SKIN;  // In AlixarDispatcher defineConstants()
                 }
 
-            	$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
+                $htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
 
-            	$out.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
-            	$out.= '<script type="text/javascript">
+                $out.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
+                $out.= '<script type="text/javascript">
             			$(document).ready(function () {
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
                             /* should be editor=CKEDITOR.replace but what if serveral editors ? */
@@ -233,8 +233,8 @@ 
                                                         });
                                                 }
                                             }';
-            	if ($this->uselocalbrowser)
-            	{
+                if ($this->uselocalbrowser)
+                {
                     $out.= ','."\n";
                     // To use filemanager with old fckeditor (GPL)
                     $out.= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
@@ -243,7 +243,7 @@ 
                     //$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
                     $out.= "\n";
                     // To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
-					/* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
+                    /* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
                                filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
                                filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',
                                filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files\',
@@ -254,10 +254,10 @@ 
                                filebrowserWindowHeight : \'500\',
                                filebrowserImageWindowWidth : \'900\',
                                filebrowserImageWindowHeight : \'500\'';
-            	}
-            	$out.= '	})'.$morejs;
-            	$out.= '});'."\n";
-            	$out.= '</script>'."\n";
+                }
+                $out.= '	})'.$morejs;
+                $out.= '});'."\n";
+                $out.= '</script>'."\n";
             }
         }
 
@@ -265,19 +265,19 @@ 
         // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
         if (preg_match('/^ace/', $this->tool))
         {
-        	$found=1;
-			$format=$option;
+            $found=1;
+            $format=$option;
 
             $out.= "\n".'<!-- Output Ace editor -->'."\n";
 
-			if ($titlecontent)
-			{
-	            $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
-	            $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
-	            $out.= '</div>';
-	            $out.= '<script type="text/javascript" language="javascript">'."\n";
-	            $out.= 'jQuery(document).ready(function() {'."\n";
-	            $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+            if ($titlecontent)
+            {
+                $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
+                $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+                $out.= '</div>';
+                $out.= '<script type="text/javascript" language="javascript">'."\n";
+                $out.= 'jQuery(document).ready(function() {'."\n";
+                $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
 	            			var oldNbOfLines = 0
@@ -299,21 +299,21 @@ 
 									}
 							});
 						})';
-	            $out.= '</script>'."\n";
-			}
+                $out.= '</script>'."\n";
+            }
 
             $out.= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'');
             $out.= ($this->height?' height: '.$this->height.'px; ':'');
             //$out.=" min-height: 100px;";
             $out.= '">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</pre>';
-        	$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</textarea>';
+            $out.= htmlspecialchars($this->content);
+            $out.= '</pre>';
+            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
+            $out.= htmlspecialchars($this->content);
+            $out.= '</textarea>';
 
-        	$out.= '<script type="text/javascript" language="javascript">'."\n";
-        	$out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+            $out.= '<script type="text/javascript" language="javascript">'."\n";
+            $out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
 					aceEditor.setOptions({
@@ -333,7 +333,7 @@ 
 					//aceEditor.getSession().setMode("ace/mode/javascript_expression");
 					'."\n";
 
-        	$out.= 'jQuery(document).ready(function() {
+            $out.= 'jQuery(document).ready(function() {
 						jQuery(".buttonforacesave").click(function() {
         					console.log("We click on savefile button for component '.$this->htmlname.'");
         					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")
@@ -343,7 +343,7 @@ 
 							else return false;*/
 	        			});
 					})';
-        	$out.= '</script>'."\n";
+            $out.= '</script>'."\n";
         }
 
         if (empty($found))

Spacing +82 added lines, -82 removed lines

@@ -28,7 +28,7 @@ 
  */
 class DolEditor
 {
-    var $tool;      // Store the selected tool
+    var $tool; // Store the selected tool
 
 	// If using fckeditor
 	var $editor;
@@ -64,57 +64,57 @@ 
 	 *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
 	 *      @param	int		$readonly						0=Read/Edit, 1=Read only
 	 */
-    function __construct($htmlname, $content, $width='', $height=200, $toolbarname='Basic', $toolbarlocation='In', $toolbarstartexpanded=false, $uselocalbrowser=true, $okforextendededitor=true, $rows=0, $cols=0, $readonly=0)
+    function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0)
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
     	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
-    	if (! $rows) $rows=round($height/20);
-    	if (! $cols) $cols=($width?round($width/6):80);
-		$shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
+    	if (!$rows) $rows = round($height / 20);
+    	if (!$cols) $cols = ($width ?round($width / 6) : 80);
+		$shorttoolbarname = preg_replace('/_encoded$/', '', $toolbarname);
 
         // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
-        $defaulteditor='ckeditor';
-        $this->tool=empty($conf->global->FCKEDITOR_EDITORNAME)?$defaulteditor:$conf->global->FCKEDITOR_EDITORNAME;
-        $this->uselocalbrowser=$uselocalbrowser;
-        $this->readonly=$readonly;
+        $defaulteditor = 'ckeditor';
+        $this->tool = empty($conf->global->FCKEDITOR_EDITORNAME) ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;
+        $this->uselocalbrowser = $uselocalbrowser;
+        $this->readonly = $readonly;
 
         // Check if extended editor is ok. If not we force textarea
         if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
-		if ($okforextendededitor === 'ace') $this->tool='ace';
+		if ($okforextendededitor === 'ace') $this->tool = 'ace';
         //if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
 
         // Define content and some properties
         if ($this->tool == 'ckeditor')
         {
-            $content=dol_htmlentitiesbr($content);  // If content is not HTML, we convert to HTML.
+            $content = dol_htmlentitiesbr($content); // If content is not HTML, we convert to HTML.
         }
         if ($this->tool == 'fckeditor')
     	{
         	require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
 
-    		$content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
+    		$content = dol_htmlentitiesbr($content); // If content is not HTML, we convert to HTML.
 
         	$this->editor = new FCKeditor($htmlname);
-        	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
-        	$this->editor->Value	= $content;
+        	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/';
+        	$this->editor->Value = $content;
         	$this->editor->Height   = $height;
-        	if (! empty($width)) $this->editor->Width = $width;
-        	$this->editor->ToolbarSet = $shorttoolbarname;         // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
-        	$this->editor->Config['AutoDetectLanguage'] = 'true';  // Language of user (browser)
+        	if (!empty($width)) $this->editor->Width = $width;
+        	$this->editor->ToolbarSet = $shorttoolbarname; // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
+        	$this->editor->Config['AutoDetectLanguage'] = 'true'; // Language of user (browser)
         	$this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In';
         	$this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
 
     		// Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
     		// Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
     		// Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
-        	$modulepart='fckeditor';
+        	$modulepart = 'fckeditor';
     		$this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
-    		$this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
+    		$this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/';
 
-        	$this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
-        	$this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
+        	$this->editor->Config['LinkBrowser'] = ($uselocalbrowser ? 'true' : 'false');
+        	$this->editor->Config['ImageBrowser'] = ($uselocalbrowser ? 'true' : 'false');
 
         	if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
         	{
@@ -124,15 +124,15 @@ 
     	}
 
     	// Define some properties
-        if (in_array($this->tool,array('textarea','ckeditor','ace')))
+        if (in_array($this->tool, array('textarea', 'ckeditor', 'ace')))
         {
-    	    $this->content				= $content;
+    	    $this->content = $content;
     	    $this->htmlname 			= $htmlname;
-    	    $this->toolbarname			= $shorttoolbarname;
+    	    $this->toolbarname = $shorttoolbarname;
     	    $this->toolbarstartexpanded = $toolbarstartexpanded;
-            $this->rows					= max(ROWS_3,$rows);
-            $this->cols					= (preg_match('/%/',$cols)?$cols:max(40,$cols));	// If $cols is a percent, we keep it, otherwise, we take max
-            $this->height				= $height;
+            $this->rows					= max(ROWS_3, $rows);
+            $this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max
+            $this->height = $height;
             $this->width				= $width;
     	}
     }
@@ -149,39 +149,39 @@ 
      *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', ...)
      *  @return	void|string
      */
-    function Create($noprint=0, $morejs='', $disallowAnyContent=true, $titlecontent='', $option='')
+    function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '')
     {
         // phpcs:enable
-    	global $conf,$langs;
+    	global $conf, $langs;
 
-    	$fullpage=false;
+    	$fullpage = false;
     	if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
     	{
-    	   $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT);      // Only predefined list of html tags are allowed or all
+    	   $disallowAnyContent = empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all
     	}
 
-    	$found=0;
-		$out='';
+    	$found = 0;
+		$out = '';
 
         if ($this->tool == 'fckeditor') // not used anymore
         {
-			$found=1;
+			$found = 1;
             $this->editor->Create();
         }
-        if (in_array($this->tool,array('textarea','ckeditor')))
+        if (in_array($this->tool, array('textarea', 'ckeditor')))
         {
-            $found=1;
+            $found = 1;
             //$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
             // TODO We do not put the disabled tag because on a read form, it change style with grey.
-            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
-            $out.= $this->content;
-            $out.= '</textarea>';
+            $out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' class="flat">';
+            $out .= $this->content;
+            $out .= '</textarea>';
 
-            if ($this->tool == 'ckeditor' && ! empty($conf->use_javascript_ajax))
+            if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax))
             {
-            	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
+            	if (!defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR', '1');
 
-            	if (! empty($conf->global->FCKEDITOR_SKIN)) {
+            	if (!empty($conf->global->FCKEDITOR_SKIN)) {
 					$skin = $conf->global->FCKEDITOR_SKIN;
 				} else {
 					// $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
@@ -192,13 +192,13 @@ 
                      * When updating ckeditor, the moono-lisa skin disappears 
                      * and includes kama and moono.
                      */
-                    $skin = CKEDITOR_SKIN;  // In AlixarDispatcher defineConstants()
+                    $skin = CKEDITOR_SKIN; // In AlixarDispatcher defineConstants()
                 }
 
-            	$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
+            	$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
 
-            	$out.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
-            	$out.= '<script type="text/javascript">
+            	$out .= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
+            	$out .= '<script type="text/javascript">
             			$(document).ready(function () {
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
                             /* should be editor=CKEDITOR.replace but what if serveral editors ? */
@@ -206,11 +206,11 @@ 
             					{
             						/* property:xxx is same than CKEDITOR.config.property = xxx */
             						customConfig : ckeditorConfig,
-            						readOnly : '.($this->readonly?'true':'false').',
+            						readOnly : '.($this->readonly ? 'true' : 'false').',
                             		htmlEncodeOutput :'.$htmlencode_force.',
-            						allowedContent :'.($disallowAnyContent?'false':'true').',
+            						allowedContent :'.($disallowAnyContent ? 'false' : 'true').',
             						extraAllowedContent : \'\',
-            						fullPage : '.($fullpage?'true':'false').',
+            						fullPage : '.($fullpage ? 'true' : 'false').',
                             		toolbar: \''.$this->toolbarname.'\',
             						toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
             						width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
@@ -235,13 +235,13 @@ 
                                             }';
             	if ($this->uselocalbrowser)
             	{
-                    $out.= ','."\n";
+                    $out .= ','."\n";
                     // To use filemanager with old fckeditor (GPL)
-                    $out.= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
-                    $out.= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';
+                    $out .= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
+                    $out .= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';
                     //$out.= '    filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\',';
                     //$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
-                    $out.= "\n";
+                    $out .= "\n";
                     // To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
 					/* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
                                filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
@@ -250,14 +250,14 @@ 
                                filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images\',
                                filebrowserFlashUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash\','."\n";
 					*/
-                    $out.= '    filebrowserWindowWidth : \'900\',
+                    $out .= '    filebrowserWindowWidth : \'900\',
                                filebrowserWindowHeight : \'500\',
                                filebrowserImageWindowWidth : \'900\',
                                filebrowserImageWindowHeight : \'500\'';
             	}
-            	$out.= '	})'.$morejs;
-            	$out.= '});'."\n";
-            	$out.= '</script>'."\n";
+            	$out .= '	})'.$morejs;
+            	$out .= '});'."\n";
+            	$out .= '</script>'."\n";
             }
         }
 
@@ -265,19 +265,19 @@ 
         // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
         if (preg_match('/^ace/', $this->tool))
         {
-        	$found=1;
-			$format=$option;
+        	$found = 1;
+			$format = $option;
 
-            $out.= "\n".'<!-- Output Ace editor -->'."\n";
+            $out .= "\n".'<!-- Output Ace editor -->'."\n";
 
 			if ($titlecontent)
 			{
-	            $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
-	            $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
-	            $out.= '</div>';
-	            $out.= '<script type="text/javascript" language="javascript">'."\n";
-	            $out.= 'jQuery(document).ready(function() {'."\n";
-	            $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+	            $out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
+	            $out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+	            $out .= '</div>';
+	            $out .= '<script type="text/javascript" language="javascript">'."\n";
+	            $out .= 'jQuery(document).ready(function() {'."\n";
+	            $out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
 	            			var oldNbOfLines = 0
@@ -299,21 +299,21 @@ 
 									}
 							});
 						})';
-	            $out.= '</script>'."\n";
+	            $out .= '</script>'."\n";
 			}
 
-            $out.= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'');
-            $out.= ($this->height?' height: '.$this->height.'px; ':'');
+            $out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');
+            $out .= ($this->height ? ' height: '.$this->height.'px; ' : '');
             //$out.=" min-height: 100px;";
-            $out.= '">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</pre>';
-        	$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</textarea>';
+            $out .= '">';
+        	$out .= htmlspecialchars($this->content);
+        	$out .= '</pre>';
+        	$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
+        	$out .= htmlspecialchars($this->content);
+        	$out .= '</textarea>';
 
-        	$out.= '<script type="text/javascript" language="javascript">'."\n";
-        	$out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+        	$out .= '<script type="text/javascript" language="javascript">'."\n";
+        	$out .= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
 					aceEditor.setOptions({
@@ -321,7 +321,7 @@ 
 					   enableLiveAutocompletion: false, // the editor completes the statement while you are typing. Need lib ext-language_tools.js
 					   showPrintMargin: false, // hides the vertical limiting strip
 					   minLines: 10,
-					   maxLines: '.(empty($this->height)?'34':(round($this->height/10))).',
+					   maxLines: '.(empty($this->height) ? '34' : (round($this->height / 10))).',
 				       fontSize: "110%" // ensures that the editor fits in the environment
 					});
 
@@ -333,7 +333,7 @@ 
 					//aceEditor.getSession().setMode("ace/mode/javascript_expression");
 					'."\n";
 
-        	$out.= 'jQuery(document).ready(function() {
+        	$out .= 'jQuery(document).ready(function() {
 						jQuery(".buttonforacesave").click(function() {
         					console.log("We click on savefile button for component '.$this->htmlname.'");
         					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")
@@ -343,12 +343,12 @@ 
 							else return false;*/
 	        			});
 					})';
-        	$out.= '</script>'."\n";
+        	$out .= '</script>'."\n";
         }
 
         if (empty($found))
         {
-            $out.= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
+            $out .= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
         }
 
         if ($noprint) return $out;

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

Indentation +700 added lines, -700 removed lines

@@ -31,589 +31,589 @@ 
  */
 class FormCompany
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
+    /**
+     *	Constructor
+     *
+     *	@param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    	Return list of labels (translated) of third parties type
-	 *
-	 *		@param	int		$mode		0=Return id+label, 1=Return code+label
-	 *      @param  string	$filter     Add a SQL filter to select
-	 *    	@return array      			Array of types
-	 */
-	function typent_array($mode=0, $filter='')
-	{
+    /**
+     *    	Return list of labels (translated) of third parties type
+     *
+     *		@param	int		$mode		0=Return id+label, 1=Return code+label
+     *      @param  string	$filter     Add a SQL filter to select
+     *    	@return array      			Array of types
+     */
+    function typent_array($mode=0, $filter='')
+    {
         // phpcs:enable
-		global $langs,$mysoc;
-
-		$effs = array();
-
-		$sql = "SELECT id, code, libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
-		if ($filter) $sql.=" ".$filter;
-		$sql.= " ORDER by position, id";
-		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-
-			while ($i < $num)
-			{
-				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
-				if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);
-				else $effs[$key] = $objp->libelle;
-				if ($effs[$key]=='-') $effs[$key]='';
-				$i++;
-			}
-			$this->db->free($resql);
-		}
-
-		return $effs;
-	}
+        global $langs,$mysoc;
+
+        $effs = array();
+
+        $sql = "SELECT id, code, libelle";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
+        $sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
+        if ($filter) $sql.=" ".$filter;
+        $sql.= " ORDER by position, id";
+        dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+
+            while ($i < $num)
+            {
+                $objp = $this->db->fetch_object($resql);
+                if (! $mode) $key=$objp->id;
+                else $key=$objp->code;
+                if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);
+                else $effs[$key] = $objp->libelle;
+                if ($effs[$key]=='-') $effs[$key]='';
+                $i++;
+            }
+            $this->db->free($resql);
+        }
+
+        return $effs;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Renvoie la liste des types d'effectifs possibles (pas de traduction car nombre)
-	 *
-	 *	@param	int		$mode		0=renvoi id+libelle, 1=renvoi code+libelle
-	 *	@param  string	$filter     Add a SQL filter to select
-	 *  @return array				Array of types d'effectifs
-	 */
-	function effectif_array($mode=0, $filter='')
-	{
+    /**
+     *	Renvoie la liste des types d'effectifs possibles (pas de traduction car nombre)
+     *
+     *	@param	int		$mode		0=renvoi id+libelle, 1=renvoi code+libelle
+     *	@param  string	$filter     Add a SQL filter to select
+     *  @return array				Array of types d'effectifs
+     */
+    function effectif_array($mode=0, $filter='')
+    {
         // phpcs:enable
-		$effs = array();
-
-		$sql = "SELECT id, code, libelle";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
-		$sql.= " WHERE active = 1";
-		if ($filter) $sql.=" ".$filter;
-		$sql .= " ORDER BY id ASC";
-		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-
-			while ($i < $num)
-			{
-				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
-
-				$effs[$key] = $objp->libelle!='-'?$objp->libelle:'';
-				$i++;
-			}
-			$this->db->free($resql);
-		}
-		return $effs;
-	}
+        $effs = array();
+
+        $sql = "SELECT id, code, libelle";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
+        $sql.= " WHERE active = 1";
+        if ($filter) $sql.=" ".$filter;
+        $sql .= " ORDER BY id ASC";
+        dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+
+            while ($i < $num)
+            {
+                $objp = $this->db->fetch_object($resql);
+                if (! $mode) $key=$objp->id;
+                else $key=$objp->code;
+
+                $effs[$key] = $objp->libelle!='-'?$objp->libelle:'';
+                $i++;
+            }
+            $this->db->free($resql);
+        }
+        return $effs;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Affiche formulaire de selection des modes de reglement
-	 *
-	 *  @param	int		$page        	Page
-	 *  @param  int		$selected    	Id or code preselected
-	 *  @param  string	$htmlname   	Nom du formulaire select
-	 *	@param	int		$empty			Add empty value in list
-	 *	@return	void
-	 */
-	function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0)
-	{
+    /**
+     *  Affiche formulaire de selection des modes de reglement
+     *
+     *  @param	int		$page        	Page
+     *  @param  int		$selected    	Id or code preselected
+     *  @param  string	$htmlname   	Nom du formulaire select
+     *	@param	int		$empty			Add empty value in list
+     *	@return	void
+     */
+    function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0)
+    {
         // phpcs:enable
-		global $user, $langs;
-
-		print '<form method="post" action="'.$page.'">';
-		print '<input type="hidden" name="action" value="setprospectlevel">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-		dol_syslog(get_class($this).'::form_prospect_level',LOG_DEBUG);
-		$sql = "SELECT code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY sortorder";
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$options = array();
-
-			if ($empty) {
-				$options[''] = '';
-			}
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$level = $langs->trans($obj->code);
-
-				if ($level == $obj->code) {
-					$level = $langs->trans($obj->label);
-				}
-
-				$options[$obj->code] = $level;
-			}
-
-			print Form::selectarray($htmlname, $options, $selected);
-		}
-		else dol_print_error($this->db);
-		if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		print '</form>';
-	}
+        global $user, $langs;
+
+        print '<form method="post" action="'.$page.'">';
+        print '<input type="hidden" name="action" value="setprospectlevel">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+        dol_syslog(get_class($this).'::form_prospect_level',LOG_DEBUG);
+        $sql = "SELECT code, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+        $sql.= " WHERE active > 0";
+        $sql.= " ORDER BY sortorder";
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $options = array();
+
+            if ($empty) {
+                $options[''] = '';
+            }
+
+            while ($obj = $this->db->fetch_object($resql)) {
+                $level = $langs->trans($obj->code);
+
+                if ($level == $obj->code) {
+                    $level = $langs->trans($obj->label);
+                }
+
+                $options[$obj->code] = $level;
+            }
+
+            print Form::selectarray($htmlname, $options, $selected);
+        }
+        else dol_print_error($this->db);
+        if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+        print '</form>';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne.
-	 *   Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays.
-	 *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
-	 *   un code donnee mais dans ce cas, le champ pays differe).
-	 *   Ainsi les liens avec les departements se font sur un departement independemment de son nom.
-	 *
-	 *   @param     string	$selected        	Code state preselected
-	 *   @param     int		$country_codeid     0=list for all countries, otherwise country code or country rowid to show
-	 *   @param     string	$htmlname			Id of department
-	 *   @return	void
-	 */
-	function select_departement($selected='',$country_codeid=0, $htmlname='state_id')
-	{
+    /**
+     *   Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne.
+     *   Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays.
+     *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
+     *   un code donnee mais dans ce cas, le champ pays differe).
+     *   Ainsi les liens avec les departements se font sur un departement independemment de son nom.
+     *
+     *   @param     string	$selected        	Code state preselected
+     *   @param     int		$country_codeid     0=list for all countries, otherwise country code or country rowid to show
+     *   @param     string	$htmlname			Id of department
+     *   @return	void
+     */
+    function select_departement($selected='',$country_codeid=0, $htmlname='state_id')
+    {
         // phpcs:enable
-		print $this->select_state($selected,$country_codeid, $htmlname);
-	}
+        print $this->select_state($selected,$country_codeid, $htmlname);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne.
-	 *    Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays.
-	 *    La cle de la liste est le code (il peut y avoir plusieurs entree pour
-	 *    un code donnee mais dans ce cas, le champ pays differe).
-	 *    Ainsi les liens avec les departements se font sur un departement independemment de son nom.
-	 *
-	 *    @param	string	$selected        	Code state preselected (mus be state id)
-	 *    @param    integer	$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
-	 *    @param    string	$htmlname			Id of department. If '', we want only the string with <option>
-	 * 	  @return	string						String with HTML select
-	 *    @see select_country
-	 */
-	function select_state($selected='',$country_codeid=0, $htmlname='state_id')
-	{
+    /**
+     *    Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne.
+     *    Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays.
+     *    La cle de la liste est le code (il peut y avoir plusieurs entree pour
+     *    un code donnee mais dans ce cas, le champ pays differe).
+     *    Ainsi les liens avec les departements se font sur un departement independemment de son nom.
+     *
+     *    @param	string	$selected        	Code state preselected (mus be state id)
+     *    @param    integer	$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
+     *    @param    string	$htmlname			Id of department. If '', we want only the string with <option>
+     * 	  @return	string						String with HTML select
+     *    @see select_country
+     */
+    function select_state($selected='',$country_codeid=0, $htmlname='state_id')
+    {
         // phpcs:enable
-		global $conf,$langs,$user;
-
-		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid,LOG_DEBUG);
-
-		$langs->load("dict");
-
-		$out='';
-
-		// Serch departements/cantons/province active d'une region et pays actif
-		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
-		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
-		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
-		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
-		if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
-		$sql .= " ORDER BY c.code, d.code_departement";
-
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			if (!empty($htmlname)) $out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			dol_syslog(get_class($this)."::select_departement num=".$num,LOG_DEBUG);
-			if ($num)
-			{
-				$country='';
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($result);
-					if ($obj->code == '0')		// Le code peut etre une chaine
-					{
-						$out.= '<option value="0">&nbsp;</option>';
-					}
-					else {
-						if (! $country || $country != $obj->country)
-						{
-							// Affiche la rupture si on est en mode liste multipays
-							if (! $country_codeid && $obj->country_code)
-							{
-								$out.= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
-								$country=$obj->country;
-							}
-						}
-
-						if ((! empty($selected) && $selected == $obj->rowid)
-						 || (empty($selected) && ! empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
-						{
-							$out.= '<option value="'.$obj->rowid.'" selected>';
-						}
-						else
-						{
-							$out.= '<option value="'.$obj->rowid.'">';
-						}
-
-						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-						if (!empty($conf->global->MAIN_SHOW_STATE_CODE) &&
-						($conf->global->MAIN_SHOW_STATE_CODE == 1 || $conf->global->MAIN_SHOW_STATE_CODE == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')) {
-							if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
-								$out.= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-							else {
-								$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-						}
-						else {
-							if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
-								$out.= $obj->region_name . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-							else {
-								$out.= ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-						}
-
-						$out.= '</option>';
-					}
-					$i++;
-				}
-			}
-			if (! empty($htmlname)) $out.= '</select>';
-			if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		// Make select dynamic
-		if (! empty($htmlname))
-		{
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-			$out .= ajax_combobox($htmlname);
-		}
-
-		return $out;
-	}
+        global $conf,$langs,$user;
+
+        dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid,LOG_DEBUG);
+
+        $langs->load("dict");
+
+        $out='';
+
+        // Serch departements/cantons/province active d'une region et pays actif
+        $sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
+        $sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
+        $sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
+        if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
+        if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
+        $sql .= " ORDER BY c.code, d.code_departement";
+
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            if (!empty($htmlname)) $out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
+            if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            dol_syslog(get_class($this)."::select_departement num=".$num,LOG_DEBUG);
+            if ($num)
+            {
+                $country='';
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($result);
+                    if ($obj->code == '0')		// Le code peut etre une chaine
+                    {
+                        $out.= '<option value="0">&nbsp;</option>';
+                    }
+                    else {
+                        if (! $country || $country != $obj->country)
+                        {
+                            // Affiche la rupture si on est en mode liste multipays
+                            if (! $country_codeid && $obj->country_code)
+                            {
+                                $out.= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
+                                $country=$obj->country;
+                            }
+                        }
+
+                        if ((! empty($selected) && $selected == $obj->rowid)
+                         || (empty($selected) && ! empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
+                        {
+                            $out.= '<option value="'.$obj->rowid.'" selected>';
+                        }
+                        else
+                        {
+                            $out.= '<option value="'.$obj->rowid.'">';
+                        }
+
+                        // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                        if (!empty($conf->global->MAIN_SHOW_STATE_CODE) &&
+                        ($conf->global->MAIN_SHOW_STATE_CODE == 1 || $conf->global->MAIN_SHOW_STATE_CODE == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')) {
+                            if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
+                                $out.= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+                            }
+                            else {
+                                $out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+                            }
+                        }
+                        else {
+                            if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
+                                $out.= $obj->region_name . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+                            }
+                            else {
+                                $out.= ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+                            }
+                        }
+
+                        $out.= '</option>';
+                    }
+                    $i++;
+                }
+            }
+            if (! empty($htmlname)) $out.= '</select>';
+            if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        // Make select dynamic
+        if (! empty($htmlname))
+        {
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $out .= ajax_combobox($htmlname);
+        }
+
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Retourne la liste deroulante des regions actives dont le pays est actif
-	 *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
-	 *   un code donnee mais dans ce cas, le champ pays et lang differe).
-	 *   Ainsi les liens avec les regions se font sur une region independemment de son name.
-	 *
-	 *   @param		string		$selected		Preselected value
-	 *   @param		string		$htmlname		Name of HTML select field
-	 *   @return	void
-	 */
-	function select_region($selected='',$htmlname='region_id')
-	{
+    /**
+     *   Retourne la liste deroulante des regions actives dont le pays est actif
+     *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
+     *   un code donnee mais dans ce cas, le champ pays et lang differe).
+     *   Ainsi les liens avec les regions se font sur une region independemment de son name.
+     *
+     *   @param		string		$selected		Preselected value
+     *   @param		string		$htmlname		Name of HTML select field
+     *   @return	void
+     */
+    function select_region($selected='',$htmlname='region_id')
+    {
         // phpcs:enable
-		global $conf,$langs;
-		$langs->load("dict");
-
-		$sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
-		$sql.= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
-		$sql.= " ORDER BY c.code, c.label ASC";
-
-		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			print '<select class="flat" name="'.$htmlname.'">';
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				$country='';
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					if ($obj->code == 0) {
-						print '<option value="0">&nbsp;</option>';
-					}
-					else {
-						if ($country == '' || $country != $obj->country)
-						{
-							// Show break
-							$key=$langs->trans("Country".strtoupper($obj->country_code));
-							$valuetoshow=($key != "Country".strtoupper($obj->country_code))?$obj->country_code." - ".$key:$obj->country;
-							print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n";
-							$country=$obj->country;
-						}
-
-						if ($selected > 0 && $selected == $obj->code)
-						{
-							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
-						}
-						else
-						{
-							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
-						}
-					}
-					$i++;
-				}
-			}
-			print '</select>';
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
+        global $conf,$langs;
+        $langs->load("dict");
+
+        $sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
+        $sql.= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
+        $sql.= " ORDER BY c.code, c.label ASC";
+
+        dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            print '<select class="flat" name="'.$htmlname.'">';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                $country='';
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    if ($obj->code == 0) {
+                        print '<option value="0">&nbsp;</option>';
+                    }
+                    else {
+                        if ($country == '' || $country != $obj->country)
+                        {
+                            // Show break
+                            $key=$langs->trans("Country".strtoupper($obj->country_code));
+                            $valuetoshow=($key != "Country".strtoupper($obj->country_code))?$obj->country_code." - ".$key:$obj->country;
+                            print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n";
+                            $country=$obj->country;
+                        }
+
+                        if ($selected > 0 && $selected == $obj->code)
+                        {
+                            print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
+                        }
+                        else
+                        {
+                            print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
+                        }
+                    }
+                    $i++;
+                }
+            }
+            print '</select>';
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return combo list with people title
-	 *
-	 *  @param  string	$selected   	Title preselected
-	 * 	@param	string	$htmlname		Name of HTML select combo field
-	 *  @param  string  $morecss        Add more css on SELECT element
-	 *  @return	string					String with HTML select
-	 */
-	function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
-	{
+    /**
+     *  Return combo list with people title
+     *
+     *  @param  string	$selected   	Title preselected
+     * 	@param	string	$htmlname		Name of HTML select combo field
+     *  @param  string  $morecss        Add more css on SELECT element
+     *  @return	string					String with HTML select
+     */
+    function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
+    {
         // phpcs:enable
-		global $conf,$langs,$user;
-		$langs->load("dict");
-
-		$out='';
-
-		$sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";
-		$sql.= " WHERE active = 1";
-
-		dol_syslog("Form::select_civility", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$out.= '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			$out.= '<option value="">&nbsp;</option>';
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					if ($selected == $obj->code)
-					{
-						$out.= '<option value="'.$obj->code.'" selected>';
-					}
-					else
-					{
-						$out.= '<option value="'.$obj->code.'">';
-					}
-					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-					$out.= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label!='-'?$obj->label:''));
-					$out.= '</option>';
-					$i++;
-				}
-			}
-			$out.= '</select>';
-			if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		return $out;
-	}
+        global $conf,$langs,$user;
+        $langs->load("dict");
+
+        $out='';
+
+        $sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";
+        $sql.= " WHERE active = 1";
+
+        dol_syslog("Form::select_civility", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+            $out.= '<option value="">&nbsp;</option>';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    if ($selected == $obj->code)
+                    {
+                        $out.= '<option value="'.$obj->code.'" selected>';
+                    }
+                    else
+                    {
+                        $out.= '<option value="'.$obj->code.'">';
+                    }
+                    // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                    $out.= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label!='-'?$obj->label:''));
+                    $out.= '</option>';
+                    $i++;
+                }
+            }
+            $out.= '</select>';
+            if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
-	 *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays.
-	 *
-	 *    @param	string		$selected        	Code forme juridique a pre-selectionne
-	 *    @param    mixed		$country_codeid		0=liste tous pays confondus, sinon code du pays a afficher
-	 *    @param    string		$filter          	Add a SQL filter on list
-	 *    @return	void
-	 *    @deprecated Use print xxx->select_juridicalstatus instead
-	 *    @see select_juridicalstatus()
-	 */
-	function select_forme_juridique($selected='', $country_codeid=0, $filter='')
-	{
+    /**
+     *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
+     *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays.
+     *
+     *    @param	string		$selected        	Code forme juridique a pre-selectionne
+     *    @param    mixed		$country_codeid		0=liste tous pays confondus, sinon code du pays a afficher
+     *    @param    string		$filter          	Add a SQL filter on list
+     *    @return	void
+     *    @deprecated Use print xxx->select_juridicalstatus instead
+     *    @see select_juridicalstatus()
+     */
+    function select_forme_juridique($selected='', $country_codeid=0, $filter='')
+    {
         // phpcs:enable
-		print $this->select_juridicalstatus($selected, $country_codeid, $filter);
-	}
+        print $this->select_juridicalstatus($selected, $country_codeid, $filter);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
-	 *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays
-	 *
-	 *    @param	string		$selected        	Preselected code of juridical type
-	 *    @param    int			$country_codeid     0=list for all countries, otherwise list only country requested
+    /**
+     *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
+     *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays
+     *
+     *    @param	string		$selected        	Preselected code of juridical type
+     *    @param    int			$country_codeid     0=list for all countries, otherwise list only country requested
      *    @param    string		$filter          	Add a SQL filter on list
      *    @param	string		$htmlname			HTML name of select
      *    @return	string							String with HTML select
-	 */
-	function select_juridicalstatus($selected='', $country_codeid=0, $filter='', $htmlname='forme_juridique_code')
-	{
+     */
+    function select_juridicalstatus($selected='', $country_codeid=0, $filter='', $htmlname='forme_juridique_code')
+    {
         // phpcs:enable
-		global $conf,$langs,$user;
-		$langs->load("dict");
-
-		$out='';
-
-		// On recherche les formes juridiques actives des pays actifs
-		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE f.fk_pays=c.rowid";
-		$sql .= " AND f.active = 1 AND c.active = 1";
-		if ($country_codeid) $sql .= " AND c.code = '".$country_codeid."'";
-		if ($filter) $sql .= " ".$filter;
-		$sql .= " ORDER BY c.code";
-
-		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$out.= '<div id="particulier2" class="visible">';
-			$out.= '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';	// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
-
-			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				$i = 0;
-				$country=''; $arraydata=array();
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-
-					if ($obj->code)		// We exclude empty line, we will add it later
-					{
-						$labelcountry=(($langs->trans("Country".$obj->country_code)!="Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
-						$labeljs=(($langs->trans("JuridicalStatus".$obj->code)!="JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label!='-'?$obj->label:''));	// $obj->label is already in output charset (converted by database driver)
-						$arraydata[$obj->code]=array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
-					}
-					$i++;
-				}
-
-				$arraydata=dol_sort_array($arraydata, 'label_sort', 'ASC');
-				if (empty($country_codeid))	// Introduce empty value (if $country_codeid not empty, empty value was already added)
-				{
-					$arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
-				}
-
-				foreach($arraydata as $key => $val)
-				{
-					if (! $country || $country != $val['country'])
-					{
-						// Show break when we are in multi country mode
-						if (empty($country_codeid) && $val['country_code'])
-						{
-							$out.= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
-							$country=$val['country'];
-						}
-					}
-
-					if ($selected > 0 && $selected == $val['code'])
-					{
-						$out.= '<option value="'.$val['code'].'" selected>';
-					}
-					else
-					{
-						$out.= '<option value="'.$val['code'].'">';
-					}
-					// If translation exists, we use it, otherwise we use default label in database
-					$out.= $val['label'];
-					$out.= '</option>';
-				}
-			}
-			$out.= '</select>';
-			if ($user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-
-		    // Make select dynamic
-        	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-	        $out .= ajax_combobox($htmlname);
-
-			$out.= '</div>';
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		return $out;
-	}
-
-
-	/**
-	 *  Output list of third parties.
-	 *
-	 *  @param  object		$object         Object we try to find contacts
-	 *  @param  string		$var_id         Name of id field
-	 *  @param  string		$selected       Pre-selected third party
-	 *  @param  string		$htmlname       Name of HTML form
-	 * 	@param	array		$limitto		Disable answers that are not id in this array list
-	 *  @param	int			$forceid		This is to force another object id than object->id
+        global $conf,$langs,$user;
+        $langs->load("dict");
+
+        $out='';
+
+        // On recherche les formes juridiques actives des pays actifs
+        $sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE f.fk_pays=c.rowid";
+        $sql .= " AND f.active = 1 AND c.active = 1";
+        if ($country_codeid) $sql .= " AND c.code = '".$country_codeid."'";
+        if ($filter) $sql .= " ".$filter;
+        $sql .= " ORDER BY c.code";
+
+        dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $out.= '<div id="particulier2" class="visible">';
+            $out.= '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
+            if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';	// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
+
+            $num = $this->db->num_rows($resql);
+            if ($num)
+            {
+                $i = 0;
+                $country=''; $arraydata=array();
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+
+                    if ($obj->code)		// We exclude empty line, we will add it later
+                    {
+                        $labelcountry=(($langs->trans("Country".$obj->country_code)!="Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
+                        $labeljs=(($langs->trans("JuridicalStatus".$obj->code)!="JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label!='-'?$obj->label:''));	// $obj->label is already in output charset (converted by database driver)
+                        $arraydata[$obj->code]=array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
+                    }
+                    $i++;
+                }
+
+                $arraydata=dol_sort_array($arraydata, 'label_sort', 'ASC');
+                if (empty($country_codeid))	// Introduce empty value (if $country_codeid not empty, empty value was already added)
+                {
+                    $arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
+                }
+
+                foreach($arraydata as $key => $val)
+                {
+                    if (! $country || $country != $val['country'])
+                    {
+                        // Show break when we are in multi country mode
+                        if (empty($country_codeid) && $val['country_code'])
+                        {
+                            $out.= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
+                            $country=$val['country'];
+                        }
+                    }
+
+                    if ($selected > 0 && $selected == $val['code'])
+                    {
+                        $out.= '<option value="'.$val['code'].'" selected>';
+                    }
+                    else
+                    {
+                        $out.= '<option value="'.$val['code'].'">';
+                    }
+                    // If translation exists, we use it, otherwise we use default label in database
+                    $out.= $val['label'];
+                    $out.= '</option>';
+                }
+            }
+            $out.= '</select>';
+            if ($user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+
+            // Make select dynamic
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $out .= ajax_combobox($htmlname);
+
+            $out.= '</div>';
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        return $out;
+    }
+
+
+    /**
+     *  Output list of third parties.
+     *
+     *  @param  object		$object         Object we try to find contacts
+     *  @param  string		$var_id         Name of id field
+     *  @param  string		$selected       Pre-selected third party
+     *  @param  string		$htmlname       Name of HTML form
+     * 	@param	array		$limitto		Disable answers that are not id in this array list
+     *  @param	int			$forceid		This is to force another object id than object->id
      *  @param	string		$moreparam		String with more param to add into url when noajax search is used.
      *  @param	string		$morecss		More CSS on select component
-	 * 	@return int 						The selected third party ID
-	 */
-	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='', $morecss='')
-	{
-		global $conf, $langs;
-
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
-		{
-			// Use Ajax search
-			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
-
-			$socid=0; $name='';
-			if ($selected > 0)
-			{
-				$tmpthirdparty=new Societe($this->db);
-				$result = $tmpthirdparty->fetch($selected);
-				if ($result > 0)
-				{
-					$socid = $selected;
-					$name = $tmpthirdparty->name;
-				}
-			}
-
-
-			$events=array();
-			// Add an entry 'method' to say 'yes, we must execute url with param action = method';
-			// Add an entry 'url' to say which url to execute
-			// Add an entry htmlname to say which element we must change once url is called
-			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines
-			// To refresh contacts list on thirdparty list change
-			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
-
-			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
-			{
-				print '<script type="text/javascript">
+     * 	@return int 						The selected third party ID
+     */
+    function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='', $morecss='')
+    {
+        global $conf, $langs;
+
+        if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+        {
+            // Use Ajax search
+            $minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
+
+            $socid=0; $name='';
+            if ($selected > 0)
+            {
+                $tmpthirdparty=new Societe($this->db);
+                $result = $tmpthirdparty->fetch($selected);
+                if ($result > 0)
+                {
+                    $socid = $selected;
+                    $name = $tmpthirdparty->name;
+                }
+            }
+
+
+            $events=array();
+            // Add an entry 'method' to say 'yes, we must execute url with param action = method';
+            // Add an entry 'url' to say which url to execute
+            // Add an entry htmlname to say which element we must change once url is called
+            // Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines
+            // To refresh contacts list on thirdparty list change
+            $events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
+
+            if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
+            {
+                print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					$("#search_'.$htmlname.'").change(function() {
 						var obj = '.json_encode($events).';
@@ -661,72 +661,72 @@ 
 					};
 				});
 				</script>';
-			}
-
-			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
-			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
-			print ajax_autocompleter(($socid?$socid:-1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
-			return $socid;
-		}
-		else
-		{
-			// Search to list thirdparties
-			$sql = "SELECT s.rowid, s.nom as name FROM";
-			$sql.= " ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " WHERE s.entity IN (".getEntity('societe').")";
-			// For ajax search we limit here. For combo list, we limit later
-			if (is_array($limitto) && count($limitto))
-			{
-				$sql.= " AND s.rowid IN (".join(',',$limitto).")";
-			}
-			$sql.= " ORDER BY s.nom ASC";
-
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				print '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"';
-				if ($conf->use_javascript_ajax)
-				{
-					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid>0?$forceid:$object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
-					print ' onChange="'.$javaScript.'"';
-				}
-				print '>';
-				$num = $this->db->num_rows($resql);
-				$i = 0;
-				if ($num)
-				{
-					while ($i < $num)
-					{
-						$obj = $this->db->fetch_object($resql);
-						if ($i == 0) $firstCompany = $obj->rowid;
-						$disabled=0;
-						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
-						if ($selected > 0 && $selected == $obj->rowid)
-						{
-							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
-							print ' selected>'.dol_trunc($obj->name,24).'</option>';
-							$firstCompany = $obj->rowid;
-						}
-						else
-						{
-							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
-							print '>'.dol_trunc($obj->name,24).'</option>';
-						}
-						$i ++;
-					}
-				}
-				print "</select>\n";
-				return $firstCompany;
-			}
-			else
-			{
-				dol_print_error($this->db);
-				print 'Error sql';
-			}
-		}
-	}
+            }
+
+            print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
+            print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
+            print ajax_autocompleter(($socid?$socid:-1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
+            return $socid;
+        }
+        else
+        {
+            // Search to list thirdparties
+            $sql = "SELECT s.rowid, s.nom as name FROM";
+            $sql.= " ".MAIN_DB_PREFIX."societe as s";
+            $sql.= " WHERE s.entity IN (".getEntity('societe').")";
+            // For ajax search we limit here. For combo list, we limit later
+            if (is_array($limitto) && count($limitto))
+            {
+                $sql.= " AND s.rowid IN (".join(',',$limitto).")";
+            }
+            $sql.= " ORDER BY s.nom ASC";
+
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                print '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"';
+                if ($conf->use_javascript_ajax)
+                {
+                    $javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid>0?$forceid:$object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
+                    print ' onChange="'.$javaScript.'"';
+                }
+                print '>';
+                $num = $this->db->num_rows($resql);
+                $i = 0;
+                if ($num)
+                {
+                    while ($i < $num)
+                    {
+                        $obj = $this->db->fetch_object($resql);
+                        if ($i == 0) $firstCompany = $obj->rowid;
+                        $disabled=0;
+                        if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
+                        if ($selected > 0 && $selected == $obj->rowid)
+                        {
+                            print '<option value="'.$obj->rowid.'"';
+                            if ($disabled) print ' disabled';
+                            print ' selected>'.dol_trunc($obj->name,24).'</option>';
+                            $firstCompany = $obj->rowid;
+                        }
+                        else
+                        {
+                            print '<option value="'.$obj->rowid.'"';
+                            if ($disabled) print ' disabled';
+                            print '>'.dol_trunc($obj->name,24).'</option>';
+                        }
+                        $i ++;
+                    }
+                }
+                print "</select>\n";
+                return $firstCompany;
+            }
+            else
+            {
+                dol_print_error($this->db);
+                print 'Error sql';
+            }
+        }
+    }
 
     /**
      *  Return a select list with types of contacts
@@ -740,59 +740,59 @@ 
      *  @param  string      $morecss        Add more css to select component
      *  @return	void
      */
-	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
-	{
-	    global $user, $langs;
-
-		if (is_object($object) && method_exists($object, 'liste_type_contact'))
-		{
-			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
-			print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($showempty) print '<option value="0"></option>';
-			foreach($lesTypes as $key=>$value)
-			{
-				print '<option value="'.$key.'"';
-				if ($key == $selected) print ' selected';
-				print '>'.$value.'</option>';
-			}
-			print "</select>";
-			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-			print "\n";
-		}
-	}
+    function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
+    {
+        global $user, $langs;
+
+        if (is_object($object) && method_exists($object, 'liste_type_contact'))
+        {
+            $lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
+            print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+            if ($showempty) print '<option value="0"></option>';
+            foreach($lesTypes as $key=>$value)
+            {
+                print '<option value="'.$key.'"';
+                if ($key == $selected) print ' selected';
+                print '>'.$value.'</option>';
+            }
+            print "</select>";
+            if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print "\n";
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return a select list with zip codes and their town
-	 *
-	 *    @param	string		$selected				Preselected value
-	 *    @param    string		$htmlname				HTML select name
-	 *    @param    string		$fields					Fields
-	 *    @param    int			$fieldsize				Field size
-	 *    @param    int			$disableautocomplete    1 To disable ajax autocomplete features (browser autocomplete may still occurs)
-	 *    @param	string		$moreattrib				Add more attribute on HTML input field
-	 *    @param    string      $morecss                More css
-	 *    @return	string
-	 */
-	function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='')
-	{
+    /**
+     *    Return a select list with zip codes and their town
+     *
+     *    @param	string		$selected				Preselected value
+     *    @param    string		$htmlname				HTML select name
+     *    @param    string		$fields					Fields
+     *    @param    int			$fieldsize				Field size
+     *    @param    int			$disableautocomplete    1 To disable ajax autocomplete features (browser autocomplete may still occurs)
+     *    @param	string		$moreattrib				Add more attribute on HTML input field
+     *    @param    string      $morecss                More css
+     *    @return	string
+     */
+    function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='')
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$out='';
+        $out='';
 
-		$size='';
-		if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
+        $size='';
+        if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
 
-		if ($conf->use_javascript_ajax && empty($disableautocomplete))
-		{
-			$out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
-			$moreattrib.=' autocomplete="off"';
-		}
-		$out.= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss?' '.$morecss:'').'" type="text"'.($moreattrib?' '.$moreattrib:'').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
+        if ($conf->use_javascript_ajax && empty($disableautocomplete))
+        {
+            $out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
+            $moreattrib.=' autocomplete="off"';
+        }
+        $out.= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss?' '.$morecss:'').'" type="text"'.($moreattrib?' '.$moreattrib:'').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
 
-		return $out;
-	}
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -812,30 +812,30 @@ 
 
         $formlength=0;
         if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
-        	if ($country_code == 'FR')
-        	{
-        		if (isset($idprof)) {
-        			if ($idprof==1) $formlength=9;
-        			else if ($idprof==2) $formlength=14;
-        			else if ($idprof==3) $formlength=5;      // 4 chiffres et 1 lettre depuis janvier
-        			else if ($idprof==4) $formlength=32;     // No maximum as we need to include a town name in this id
-        		}
-        	}
-        	else if ($country_code == 'ES')
-        	{
-        		if ($idprof==1) $formlength=9;  //CIF/NIF/NIE 9 digits
-        		if ($idprof==2) $formlength=12; //NASS 12 digits without /
-        		if ($idprof==3) $formlength=5;  //CNAE 5 digits
-        		if ($idprof==4) $formlength=32; //depend of college
-        	}
+            if ($country_code == 'FR')
+            {
+                if (isset($idprof)) {
+                    if ($idprof==1) $formlength=9;
+                    else if ($idprof==2) $formlength=14;
+                    else if ($idprof==3) $formlength=5;      // 4 chiffres et 1 lettre depuis janvier
+                    else if ($idprof==4) $formlength=32;     // No maximum as we need to include a town name in this id
+                }
+            }
+            else if ($country_code == 'ES')
+            {
+                if ($idprof==1) $formlength=9;  //CIF/NIF/NIE 9 digits
+                if ($idprof==2) $formlength=12; //NASS 12 digits without /
+                if ($idprof==3) $formlength=5;  //CNAE 5 digits
+                if ($idprof==4) $formlength=32; //depend of college
+            }
         }
 
         $selected=$preselected;
         if (! $selected && isset($idprof)) {
-        	if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
-        	else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
-        	else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
-        	else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
+            if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
+            else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
+            else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
+            else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
         }
 
         $maxlength=$formlength;
@@ -862,30 +862,30 @@ 
 
         $num = $this->db->num_rows($tax);
         $i = 0;
-    	if ($num)
-    	{
-    		$valors=explode(":", $tax);
-
-    		if (count($valors) > 1)
-    		{
-    			//montar select
-    			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-    			while ($i <= (count($valors))-1)
-    			{
-    				if ($selected == $valors[$i])
-    				{
-    					print '<option value="'.$valors[$i].'" selected>';
-    				}
-    				else
-    				{
-    					print '<option value="'.$valors[$i].'">';
-    				}
-    				print $valors[$i];
-    				print '</option>';
-    				$i++;
-    			}
-    			print'</select>';
-    		}
-    	}
+        if ($num)
+        {
+            $valors=explode(":", $tax);
+
+            if (count($valors) > 1)
+            {
+                //montar select
+                print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+                while ($i <= (count($valors))-1)
+                {
+                    if ($selected == $valors[$i])
+                    {
+                        print '<option value="'.$valors[$i].'" selected>';
+                    }
+                    else
+                    {
+                        print '<option value="'.$valors[$i].'">';
+                    }
+                    print $valors[$i];
+                    print '</option>';
+                    $i++;
+                }
+                print'</select>';
+            }
+        }
     }
 }

Spacing +159 added lines, -159 removed lines

@@ -39,7 +39,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *	Constructor
@@ -60,20 +60,20 @@ 
 	 *      @param  string	$filter     Add a SQL filter to select
 	 *    	@return array      			Array of types
 	 */
-	function typent_array($mode=0, $filter='')
+	function typent_array($mode = 0, $filter = '')
 	{
         // phpcs:enable
-		global $langs,$mysoc;
+		global $langs, $mysoc;
 
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
-		if ($filter) $sql.=" ".$filter;
-		$sql.= " ORDER by position, id";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_typent";
+		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id) ? '0' : $mysoc->country_id).")";
+		if ($filter) $sql .= " ".$filter;
+		$sql .= " ORDER by position, id";
 		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -82,11 +82,11 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
+				if (!$mode) $key = $objp->id;
+				else $key = $objp->code;
 				if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);
 				else $effs[$key] = $objp->libelle;
-				if ($effs[$key]=='-') $effs[$key]='';
+				if ($effs[$key] == '-') $effs[$key] = '';
 				$i++;
 			}
 			$this->db->free($resql);
@@ -103,18 +103,18 @@ 
 	 *	@param  string	$filter     Add a SQL filter to select
 	 *  @return array				Array of types d'effectifs
 	 */
-	function effectif_array($mode=0, $filter='')
+	function effectif_array($mode = 0, $filter = '')
 	{
         // phpcs:enable
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
-		$sql.= " WHERE active = 1";
-		if ($filter) $sql.=" ".$filter;
+		$sql .= " WHERE active = 1";
+		if ($filter) $sql .= " ".$filter;
 		$sql .= " ORDER BY id ASC";
 		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -123,10 +123,10 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
+				if (!$mode) $key = $objp->id;
+				else $key = $objp->code;
 
-				$effs[$key] = $objp->libelle!='-'?$objp->libelle:'';
+				$effs[$key] = $objp->libelle != '-' ? $objp->libelle : '';
 				$i++;
 			}
 			$this->db->free($resql);
@@ -145,7 +145,7 @@ 
 	 *	@param	int		$empty			Add empty value in list
 	 *	@return	void
 	 */
-	function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0)
+	function form_prospect_level($page, $selected = '', $htmlname = 'prospect_level_id', $empty = 0)
 	{
         // phpcs:enable
 		global $user, $langs;
@@ -154,11 +154,11 @@ 
 		print '<input type="hidden" name="action" value="setprospectlevel">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-		dol_syslog(get_class($this).'::form_prospect_level',LOG_DEBUG);
+		dol_syslog(get_class($this).'::form_prospect_level', LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY sortorder";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+		$sql .= " WHERE active > 0";
+		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -181,7 +181,7 @@ 
 			print Form::selectarray($htmlname, $options, $selected);
 		}
 		else dol_print_error($this->db);
-		if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		if (!empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
@@ -199,10 +199,10 @@ 
 	 *   @param     string	$htmlname			Id of department
 	 *   @return	void
 	 */
-	function select_departement($selected='',$country_codeid=0, $htmlname='state_id')
+	function select_departement($selected = '', $country_codeid = 0, $htmlname = 'state_id')
 	{
         // phpcs:enable
-		print $this->select_state($selected,$country_codeid, $htmlname);
+		print $this->select_state($selected, $country_codeid, $htmlname);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -219,91 +219,91 @@ 
 	 * 	  @return	string						String with HTML select
 	 *    @see select_country
 	 */
-	function select_state($selected='',$country_codeid=0, $htmlname='state_id')
+	function select_state($selected = '', $country_codeid = 0, $htmlname = 'state_id')
 	{
         // phpcs:enable
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid,LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid, LOG_DEBUG);
 
 		$langs->load("dict");
 
-		$out='';
+		$out = '';
 
 		// Serch departements/cantons/province active d'une region et pays actif
 		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
-		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
 		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
-		if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
+		if ($country_codeid && !is_numeric($country_codeid)) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
 		$sql .= " ORDER BY c.code, d.code_departement";
 
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
-			if (!empty($htmlname)) $out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';
+			if (!empty($htmlname)) $out .= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
+			if ($country_codeid) $out .= '<option value="0">&nbsp;</option>';
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			dol_syslog(get_class($this)."::select_departement num=".$num,LOG_DEBUG);
+			dol_syslog(get_class($this)."::select_departement num=".$num, LOG_DEBUG);
 			if ($num)
 			{
-				$country='';
+				$country = '';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($result);
 					if ($obj->code == '0')		// Le code peut etre une chaine
 					{
-						$out.= '<option value="0">&nbsp;</option>';
+						$out .= '<option value="0">&nbsp;</option>';
 					}
 					else {
-						if (! $country || $country != $obj->country)
+						if (!$country || $country != $obj->country)
 						{
 							// Affiche la rupture si on est en mode liste multipays
-							if (! $country_codeid && $obj->country_code)
+							if (!$country_codeid && $obj->country_code)
 							{
-								$out.= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
-								$country=$obj->country;
+								$out .= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
+								$country = $obj->country;
 							}
 						}
 
-						if ((! empty($selected) && $selected == $obj->rowid)
-						 || (empty($selected) && ! empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
+						if ((!empty($selected) && $selected == $obj->rowid)
+						 || (empty($selected) && !empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
 						{
-							$out.= '<option value="'.$obj->rowid.'" selected>';
+							$out .= '<option value="'.$obj->rowid.'" selected>';
 						}
 						else
 						{
-							$out.= '<option value="'.$obj->rowid.'">';
+							$out .= '<option value="'.$obj->rowid.'">';
 						}
 
 						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 						if (!empty($conf->global->MAIN_SHOW_STATE_CODE) &&
 						($conf->global->MAIN_SHOW_STATE_CODE == 1 || $conf->global->MAIN_SHOW_STATE_CODE == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')) {
-							if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
-								$out.= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
+								$out .= $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 							else {
-								$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+								$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						}
 						else {
-							if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
-								$out.= $obj->region_name . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
+								$out .= $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 							else {
-								$out.= ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+								$out .= ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						}
 
-						$out.= '</option>';
+						$out .= '</option>';
 					}
 					$i++;
 				}
 			}
-			if (! empty($htmlname)) $out.= '</select>';
-			if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if (!empty($htmlname)) $out .= '</select>';
+			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
 		else
 		{
@@ -311,9 +311,9 @@ 
 		}
 
 		// Make select dynamic
-		if (! empty($htmlname))
+		if (!empty($htmlname))
 		{
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 		}
 
@@ -332,19 +332,19 @@ 
 	 *   @param		string		$htmlname		Name of HTML select field
 	 *   @return	void
 	 */
-	function select_region($selected='',$htmlname='region_id')
+	function select_region($selected = '', $htmlname = 'region_id')
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 		$langs->load("dict");
 
 		$sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
-		$sql.= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
-		$sql.= " ORDER BY c.code, c.label ASC";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
+		$sql .= " ORDER BY c.code, c.label ASC";
 
 		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
@@ -352,7 +352,7 @@ 
 			$i = 0;
 			if ($num)
 			{
-				$country='';
+				$country = '';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
@@ -363,10 +363,10 @@ 
 						if ($country == '' || $country != $obj->country)
 						{
 							// Show break
-							$key=$langs->trans("Country".strtoupper($obj->country_code));
-							$valuetoshow=($key != "Country".strtoupper($obj->country_code))?$obj->country_code." - ".$key:$obj->country;
+							$key = $langs->trans("Country".strtoupper($obj->country_code));
+							$valuetoshow = ($key != "Country".strtoupper($obj->country_code)) ? $obj->country_code." - ".$key : $obj->country;
 							print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n";
-							$country=$obj->country;
+							$country = $obj->country;
 						}
 
 						if ($selected > 0 && $selected == $obj->code)
@@ -398,23 +398,23 @@ 
 	 *  @param  string  $morecss        Add more css on SELECT element
 	 *  @return	string					String with HTML select
 	 */
-	function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
+	function select_civility($selected = '', $htmlname = 'civility_id', $morecss = 'maxwidth100')
 	{
         // phpcs:enable
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 		$langs->load("dict");
 
-		$out='';
+		$out = '';
 
 		$sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";
-		$sql.= " WHERE active = 1";
+		$sql .= " WHERE active = 1";
 
 		dol_syslog("Form::select_civility", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$out.= '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			$out.= '<option value="">&nbsp;</option>';
+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			$out .= '<option value="">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -424,20 +424,20 @@ 
 					$obj = $this->db->fetch_object($resql);
 					if ($selected == $obj->code)
 					{
-						$out.= '<option value="'.$obj->code.'" selected>';
+						$out .= '<option value="'.$obj->code.'" selected>';
 					}
 					else
 					{
-						$out.= '<option value="'.$obj->code.'">';
+						$out .= '<option value="'.$obj->code.'">';
 					}
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-					$out.= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label!='-'?$obj->label:''));
-					$out.= '</option>';
+					$out .= ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+					$out .= '</option>';
 					$i++;
 				}
 			}
-			$out.= '</select>';
-			if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			$out .= '</select>';
+			if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
 		else
 		{
@@ -459,7 +459,7 @@ 
 	 *    @deprecated Use print xxx->select_juridicalstatus instead
 	 *    @see select_juridicalstatus()
 	 */
-	function select_forme_juridique($selected='', $country_codeid=0, $filter='')
+	function select_forme_juridique($selected = '', $country_codeid = 0, $filter = '')
 	{
         // phpcs:enable
 		print $this->select_juridicalstatus($selected, $country_codeid, $filter);
@@ -476,13 +476,13 @@ 
      *    @param	string		$htmlname			HTML name of select
      *    @return	string							String with HTML select
 	 */
-	function select_juridicalstatus($selected='', $country_codeid=0, $filter='', $htmlname='forme_juridique_code')
+	function select_juridicalstatus($selected = '', $country_codeid = 0, $filter = '', $htmlname = 'forme_juridique_code')
 	{
         // phpcs:enable
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 		$langs->load("dict");
 
-		$out='';
+		$out = '';
 
 		// On recherche les formes juridiques actives des pays actifs
 		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
@@ -494,70 +494,70 @@ 
 		$sql .= " ORDER BY c.code";
 
 		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$out.= '<div id="particulier2" class="visible">';
-			$out.= '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';	// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
+			$out .= '<div id="particulier2" class="visible">';
+			$out .= '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($country_codeid) $out .= '<option value="0">&nbsp;</option>'; // When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
 
 			$num = $this->db->num_rows($resql);
 			if ($num)
 			{
 				$i = 0;
-				$country=''; $arraydata=array();
+				$country = ''; $arraydata = array();
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
 
 					if ($obj->code)		// We exclude empty line, we will add it later
 					{
-						$labelcountry=(($langs->trans("Country".$obj->country_code)!="Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
-						$labeljs=(($langs->trans("JuridicalStatus".$obj->code)!="JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label!='-'?$obj->label:''));	// $obj->label is already in output charset (converted by database driver)
-						$arraydata[$obj->code]=array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
+						$labelcountry = (($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
+						$labeljs = (($langs->trans("JuridicalStatus".$obj->code) != "JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label != '-' ? $obj->label : '')); // $obj->label is already in output charset (converted by database driver)
+						$arraydata[$obj->code] = array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
 					}
 					$i++;
 				}
 
-				$arraydata=dol_sort_array($arraydata, 'label_sort', 'ASC');
+				$arraydata = dol_sort_array($arraydata, 'label_sort', 'ASC');
 				if (empty($country_codeid))	// Introduce empty value (if $country_codeid not empty, empty value was already added)
 				{
-					$arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
+					$arraydata[0] = array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
 				}
 
-				foreach($arraydata as $key => $val)
+				foreach ($arraydata as $key => $val)
 				{
-					if (! $country || $country != $val['country'])
+					if (!$country || $country != $val['country'])
 					{
 						// Show break when we are in multi country mode
 						if (empty($country_codeid) && $val['country_code'])
 						{
-							$out.= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
-							$country=$val['country'];
+							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
+							$country = $val['country'];
 						}
 					}
 
 					if ($selected > 0 && $selected == $val['code'])
 					{
-						$out.= '<option value="'.$val['code'].'" selected>';
+						$out .= '<option value="'.$val['code'].'" selected>';
 					}
 					else
 					{
-						$out.= '<option value="'.$val['code'].'">';
+						$out .= '<option value="'.$val['code'].'">';
 					}
 					// If translation exists, we use it, otherwise we use default label in database
-					$out.= $val['label'];
-					$out.= '</option>';
+					$out .= $val['label'];
+					$out .= '</option>';
 				}
 			}
-			$out.= '</select>';
-			if ($user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			$out .= '</select>';
+			if ($user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
 		    // Make select dynamic
-        	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	        $out .= ajax_combobox($htmlname);
 
-			$out.= '</div>';
+			$out .= '</div>';
 		}
 		else
 		{
@@ -581,19 +581,19 @@ 
      *  @param	string		$morecss		More CSS on select component
 	 * 	@return int 						The selected third party ID
 	 */
-	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='', $morecss='')
+	function selectCompaniesForNewContact($object, $var_id, $selected = '', $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '', $morecss = '')
 	{
 		global $conf, $langs;
 
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
 		{
 			// Use Ajax search
-			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
+			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT) ? $conf->global->COMPANY_USE_SEARCH_TO_SELECT : 2);
 
-			$socid=0; $name='';
+			$socid = 0; $name = '';
 			if ($selected > 0)
 			{
-				$tmpthirdparty=new Societe($this->db);
+				$tmpthirdparty = new Societe($this->db);
 				$result = $tmpthirdparty->fetch($selected);
 				if ($result > 0)
 				{
@@ -603,13 +603,13 @@ 
 			}
 
 
-			$events=array();
+			$events = array();
 			// Add an entry 'method' to say 'yes, we must execute url with param action = method';
 			// Add an entry 'url' to say which url to execute
 			// Add an entry htmlname to say which element we must change once url is called
 			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines
 			// To refresh contacts list on thirdparty list change
-			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
+			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 
 			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
 			{
@@ -665,29 +665,29 @@ 
 
 			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
 			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
-			print ajax_autocompleter(($socid?$socid:-1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
+			print ajax_autocompleter(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
 		}
 		else
 		{
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
-			$sql.= " ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " WHERE s.entity IN (".getEntity('societe').")";
+			$sql .= " ".MAIN_DB_PREFIX."societe as s";
+			$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 			// For ajax search we limit here. For combo list, we limit later
 			if (is_array($limitto) && count($limitto))
 			{
-				$sql.= " AND s.rowid IN (".join(',',$limitto).")";
+				$sql .= " AND s.rowid IN (".join(',', $limitto).")";
 			}
-			$sql.= " ORDER BY s.nom ASC";
+			$sql .= " ORDER BY s.nom ASC";
 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				print '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"';
+				print '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"';
 				if ($conf->use_javascript_ajax)
 				{
-					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid>0?$forceid:$object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
+					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid > 0 ? $forceid : $object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
 					print ' onChange="'.$javaScript.'"';
 				}
 				print '>';
@@ -699,22 +699,22 @@ 
 					{
 						$obj = $this->db->fetch_object($resql);
 						if ($i == 0) $firstCompany = $obj->rowid;
-						$disabled=0;
-						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
+						$disabled = 0;
+						if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) $disabled = 1;
 						if ($selected > 0 && $selected == $obj->rowid)
 						{
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled';
-							print ' selected>'.dol_trunc($obj->name,24).'</option>';
+							print ' selected>'.dol_trunc($obj->name, 24).'</option>';
 							$firstCompany = $obj->rowid;
 						}
 						else
 						{
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled';
-							print '>'.dol_trunc($obj->name,24).'</option>';
+							print '>'.dol_trunc($obj->name, 24).'</option>';
 						}
-						$i ++;
+						$i++;
 					}
 				}
 				print "</select>\n";
@@ -740,23 +740,23 @@ 
      *  @param  string      $morecss        Add more css to select component
      *  @return	void
      */
-	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
+	function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '')
 	{
 	    global $user, $langs;
 
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
-			print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			print '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($showempty) print '<option value="0"></option>';
-			foreach($lesTypes as $key=>$value)
+			foreach ($lesTypes as $key=>$value)
 			{
 				print '<option value="'.$key.'"';
 				if ($key == $selected) print ' selected';
 				print '>'.$value.'</option>';
 			}
 			print "</select>";
-			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print "\n";
 		}
 	}
@@ -774,22 +774,22 @@ 
 	 *    @param    string      $morecss                More css
 	 *    @return	string
 	 */
-	function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='')
+	function select_ziptown($selected = '', $htmlname = 'zipcode', $fields = '', $fieldsize = 0, $disableautocomplete = 0, $moreattrib = '', $morecss = '')
 	{
         // phpcs:enable
 		global $conf;
 
-		$out='';
+		$out = '';
 
-		$size='';
-		if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
+		$size = '';
+		if (!empty($fieldsize)) $size = 'size="'.$fieldsize.'"';
 
 		if ($conf->use_javascript_ajax && empty($disableautocomplete))
 		{
-			$out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
-			$moreattrib.=' autocomplete="off"';
+			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
+			$moreattrib .= ' autocomplete="off"';
 		}
-		$out.= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss?' '.$morecss:'').'" type="text"'.($moreattrib?' '.$moreattrib:'').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
+		$out .= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" type="text"'.($moreattrib ? ' '.$moreattrib : '').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
 
 		return $out;
 	}
@@ -805,43 +805,43 @@ 
      *  @param  string  $morecss        More css
      *  @return	string					HTML string with prof id
      */
-    function get_input_id_prof($idprof,$htmlname,$preselected,$country_code,$morecss='maxwidth100onsmartphone quatrevingtpercent')
+    function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent')
     {
         // phpcs:enable
-        global $conf,$langs;
+        global $conf, $langs;
 
-        $formlength=0;
+        $formlength = 0;
         if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
         	if ($country_code == 'FR')
         	{
         		if (isset($idprof)) {
-        			if ($idprof==1) $formlength=9;
-        			else if ($idprof==2) $formlength=14;
-        			else if ($idprof==3) $formlength=5;      // 4 chiffres et 1 lettre depuis janvier
-        			else if ($idprof==4) $formlength=32;     // No maximum as we need to include a town name in this id
+        			if ($idprof == 1) $formlength = 9;
+        			else if ($idprof == 2) $formlength = 14;
+        			else if ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier
+        			else if ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id
         		}
         	}
         	else if ($country_code == 'ES')
         	{
-        		if ($idprof==1) $formlength=9;  //CIF/NIF/NIE 9 digits
-        		if ($idprof==2) $formlength=12; //NASS 12 digits without /
-        		if ($idprof==3) $formlength=5;  //CNAE 5 digits
-        		if ($idprof==4) $formlength=32; //depend of college
+        		if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits
+        		if ($idprof == 2) $formlength = 12; //NASS 12 digits without /
+        		if ($idprof == 3) $formlength = 5; //CNAE 5 digits
+        		if ($idprof == 4) $formlength = 32; //depend of college
         	}
         }
 
-        $selected=$preselected;
-        if (! $selected && isset($idprof)) {
-        	if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
-        	else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
-        	else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
-        	else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
+        $selected = $preselected;
+        if (!$selected && isset($idprof)) {
+        	if ($idprof == 1 && !empty($this->idprof1)) $selected = $this->idprof1;
+        	else if ($idprof == 2 && !empty($this->idprof2)) $selected = $this->idprof2;
+        	else if ($idprof == 3 && !empty($this->idprof3)) $selected = $this->idprof3;
+        	else if ($idprof == 4 && !empty($this->idprof4)) $selected = $this->idprof4;
         }
 
-        $maxlength=$formlength;
-        if (empty($formlength)) { $formlength=24; $maxlength=128; }
+        $maxlength = $formlength;
+        if (empty($formlength)) { $formlength = 24; $maxlength = 128; }
 
-        $out = '<input type="text" '.($morecss?'class="'.$morecss.'" ':'').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
+        $out = '<input type="text" '.($morecss ? 'class="'.$morecss.'" ' : '').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 
         return $out;
     }
@@ -858,19 +858,19 @@ 
     function select_localtax($local, $selected, $htmlname)
     {
         // phpcs:enable
-        $tax=get_localtax_by_third($local);
+        $tax = get_localtax_by_third($local);
 
         $num = $this->db->num_rows($tax);
         $i = 0;
     	if ($num)
     	{
-    		$valors=explode(":", $tax);
+    		$valors = explode(":", $tax);
 
     		if (count($valors) > 1)
     		{
     			//montar select
     			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-    			while ($i <= (count($valors))-1)
+    			while ($i <= (count($valors)) - 1)
     			{
     				if ($selected == $valors[$i])
     				{

Braces +153 added lines, -81 removed lines

@@ -70,7 +70,9 @@ 
 		$sql = "SELECT id, code, libelle";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
 		$sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
-		if ($filter) $sql.=" ".$filter;
+		if ($filter) {
+		    $sql.=" ".$filter;
+		}
 		$sql.= " ORDER by position, id";
 		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -82,11 +84,19 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
-				if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);
-				else $effs[$key] = $objp->libelle;
-				if ($effs[$key]=='-') $effs[$key]='';
+				if (! $mode) {
+				    $key=$objp->id;
+				} else {
+				    $key=$objp->code;
+				}
+				if ($langs->trans($objp->code) != $objp->code) {
+				    $effs[$key] = $langs->trans($objp->code);
+				} else {
+				    $effs[$key] = $objp->libelle;
+				}
+				if ($effs[$key]=='-') {
+				    $effs[$key]='';
+				}
 				$i++;
 			}
 			$this->db->free($resql);
@@ -111,7 +121,9 @@ 
 		$sql = "SELECT id, code, libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
 		$sql.= " WHERE active = 1";
-		if ($filter) $sql.=" ".$filter;
+		if ($filter) {
+		    $sql.=" ".$filter;
+		}
 		$sql .= " ORDER BY id ASC";
 		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -123,8 +135,11 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
+				if (! $mode) {
+				    $key=$objp->id;
+				} else {
+				    $key=$objp->code;
+				}
 
 				$effs[$key] = $objp->libelle!='-'?$objp->libelle:'';
 				$i++;
@@ -179,9 +194,12 @@ 
 			}
 
 			print Form::selectarray($htmlname, $options, $selected);
+		} else {
+		    dol_print_error($this->db);
+		}
+		if (! empty($htmlname) && $user->admin) {
+		    print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		}
-		else dol_print_error($this->db);
-		if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
@@ -235,15 +253,23 @@ 
 		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
-		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
-		if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
+		if ($country_codeid && is_numeric($country_codeid)) {
+		    $sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
+		}
+		if ($country_codeid && ! is_numeric($country_codeid)) {
+		    $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
+		}
 		$sql .= " ORDER BY c.code, d.code_departement";
 
 		$result=$this->db->query($sql);
 		if ($result)
 		{
-			if (!empty($htmlname)) $out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';
+			if (!empty($htmlname)) {
+			    $out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
+			}
+			if ($country_codeid) {
+			    $out.= '<option value="0">&nbsp;</option>';
+			}
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			dol_syslog(get_class($this)."::select_departement num=".$num,LOG_DEBUG);
@@ -253,11 +279,12 @@ 
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($result);
-					if ($obj->code == '0')		// Le code peut etre une chaine
+					if ($obj->code == '0') {
+					    // Le code peut etre une chaine
 					{
 						$out.= '<option value="0">&nbsp;</option>';
 					}
-					else {
+					} else {
 						if (! $country || $country != $obj->country)
 						{
 							// Affiche la rupture si on est en mode liste multipays
@@ -272,8 +299,7 @@ 
 						 || (empty($selected) && ! empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
 						{
 							$out.= '<option value="'.$obj->rowid.'" selected>';
-						}
-						else
+						} else
 						{
 							$out.= '<option value="'.$obj->rowid.'">';
 						}
@@ -283,16 +309,13 @@ 
 						($conf->global->MAIN_SHOW_STATE_CODE == 1 || $conf->global->MAIN_SHOW_STATE_CODE == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')) {
 							if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out.= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-							else {
+							} else {
 								$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
 							}
-						}
-						else {
+						} else {
 							if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out.= $obj->region_name . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-							else {
+							} else {
 								$out.= ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
 							}
 						}
@@ -302,10 +325,13 @@ 
 					$i++;
 				}
 			}
-			if (! empty($htmlname)) $out.= '</select>';
-			if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
+			if (! empty($htmlname)) {
+			    $out.= '</select>';
+			}
+			if (! empty($htmlname) && $user->admin) {
+			    $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -358,8 +384,7 @@ 
 					$obj = $this->db->fetch_object($resql);
 					if ($obj->code == 0) {
 						print '<option value="0">&nbsp;</option>';
-					}
-					else {
+					} else {
 						if ($country == '' || $country != $obj->country)
 						{
 							// Show break
@@ -372,8 +397,7 @@ 
 						if ($selected > 0 && $selected == $obj->code)
 						{
 							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
-						}
-						else
+						} else
 						{
 							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
@@ -382,8 +406,7 @@ 
 				}
 			}
 			print '</select>';
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -425,8 +448,7 @@ 
 					if ($selected == $obj->code)
 					{
 						$out.= '<option value="'.$obj->code.'" selected>';
-					}
-					else
+					} else
 					{
 						$out.= '<option value="'.$obj->code.'">';
 					}
@@ -437,9 +459,10 @@ 
 				}
 			}
 			$out.= '</select>';
-			if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
+			if ($user->admin) {
+			    $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -489,8 +512,12 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE f.fk_pays=c.rowid";
 		$sql .= " AND f.active = 1 AND c.active = 1";
-		if ($country_codeid) $sql .= " AND c.code = '".$country_codeid."'";
-		if ($filter) $sql .= " ".$filter;
+		if ($country_codeid) {
+		    $sql .= " AND c.code = '".$country_codeid."'";
+		}
+		if ($filter) {
+		    $sql .= " ".$filter;
+		}
 		$sql .= " ORDER BY c.code";
 
 		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
@@ -499,7 +526,10 @@ 
 		{
 			$out.= '<div id="particulier2" class="visible">';
 			$out.= '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';	// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
+			if ($country_codeid) {
+			    $out.= '<option value="0">&nbsp;</option>';
+			}
+			// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
 
 			$num = $this->db->num_rows($resql);
 			if ($num)
@@ -510,9 +540,11 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 
-					if ($obj->code)		// We exclude empty line, we will add it later
+					if ($obj->code) {
+					    // We exclude empty line, we will add it later
 					{
 						$labelcountry=(($langs->trans("Country".$obj->country_code)!="Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
+					}
 						$labeljs=(($langs->trans("JuridicalStatus".$obj->code)!="JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label!='-'?$obj->label:''));	// $obj->label is already in output charset (converted by database driver)
 						$arraydata[$obj->code]=array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
 					}
@@ -520,10 +552,12 @@ 
 				}
 
 				$arraydata=dol_sort_array($arraydata, 'label_sort', 'ASC');
-				if (empty($country_codeid))	// Introduce empty value (if $country_codeid not empty, empty value was already added)
+				if (empty($country_codeid)) {
+				    // Introduce empty value (if $country_codeid not empty, empty value was already added)
 				{
 					$arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
 				}
+				}
 
 				foreach($arraydata as $key => $val)
 				{
@@ -540,8 +574,7 @@ 
 					if ($selected > 0 && $selected == $val['code'])
 					{
 						$out.= '<option value="'.$val['code'].'" selected>';
-					}
-					else
+					} else
 					{
 						$out.= '<option value="'.$val['code'].'">';
 					}
@@ -551,15 +584,16 @@ 
 				}
 			}
 			$out.= '</select>';
-			if ($user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) {
+			    $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
 
 		    // Make select dynamic
         	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 	        $out .= ajax_combobox($htmlname);
 
 			$out.= '</div>';
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -611,7 +645,8 @@ 
 			// To refresh contacts list on thirdparty list change
 			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 
-			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
+			if (count($events)) {
+			    // If there is some ajax events to run once selection is done, we add code here to run events
 			{
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
@@ -662,13 +697,13 @@ 
 				});
 				</script>';
 			}
+			}
 
 			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
 			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
 			print ajax_autocompleter(($socid?$socid:-1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
-		}
-		else
+		} else
 		{
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
@@ -698,20 +733,27 @@ 
 					while ($i < $num)
 					{
 						$obj = $this->db->fetch_object($resql);
-						if ($i == 0) $firstCompany = $obj->rowid;
+						if ($i == 0) {
+						    $firstCompany = $obj->rowid;
+						}
 						$disabled=0;
-						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
+						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) {
+						    $disabled=1;
+						}
 						if ($selected > 0 && $selected == $obj->rowid)
 						{
 							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
+							if ($disabled) {
+							    print ' disabled';
+							}
 							print ' selected>'.dol_trunc($obj->name,24).'</option>';
 							$firstCompany = $obj->rowid;
-						}
-						else
+						} else
 						{
 							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
+							if ($disabled) {
+							    print ' disabled';
+							}
 							print '>'.dol_trunc($obj->name,24).'</option>';
 						}
 						$i ++;
@@ -719,8 +761,7 @@ 
 				}
 				print "</select>\n";
 				return $firstCompany;
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 				print 'Error sql';
@@ -748,15 +789,21 @@ 
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
 			print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($showempty) print '<option value="0"></option>';
+			if ($showempty) {
+			    print '<option value="0"></option>';
+			}
 			foreach($lesTypes as $key=>$value)
 			{
 				print '<option value="'.$key.'"';
-				if ($key == $selected) print ' selected';
+				if ($key == $selected) {
+				    print ' selected';
+				}
 				print '>'.$value.'</option>';
 			}
 			print "</select>";
-			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) {
+			    print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
 			print "\n";
 		}
 	}
@@ -782,7 +829,9 @@ 
 		$out='';
 
 		$size='';
-		if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
+		if (!empty($fieldsize)) {
+		    $size='size="'.$fieldsize.'"';
+		}
 
 		if ($conf->use_javascript_ajax && empty($disableautocomplete))
 		{
@@ -815,27 +864,51 @@ 
         	if ($country_code == 'FR')
         	{
         		if (isset($idprof)) {
-        			if ($idprof==1) $formlength=9;
-        			else if ($idprof==2) $formlength=14;
-        			else if ($idprof==3) $formlength=5;      // 4 chiffres et 1 lettre depuis janvier
-        			else if ($idprof==4) $formlength=32;     // No maximum as we need to include a town name in this id
+        			if ($idprof==1) {
+        			    $formlength=9;
+        			} else if ($idprof==2) {
+        			    $formlength=14;
+        			} else if ($idprof==3) {
+        			    $formlength=5;
+        			}
+        			// 4 chiffres et 1 lettre depuis janvier
+        			else if ($idprof==4) {
+        			    $formlength=32;
+        			}
+        			// No maximum as we need to include a town name in this id
         		}
-        	}
-        	else if ($country_code == 'ES')
+        	} else if ($country_code == 'ES')
         	{
-        		if ($idprof==1) $formlength=9;  //CIF/NIF/NIE 9 digits
-        		if ($idprof==2) $formlength=12; //NASS 12 digits without /
-        		if ($idprof==3) $formlength=5;  //CNAE 5 digits
-        		if ($idprof==4) $formlength=32; //depend of college
+        		if ($idprof==1) {
+        		    $formlength=9;
+        		}
+        		//CIF/NIF/NIE 9 digits
+        		if ($idprof==2) {
+        		    $formlength=12;
+        		}
+        		//NASS 12 digits without /
+        		if ($idprof==3) {
+        		    $formlength=5;
+        		}
+        		//CNAE 5 digits
+        		if ($idprof==4) {
+        		    $formlength=32;
+        		}
+        		//depend of college
         	}
         }
 
         $selected=$preselected;
         if (! $selected && isset($idprof)) {
-        	if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
-        	else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
-        	else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
-        	else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
+        	if ($idprof==1 && ! empty($this->idprof1)) {
+        	    $selected=$this->idprof1;
+        	} else if ($idprof==2 && ! empty($this->idprof2)) {
+        	    $selected=$this->idprof2;
+        	} else if ($idprof==3 && ! empty($this->idprof3)) {
+        	    $selected=$this->idprof3;
+        	} else if ($idprof==4 && ! empty($this->idprof4)) {
+        	    $selected=$this->idprof4;
+        	}
         }
 
         $maxlength=$formlength;
@@ -875,8 +948,7 @@ 
     				if ($selected == $valors[$i])
     				{
     					print '<option value="'.$valors[$i].'" selected>';
-    				}
-    				else
+    				} else
     				{
     					print '<option value="'.$valors[$i].'">';
     				}

dolibarr/htdocs/core/class/dolreceiptprinter.class.php

Braces +1 added lines, -2 removed lines

@@ -545,8 +545,7 @@
         $ret = $this->InitPrinter($printerid);
         if ($ret>0) {
             setEventMessages($this->error, $this->errors, 'errors');
-        }
-        else
+        } else
         {
             $nboflines = count($vals);
             for ($line=0; $line < $nboflines; $line++)

Spacing +47 added lines, -47 removed lines

@@ -92,7 +92,7 @@ 
  *
  */
 
-require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/Escpos.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/mike42/escpos-php/Escpos.php';
 
 
 /**
@@ -118,7 +118,7 @@ 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
     /**
      * @var string[] Error codes (or messages)
@@ -134,7 +134,7 @@ 
      */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
         $this->tags = array(
             'dol_align_left',
             'dol_align_center',
@@ -218,8 +218,8 @@ 
         $line = 0;
         $obj = array();
         $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql .= ' WHERE entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -286,8 +286,8 @@ 
         $line = 0;
         $obj = array();
         $sql = 'SELECT rowid, name, template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql .= ' WHERE entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -311,7 +311,7 @@ 
      *  @param    string    $htmlname       select html name
      *  @return  int                        0 if OK; >0 if KO
      */
-    function selectTypePrinter($selected='', $htmlname='printertypeid')
+    function selectTypePrinter($selected = '', $htmlname = 'printertypeid')
     {
         global $langs;
 
@@ -335,7 +335,7 @@ 
      *  @param    string    $htmlname       select html name
      *  @return  int                        0 if OK; >0 if KO
      */
-    function selectProfilePrinter($selected='', $htmlname='printerprofileid')
+    function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')
     {
         global $langs;
 
@@ -368,10 +368,10 @@ 
         global $conf;
         $error = 0;
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' (name, fk_type, fk_profile, parameter, entity)';
-        $sql.= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
+        $sql .= ' (name, fk_type, fk_profile, parameter, entity)';
+        $sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -395,13 +395,13 @@ 
         global $conf;
         $error = 0;
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', fk_type='.$type;
-        $sql.= ', fk_profile='.$profile;
-        $sql.= ', parameter="'.$this->db->escape($parameter).'"';
-        $sql.= ' WHERE rowid='.$printerid;
+        $sql .= ' SET name="'.$this->db->escape($name).'"';
+        $sql .= ', fk_type='.$type;
+        $sql .= ', fk_profile='.$profile;
+        $sql .= ', parameter="'.$this->db->escape($parameter).'"';
+        $sql .= ' WHERE rowid='.$printerid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -421,9 +421,9 @@ 
         global $conf;
         $error = 0;
         $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid='.$printerid;
+        $sql .= ' WHERE rowid='.$printerid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -445,11 +445,11 @@ 
         global $conf;
         $error = 0;
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', template="'.$this->db->escape($template).'"';
-        $sql.= ' WHERE rowid='.$templateid;
+        $sql .= ' SET name="'.$this->db->escape($name).'"';
+        $sql .= ', template="'.$this->db->escape($template).'"';
+        $sql .= ' WHERE rowid='.$templateid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -469,9 +469,9 @@ 
         // phpcs:enable
         global $conf;
         $error = 0;
-        $img = new EscposImage(DOL_BASE_URI . '/theme/common/dolibarr_logo_bw.png');
+        $img = new EscposImage(DOL_BASE_URI.'/theme/common/dolibarr_logo_bw.png');
         $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
+        if ($ret > 0) {
             setEventMessages($this->error, $this->errors, 'errors');
         } else {
             try {
@@ -543,35 +543,35 @@ 
         $level = 0;
         $html = '<table border="1" style="width:210px"><pre>';
         $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
+        if ($ret > 0) {
             setEventMessages($this->error, $this->errors, 'errors');
         }
         else
         {
             $nboflines = count($vals);
-            for ($line=0; $line < $nboflines; $line++)
+            for ($line = 0; $line < $nboflines; $line++)
             {
                 switch ($vals[$line]['tag']) {
                     case 'DOL_ALIGN_CENTER':
                         $this->printer->setJustification(Escpos::JUSTIFY_CENTER);
-                        $html.='<center>';
+                        $html .= '<center>';
                         $this->printer->text($vals[$line]['value']);
                         break;
                     case 'DOL_ALIGN_RIGHT':
                         $this->printer->setJustification(Escpos::JUSTIFY_RIGHT);
-                        $html.='<right>';
+                        $html .= '<right>';
                         break;
                     case 'DOL_ALIGN_LEFT':
                         $this->printer->setJustification(Escpos::JUSTIFY_LEFT);
-                        $html.='<left>';
+                        $html .= '<left>';
                         break;
                     case 'DOL_OPEN_DRAWER':
                         $this->printer->pulse();
-                        $html.= ' &#991;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#991;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_ACTIVATE_BUZZER':
                         //$this->printer->buzzer();
-                        $html.= ' &#x266b;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#x266b;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_PRINT_BARCODE':
                         // $vals[$line]['value'] -> barcode($content, $type)
@@ -584,15 +584,15 @@ 
                     case 'DOL_PRINT_QRCODE':
                         // $vals[$line]['value'] -> qrCode($content, $ec, $size, $model)
                         $this->printer->qrcode($vals[$line]['value']);
-                        $html.='QRCODE: '.$vals[$line]['value'];
+                        $html .= 'QRCODE: '.$vals[$line]['value'];
                         break;
                     case 'DOL_CUT_PAPER_FULL':
                         $this->printer->cut(Escpos::CUT_FULL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_CUT_PAPER_PARTIAL':
                         $this->printer->cut(Escpos::CUT_PARTIAL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_USE_FONT_A':
                         $this->printer->setFont(Escpos::FONT_A);
@@ -608,13 +608,13 @@ 
                         break;
                     default:
                         $this->printer->text($vals[$line]['value']);
-                        $html.= nl2br($vals[$line]['value']);
+                        $html .= nl2br($vals[$line]['value']);
                         $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$line]['tag']).'&gt;';
                         $error++;
                         break;
                 }
             }
-            $html.= '</pre></table>';
+            $html .= '</pre></table>';
             print $html;
             // Close and print
             // uncomment next line to see content sent to printer
@@ -635,9 +635,9 @@ 
         global $conf;
         $error = 0;
         $sql = 'SELECT template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE rowid='.$templateid;
-        $sql.= ' AND entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql .= ' WHERE rowid='.$templateid;
+        $sql .= ' AND entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_array($resql);
@@ -667,11 +667,11 @@ 
     {
         // phpcs:enable
         global $conf;
-        $error=0;
+        $error = 0;
         $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid = '.$printerid;
-        $sql.= ' AND entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql .= ' WHERE rowid = '.$printerid;
+        $sql .= ' AND entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_array($resql);
@@ -683,12 +683,12 @@ 
             $error++;
             $this->errors[] = 'PrinterDontExist';
         }
-        if (! $error) {
+        if (!$error) {
             $parameter = $obj['parameter'];
             try {
                 switch ($obj['fk_type']) {
                     case 1:
-                        require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
+                        require_once DOL_DOCUMENT_ROOT.'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
                         $this->connector = new DummyPrintConnector();
                         break;
                     case 2: