Dolibarr / dolibarr

htdocs/categories/class/categorie.class.php

Indentation +438 added lines, -438 removed lines

@@ -52,10 +52,10 @@ 
 	const TYPE_USER      = 'user';
 	const TYPE_PROJECT   = 'project';
 	const TYPE_ACCOUNT   = 'bank_account';
-    const TYPE_BANK_LINE = 'bank_line';
-    const TYPE_WAREHOUSE = 'warehouse';
-    const TYPE_ACTIONCOMM = 'actioncomm';
-    const TYPE_WEBSITE_PAGE = 'website_page';
+	const TYPE_BANK_LINE = 'bank_line';
+	const TYPE_WAREHOUSE = 'warehouse';
+	const TYPE_ACTIONCOMM = 'actioncomm';
+	const TYPE_WEBSITE_PAGE = 'website_page';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -73,15 +73,15 @@ 
 		'member'       => 3,
 		'contact'      => 4,
 		'bank_account' => 5,
-        'project'      => 6,
+		'project'      => 6,
 		'user'         => 7,
 		'bank_line'    => 8,
 		'warehouse'    => 9,
-        'actioncomm'   => 10,
+		'actioncomm'   => 10,
 		'website_page' => 11
 	);
 
-    /**
+	/**
 	 * @var array Code mapping from ID
 	 *
 	 * @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
@@ -97,7 +97,7 @@ 
 		7 => 'user',
 		8 => 'bank_line',
 		9 => 'warehouse',
-        10 => 'actioncomm',
+		10 => 'actioncomm',
 	);
 
 	/**
@@ -109,10 +109,10 @@ 
 		'customer' => 'soc',
 		'supplier' => 'soc',
 		'contact'  => 'socpeople',
-        'bank_account' => 'account',
-    );
+		'bank_account' => 'account',
+	);
 
-    /**
+	/**
 	 * @var array Category tables mapping from type string (llx_categorie_...) when value does not match
 	 *
 	 * @note Move to const array when PHP 5.6 will be our minimum target
@@ -120,10 +120,10 @@ 
 	protected $MAP_CAT_TABLE = array(
 		'customer' => 'societe',
 		'supplier' => 'fournisseur',
-        'bank_account'=> 'account',
+		'bank_account'=> 'account',
 	);
 
-    /**
+	/**
 	 * @var array Object class mapping from type string
 	 *
 	 * @note Move to const array when PHP 5.6 will be our minimum target
@@ -137,33 +137,33 @@ 
 		'user'     => 'User',
 		'account'  => 'Account', // old for bank account
 		'bank_account'  => 'Account',
-        'project'  => 'Project',
-        'warehouse'=> 'Entrepot',
-        'actioncomm' => 'ActionComm',
+		'project'  => 'Project',
+		'warehouse'=> 'Entrepot',
+		'actioncomm' => 'ActionComm',
 		'website_page' => 'WebsitePage'
 	);
 
-    /**
-     * @var array Title Area mapping from type string
-     *
-     * @note Move to const array when PHP 5.6 will be our minimum target
-     */
-    public static $MAP_TYPE_TITLE_AREA = array(
-        'product' => 'ProductsCategoriesArea',
-        'customer' => 'CustomersCategoriesArea',
-        'supplier' => 'SuppliersCategoriesArea',
-        'member' => 'MembersCategoriesArea',
-        'contact' => 'ContactsCategoriesArea',
-        'user' => 'UsersCategoriesArea',
-        'account' => 'AccountsCategoriesArea', // old for bank account
-        'bank_account' => 'AccountsCategoriesArea',
-        'project' => 'ProjectsCategoriesArea',
-        'warehouse'=> 'StocksCategoriesArea',
-        'actioncomm' => 'ActioncommCategoriesArea',
-        'website_page' => 'WebsitePageCategoriesArea'
-    );
-
-    /**
+	/**
+	 * @var array Title Area mapping from type string
+	 *
+	 * @note Move to const array when PHP 5.6 will be our minimum target
+	 */
+	public static $MAP_TYPE_TITLE_AREA = array(
+		'product' => 'ProductsCategoriesArea',
+		'customer' => 'CustomersCategoriesArea',
+		'supplier' => 'SuppliersCategoriesArea',
+		'member' => 'MembersCategoriesArea',
+		'contact' => 'ContactsCategoriesArea',
+		'user' => 'UsersCategoriesArea',
+		'account' => 'AccountsCategoriesArea', // old for bank account
+		'bank_account' => 'AccountsCategoriesArea',
+		'project' => 'ProjectsCategoriesArea',
+		'warehouse'=> 'StocksCategoriesArea',
+		'actioncomm' => 'ActioncommCategoriesArea',
+		'website_page' => 'WebsitePageCategoriesArea'
+	);
+
+	/**
 	 * @var array Object table mapping from type string (table llx_...) when value of key does not match table name.
 	 *
 	 * @note Move to const array when PHP 5.6 will be our minimum target
@@ -175,7 +175,7 @@ 
 		'contact'  => 'socpeople',
 		'account'  => 'bank_account', // old for bank account
 		'project'  => 'projet',
-        'warehouse'=> 'entrepot'
+		'warehouse'=> 'entrepot'
 	);
 
 	/**
@@ -189,13 +189,13 @@ 
 	public $table_element = 'categorie';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_parent;
 
 	/**
-     * @var string Category label
-     */
+	 * @var string Category label
+	 */
    	public $label;
 
 	/**
@@ -225,8 +225,8 @@ 
 	 * @see Categorie::TYPE_USER
 	 * @see Categorie::TYPE_PROJECT
 	 * @see Categorie::TYPE_BANK_LINE
-     * @see Categorie::TYPE_WAREHOUSE
-     * @see Categorie::TYPE_ACTIONCOMM
+	 * @see Categorie::TYPE_WAREHOUSE
+	 * @see Categorie::TYPE_ACTIONCOMM
 	 */
 	public $type;
 
@@ -235,7 +235,7 @@ 
 	 */
 	public $cats = array();
 
-    /**
+	/**
 	 * @var array Mother of table
 	 */
 	public $motherof = array();
@@ -464,20 +464,20 @@ 
 
 				if (!$error)
 				{
-	                // Call trigger
-    	            $result = $this->call_trigger('CATEGORY_CREATE', $user);
-        	        if ($result < 0) { $error++; }
-            	    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('CATEGORY_CREATE', $user);
+					if ($result < 0) { $error++; }
+					// End call triggers
 				}
 
-                if (!$error)
-                {
-    				$this->db->commit();
-    				return $id;
-                } else {
-                	$this->db->rollback();
-                    return -3;
-                }
+				if (!$error)
+				{
+					$this->db->commit();
+					return $id;
+				} else {
+					$this->db->rollback();
+					return -3;
+				}
 			} else {
 				$this->db->rollback();
 				return -2;
@@ -550,10 +550,10 @@ 
 
 			if (!$error)
 			{
-	            // Call trigger
-    	        $result = $this->call_trigger('CATEGORY_MODIFY', $user);
-        	    if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-            	// End call triggers
+				// Call trigger
+				$result = $this->call_trigger('CATEGORY_MODIFY', $user);
+				if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+				// End call triggers
 			}
 
 			$this->db->commit();
@@ -570,7 +570,7 @@ 
 	 * 	Delete a category from database
 	 *
 	 * 	@param	User	$user		Object user that ask to delete
-     *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return	int                 <0 KO >0 OK
 	 */
 	public function delete($user, $notrigger = 0)
@@ -579,7 +579,7 @@ 
 
 		$error = 0;
 
-        // Clean parameters
+		// Clean parameters
 		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);
 
 		dol_syslog(get_class($this)."::remove");
@@ -588,10 +588,10 @@ 
 
 		if (!$error && !$notrigger)
 		{
-		    // Call trigger
-		    $result = $this->call_trigger('CATEGORY_DELETE', $user);
-		    if ($result < 0) $error++;
-		    // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('CATEGORY_DELETE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		/* FIX #1317 : Check for child category and move up 1 level*/
@@ -608,26 +608,26 @@ 
 			}
 		}
 
-        $arraydelete = array(
-            'categorie_societe' => 'fk_categorie',
-            'categorie_fournisseur' => 'fk_categorie',
-            'categorie_product' => 'fk_categorie',
-            'categorie_member' => 'fk_categorie',
-            'categorie_contact' => 'fk_categorie',
-            'categorie_account' => 'fk_categorie',
-            'bank_class' => 'fk_categ',
-            'categorie_lang' => 'fk_category',
-            'categorie' => 'rowid',
-        );
-        foreach ($arraydelete as $key => $value) {
-            $sql  = "DELETE FROM ".MAIN_DB_PREFIX.$key;
-            $sql .= " WHERE ".$value." = ".$this->id;
-            if (!$this->db->query($sql)) {
-                $this->errors[] = $this->db->lasterror();
-                dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
-                $error++;
-            }
-        }
+		$arraydelete = array(
+			'categorie_societe' => 'fk_categorie',
+			'categorie_fournisseur' => 'fk_categorie',
+			'categorie_product' => 'fk_categorie',
+			'categorie_member' => 'fk_categorie',
+			'categorie_contact' => 'fk_categorie',
+			'categorie_account' => 'fk_categorie',
+			'bank_class' => 'fk_categ',
+			'categorie_lang' => 'fk_category',
+			'categorie' => 'rowid',
+		);
+		foreach ($arraydelete as $key => $value) {
+			$sql  = "DELETE FROM ".MAIN_DB_PREFIX.$key;
+			$sql .= " WHERE ".$value." = ".$this->id;
+			if (!$this->db->query($sql)) {
+				$this->errors[] = $this->db->lasterror();
+				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
+				$error++;
+			}
+		}
 
 		// Removed extrafields
 		if (!$error)
@@ -650,7 +650,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Link an object to the category
 	 *
@@ -660,7 +660,7 @@ 
 	 */
 	public function add_type($obj, $type = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf;
 
 		$error = 0;
@@ -669,9 +669,9 @@ 
 
 		if (empty($type)) $type = $obj->element;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
 		$sql .= " (fk_categorie, fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]).")";
 		$sql .= " VALUES (".$this->id.", ".$obj->id.")";
 
@@ -689,7 +689,7 @@ 
 				{
 					if ($this->db->num_rows($resql) > 0)
 					{
-                        $objparent = $this->db->fetch_object($resql);
+						$objparent = $this->db->fetch_object($resql);
 
 						if (!empty($objparent->fk_parent))
 						{
@@ -712,29 +712,29 @@ 
 
 				if ($error)
 				{
-				    $this->db->rollback();
+					$this->db->rollback();
 					return -1;
 				}
 			}
 
 
 
-            // Call trigger
+			// Call trigger
 			$this->context = array('linkto'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_LINK', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			if ($result < 0) { $error++; }
+			// End call triggers
 
 			if (!$error)
 			{
-			    $this->db->commit();
-			    return 1;
+				$this->db->commit();
+				return 1;
 			} else {
-			    $this->db->rollback();
-			    return -2;
+				$this->db->rollback();
+				return -2;
 			}
 		} else {
-		    $this->db->rollback();
+			$this->db->rollback();
 			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error = $this->db->lasterrno();
@@ -746,7 +746,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Delete object from category
 	 *
@@ -757,7 +757,7 @@ 
 	 */
 	public function del_type($obj, $type)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf;
 
 		$error = 0;
@@ -771,31 +771,31 @@ 
 			dol_syslog(get_class($this)."::del_type(): type 'fournisseur' is deprecated, please use 'supplier' instead", LOG_WARNING);
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
 		$sql .= " WHERE fk_categorie = ".$this->id;
 		$sql .= " AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".$obj->id;
 
 		dol_syslog(get_class($this).'::del_type', LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-            // Call trigger
+			// Call trigger
 			$this->context = array('unlinkoff'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_UNLINK', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			if ($result < 0) { $error++; }
+			// End call triggers
 
 			if (!$error)
 			{
-			    $this->db->commit();
-			    return 1;
+				$this->db->commit();
+				return 1;
 			} else {
-			    $this->db->rollback();
-                return -2;
+				$this->db->rollback();
+				return -2;
 			}
 		} else {
-		    $this->db->rollback();
+			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -842,14 +842,14 @@ 
 		{
 			while ($rec = $this->db->fetch_array($resql))
 			{
-			    if ($onlyids)
-			    {
-			    	$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
-			    } else {
-				    $obj = new $this->MAP_OBJ_CLASS[$type]($this->db);
-				    $obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
-				    $objs[] = $obj;
-			    }
+				if ($onlyids)
+				{
+					$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
+				} else {
+					$obj = new $this->MAP_OBJ_CLASS[$type]($this->db);
+					$obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
+					$objs[] = $obj;
+				}
 			}
 			return $objs;
 		} else {
@@ -988,7 +988,7 @@ 
 		return $categories;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return direct childs id of a category into an array
 	 *
@@ -996,7 +996,7 @@ 
 	 */
 	public function get_filles()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
 		$sql .= " WHERE fk_parent = ".$this->id;
 		$sql .= " AND entity IN (".getEntity('category').")";
@@ -1018,7 +1018,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Load the array this->motherof that is array(id_son=>id_parent, ...)
 	 *
@@ -1026,8 +1026,8 @@ 
 	 */
 	protected function load_motherof()
 	{
-        // phpcs:enable
-	    $this->motherof = array();
+		// phpcs:enable
+		$this->motherof = array();
 
 		// Load array[child]=parent
 		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
@@ -1050,7 +1050,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Rebuilding the category tree as an array
 	 * Return an array of table('id','id_mere',...) trie selon arbre et avec:
@@ -1063,17 +1063,17 @@ 
 	 *
 	 * @param   string                  $type                   Type of categories ('customer', 'supplier', 'contact', 'product', 'member', ...)
 	 * @param   int|string|array        $markafterid            Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
-     *                                                          $markafterid can be an :
-     *                                                          - int (id of category)
-     *                                                          - string (categories ids separated by comma)
-     *                                                          - array (list of categories ids)
-     * @param   int                     $include                [=0] Removed or 1=Keep only
+	 *                                                          $markafterid can be an :
+	 *                                                          - int (id of category)
+	 *                                                          - string (categories ids separated by comma)
+	 *                                                          - array (list of categories ids)
+	 * @param   int                     $include                [=0] Removed or 1=Keep only
 	 * @return  array|int               Array of categories. this->cats and this->motherof are set, -1 on error
 	 */
 	public function get_full_arbo($type, $markafterid = 0, $include = 0)
 	{
-        // phpcs:enable
-	    global $conf, $langs;
+		// phpcs:enable
+		global $conf, $langs;
 
 		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
 		if (is_null($type)) {
@@ -1081,23 +1081,23 @@ 
 			return -1;
 		}
 
-        if (is_string($markafterid))
-        {
-            $markafterid = explode(',', $markafterid);
-        } elseif (is_numeric($markafterid))
-        {
-            if ($markafterid > 0)
-            {
-                $markafterid = array($markafterid);
-            } else {
-                $markafterid = array();
-            }
-        } elseif (!is_array($markafterid))
-        {
-            $markafterid = array();
-        }
-
-        $this->cats = array();
+		if (is_string($markafterid))
+		{
+			$markafterid = explode(',', $markafterid);
+		} elseif (is_numeric($markafterid))
+		{
+			if ($markafterid > 0)
+			{
+				$markafterid = array($markafterid);
+			} else {
+				$markafterid = array();
+			}
+		} elseif (!is_array($markafterid))
+		{
+			$markafterid = array();
+		}
+
+		$this->cats = array();
 
 		// Init this->motherof that is array(id_son=>id_parent, ...)
 		$this->load_motherof();
@@ -1141,27 +1141,27 @@ 
 			$this->build_path_from_id_categ($key, 0); // Process a branch from the root category key (this category has no parent)
 		}
 
-        // Include or exclude leaf including $markafterid from tree
-        if (count($markafterid) > 0)
-        {
-            $keyfiltercatid = '('.implode('|', $markafterid).')';
-
-            //print "Look to discard category ".$markafterid."\n";
-            $keyfilter1 = '^'.$keyfiltercatid.'$';
-            $keyfilter2 = '_'.$keyfiltercatid.'$';
-            $keyfilter3 = '^'.$keyfiltercatid.'_';
-            $keyfilter4 = '_'.$keyfiltercatid.'_';
-            foreach ($this->cats as $key => $val)
-            {
-                $test = (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
-                    || preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath']));
-
-                if (($test && !$include) || (!$test && $include))
-                {
-                    unset($this->cats[$key]);
-                }
-            }
-        }
+		// Include or exclude leaf including $markafterid from tree
+		if (count($markafterid) > 0)
+		{
+			$keyfiltercatid = '('.implode('|', $markafterid).')';
+
+			//print "Look to discard category ".$markafterid."\n";
+			$keyfilter1 = '^'.$keyfiltercatid.'$';
+			$keyfilter2 = '_'.$keyfiltercatid.'$';
+			$keyfilter3 = '^'.$keyfiltercatid.'_';
+			$keyfilter4 = '_'.$keyfiltercatid.'_';
+			foreach ($this->cats as $key => $val)
+			{
+				$test = (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
+					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath']));
+
+				if (($test && !$include) || (!$test && $include))
+				{
+					unset($this->cats[$key]);
+				}
+			}
+		}
 
 		dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);
 		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);
@@ -1171,7 +1171,7 @@ 
 		return $this->cats;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	For category id_categ and its childs available in this->cats, define property fullpath and fulllabel.
 	 *  It is called by get_full_arbo()
@@ -1182,10 +1182,10 @@ 
 	 *	@return		void
 	 *  @see get_full_arbo()
 	 */
-    public function build_path_from_id_categ($id_categ, $protection = 1000)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);
+	public function build_path_from_id_categ($id_categ, $protection = 1000)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);
 
 		if (!empty($this->cats[$id_categ]['fullpath']))
 		{
@@ -1215,10 +1215,10 @@ 
 		// We count number of _ to have level
 		$this->cats[$id_categ]['level'] = dol_strlen(preg_replace('/[^_]/i', '', $this->cats[$id_categ]['fullpath']));
 
-        return;
-    }
+		return;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Display content of $this->cats
 	 *
@@ -1226,7 +1226,7 @@ 
 	 */
 	public function debug_cats()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Display $this->cats
 		foreach ($this->cats as $key => $val)
 		{
@@ -1241,7 +1241,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Returns all categories
 	 *
@@ -1251,7 +1251,7 @@ 
 	 */
 	public function get_all_categories($type = null, $parent = false)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
@@ -1287,11 +1287,11 @@ 
 	 */
 	public function get_main_categories($type = null)
 	{
-	    // phpcs:enable
-	    return $this->get_all_categories($type, true);
+		// phpcs:enable
+		return $this->get_all_categories($type, true);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Check if no category with same label already exists for this cat's parent or root and for this cat's type
 	 *
@@ -1299,7 +1299,7 @@ 
 	 */
 	public function already_exists()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$type = $this->type;
 
 		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
@@ -1341,7 +1341,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Returns the path of the category, with the names of the categories
 	 * separated by $sep (" >> " by default)
@@ -1354,7 +1354,7 @@ 
 	 */
 	public function print_all_ways($sep = ' &gt;&gt; ', $url = '', $nocolor = 0, $addpicto = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$ways = array();
 
 		$allways = $this->get_all_ways(); // Load array of categories
@@ -1365,27 +1365,27 @@ 
 			$forced_color = '';
 			foreach ($way as $cat)
 			{
-			    $i++;
-
-			    if (empty($nocolor))
-			    {
-    			    $forced_color = 'toreplace';
-    			    if ($i == count($way))
-    			    {
-    			        // Check contrast with background and correct text color
-    			        $forced_color = 'categtextwhite';
-    			        if ($cat->color)
-    			        {
-    			            if (colorIsLight($cat->color)) $forced_color = 'categtextblack';
-    			        }
-    			    }
-			    }
+				$i++;
+
+				if (empty($nocolor))
+				{
+					$forced_color = 'toreplace';
+					if ($i == count($way))
+					{
+						// Check contrast with background and correct text color
+						$forced_color = 'categtextwhite';
+						if ($cat->color)
+						{
+							if (colorIsLight($cat->color)) $forced_color = 'categtextblack';
+						}
+					}
+				}
 
 				if ($url == '')
 				{
-			        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
-			        $linkend = '</a>';
-			        $w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
+					$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
+					$linkend = '</a>';
+					$w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
 				} elseif ($url == 'none') {
 					$link = '';
 					$linkend = '';
@@ -1403,7 +1403,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Returns an array containing the list of parent categories
 	 *
@@ -1411,7 +1411,7 @@ 
 	 */
 	public function get_meres()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$parents = array();
 
 		$sql = "SELECT fk_parent FROM ".MAIN_DB_PREFIX."categorie";
@@ -1437,7 +1437,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Returns in a table all possible paths to get to the category
 	 * 	starting with the major categories represented by Tables of categories
@@ -1446,7 +1446,7 @@ 
 	 */
 	public function get_all_ways()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$ways = array();
 
 		$parents = $this->get_meres();
@@ -1488,60 +1488,60 @@ 
 
 		if ($type === Categorie::TYPE_BANK_LINE)   // TODO Remove this with standard category code
 		{
-		    // Load bank groups
-		    $sql = "SELECT c.label, c.rowid";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";
-		    $sql .= " WHERE a.lineid=".$id." AND a.fk_categ = c.rowid";
-		    $sql .= " ORDER BY c.label";
-
-		    $res = $this->db->query($sql);
-		    if ($res)
-		    {
-		        while ($obj = $this->db->fetch_object($res))
-		        {
-    				if ($mode == 'id') {
-    				    $cats[] = $obj->rowid;
-    				} elseif ($mode == 'label') {
-    				    $cats[] = $obj->label;
-    				} else {
-    				    $cat = new Categorie($this->db);
-    				    $cat->id = $obj->rowid;
-    				    $cat->label = $obj->label;
-    				    $cats[] = $cat;
-    				}
-		        }
-		    } else {
-		        dol_print_error($this->db);
-		        return -1;
-		    }
+			// Load bank groups
+			$sql = "SELECT c.label, c.rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";
+			$sql .= " WHERE a.lineid=".$id." AND a.fk_categ = c.rowid";
+			$sql .= " ORDER BY c.label";
+
+			$res = $this->db->query($sql);
+			if ($res)
+			{
+				while ($obj = $this->db->fetch_object($res))
+				{
+					if ($mode == 'id') {
+						$cats[] = $obj->rowid;
+					} elseif ($mode == 'label') {
+						$cats[] = $obj->label;
+					} else {
+						$cat = new Categorie($this->db);
+						$cat->id = $obj->rowid;
+						$cat->label = $obj->label;
+						$cats[] = $cat;
+					}
+				}
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
 		} else {
-    		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
-    		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
-    		$sql .= " AND c.entity IN (".getEntity('category').")";
-
-    		$res = $this->db->query($sql);
-    		if ($res)
-    		{
-    			while ($obj = $this->db->fetch_object($res))
-    			{
-    				if ($mode == 'id') {
-    					$cats[] = $obj->rowid;
-    				} elseif ($mode == 'label') {
-    					$cats[] = $obj->label;
-    				} else {
-    					$cat = new Categorie($this->db);
-    					$cat->fetch($obj->fk_categorie);
-    					$cats[] = $cat;
-    				}
-    			}
-    		} else {
-    			dol_print_error($this->db);
-    			return -1;
-    		}
-        }
-
-        return $cats;
+			$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
+			$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
+			$sql .= " AND c.entity IN (".getEntity('category').")";
+
+			$res = $this->db->query($sql);
+			if ($res)
+			{
+				while ($obj = $this->db->fetch_object($res))
+				{
+					if ($mode == 'id') {
+						$cats[] = $obj->rowid;
+					} elseif ($mode == 'label') {
+						$cats[] = $obj->label;
+					} else {
+						$cat = new Categorie($this->db);
+						$cat->fetch($obj->fk_categorie);
+						$cats[] = $cat;
+					}
+				}
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
+		}
+
+		return $cats;
 	}
 
 
@@ -1551,7 +1551,7 @@ 
 	 *
 	 * 	@param		int			$id			Id
 	 * 	@param		string		$nom		Name
- 	 * 	@param		string		$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.
+	 * 	@param		string		$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.
 	 * 	@param		boolean		$exact		Exact string search (true/false)
 	 * 	@param		boolean		$case		Case sensitive (true/false)
 	 * 	@return		Categorie[]|int			Array of Categorie, -1 if error
@@ -1565,15 +1565,15 @@ 
 
 		$cats = array();
 
-        // For backward compatibility
-        if (is_numeric($type)) {
-            // We want to reverse lookup
-            $map_type = array_flip($this->MAP_ID);
-            $type = $map_type[$type];
-            dol_syslog(get_class($this)."::rechercher(): numeric types are deprecated, please use string instead", LOG_WARNING);
-        }
+		// For backward compatibility
+		if (is_numeric($type)) {
+			// We want to reverse lookup
+			$map_type = array_flip($this->MAP_ID);
+			$type = $map_type[$type];
+			dol_syslog(get_class($this)."::rechercher(): numeric types are deprecated, please use string instead", LOG_WARNING);
+		}
 
-        // Generation requete recherche
+		// Generation requete recherche
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
 		$sql .= " WHERE type = ".$this->MAP_ID[$type];
 		$sql .= " AND entity IN (".getEntity('category').")";
@@ -1636,14 +1636,14 @@ 
 		$picto = 'category';
 
 
-        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		if ($withpicto != 2) $result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;
 		return $result;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Deplace fichier uploade sous le nom $files dans le repertoire sdir
 	 *
@@ -1653,7 +1653,7 @@ 
 	 */
 	public function add_photo($sdir, $file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, 'category').$this->id."/";
@@ -1693,7 +1693,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return tableau de toutes les photos de la categorie
 	 *
@@ -1703,7 +1703,7 @@ 
 	 */
 	public function liste_photos($dir, $nbmax = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$nbphoto = 0;
@@ -1714,43 +1714,43 @@ 
 		if (file_exists($dir))
 		{
 			$handle = opendir($dir);
-            if (is_resource($handle))
-            {
-    			while (($file = readdir($handle)) !== false)
-    			{
-    				if (dol_is_file($dir.$file) && preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file))
-    				{
-    					$nbphoto++;
-    					$photo = $file;
-
-    					// On determine nom du fichier vignette
-    					$photo_vignette = '';
-    					if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $photo, $regs))
-    					{
-    						$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
-    					}
-
-    					// Objet
-    					$obj = array();
-    					$obj['photo'] = $photo;
-    					if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
-    					else $obj['photo_vignette'] = "";
-
-    					$tabobj[$nbphoto - 1] = $obj;
-
-    					// On continue ou on arrete de boucler
-    					if ($nbmax && $nbphoto >= $nbmax) break;
-    				}
-    			}
-
-    			closedir($handle);
-            }
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					if (dol_is_file($dir.$file) && preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file))
+					{
+						$nbphoto++;
+						$photo = $file;
+
+						// On determine nom du fichier vignette
+						$photo_vignette = '';
+						if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $photo, $regs))
+						{
+							$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
+						}
+
+						// Objet
+						$obj = array();
+						$obj['photo'] = $photo;
+						if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
+						else $obj['photo_vignette'] = "";
+
+						$tabobj[$nbphoto - 1] = $obj;
+
+						// On continue ou on arrete de boucler
+						if ($nbmax && $nbphoto >= $nbmax) break;
+					}
+				}
+
+				closedir($handle);
+			}
 		}
 
 		return $tabobj;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Efface la photo de la categorie et sa vignette
 	 *
@@ -1759,10 +1759,10 @@ 
 	 */
 	public function delete_photo($file)
 	{
-        // phpcs:enable
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		// phpcs:enable
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
+		$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
 		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
 		$filename = preg_replace('/'.preg_quote($dir, '/').'/i', '', $file); // Nom du fichier
 
@@ -1780,7 +1780,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load size of image file
 	 *
@@ -1789,7 +1789,7 @@ 
 	 */
 	public function get_image_size($file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$infoImg = getimagesize($file); // Recuperation des infos de l'image
 		$this->imgWidth = $infoImg[0]; // Largeur de l'image
 		$this->imgHeight = $infoImg[1]; // Hauteur de l'image
@@ -1804,63 +1804,63 @@ 
 	 */
 	public function setMultiLangs($user)
 	{
-	    global $langs;
-
-	    $langs_available = $langs->get_available_languages();
-	    $current_lang = $langs->getDefaultLang();
-
-	    foreach ($langs_available as $key => $value)
-	    {
-	        $sql = "SELECT rowid";
-	        $sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
-	        $sql .= " WHERE fk_category=".$this->id;
-	        $sql .= " AND lang='".$key."'";
-
-	        $result = $this->db->query($sql);
-
-	        if ($key == $current_lang)
-	        {
-	            if ($this->db->num_rows($result)) // si aucune ligne dans la base
-	            {
-	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
-	                $sql2 .= " SET label='".$this->db->escape($this->label)."',";
-	                $sql2 .= " description='".$this->db->escape($this->description)."'";
-	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
-	            } else {
-	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
-	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->label);
-	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
-	            }
-	            dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
-	            if (!$this->db->query($sql2))
-	            {
-	                $this->error = $this->db->lasterror();
-	                return -1;
-	            }
-	        } elseif (isset($this->multilangs["$key"]))
-	        {
-	            if ($this->db->num_rows($result)) // si aucune ligne dans la base
-	            {
-	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
-	                $sql2 .= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
-	                $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
-	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
-	            } else {
-	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
-	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->multilangs["$key"]["label"]);
-	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
-	            }
-
-	            // on ne sauvegarde pas des champs vides
-	            if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"])
-	                dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
-	            if (!$this->db->query($sql2))
-	            {
-	                $this->error = $this->db->lasterror();
-	                return -1;
-	            }
-	        }
-	    }
+		global $langs;
+
+		$langs_available = $langs->get_available_languages();
+		$current_lang = $langs->getDefaultLang();
+
+		foreach ($langs_available as $key => $value)
+		{
+			$sql = "SELECT rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
+			$sql .= " WHERE fk_category=".$this->id;
+			$sql .= " AND lang='".$key."'";
+
+			$result = $this->db->query($sql);
+
+			if ($key == $current_lang)
+			{
+				if ($this->db->num_rows($result)) // si aucune ligne dans la base
+				{
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
+					$sql2 .= " SET label='".$this->db->escape($this->label)."',";
+					$sql2 .= " description='".$this->db->escape($this->description)."'";
+					$sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
+				} else {
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
+					$sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->label);
+					$sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
+				}
+				dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
+				if (!$this->db->query($sql2))
+				{
+					$this->error = $this->db->lasterror();
+					return -1;
+				}
+			} elseif (isset($this->multilangs["$key"]))
+			{
+				if ($this->db->num_rows($result)) // si aucune ligne dans la base
+				{
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
+					$sql2 .= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					$sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
+				} else {
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
+					$sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->multilangs["$key"]["label"]);
+					$sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
+				}
+
+				// on ne sauvegarde pas des champs vides
+				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"])
+					dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
+				if (!$this->db->query($sql2))
+				{
+					$this->error = $this->db->lasterror();
+					return -1;
+				}
+			}
+		}
 
 		// Call trigger
 		$result = $this->call_trigger('CATEGORY_SET_MULTILANGS', $user);
@@ -1870,7 +1870,7 @@ 
 		}
 		// End call triggers
 
-	    return 1;
+		return 1;
 	}
 
 	/**
@@ -1880,33 +1880,33 @@ 
 	 */
 	public function getMultiLangs()
 	{
-	    global $langs;
-
-	    $current_lang = $langs->getDefaultLang();
-
-	    $sql = "SELECT lang, label, description";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
-	    $sql .= " WHERE fk_category=".$this->id;
-
-	    $result = $this->db->query($sql);
-	    if ($result)
-	    {
-	        while ($obj = $this->db->fetch_object($result))
-	        {
-	            //print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
-	            if ($obj->lang == $current_lang) // si on a les traduct. dans la langue courante on les charge en infos principales.
-	            {
-	                $this->label = $obj->label;
-	                $this->description = $obj->description;
-	            }
-	            $this->multilangs["$obj->lang"]["label"] = $obj->label;
-	            $this->multilangs["$obj->lang"]["description"] = $obj->description;
-	        }
-	        return 1;
-	    } else {
-	        $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
-	        return -1;
-	    }
+		global $langs;
+
+		$current_lang = $langs->getDefaultLang();
+
+		$sql = "SELECT lang, label, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
+		$sql .= " WHERE fk_category=".$this->id;
+
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			while ($obj = $this->db->fetch_object($result))
+			{
+				//print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
+				if ($obj->lang == $current_lang) // si on a les traduct. dans la langue courante on les charge en infos principales.
+				{
+					$this->label = $obj->label;
+					$this->description = $obj->description;
+				}
+				$this->multilangs["$obj->lang"]["label"] = $obj->label;
+				$this->multilangs["$obj->lang"]["description"] = $obj->description;
+			}
+			return 1;
+		} else {
+			$this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+			return -1;
+		}
 	}
 
 	/**
@@ -1917,47 +1917,47 @@ 
 	 */
 	public function getLibStatut($mode)
 	{
-	    return '';
+		return '';
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		dol_syslog(get_class($this)."::initAsSpecimen");
+
+		// Initialise parametres
+		$this->id = 0;
+		$this->fk_parent = 0;
+		$this->label = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->description = 'This is a description';
+		$this->socid = 1;
+		$this->type = self::TYPE_PRODUCT;
 	}
 
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'categorie_societe'
+		);
 
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        dol_syslog(get_class($this)."::initAsSpecimen");
-
-        // Initialise parametres
-        $this->id = 0;
-        $this->fk_parent = 0;
-        $this->label = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->description = 'This is a description';
-        $this->socid = 1;
-        $this->type = self::TYPE_PRODUCT;
-    }
-
-    /**
-     * Function used to replace a thirdparty id with another one.
-     *
-     * @param DoliDB $db Database handler
-     * @param int $origin_id Old thirdparty id
-     * @param int $dest_id New thirdparty id
-     * @return bool
-     */
-    public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-    {
-        $tables = array(
-            'categorie_societe'
-        );
-
-        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables, 1);
-    }
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables, 1);
+	}
 
 	/**
 	 * Return the addtional SQL JOIN query for filtering a list by a category

htdocs/core/class/html.form.class.php

Indentation +452 added lines, -452 removed lines

@@ -636,8 +636,8 @@ 
 	 * @param	string	$selected		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
 	 * @param	array		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
 	 * @param   int     $alwaysvisible  1=select button always visible
-         * @param       string  $name     Name for massaction
-         * @param       string  $cssclass CSS class used to check for select
+	 * @param       string  $name     Name for massaction
+	 * @param       string  $cssclass CSS class used to check for select
 	 * @return	string|void					Select list
 	 */
 	public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0, $name = 'massaction', $cssclass = 'checkforselect')
@@ -647,7 +647,7 @@ 
 
 		$disabled = 0;
 		$ret = '<div class="centpercent center">';
-                $ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'select valignmiddle alignstart" name="' . $name . '"'.($disabled ? ' disabled="disabled"' : '').'>';
+				$ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'select valignmiddle alignstart" name="' . $name . '"'.($disabled ? ' disabled="disabled"' : '').'>';
 
 		// Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
 		$parameters = array();
@@ -666,11 +666,11 @@ 
 
 		$ret .= '</select>';
 
-                if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.' . $name . 'select');
+				if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.' . $name . 'select');
 
 		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
 		$ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.
-                $ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
+				$ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' ' . $name . ' ' . $name . 'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
 		$ret .= '</div>';
 
 		if (!empty($conf->use_javascript_ajax))
@@ -2056,7 +2056,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of products for a customer
 	 *
@@ -2080,18 +2080,18 @@ 
 	 *										    'warehouseinternal' = count products from warehouses for internal correct/transfer only
 	 *  @return     array    				    Array of keys for json
 	 */
-    public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')
+	public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $user, $db;
 
 		$out = '';
 		$outarray = array();
 
-        // Units
-        if ($conf->global->PRODUCT_USE_UNITS) {
-            $langs->load('other');
-        }
+		// Units
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$langs->load('other');
+		}
 
 		$warehouseStatusArray = array();
 		if (!empty($warehouseStatus))
@@ -2114,9 +2114,9 @@ 
 		$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_country, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
 		if (count($warehouseStatusArray))
 		{
-		    $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
+			$selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
 		} else {
-		    $selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
+			$selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
 		}
 
 		$sql = "SELECT ";
@@ -2139,11 +2139,11 @@ 
 			$sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx';
 			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx";
 		}
-        // Units
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
-            $selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';
-        }
+		// Units
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
+			$selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';
+		}
 
 		// Multilang : we add translation
 		if (!empty($conf->global->MAIN_MULTILANGS))
@@ -2175,17 +2175,17 @@ 
 		// include search in supplier ref
 		if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))
 		{
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 		}
 
 		//Price by customer
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
 			$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";
 		}
-        // Units
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
-        }
+		// Units
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
+		}
 		// Multilang : we add translation
 		if (!empty($conf->global->MAIN_MULTILANGS))
 		{
@@ -2293,7 +2293,7 @@ 
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
 			} else {
-			    if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 			}
 			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
 
@@ -2433,43 +2433,43 @@ 
 
 		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO))  require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        // Units
-        $outvalUnits = '';
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            if (!empty($objp->unit_short)) {
-                $outvalUnits .= ' - '.$objp->unit_short;
-            }
-        }
-        if (!empty($conf->global->PRODUCT_SHOW_DIMENSIONS_IN_COMBO)) {
-            if (!empty($objp->weight) && $objp->weight_units !== null) {
-                $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
-                $outvalUnits .= ' - '.$unitToShow;
-            }
-            if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
-            	$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
-                $outvalUnits .= ' - '.$unitToShow;
-            }
-            if (!empty($objp->surface) && $objp->surface_units !== null) {
-                $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
-                $outvalUnits .= ' - '.$unitToShow;
-            }
-            if (!empty($objp->volume) && $objp->volume_units !== null) {
-                $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
-                $outvalUnits .= ' - '.$unitToShow;
-            }
-        }
-        if ($outdurationvalue && $outdurationunit) {
-            $da = array(
-                'h' => $langs->trans('Hour'),
-                'd' => $langs->trans('Day'),
-                'w' => $langs->trans('Week'),
-                'm' => $langs->trans('Month'),
-                'y' => $langs->trans('Year')
-            );
-            if (isset($da[$outdurationunit])) {
-                $outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
-            }
-        }
+		// Units
+		$outvalUnits = '';
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			if (!empty($objp->unit_short)) {
+				$outvalUnits .= ' - '.$objp->unit_short;
+			}
+		}
+		if (!empty($conf->global->PRODUCT_SHOW_DIMENSIONS_IN_COMBO)) {
+			if (!empty($objp->weight) && $objp->weight_units !== null) {
+				$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
+				$outvalUnits .= ' - '.$unitToShow;
+			}
+			if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
+				$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
+				$outvalUnits .= ' - '.$unitToShow;
+			}
+			if (!empty($objp->surface) && $objp->surface_units !== null) {
+				$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
+				$outvalUnits .= ' - '.$unitToShow;
+			}
+			if (!empty($objp->volume) && $objp->volume_units !== null) {
+				$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
+				$outvalUnits .= ' - '.$unitToShow;
+			}
+		}
+		if ($outdurationvalue && $outdurationunit) {
+			$da = array(
+				'h' => $langs->trans('Hour'),
+				'd' => $langs->trans('Day'),
+				'w' => $langs->trans('Week'),
+				'm' => $langs->trans('Month'),
+				'y' => $langs->trans('Year')
+			);
+			if (isset($da[$outdurationunit])) {
+				$outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
+			}
+		}
 
 		$opt = '<option value="'.$objp->rowid.'"';
 		$opt .= ($objp->rowid == $selected) ? ' selected' : '';
@@ -2479,10 +2479,10 @@ 
 		}
 		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
 		{
-		    if (!empty($user->rights->stock->lire)) {
-    			if ($objp->stock > 0) $opt .= ' class="product_line_stock_ok"';
-	       		elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';
-		    }
+			if (!empty($user->rights->stock->lire)) {
+				if ($objp->stock > 0) $opt .= ' class="product_line_stock_ok"';
+		   		elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';
+			}
 		}
 		$opt .= '>';
 		$opt .= $objp->ref;
@@ -2497,9 +2497,9 @@ 
 		$outval .= ' - '.dol_trunc($label, $maxlengtharticle);
 		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $outval .= ' ('.getCountry($outorigin, 1).')';
 
-        // Units
-        $opt .= $outvalUnits;
-        $outval .= $outvalUnits;
+		// Units
+		$opt .= $outvalUnits;
+		$outval .= $outvalUnits;
 
 		$found = 0;
 
@@ -2618,46 +2618,46 @@ 
 
 		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
 		{
-	        if (!empty($user->rights->stock->lire)) {
-                $opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;
-
-    			if ($objp->stock > 0) {
-    				$outval .= ' - <span class="product_line_stock_ok">';
-    			} elseif ($objp->stock <= 0) {
-    				$outval .= ' - <span class="product_line_stock_too_low">';
-    			}
-    			$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
-    			$outval .= '</span>';
-    			if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
-    			{
-    			    $langs->load("stocks");
-
-    			    $tmpproduct = new Product($this->db);
-    			    $tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)
-    			    $tmpproduct->load_virtual_stock();
-    			    $virtualstock = $tmpproduct->stock_theorique;
-
-    			    $opt .= ' - '.$langs->trans("VirtualStock").':'.$virtualstock;
-
-    			    $outval .= ' - '.$langs->transnoentities("VirtualStock").':';
-    			    if ($virtualstock > 0) {
-    			        $outval .= ' - <span class="product_line_stock_ok">';
-    			    } elseif ($virtualstock <= 0) {
-    			        $outval .= ' - <span class="product_line_stock_too_low">';
-    			    }
-    			    $outval .= $virtualstock;
-    			    $outval .= '</span>';
-
-    			    unset($tmpproduct);
-    			}
-	        }
+			if (!empty($user->rights->stock->lire)) {
+				$opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;
+
+				if ($objp->stock > 0) {
+					$outval .= ' - <span class="product_line_stock_ok">';
+				} elseif ($objp->stock <= 0) {
+					$outval .= ' - <span class="product_line_stock_too_low">';
+				}
+				$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
+				$outval .= '</span>';
+				if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
+				{
+					$langs->load("stocks");
+
+					$tmpproduct = new Product($this->db);
+					$tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)
+					$tmpproduct->load_virtual_stock();
+					$virtualstock = $tmpproduct->stock_theorique;
+
+					$opt .= ' - '.$langs->trans("VirtualStock").':'.$virtualstock;
+
+					$outval .= ' - '.$langs->transnoentities("VirtualStock").':';
+					if ($virtualstock > 0) {
+						$outval .= ' - <span class="product_line_stock_ok">';
+					} elseif ($virtualstock <= 0) {
+						$outval .= ' - <span class="product_line_stock_too_low">';
+					}
+					$outval .= $virtualstock;
+					$outval .= '</span>';
+
+					unset($tmpproduct);
+				}
+			}
 		}
 
 		$opt .= "</option>\n";
 		$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>price2num($outprice_ht), 'price_ttc'=>price2num($outprice_ttc), 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'pbq'=>$outpbq);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of products for customer (in Ajax if Ajax activated or go to select_produits_fournisseurs_list)
 	 *
@@ -2672,9 +2672,9 @@ 
 	 *  @param	string	$morecss		More CSS
 	 *	@return	void
 	 */
-    public function select_produits_fournisseurs($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $ajaxoptions = array(), $hidelabel = 0, $alsoproductwithnosupplierprice = 0, $morecss = '')
+	public function select_produits_fournisseurs($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $ajaxoptions = array(), $hidelabel = 0, $alsoproductwithnosupplierprice = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 		global $price_level, $status, $finished;
 
@@ -2699,7 +2699,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of suppliers products
 	 *
@@ -2716,9 +2716,9 @@ 
 	 *  @param	string	$morecss		Add more CSS
 	 *  @return array           		Array of keys for json
 	 */
-    public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '')
+	public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $db;
 
 		$out = '';
@@ -2727,28 +2727,28 @@ 
 		$maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
 
 		$langs->load('stocks');
-        // Units
-        if ($conf->global->PRODUCT_USE_UNITS) {
-            $langs->load('other');
-        }
+		// Units
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$langs->load('other');
+		}
 
 		$sql = "SELECT p.rowid, p.ref, p.label, p.price, p.duration, p.fk_product_type,";
 		$sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
 		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
 		$sql .= " pfp.supplier_reputation";
-        // Units
-        if ($conf->global->PRODUCT_USE_UNITS) {
-            $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
-        }
-        if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";
+		// Units
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
+		}
+		if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (".getEntity('product').") )";
 		if ($socid) $sql .= " AND pfp.fk_soc = ".$socid;
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
-        // Units
-        if ($conf->global->PRODUCT_USE_UNITS) {
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
-        }
+		// Units
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
+		}
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
 		$sql .= " AND p.tobuy = 1";
 		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);
@@ -2770,9 +2770,9 @@ 
 			}
 			if (count($scrit) > 1) $sql .= ")";
 			if (!empty($conf->barcode->enabled)) {
-                $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
-                $sql .= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
-            }
+				$sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+				$sql .= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+			}
 			$sql .= ')';
 		}
 		$sql .= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
@@ -2811,41 +2811,41 @@ 
 				$outdurationvalue = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';
 				$outdurationunit = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, -1) : '';
 
-                // Units
-                $outvalUnits = '';
-                if ($conf->global->PRODUCT_USE_UNITS) {
-                    if (!empty($objp->unit_short)) {
-                        $outvalUnits .= ' - '.$objp->unit_short;
-                    }
-                    if (!empty($objp->weight) && $objp->weight_units !== null) {
-                        $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
-                        $outvalUnits .= ' - '.$unitToShow;
-                    }
-                    if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
-                    	$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
-                        $outvalUnits .= ' - '.$unitToShow;
-                    }
-                    if (!empty($objp->surface) && $objp->surface_units !== null) {
-                        $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
-                        $outvalUnits .= ' - '.$unitToShow;
-                    }
-                    if (!empty($objp->volume) && $objp->volume_units !== null) {
-                        $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
-                        $outvalUnits .= ' - '.$unitToShow;
-                    }
-                    if ($outdurationvalue && $outdurationunit) {
-                        $da = array(
-                            'h' => $langs->trans('Hour'),
-                            'd' => $langs->trans('Day'),
-                            'w' => $langs->trans('Week'),
-                            'm' => $langs->trans('Month'),
-                            'y' => $langs->trans('Year')
-                        );
-                        if (isset($da[$outdurationunit])) {
-                            $outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
-                        }
-                    }
-                }
+				// Units
+				$outvalUnits = '';
+				if ($conf->global->PRODUCT_USE_UNITS) {
+					if (!empty($objp->unit_short)) {
+						$outvalUnits .= ' - '.$objp->unit_short;
+					}
+					if (!empty($objp->weight) && $objp->weight_units !== null) {
+						$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
+						$outvalUnits .= ' - '.$unitToShow;
+					}
+					if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
+						$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
+						$outvalUnits .= ' - '.$unitToShow;
+					}
+					if (!empty($objp->surface) && $objp->surface_units !== null) {
+						$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
+						$outvalUnits .= ' - '.$unitToShow;
+					}
+					if (!empty($objp->volume) && $objp->volume_units !== null) {
+						$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
+						$outvalUnits .= ' - '.$unitToShow;
+					}
+					if ($outdurationvalue && $outdurationunit) {
+						$da = array(
+							'h' => $langs->trans('Hour'),
+							'd' => $langs->trans('Day'),
+							'w' => $langs->trans('Week'),
+							'm' => $langs->trans('Month'),
+							'y' => $langs->trans('Year')
+						);
+						if (isset($da[$outdurationunit])) {
+							$outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
+						}
+					}
+				}
 
 				$objRef = $objp->ref;
 				if ($filterkey && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
@@ -2872,7 +2872,7 @@ 
 				}
 				$outvallabel .= ' - '.dol_trunc($label, $maxlengtharticle);
 
-                // Units
+				// Units
 				$optlabel .= $outvalUnits;
 				$outvallabel .= $outvalUnits;
 
@@ -2996,7 +2996,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of suppliers prices for a product
 	 *
@@ -3005,9 +3005,9 @@ 
 	 *  @param      int		$selected_supplier  Pre-selected supplier if more than 1 result
 	 *  @return	    string
 	 */
-    public function select_product_fourn_price($productid, $htmlname = 'productfournpriceid', $selected_supplier = '')
+	public function select_product_fourn_price($productid, $htmlname = 'productfournpriceid', $selected_supplier = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$langs->load('stocks');
@@ -3103,7 +3103,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of delivery address
 	 *
@@ -3113,9 +3113,9 @@ 
 	 *    @param    int		$showempty         	Add an empty field
 	 *    @return	integer|null
 	 */
-    public function select_address($selected, $socid, $htmlname = 'address_id', $showempty = 0)
+	public function select_address($selected, $socid, $htmlname = 'address_id', $showempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// looking for users
 		$sql = "SELECT a.rowid, a.label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_address as a";
@@ -3153,15 +3153,15 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load into cache list of payment terms
 	 *
 	 *      @return     int             Nb of lines loaded, <0 if KO
 	 */
-    public function load_cache_conditions_paiements()
+	public function load_cache_conditions_paiements()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$num = count($this->cache_conditions_paiements);
@@ -3200,15 +3200,15 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge dans cache la liste des délais de livraison possibles
 	 *
 	 *      @return     int             Nb of lines loaded, <0 if KO
 	 */
-    public function load_cache_availability()
+	public function load_cache_availability()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$num = count($this->cache_availability);
@@ -3256,7 +3256,7 @@ 
 	 *		@param	int		$addempty		Add empty entry
 	 *		@return	void
 	 */
-    public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0)
+	public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0)
 	{
 		global $langs, $user;
 
@@ -3286,7 +3286,7 @@ 
 	 *
 	 *      @return     int             Nb of lines loaded, <0 if KO
 	 */
-    public function loadCacheInputReason()
+	public function loadCacheInputReason()
 	{
 		global $langs;
 
@@ -3338,7 +3338,7 @@ 
 	 *	@param	int		$addempty		 Add an empty entry
 	 *	@return	void
 	 */
-    public function selectInputReason($selected = '', $htmlname = 'demandreasonid', $exclude = '', $addempty = 0)
+	public function selectInputReason($selected = '', $htmlname = 'demandreasonid', $exclude = '', $addempty = 0)
 	{
 		global $langs, $user;
 
@@ -3364,15 +3364,15 @@ 
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge dans cache la liste des types de paiements possibles
 	 *
 	 *      @return     int                 Nb of lines loaded, <0 if KO
 	 */
-    public function load_cache_types_paiements()
+	public function load_cache_types_paiements()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$num = count($this->cache_types_paiements);
@@ -3416,7 +3416,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Return list of payment modes.
 	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
@@ -3430,9 +3430,9 @@ 
 	 * 		@param	string	$morecss			Add more CSS on select tag
 	 *		@return	void
 	 */
-    public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
+	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $user, $conf;
 
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
@@ -3460,7 +3460,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Return list of payment methods
 	 *      Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value but scope is all application, probably not what you want.
@@ -3476,9 +3476,9 @@ 
 	 *      @param  string  $morecss        Add more CSS on select tag
 	 * 		@return	void
 	 */
-    public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
+	public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $user, $conf;
 
 		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
@@ -3536,7 +3536,7 @@ 
 	 *  @param  string	$htmlname       Nom de la zone select
 	 * 	@return	string					Code of HTML select to chose tax or not
 	 */
-    public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type')
+	public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type')
 	{
 		global $langs;
 
@@ -3572,7 +3572,7 @@ 
 	 *  @param  string	$moreattrib        To add more attribute on select
 	 * 	@return	void
 	 */
-    public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '')
+	public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '')
 	{
 		global $langs, $conf, $user;
 
@@ -3625,7 +3625,7 @@ 
 	 *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 *    @return	void
 	 */
-    public function formSelectShippingMethod($page, $selected = '', $htmlname = 'shipping_method_id', $addempty = 0)
+	public function formSelectShippingMethod($page, $selected = '', $htmlname = 'shipping_method_id', $addempty = 0)
 	{
 		global $langs, $db;
 
@@ -3656,7 +3656,7 @@ 
 	 *
 	 * @return    string                     HTML select
 	 */
-    public function selectSituationInvoices($selected = '', $socid = 0)
+	public function selectSituationInvoices($selected = '', $socid = 0)
 	{
 		global $langs;
 
@@ -3677,17 +3677,17 @@ 
 			$ref = 0;
 			while ($obj = $this->db->fetch_object($resql)) {
 				//Same cycle ?
-		        if ($obj->situation_cycle_ref != $ref) {
+				if ($obj->situation_cycle_ref != $ref) {
 					// Just seen this cycle
-		            $ref = $obj->situation_cycle_ref;
+					$ref = $obj->situation_cycle_ref;
 					//not final ?
-		            if ($obj->situation_final != 1) {
+					if ($obj->situation_final != 1) {
 						//Not prov?
-		                if (substr($obj->ref, 1, 4) != 'PROV') {
-		                    if ($selected == $obj->rowid) {
-		                        $opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';
+						if (substr($obj->ref, 1, 4) != 'PROV') {
+							if ($selected == $obj->rowid) {
+								$opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';
 							} else {
-							    $opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
+								$opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
 							}
 						}
 					}
@@ -3711,7 +3711,7 @@ 
 	 *      @param	int		$showempty		Add a nempty line
 	 * 		@return	string                  HTML select
 	 */
-    public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0)
+	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0)
 	{
 		global $langs;
 
@@ -3729,17 +3729,17 @@ 
 
 			while ($res = $this->db->fetch_object($resql))
 			{
-			    $unitLabel = $res->label;
-			    if (!empty($langs->tab_translate['unit'.$res->code]))	// check if Translation is available before
-			    {
-			        $unitLabel = $langs->trans('unit'.$res->code) != $res->label ? $langs->trans('unit'.$res->code) : $res->label;
-			    }
+				$unitLabel = $res->label;
+				if (!empty($langs->tab_translate['unit'.$res->code]))	// check if Translation is available before
+				{
+					$unitLabel = $langs->trans('unit'.$res->code) != $res->label ? $langs->trans('unit'.$res->code) : $res->label;
+				}
 
 				if ($selected == $res->rowid)
 				{
-				    $return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
+					$return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
 				} else {
-				    $return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
+					$return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
 				}
 			}
 			$return .= '</select>';
@@ -3747,7 +3747,7 @@ 
 		return $return;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return a HTML select list of bank accounts
 	 *
@@ -3761,9 +3761,9 @@ 
 	 *  @param	string	$morecss			More CSS
 	 * 	@return	int							<0 if error, Num of bank account found if OK (0, 1, 2, ...)
 	 */
-    public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
+	public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$langs->load("admin");
@@ -3830,7 +3830,7 @@ 
 	 */
 	public function selectEstablishments($selected = '', $htmlname = 'entity', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$langs->load("admin");
@@ -3890,7 +3890,7 @@ 
 	 *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 *    @return	void
 	 */
-    public function formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0)
+	public function formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0)
 	{
 		global $langs;
 		if ($htmlname != "none") {
@@ -3914,7 +3914,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of categories having choosed type
 	 *
@@ -3922,20 +3922,20 @@ 
 	 *    @param    string		            $selected    		Id of category preselected or 'auto' (autoselect category if there is only one element). Not used if $outputmode = 1.
 	 *    @param    string		            $htmlname			HTML field name
 	 *    @param    int			            $maxlength      	Maximum length for labels
-     *    @param    int|string|array    	$markafterid        Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
-     *                                                          $markafterid can be an :
-     *                                                          - int (id of category)
-     *                                                          - string (categories ids seprated by comma)
-     *                                                          - array (list of categories ids)
+	 *    @param    int|string|array    	$markafterid        Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
+	 *                                                          $markafterid can be an :
+	 *                                                          - int (id of category)
+	 *                                                          - string (categories ids seprated by comma)
+	 *                                                          - array (list of categories ids)
 	 *    @param	int			            $outputmode			0=HTML select string, 1=Array
-     *    @param	int			            $include			[=0] Removed or 1=Keep only
-     *    @param	string					$morecss			More CSS
+	 *    @param	int			            $include			[=0] Removed or 1=Keep only
+	 *    @param	string					$morecss			More CSS
 	 *    @return	string
 	 *    @see select_categories()
 	 */
-    public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '')
+	public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		$langs->load("categories");
 
@@ -3970,7 +3970,7 @@ 
 			} else dol_print_error($this->db);
 		} else {
 			$cat = new Categorie($this->db);
-            $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
+			$cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
 		}
 
 		$output = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
@@ -4001,7 +4001,7 @@ 
 		return $output;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *     Show a confirmation HTML form or AJAX popup
 	 *
@@ -4018,10 +4018,10 @@ 
 	 *     @deprecated
 	 *     @see formconfirm()
 	 */
-    public function form_confirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)
+	public function form_confirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)
 	{
-        // phpcs:enable
-        dol_syslog(__METHOD__.': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);
+		// phpcs:enable
+		dol_syslog(__METHOD__.': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);
 		print $this->formconfirm($page, $title, $question, $action, $formquestion, $selectedchoice, $useajax, $height, $width);
 	}
 
@@ -4049,7 +4049,7 @@ 
 	 *     @param	int				$disableformtag		1=Disable form tag. Can be used if we are already inside a <form> section.
 	 *     @return 	string      		    			HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form
 	 */
-    public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0)
+	public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0)
 	{
 		global $langs, $conf;
 
@@ -4321,7 +4321,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show a form to select a project
 	 *
@@ -4335,9 +4335,9 @@ 
 	 *    @param    int     $nooutput           No print is done. String is returned.
 	 *    @return	string                      Return html content
 	 */
-    public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0)
+	public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
@@ -4377,7 +4377,7 @@ 
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show a form to select payment conditions
 	 *
@@ -4387,9 +4387,9 @@ 
 	 *	@param	int		$addempty		Add empty entry
 	 *  @return	void
 	 */
-    public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0)
+	public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4410,7 +4410,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show a form to select a delivery delay
 	 *
@@ -4420,9 +4420,9 @@ 
 	 *	@param	int		$addempty		Ajoute entree vide
 	 *  @return	void
 	 */
-    public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0)
+	public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4452,9 +4452,9 @@ 
 	 *  @param  string	$htmlname    	Name of select html field
 	 *  @param	int		$addempty		Add empty entry
 	 *  @return	void
-     */
-    public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0)
-    {
+	 */
+	public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0)
+	{
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4482,7 +4482,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show a form + html select a date
 	 *
@@ -4495,9 +4495,9 @@ 
 	 *    @return	string
 	 *    @see		selectDate()
 	 */
-    public function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0)
+	public function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$ret = '';
@@ -4523,7 +4523,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show a select form to choose a user
 	 *
@@ -4534,9 +4534,9 @@ 
 	 *  @param  array	$include        List of users id to include
 	 *  @return	void
 	 */
-    public function form_users($page, $selected = '', $htmlname = 'userid', $exclude = '', $include = '')
+	public function form_users($page, $selected = '', $htmlname = 'userid', $exclude = '', $include = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($htmlname != "none")
@@ -4561,7 +4561,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with payment mode
 	 *
@@ -4573,9 +4573,9 @@ 
 	 *    @param   int     $addempty       1=Add empty entry
 	 *    @return	void
 	 */
-    public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0)
+	public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4596,7 +4596,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with multicurrency code
 	 *
@@ -4605,9 +4605,9 @@ 
 	 *    @param    string	$htmlname    	Name of select html field
 	 *    @return	void
 	 */
-    public function form_multicurrency_code($page, $selected = '', $htmlname = 'multicurrency_code')
+	public function form_multicurrency_code($page, $selected = '', $htmlname = 'multicurrency_code')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4623,7 +4623,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with multicurrency rate
 	 *
@@ -4633,9 +4633,9 @@ 
 	 *    @param    string  $currency       Currency code to explain the rate
 	 *    @return	void
 	 */
-    public function form_multicurrency_rate($page, $rate = '', $htmlname = 'multicurrency_tx', $currency = '')
+	public function form_multicurrency_rate($page, $rate = '', $htmlname = 'multicurrency_tx', $currency = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $mysoc, $conf;
 
 		if ($htmlname != "none")
@@ -4662,7 +4662,7 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show a select box with available absolute discounts
 	 *
@@ -4678,9 +4678,9 @@ 
 	 *  @param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *  @return	void
 	 */
-    public function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter = '', $maxvalue = 0, $more = '', $hidelist = 0, $discount_type = 0)
+	public function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter = '', $maxvalue = 0, $more = '', $hidelist = 0, $discount_type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		if ($htmlname != "none")
 		{
@@ -4751,19 +4751,19 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Show forms to select a contact
-     *
-     *  @param	string		$page        	Page
-     *  @param	Societe		$societe		Filter on third party
-     *  @param    int			$selected    	Id contact pre-selectionne
-     *  @param    string		$htmlname    	Name of HTML select. If 'none', we just show contact link.
-     *  @return	void
-     */
-    public function form_contacts($page, $societe, $selected = '', $htmlname = 'contactid')
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Show forms to select a contact
+	 *
+	 *  @param	string		$page        	Page
+	 *  @param	Societe		$societe		Filter on third party
+	 *  @param    int			$selected    	Id contact pre-selectionne
+	 *  @param    string		$htmlname    	Name of HTML select. If 'none', we just show contact link.
+	 *  @return	void
+	 */
+	public function form_contacts($page, $societe, $selected = '', $htmlname = 'contactid')
+	{
+		// phpcs:enable
 		global $langs, $conf;
 
 		if ($htmlname != "none")
@@ -4795,7 +4795,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output html select to select thirdparty
 	 *
@@ -4810,9 +4810,9 @@ 
 	 *  @param  int     $nooutput       No print output. Return it only.
 	 *  @return	void|string
 	 */
-    public function form_thirdparty($page, $selected = '', $htmlname = 'socid', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $events = array(), $nooutput = 0)
+	public function form_thirdparty($page, $selected = '', $htmlname = 'socid', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $events = array(), $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$out = '';
@@ -4840,18 +4840,18 @@ 
 		else print $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Retourne la liste des devises, dans la langue de l'utilisateur
 	 *
 	 *    @param	string	$selected    preselected currency code
 	 *    @param    string	$htmlname    name of HTML select list
-     *    @deprecated
+	 *    @deprecated
 	 *    @return	void
 	 */
-    public function select_currency($selected = '', $htmlname = 'currency_id')
+	public function select_currency($selected = '', $htmlname = 'currency_id')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		print $this->selectCurrency($selected, $htmlname);
 	}
 
@@ -4863,7 +4863,7 @@ 
 	 *  @param  string  $mode        0 = Add currency symbol into label, 1 = Add 3 letter iso code
 	 * 	@return	string
 	 */
-    public function selectCurrency($selected = '', $htmlname = 'currency_id', $mode = 0)
+	public function selectCurrency($selected = '', $htmlname = 'currency_id', $mode = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -4885,9 +4885,9 @@ 
 			$out .= $currency['label'];
 			if ($mode == 1)
 			{
-			    $out .= ' ('.$code_iso.')';
+				$out .= ' ('.$code_iso.')';
 			} else {
-                $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
+				$out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
 			}
 			$out .= '</option>';
 		}
@@ -4909,7 +4909,7 @@ 
 	 *  @param  integer	$useempty    1=Add empty line
 	 * 	@return	string
 	 */
-    public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0)
+	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0)
 	{
 		global $db, $conf, $langs, $user;
 
@@ -4957,16 +4957,16 @@ 
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load into the cache vat rates of a country
 	 *
 	 *  @param	string	$country_code		Country code with quotes ("'CA'", or "'CA,IN,...'")
 	 *  @return	int							Nb of loaded lines, 0 if already loaded, <0 if KO
 	 */
-    public function load_cache_vatrates($country_code)
+	public function load_cache_vatrates($country_code)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$num = count($this->cache_vatrates);
@@ -5020,7 +5020,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output an HTML select vat rate.
 	 *  The name of this function should be selectVat. We keep bad name for compatibility purpose.
@@ -5042,9 +5042,9 @@ 
 	 *  @param  int          $mode                0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key
 	 *  @return	string
 	 */
-    public function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = '', $societe_acheteuse = '', $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0)
+	public function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = '', $societe_acheteuse = '', $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $mysoc;
 
 		$langs->load('errors');
@@ -5124,10 +5124,10 @@ 
 				$tmpthirdparty = new Societe($this->db);
 				$defaulttx = get_default_tva($societe_vendeuse, (is_object($societe_acheteuse) ? $societe_acheteuse : $tmpthirdparty), $idprod);
 				$defaultnpr = get_default_npr($societe_vendeuse, (is_object($societe_acheteuse) ? $societe_acheteuse : $tmpthirdparty), $idprod);
-		        if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
-			        $defaultcode = $reg[1];
-			        $defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);
-		        }
+				if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
+					$defaultcode = $reg[1];
+					$defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);
+				}
 				if (empty($defaulttx)) $defaultnpr = 0;
 			}
 
@@ -5206,9 +5206,9 @@ 
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
 	 *  Fields are preselected with :
 	 *            	- set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')
 	 *            	- local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
@@ -5228,22 +5228,22 @@ 
 	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another select_date field.
 	 *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.
 	 *  @return	string|void					Nothing or string if nooutput is 1
-     *  @deprecated
+	 *  @deprecated
 	 *  @see    selectDate(), form_date(), select_month(), select_year(), select_dayofweek()
 	 */
-    public function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '')
-    {
-        // phpcs:enable
-        $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);
-        if (!empty($nooutput)) {
-            return $retstring;
-        }
-        print $retstring;
-        return;
-    }
-
-    /**
-     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
+	public function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '')
+	{
+		// phpcs:enable
+		$retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);
+		if (!empty($nooutput)) {
+			return $retstring;
+		}
+		print $retstring;
+		return;
+	}
+
+	/**
+	 *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
 	 *  Fields are preselected with :
 	 *              - set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')
 	 *              - local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
@@ -5261,13 +5261,13 @@ 
 	 *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
 	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another selectDate field.
 	 *  @param  datetime    $adddateof      Add a link "Date of ..." using the following date. See also $labeladddateof for the label used.
-     *  @param  string      $openinghours   Specify hour start and hour end for the select ex 8,20
-     *  @param  int         $stepminutes    Specify step for minutes between 1 and 30
-     *  @param	string		$labeladddateof Label to use for the $adddateof parameter.
+	 *  @param  string      $openinghours   Specify hour start and hour end for the select ex 8,20
+	 *  @param  int         $stepminutes    Specify step for minutes between 1 and 30
+	 *  @param	string		$labeladddateof Label to use for the $adddateof parameter.
 	 * 	@return string                      Html for selectDate
 	 *  @see    form_date(), select_month(), select_year(), select_dayofweek()
 	 */
-    public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '')
+	public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '')
 	{
 		global $conf, $langs;
 
@@ -5278,7 +5278,7 @@ 
 		if ($m == '') $m = 0;
 		$emptydate = 0;
 		$emptyhours = 0;
-        if ($stepminutes <= 0 || $stepminutes > 30) $stepminutes = 1;
+		if ($stepminutes <= 0 || $stepminutes > 30) $stepminutes = 1;
 		if ($empty == 1) { $emptydate = 1; $emptyhours = 1; }
 		if ($empty == 2) { $emptydate = 0; $emptyhours = 1; }
 		$orig_set_time = $set_time;
@@ -5525,31 +5525,31 @@ 
 		{
 			// Script which will be inserted in the onClick of the "Now" link
 			$reset_scripts = "";
-            if ($addnowlink == 2) // local computer time
-            {
-                // pad add leading 0 on numbers
-                $reset_scripts .= "Number.prototype.pad = function(size) {
+			if ($addnowlink == 2) // local computer time
+			{
+				// pad add leading 0 on numbers
+				$reset_scripts .= "Number.prototype.pad = function(size) {
                         var s = String(this);
                         while (s.length < (size || 2)) {s = '0' + s;}
                         return s;
                     };
                     var d = new Date();";
-            }
+			}
 
 			// Generate the date part, depending on the use or not of the javascript calendar
-            if ($addnowlink == 1) // server time expressed in user time setup
-            {
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
-            } elseif ($addnowlink == 2)
-            {
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(parseInt(d.getMonth().pad()) + 1);';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(d.getFullYear());';
-            }
+			if ($addnowlink == 1) // server time expressed in user time setup
+			{
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
+			} elseif ($addnowlink == 2)
+			{
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(parseInt(d.getMonth().pad()) + 1);';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(d.getFullYear());';
+			}
 			/*if ($usecalendar == "eldy")
             {
                 $base=DOL_URL_ROOT.'/core/';
@@ -5566,13 +5566,13 @@ 
 			{
 				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
 				//$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';
-                if ($addnowlink == 1)
-                {
-                    $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H', 'tzuser').'\');';
-                } elseif ($addnowlink == 2)
-                {
-                    $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';
-                }
+				if ($addnowlink == 1)
+				{
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H', 'tzuser').'\');';
+				} elseif ($addnowlink == 2)
+				{
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';
+				}
 
 				if ($fullday) $reset_scripts .= ' } ';
 			}
@@ -5581,13 +5581,13 @@ 
 			{
 				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
 				//$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';
-                if ($addnowlink == 1)
-                {
-                    $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M', 'tzuser').'\');';
-                } elseif ($addnowlink == 2)
-                {
-                    $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
-                }
+				if ($addnowlink == 1)
+				{
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M', 'tzuser').'\');';
+				} elseif ($addnowlink == 2)
+				{
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
+				}
 				if ($fullday) $reset_scripts .= ' } ';
 			}
 			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
@@ -5644,9 +5644,9 @@ 
 		return $retstring;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to show a form to select a duration on a page
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to show a form to select a duration on a page
 	 *
 	 *	@param	string		$prefix   		Prefix for input fields
 	 *	@param  int			$iSecond  		Default preselected duration (number of seconds or '')
@@ -5658,9 +5658,9 @@ 
 	 * 	@param	int			$nooutput		Do not output html string but return it
 	 *  @return	string|void
 	 */
-    public function select_duration($prefix, $iSecond = '', $disabled = 0, $typehour = 'select', $minunderhours = 0, $nooutput = 0)
+	public function select_duration($prefix, $iSecond = '', $disabled = 0, $typehour = 'select', $minunderhours = 0, $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$retstring = '';
@@ -5788,16 +5788,16 @@ 
 		$out = '';
 		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->$confkeyforautocompletemode) && !$forcecombo)
 		{
-		    // No immediate load of all database
-		    $placeholder = '';
-		    if ($preselectedvalue && empty($selected_input_value))
-		    {
-		        $objecttmp->fetch($preselectedvalue);
-		        $selected_input_value = ($prefixforautocompletemode == 'company' ? $objecttmp->name : $objecttmp->ref);
-		        //unset($objecttmp);
-		    }
+			// No immediate load of all database
+			$placeholder = '';
+			if ($preselectedvalue && empty($selected_input_value))
+			{
+				$objecttmp->fetch($preselectedvalue);
+				$selected_input_value = ($prefixforautocompletemode == 'company' ? $objecttmp->name : $objecttmp->ref);
+				//unset($objecttmp);
+			}
 
-		    $objectdesc = $classname.':'.$classpath.':'.$addcreatebuttonornot.':'.$filter;
+			$objectdesc = $classname.':'.$classpath.':'.$addcreatebuttonornot.':'.$filter;
 			$urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';
 
 			// No immediate load of all database
@@ -5859,7 +5859,7 @@ 
 	 * @return	string|array						Return HTML string
 	 * @see selectForForms()
 	 */
-    public function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled = 0)
+	public function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -5880,7 +5880,7 @@ 
 		} else {
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
-        }
+		}
 
 		if (empty($fieldstoshow))
 		{
@@ -6064,8 +6064,8 @@ 
 			{
 				foreach ($array as $key => $value)
 				{
-				    if (!is_array($value)) $array[$key] = $langs->trans($value);
-				    else $array[$key]['label'] = $langs->trans($value['label']);
+					if (!is_array($value)) $array[$key] = $langs->trans($value);
+					else $array[$key]['label'] = $langs->trans($value['label']);
 				}
 			}
 
@@ -6075,14 +6075,14 @@ 
 
 			foreach ($array as $key => $tmpvalue)
 			{
-			    if (is_array($tmpvalue)) $value = $tmpvalue['label'];
-			    else $value = $tmpvalue;
+				if (is_array($tmpvalue)) $value = $tmpvalue['label'];
+				else $value = $tmpvalue;
 
 				$disabled = ''; $style = '';
 				if (!empty($disablebademail))
 				{
-				    if (($disablebademail == 1 && !preg_match('/&lt;.+@.+&gt;/', $value))
-				        || ($disablebademail == 2 && preg_match('/---/', $value)))
+					if (($disablebademail == 1 && !preg_match('/&lt;.+@.+&gt;/', $value))
+						|| ($disablebademail == 2 && preg_match('/---/', $value)))
 					{
 						$disabled = ' disabled';
 						$style = ' class="warning"';
@@ -6110,10 +6110,10 @@ 
 				if ($nohtmlescape) $out .= ' data-html="'.dol_escape_htmltag($selectOptionValue).'"';
 				if (is_array($tmpvalue))
 				{
-				    foreach ($tmpvalue as $keyforvalue => $valueforvalue)
-				    {
-				        if (preg_match('/^data-/', $keyforvalue)) $out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';
-				    }
+					foreach ($tmpvalue as $keyforvalue => $valueforvalue)
+					{
+						if (preg_match('/^data-/', $keyforvalue)) $out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';
+					}
 				}
 				$out .= '>';
 				//var_dump($selectOptionValue);
@@ -6227,11 +6227,11 @@ 
 		return $out;
 	}
 
-    /**
-     *  Return a HTML select string, built from an array of key+value, but content returned into select is defined into $array parameter.
-     *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
-     *
-     *  @param  string	$htmlname               Name of html select area
+	/**
+	 *  Return a HTML select string, built from an array of key+value, but content returned into select is defined into $array parameter.
+	 *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
+	 *
+	 *  @param  string	$htmlname               Name of html select area
 	 *	@param	string	$array					Array (key=>array('text'=>'A text', 'url'=>'An url'), ...)
 	 *	@param	string	$id             		Preselected key
 	 *	@param  string	$moreparam      		Add more parameters onto the select tag
@@ -6368,8 +6368,8 @@ 
 		$out = '';
 
 		if ($addjscombo < 0) {
-		    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $addjscombo = 1;
-		    else $addjscombo = 0;
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $addjscombo = 1;
+			else $addjscombo = 0;
 		}
 
 		// Add code for jquery to use multiselect
@@ -6437,7 +6437,7 @@ 
 				foreach ($array as $key => $value)
 				{
 					$out .= '<option value="'.$key.'"';
-                    if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != ''))
+					if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != ''))
 					{
 						$out .= ' selected';
 					}
@@ -6489,19 +6489,19 @@ 
 
 		foreach ($array as $key => $val)
 		{
-		    /* var_dump($val);
+			/* var_dump($val);
             var_dump(array_key_exists('enabled', $val));
             var_dump(!$val['enabled']);*/
-		    if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled'])
-		    {
-			    unset($array[$key]); // We don't want this field
-			    continue;
-		    }
-		    if ($val['label'])
-		    {
-		        $lis .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked']) ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
-			    $listcheckedstring .= (empty($val['checked']) ? '' : $key.',');
-		    }
+			if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled'])
+			{
+				unset($array[$key]); // We don't want this field
+				continue;
+			}
+			if ($val['label'])
+			{
+				$lis .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked']) ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
+				$listcheckedstring .= (empty($val['checked']) ? '' : $key.',');
+			}
 		}
 
 		$out = '<!-- Component multiSelectArrayWithCheckbox '.$htmlname.' -->
@@ -6557,7 +6557,7 @@ 
 	 *  @param		int		$nolink			1=Do not add html links
 	 * 	@return		string					String with categories
 	 */
-    public function showCategories($id, $type, $rendermode = 0, $nolink = 0)
+	public function showCategories($id, $type, $rendermode = 0, $nolink = 0)
 	{
 		global $db;
 
@@ -6602,7 +6602,7 @@ 
 	 *  @param  array           $compatibleImportElementsList  Array of compatibles elements object for "import from" action
 	 *  @return	int							      <0 if KO, >=0 if OK
 	 */
-    public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)
+	public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)
 	{
 		global $conf, $langs, $hookmanager;
 		global $bc, $action;
@@ -6613,7 +6613,7 @@ 
 		$hookmanager->initHooks(array('commonobject'));
 		$parameters = array(
 			'morehtmlright' => $morehtmlright,
-		    'compatibleImportElementsList' => &$compatibleImportElementsList,
+			'compatibleImportElementsList' => &$compatibleImportElementsList,
 		);
 		$reshook = $hookmanager->executeHooks('showLinkedObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
@@ -6647,7 +6647,7 @@ 
 				// to display inport button on tpl
 				$showImportButton = false;
 				if (!empty($compatibleImportElementsList) && in_array($element, $compatibleImportElementsList)) {
-				    $showImportButton = true;
+					$showImportButton = true;
 				}
 
 				$regs = array();
@@ -6676,9 +6676,9 @@ 
 					$tplpath = 'expedition';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
 				} elseif ($objecttype == 'reception') {
-        			$tplpath = 'reception';
-        			if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
-        		} elseif ($objecttype == 'delivery') {
+					$tplpath = 'reception';
+					if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
+				} elseif ($objecttype == 'delivery') {
 					$tplpath = 'livraison';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
 				} elseif ($objecttype == 'invoice_supplier') {
@@ -6723,7 +6723,7 @@ 
 
 			if (!empty($compatibleImportElementsList))
 			{
-			    $res = @include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
+				$res = @include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
 			}
 
 
@@ -6741,7 +6741,7 @@ 
 	 *  @param	array			$excludelinksto		Do not show links of this type, for exemple array('order') or array('supplier_order'). null or array() if no exclusion.
 	 *  @return	string								<0 if KO, >0 if OK
 	 */
-    public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())
+	public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())
 	{
 		global $conf, $langs, $hookmanager;
 		global $bc, $action;
@@ -6787,7 +6787,7 @@ 
 
 		if (!empty($listofidcompanytoscan))  // If empty, we don't have criteria to scan the object we can link to
 		{
-            $reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		}
 
 		if (empty($reshook))
@@ -6889,7 +6889,7 @@ 
 
 		if (!empty($conf->use_javascript_ajax))
 		{
-		    print '<!-- Add js to show linkto box -->
+			print '<!-- Add js to show linkto box -->
 				<script>
 				jQuery(document).ready(function() {
 					jQuery(".linkto").click(function() {
@@ -6914,7 +6914,7 @@ 
 	 *  @param	int      	$useempty		1=Add empty line
 	 *	@return	string						See option
 	 */
-    public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
+	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
 	{
 		global $langs;
 
@@ -6942,7 +6942,7 @@ 
 		return $resultyesno;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of export templates
 	 *
@@ -6952,9 +6952,9 @@ 
 	 *  @param  int		$useempty          Affiche valeur vide dans liste
 	 *  @return	void
 	 */
-    public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0)
+	public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql .= " WHERE type = '".$type."'";
@@ -7007,7 +7007,7 @@ 
 	 *	  @param	string	$morehtmlright	More html code to show after ref.
 	 * 	  @return	string    				Portion HTML with ref + navigation buttons
 	 */
-    public function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '')
+	public function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '')
 	{
 		global $langs, $conf, $hookmanager, $extralanguages;
 
@@ -7032,11 +7032,11 @@ 
 			// Special case for project/task page
 			if ($paramid == 'project_ref')
 			{
-			    if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl))     // TODO Remove this when nav with project_ref on task pages are ok
-			    {
-				    $navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);
-    				$paramid = 'ref';
-			    }
+				if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl))     // TODO Remove this when nav with project_ref on task pages are ok
+				{
+					$navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);
+					$paramid = 'ref';
+				}
 			}
 
 			// accesskey is for Windows or Linux:  ALT + key for chrome, ALT + SHIFT + KEY for firefox
@@ -7187,7 +7187,7 @@ 
 	 * 		@param	int		$width			Width of photo
 	 * 	  	@return string    				HTML code to output barcode
 	 */
-    public function showbarcode(&$object, $width = 100)
+	public function showbarcode(&$object, $width = 100)
 	{
 		global $conf;
 
@@ -7360,7 +7360,7 @@ 
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return select list of groups
 	 *
@@ -7377,9 +7377,9 @@ 
 	 *  @return	string
 	 *  @see select_dolusers()
 	 */
-    public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false, $morecss = '')
+	public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs;
 
 		// Permettre l'exclusion de groupes
@@ -7467,7 +7467,7 @@ 
 	 *
 	 *  @return	string
 	 */
-    public function showFilterButtons()
+	public function showFilterButtons()
 	{
 		$out = '<div class="nowrap">';
 		$out .= '<button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
@@ -7482,16 +7482,16 @@ 
 	 *
 	 *  @param  string  $cssclass                  CSS class
 	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
-         *  @param  string  $massactionname            Mass action button name that will launch an action on the selected items
+	 *  @param  string  $massactionname            Mass action button name that will launch an action on the selected items
 	 *  @return	string
 	 */
-    public function showCheckAddButtons($cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")
+	public function showCheckAddButtons($cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")
 	{
 		global $conf, $langs;
 
 		$out = '';
 		$id = uniqid();
-                if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="' . $cssclass . 's" name="' . $cssclass . 's" class="checkallactions"></div>';
+				if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="' . $cssclass . 's" name="' . $cssclass . 's" class="checkallactions"></div>';
 		$out .= '<script>
             $(document).ready(function() {
                 $("#' . $cssclass . 's").click(function() {
@@ -7504,7 +7504,7 @@ 
                         console.log("We uncheck all");
                 		$(".'.$cssclass.'").prop(\'checked\', false).trigger(\'change\');
                     }'."\n";
-                if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "' . $massactionname . '", "' . $cssclass . '"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+				if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "' . $massactionname . '", "' . $cssclass . '"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
 		$out .= '         });
 
                 $(".' . $cssclass . '").change(function() {
@@ -7523,10 +7523,10 @@ 
 	 *  @param	int  	$addcheckuncheckall        Add the check all/uncheck all checkbox (use javascript) and code to manage this
 	 *  @param  string  $cssclass                  CSS class
 	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
-         *  @param  string  $massactionname            Mass action name
+	 *  @param  string  $massactionname            Mass action name
 	 *  @return	string
 	 */
-    public function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")
+	public function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")
 	{
 		$out = $this->showFilterButtons();
 		if ($addcheckuncheckall)
@@ -7548,12 +7548,12 @@ 
 	 * @param	array	$params                param to give
 	 * @return	string
 	 */
-    public function selectExpenseCategories($selected = '', $htmlname = 'fk_c_exp_tax_cat', $useempty = 0, $excludeid = array(), $target = '', $default_selected = 0, $params = array())
+	public function selectExpenseCategories($selected = '', $htmlname = 'fk_c_exp_tax_cat', $useempty = 0, $excludeid = array(), $target = '', $default_selected = 0, $params = array())
 	{
 		global $db, $conf, $langs, $user;
 
-        $out = '';
-        $sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
+		$out = '';
+		$sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
 		$sql .= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';
 		if (!empty($excludeid)) $sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
 		$sql .= ' ORDER BY label';
@@ -7636,11 +7636,11 @@ 
 	 * @param	integer	$useempty    1=Add empty line
 	 * @return	string
 	 */
-    public function selectExpenseRanges($selected = '', $htmlname = 'fk_range', $useempty = 0)
+	public function selectExpenseRanges($selected = '', $htmlname = 'fk_range', $useempty = 0)
 	{
 		global $db, $conf, $langs;
 
-        $out = '';
+		$out = '';
 		$sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';
 		$sql .= ' WHERE entity = '.$conf->entity.' AND active = 1';
 
@@ -7672,11 +7672,11 @@ 
 	 * @param	integer	$useid       0=use 'code' as key, 1=use 'id' as key
 	 * @return	string
 	 */
-    public function selectExpense($selected = '', $htmlname = 'fk_c_type_fees', $useempty = 0, $allchoice = 1, $useid = 0)
+	public function selectExpense($selected = '', $htmlname = 'fk_c_type_fees', $useempty = 0, $allchoice = 1, $useid = 0)
 	{
 		global $db, $langs;
 
-        $out = '';
+		$out = '';
 		$sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';
 		$sql .= ' WHERE active = 1';
 
@@ -7700,8 +7700,8 @@ 
 			dol_print_error($db);
 		}
 
-        return $out;
-    }
+		return $out;
+	}
 
 	/**
 	 *  Output a combo list with invoices qualified for a third party
@@ -7713,15 +7713,15 @@ 
 	 *	@param	int		$option_only	Return only html options lines without the select tag
 	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
 	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
-     *  @param	int		$forcefocus		Force focus on field (works with javascript only)
-     *  @param	int		$disabled		Disabled
+	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)
+	 *  @param	int		$disabled		Disabled
 	 *  @param	string	$morecss        More css added to the select component
 	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
 	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
 	 *  @param	User	$usertofilter	User object to use for filtering
 	 *	@return int         			Nbr of project if OK, <0 if KO
 	 */
-    public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
+	public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
 	{
 		global $user, $conf, $langs;
 
@@ -7747,7 +7747,7 @@ 
 		}
 
 		// Search all projects
-        $sql = 'SELECT f.rowid, f.ref as fref, "nolabel" as flabel, p.rowid as pid, f.ref,
+		$sql = 'SELECT f.rowid, f.ref as fref, "nolabel" as flabel, p.rowid as pid, f.ref,
             p.title, p.fk_soc, p.fk_statut, p.public,';
 		$sql .= ' s.nom as name';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
@@ -7767,9 +7767,9 @@ 
 			if (!empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
-            	$out .= $comboenhancement;
-            	$morecss = 'minwidth200imp maxwidth500';
+			   	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+				$out .= $comboenhancement;
+				$morecss = 'minwidth200imp maxwidth500';
 			}
 
 			if (empty($option_only)) {
@@ -7870,7 +7870,7 @@ 
 	 */
 	public function searchComponent($arrayofcriterias, $search_component_params, $arrayofinputfieldsalreadyoutput = array())
 	{
-	    global $conf, $langs;
+		global $conf, $langs;
 
 		$ret = '';
 
@@ -7889,24 +7889,24 @@ 
 		$ret .= '<input type="hidden" name="search_component_params_hidden" class="search_component_params_hidden" value="'.GETPOST("search_component_params_hidden").'">';
 		// For compatibility with forms that show themself the search criteria in addition of this component, we output the fields
 		foreach ($arrayofcriterias as $criterias) {
-		    foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {
-		    	if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) continue;
-		        if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) continue;
-		        if (in_array($criteriafamilyval['type'], array('date', 'datetime', 'timestamp'))) {
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_start">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startyear">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startmonth">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startday">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_end">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endyear">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endmonth">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endday">';
-		        } else {
+			foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {
+				if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) continue;
+				if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) continue;
+				if (in_array($criteriafamilyval['type'], array('date', 'datetime', 'timestamp'))) {
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_start">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startyear">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startmonth">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startday">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_end">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endyear">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endmonth">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endday">';
+				} else {
 					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'">';
-		        }
-		    }
+				}
+			}
 		}
-        $ret .= '</div>';
+		$ret .= '</div>';
 
 
 		return $ret;

htdocs/variants/ajax/get_attribute_values.php

Indentation +12 added lines, -12 removed lines

@@ -31,19 +31,19 @@ 
 $id = GETPOST('id', 'int');
 
 if (!$id) {
-    print json_encode(array(
-        'error' => 'ID not set'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'ID not set'
+	));
+	exit();
 }
 
 $prodattr = new ProductAttribute($db);
 
 if ($prodattr->fetch($id) < 0) {
-    print json_encode(array(
-        'error' => 'Attribute not found'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'Attribute not found'
+	));
+	exit();
 }
 
 $prodattrval = new ProductAttributeValue($db);
@@ -51,10 +51,10 @@ 
 $res = $prodattrval->fetchAllByProductAttribute($id);
 
 if ($res == -1) {
-    print json_encode(array(
-        'error' => 'Internal error'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'Internal error'
+	));
+	exit();
 }
 
 print json_encode($res);

htdocs/contrat/card.php

Indentation +83 added lines, -83 removed lines

@@ -409,13 +409,13 @@ 
 			$error++;
 		}
 
-	    $date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
-	    $date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-	    if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
-	    {
-		    setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
-		    $error++;
-	    }
+		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
+		if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
+		{
+			setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
+			$error++;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -683,9 +683,9 @@ 
 			$objectline->pa_ht = $pa_ht;
 
 			if ($fk_unit > 0) {
-			    $objectline->fk_unit = GETPOST('unit');
+				$objectline->fk_unit = GETPOST('unit');
 			} else {
-			    $objectline->fk_unit = null;
+				$objectline->fk_unit = null;
 			}
 
 			// Extrafields
@@ -876,11 +876,11 @@ 
 
 			$old_ref = $object->ref;
 
-	        $result = $object->setValueFrom('ref', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
-	        if ($result < 0) {
-	            setEventMessages($object->error, $object->errors, 'errors');
-	            $action = 'editref';
-	        } else {
+			$result = $object->setValueFrom('ref', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'editref';
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				$old_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($old_ref);
 				$new_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -895,13 +895,13 @@ 
 					}
 				}
 
-	            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-	            exit;
-	        }
-	    } else {
-	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-	        exit;
-	    }
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+				exit;
+			}
+		} else {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+			exit;
+		}
 	} elseif ($action == 'setdate_contrat')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
@@ -1232,8 +1232,8 @@ 
 
 		$result = $object->fetch_lines(); // This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
 		if ($result < 0) {
-            dol_print_error($db, $object->error);
-        }
+			dol_print_error($db, $object->error);
+		}
 
 		$nbofservices = count($object->lines);
 
@@ -1248,55 +1248,55 @@ 
 
 		$head = contract_prepare_head($object);
 
-        $hselected = 0;
-        $formconfirm = '';
-
-        dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
-
-
-        if ($action == 'delete') {
-            //Confirmation de la suppression du contrat
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("DeleteAContract"), $langs->trans("ConfirmDeleteAContract"), "confirm_delete", '', 0, 1);
-        } elseif ($action == 'valid') {
-            //Confirmation de la validation
-            $ref = substr($object->ref, 1, 4);
-            if ($ref == 'PROV' && !empty($modCodeContract->code_auto)) {
-                $numref = $object->getNextNumRef($object->thirdparty);
-            } else {
-                $numref = $object->ref;
-            }
-            $text = $langs->trans('ConfirmValidateContract', $numref);
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ValidateAContract"), $text, "confirm_valid", '', 0, 1);
-        } elseif ($action == 'close') {
-            // Confirmation de la fermeture
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CloseAContract"), $langs->trans("ConfirmCloseContract"), "confirm_close", '', 0, 1);
-        } elseif ($action == 'activate') {
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", '', 0, 1);
-        } elseif ($action == 'clone') {
-            // Clone confirmation
-            $formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-        }
-
-
-        // Call Hook formConfirm
-        $parameters = array(
-        	'formConfirm' => $formconfirm,
-            'id' => $id,
-            //'lineid' => $lineid,
-        );
-        // Note that $action and $object may have been modified by hook
-        $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
-        if (empty($reshook)) {
-            $formconfirm .= $hookmanager->resPrint;
-        } elseif ($reshook > 0) {
-            $formconfirm = $hookmanager->resPrint;
-        }
-
-        // Print form confirm
-        print $formconfirm;
-
-        /*
+		$hselected = 0;
+		$formconfirm = '';
+
+		dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
+
+
+		if ($action == 'delete') {
+			//Confirmation de la suppression du contrat
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("DeleteAContract"), $langs->trans("ConfirmDeleteAContract"), "confirm_delete", '', 0, 1);
+		} elseif ($action == 'valid') {
+			//Confirmation de la validation
+			$ref = substr($object->ref, 1, 4);
+			if ($ref == 'PROV' && !empty($modCodeContract->code_auto)) {
+				$numref = $object->getNextNumRef($object->thirdparty);
+			} else {
+				$numref = $object->ref;
+			}
+			$text = $langs->trans('ConfirmValidateContract', $numref);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ValidateAContract"), $text, "confirm_valid", '', 0, 1);
+		} elseif ($action == 'close') {
+			// Confirmation de la fermeture
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CloseAContract"), $langs->trans("ConfirmCloseContract"), "confirm_close", '', 0, 1);
+		} elseif ($action == 'activate') {
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", '', 0, 1);
+		} elseif ($action == 'clone') {
+			// Clone confirmation
+			$formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+		}
+
+
+		// Call Hook formConfirm
+		$parameters = array(
+			'formConfirm' => $formconfirm,
+			'id' => $id,
+			//'lineid' => $lineid,
+		);
+		// Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
+		if (empty($reshook)) {
+			$formconfirm .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm = $hookmanager->resPrint;
+		}
+
+		// Print form confirm
+		print $formconfirm;
+
+		/*
          *   Contrat
          */
 		if (!empty($object->brouillon) && $user->rights->contrat->creer)
@@ -1490,8 +1490,8 @@ 
 				// Line in view mode
 				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
 				{
-				    $moreparam = '';
-				    if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+					$moreparam = '';
+					if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
 					print '<tr class="tdtop oddeven" '.$moreparam.'>';
 					// Label
 					if ($objp->fk_product > 0)
@@ -1723,8 +1723,8 @@ 
 
 			if ($object->statut > 0)
 			{
-                $moreparam = '';
-                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline-1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+				$moreparam = '';
+				if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline-1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
 				print '<tr class="oddeven" '.$moreparam.'>';
 				print '<td class="tdhrthin" colspan="'.($conf->margin->enabled ? 7 : 6).'"><hr class="opacitymedium tdhrthin"></td>';
 				print "</tr>\n";
@@ -1840,12 +1840,12 @@ 
 				// Si active et en cours
 				if ($objp->date_debut_reelle && !$objp->date_fin_reelle) {
 					print $langs->trans("DateStartReal").': ';
-                    print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
+					print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
 				}
 				// Si desactive
 				if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
 					print $langs->trans("DateStartReal").': ';
-                    print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
+					print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
 					print ' &nbsp;-&nbsp; ';
 					print $langs->trans("DateEndReal").': ';
 					print dol_print_date($db->jdate($objp->date_fin_reelle), 'day');
@@ -2086,11 +2086,11 @@ 
 					//	print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CloseRefusedBecauseOneServiceActive").'">'.$langs->trans("Close").'</a></div>';
 					//}
 				}
-                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0)
-                {
-                    if ($action == 'showclosedlines') print '<div class="inline-block divButAction"><a class="butAction" id="btnhideclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=hideclosedlines">'.$langs->trans("HideClosedServices").'</a></div>';
-                    else print '<div class="inline-block divButAction"><a class="butAction" id="btnshowclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=showclosedlines">'.$langs->trans("ShowClosedServices").'</a></div>';
-                }
+				if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0)
+				{
+					if ($action == 'showclosedlines') print '<div class="inline-block divButAction"><a class="butAction" id="btnhideclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=hideclosedlines">'.$langs->trans("HideClosedServices").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butAction" id="btnshowclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=showclosedlines">'.$langs->trans("ShowClosedServices").'</a></div>';
+				}
 				// On peut supprimer entite si
 				// - Droit de creer + mode brouillon (erreur creation)
 				// - Droit de supprimer

Spacing +4 added lines, -4 removed lines

@@ -1491,7 +1491,7 @@ 
 				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
 				{
 				    $moreparam = '';
-				    if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+				    if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
 					print '<tr class="tdtop oddeven" '.$moreparam.'>';
 					// Label
 					if ($objp->fk_product > 0)
@@ -1624,7 +1624,7 @@ 
 						$line = new ContratLigne($db);
 						$line->id = $objp->rowid;
 						$line->fetch_optionals();
-						print $line->showOptionals($extrafields, 'view', array('class'=>'oddeven','style'=>$moreparam, 'colspan'=>$colspan), '', '', 1);
+						print $line->showOptionals($extrafields, 'view', array('class'=>'oddeven', 'style'=>$moreparam, 'colspan'=>$colspan), '', '', 1);
 					}
 				}
 				// Line in mode update
@@ -1724,7 +1724,7 @@ 
 			if ($object->statut > 0)
 			{
                 $moreparam = '';
-                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline-1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+                if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline - 1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
 				print '<tr class="oddeven" '.$moreparam.'>';
 				print '<td class="tdhrthin" colspan="'.($conf->margin->enabled ? 7 : 6).'"><hr class="opacitymedium tdhrthin"></td>';
 				print "</tr>\n";
@@ -2086,7 +2086,7 @@ 
 					//	print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CloseRefusedBecauseOneServiceActive").'">'.$langs->trans("Close").'</a></div>';
 					//}
 				}
-                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0)
+                if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0)
                 {
                     if ($action == 'showclosedlines') print '<div class="inline-block divButAction"><a class="butAction" id="btnhideclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=hideclosedlines">'.$langs->trans("HideClosedServices").'</a></div>';
                     else print '<div class="inline-block divButAction"><a class="butAction" id="btnshowclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=showclosedlines">'.$langs->trans("ShowClosedServices").'</a></div>';

Braces +218 added lines, -86 removed lines

@@ -40,7 +40,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
 if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -62,7 +64,9 @@ 
 $usehm = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'contrat', $id);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -74,11 +78,13 @@ 
 // Load object
 if ($id > 0 || !empty($ref) && $action != 'add') {
 	$ret = $object->fetch($id, $ref);
-	if ($ret > 0)
-		$ret = $object->fetch_thirdparty();
-	if ($ret < 0)
-		dol_print_error('', $object->error);
-}
+	if ($ret > 0) {
+			$ret = $object->fetch_thirdparty();
+	}
+	if ($ret < 0) {
+			dol_print_error('', $object->error);
+	}
+	}
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -97,7 +103,9 @@ 
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 if (empty($reshook))
 {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
@@ -288,8 +296,12 @@ 
 
 										$outputlangs = $langs;
 										$newlang = '';
-										if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-										if (empty($newlang)) $newlang = $srcobject->thirdparty->default_lang;
+										if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+											$newlang = GETPOST('lang_id', 'aZ09');
+										}
+										if (empty($newlang)) {
+											$newlang = $srcobject->thirdparty->default_lang;
+										}
 										if (!empty($newlang))
 										{
 											$outputlangs = new Translate("", $conf);
@@ -355,8 +367,9 @@ 
 					$parameters = array('objFrom' => $srcobject);
 					$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 					// modified by hook
-					if ($reshook < 0)
-						$error++;
+					if ($reshook < 0) {
+											$error++;
+					}
 				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
@@ -447,7 +460,9 @@ 
 				// Update if prices fields are defined
 				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-				if (empty($tva_tx)) $tva_npr = 0;
+				if (empty($tva_tx)) {
+					$tva_npr = 0;
+				}
 
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
@@ -476,9 +491,13 @@ 
 							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
 							$price_base_type = $prodcustprice->lines [0]->price_base_type;
 							$tva_tx = $prodcustprice->lines [0]->tva_tx;
-							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+								$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							}
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
-							if (empty($tva_tx)) $tva_npr = 0;
+							if (empty($tva_tx)) {
+								$tva_npr = 0;
+							}
 						}
 					}
 				}
@@ -499,8 +518,11 @@ 
 				}
 
 			   	$desc = $prod->description;
-			   	if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
-				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+			   	if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+			   		$desc = $product_desc;
+			   	} else {
+					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				}
 
 				$fk_unit = $prod->fk_unit;
 			} else {
@@ -517,12 +539,16 @@ 
 
 			// ajout prix achat
 			$fk_fournprice = $_POST['fournprice'];
-			if (!empty($_POST['buying_price']))
-			  $pa_ht = $_POST['buying_price'];
-			else $pa_ht = null;
+			if (!empty($_POST['buying_price'])) {
+						  $pa_ht = $_POST['buying_price'];
+			} else {
+				$pa_ht = null;
+			}
 
 			$info_bits = 0;
-			if ($tva_npr) $info_bits |= 0x01;
+			if ($tva_npr) {
+				$info_bits |= 0x01;
+			}
 
 			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance))
 				|| empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))))
@@ -555,12 +581,18 @@ 
 			if ($result > 0)
 			{
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && !empty($conf->global->CONTRACT_ADDON_PDF))    // No generation if default type not defined
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && !empty($conf->global->CONTRACT_ADDON_PDF)) {
+					// No generation if default type not defined
 				{
 					$outputlangs = $langs;
+				}
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						$newlang = GETPOST('lang_id', 'aZ09');
+					}
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+						$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -632,14 +664,19 @@ 
 
 		if (!$error)
 		{
-			if ($date_start_real_update == '') $date_start_real_update = $objectline->date_ouverture;
-			if ($date_end_real_update == '')   $date_end_real_update = $objectline->date_cloture;
+			if ($date_start_real_update == '') {
+				$date_start_real_update = $objectline->date_ouverture;
+			}
+			if ($date_end_real_update == '') {
+				$date_end_real_update = $objectline->date_cloture;
+			}
 
 			$vat_rate = GETPOST('eltva_tx');
 			// Define info_bits
 			$info_bits = 0;
-			if (preg_match('/\*/', $vat_rate))
-				  $info_bits |= 0x01;
+			if (preg_match('/\*/', $vat_rate)) {
+							  $info_bits |= 0x01;
+			}
 
 			// Define vat_rate
 			$vat_rate = str_replace('*', '', $vat_rate);
@@ -659,9 +696,11 @@ 
 
 			// ajout prix d'achat
 			$fk_fournprice = $_POST['fournprice'];
-			if (!empty($_POST['buying_price']))
-			  $pa_ht = $_POST['buying_price'];
-			else $pa_ht = null;
+			if (!empty($_POST['buying_price'])) {
+						  $pa_ht = $_POST['buying_price'];
+			} else {
+				$pa_ht = null;
+			}
 
 			$fk_unit = GETPOST('unit', 'alpha');
 
@@ -737,8 +776,12 @@ 
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+					$newlang = GETPOST('lang_id', 'aZ09');
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+					$newlang = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -812,7 +855,9 @@ 
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
 		if (!$error) {
 			$result = $object->insertExtraFields('CONTRACT_MODIFY');
@@ -888,7 +933,9 @@ 
 				$files = dol_dir_list($old_filedir);
 				if (!empty($files))
 				{
-					if (!is_dir($new_filedir)) dol_mkdir($new_filedir);
+					if (!is_dir($new_filedir)) {
+						dol_mkdir($new_filedir);
+					}
 					foreach ($files as $file)
 					{
 						dol_move($file['fullname'], $new_filedir.'/'.$file['name']);
@@ -996,7 +1043,9 @@ 
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
 				} else {
-					if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
+					if (count($object->errors) > 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
 					$action = '';
 				}
 			}
@@ -1013,7 +1062,9 @@ 
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 // Load object modContract
 $module = (!empty($conf->global->CONTRACT_ADDON) ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
@@ -1033,7 +1084,9 @@ 
 	print load_fiche_titre($langs->trans('AddContract'), '', 'contract');
 
 	$soc = new Societe($db);
-	if ($socid > 0) $soc->fetch($socid);
+	if ($socid > 0) {
+		$soc->fetch($socid);
+	}
 
 	if (GETPOST('origin') && GETPOST('originid'))
 	{
@@ -1059,7 +1112,9 @@ 
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
 			$objectsrc->fetch($originid);
-			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))  $objectsrc->fetch_lines();
+			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
+				$objectsrc->fetch_lines();
+			}
 			$objectsrc->fetch_thirdparty();
 
 			// Replicate extrafields
@@ -1134,12 +1189,18 @@ 
 	{
 		// Ligne info remises tiers
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
-		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
-		else print $langs->trans("CompanyHasNoRelativeDiscount");
+		if ($soc->remise_percent) {
+			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
+		} else {
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		}
 		print '. ';
 		$absolute_discount = $soc->getAvailableDiscounts();
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
-		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		if ($absolute_discount) {
+			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
+		} else {
+			print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		}
 		print '.';
 		print '</td></tr>';
 	}
@@ -1329,7 +1390,9 @@ 
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
+		}
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
@@ -1377,12 +1440,18 @@ 
 
 		// Line info of thirdparty discounts
 		print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
-		if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
-		else print $langs->trans("CompanyHasNoRelativeDiscount");
+		if ($object->thirdparty->remise_percent) {
+			print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
+		} else {
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		}
 		$absolute_discount = $object->thirdparty->getAvailableDiscounts();
 		print '. ';
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
-		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		if ($absolute_discount) {
+			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
+		} else {
+			print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		}
 		print '.';
 		print '</td></tr>';
 
@@ -1434,7 +1503,9 @@ 
 		$productstatic = new Product($db);
 
 		$usemargins = 0;
-		if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'propal', 'commande'))) $usemargins = 1;
+		if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'propal', 'commande'))) {
+			$usemargins = 1;
+		}
 
 		$var = false;
 
@@ -1479,9 +1550,13 @@ 
 				//	print '<td width="80" class="right">'.$langs->trans("PriceUHTCurrency").'</td>';
 				//}
 				print '<td width="30" class="center">'.$langs->trans("Qty").'</td>';
-				if ($conf->global->PRODUCT_USE_UNITS) print '<td width="30" class="left">'.$langs->trans("Unit").'</td>';
+				if ($conf->global->PRODUCT_USE_UNITS) {
+					print '<td width="30" class="left">'.$langs->trans("Unit").'</td>';
+				}
 				print '<td width="50" class="right">'.$langs->trans("ReductionShort").'</td>';
-				if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" class="right">'.$langs->trans("BuyingPrice").'</td>';
+				if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+					print '<td width="50" class="right">'.$langs->trans("BuyingPrice").'</td>';
+				}
 				print '<td width="30">&nbsp;</td>';
 				print "</tr>\n";
 
@@ -1491,7 +1566,9 @@ 
 				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
 				{
 				    $moreparam = '';
-				    if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+				    if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') {
+				    	$moreparam = 'style="display: none;"';
+				    }
 					print '<tr class="tdtop oddeven" '.$moreparam.'>';
 					// Label
 					if ($objp->fk_product > 0)
@@ -1540,7 +1617,9 @@ 
 					// Quantity
 					print '<td class="center">'.$objp->qty.'</td>';
 					// Unit
-					if ($conf->global->PRODUCT_USE_UNITS) print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
+					if ($conf->global->PRODUCT_USE_UNITS) {
+						print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
+					}
 					// Discount
 					if ($objp->remise_percent > 0)
 					{
@@ -1550,7 +1629,9 @@ 
 					}
 
 					// Margin
-					if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td class="right nowrap">'.price($objp->pa_ht).'</td>';
+					if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+						print '<td class="right nowrap">'.price($objp->pa_ht).'</td>';
+					}
 
 					// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
 					print '<td class="nowrap right">';
@@ -1602,7 +1683,9 @@ 
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
-						} else print $langs->trans("Unknown");
+						} else {
+							print $langs->trans("Unknown");
+						}
 						print ' &nbsp;-&nbsp; ';
 						print $langs->trans("DateEndPlanned").': ';
 						if ($objp->date_fin)
@@ -1613,7 +1696,9 @@ 
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
-						} else print $langs->trans("Unknown");
+						} else {
+							print $langs->trans("Unknown");
+						}
 
 						print '</td>';
 						print '</tr>';
@@ -1648,7 +1733,9 @@ 
 					// editeur wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					$nbrows = ROWS_2;
-					if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+					if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+						$nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+					}
 					$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
 					$doleditor = new DolEditor('product_desc', $objp->description, '', 92, 'dolibarr_details', '', false, true, $enable, $nbrows, '90%');
 					$doleditor->Create();
@@ -1685,7 +1772,9 @@ 
 					if (!empty($usemargins))
 					{
 						print '<td class="right">';
-						if ($objp->fk_product) print '<select id="fournprice" name="fournprice"></select>';
+						if ($objp->fk_product) {
+							print '<select id="fournprice" name="fournprice"></select>';
+						}
 						print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht, 0, '', 0).'"></td>';
 					}
 					print '<td class="center">';
@@ -1695,8 +1784,12 @@ 
 					print '</tr>';
 
 					$colspan = 6;
-					if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
-					if ($conf->global->PRODUCT_USE_UNITS) $colspan++;
+					if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+						$colspan++;
+					}
+					if ($conf->global->PRODUCT_USE_UNITS) {
+						$colspan++;
+					}
 
 					// Ligne dates prevues
 					print '<tr class="oddeven">';
@@ -1724,7 +1817,9 @@ 
 			if ($object->statut > 0)
 			{
                 $moreparam = '';
-                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline-1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline-1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') {
+                	$moreparam = 'style="display: none;"';
+                }
 				print '<tr class="oddeven" '.$moreparam.'>';
 				print '<td class="tdhrthin" colspan="'.($conf->margin->enabled ? 7 : 6).'"><hr class="opacitymedium tdhrthin"></td>';
 				print "</tr>\n";
@@ -1742,7 +1837,9 @@ 
 			if ($action == 'deleteline' && !$_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline - 1]->id == GETPOST('rowid'))
 			{
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'), $langs->trans("DeleteContractLine"), $langs->trans("ConfirmDeleteContractLine"), "confirm_deleteline", '', 0, 1);
-				if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
+				if ($ret == 'html') {
+					print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
+				}
 			}
 
 			/*
@@ -1834,8 +1931,11 @@ 
 				// Si pas encore active
 				if (!$objp->date_debut_reelle) {
 					print $langs->trans("DateStartReal").': ';
-					if ($objp->date_debut_reelle) print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
-					else print $langs->trans("ContractStatusNotRunning");
+					if ($objp->date_debut_reelle) {
+						print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
+					} else {
+						print $langs->trans("ContractStatusNotRunning");
+					}
 				}
 				// Si active et en cours
 				if ($objp->date_debut_reelle && !$objp->date_fin_reelle) {
@@ -1850,7 +1950,9 @@ 
 					print $langs->trans("DateEndReal").': ';
 					print dol_print_date($db->jdate($objp->date_fin_reelle), 'day');
 				}
-				if (!empty($objp->comment)) print " &nbsp;-&nbsp; ".$objp->comment;
+				if (!empty($objp->comment)) {
+					print " &nbsp;-&nbsp; ".$objp->comment;
+				}
 				print '</td>';
 
 				print '<td class="center">&nbsp;</td>';
@@ -1869,12 +1971,16 @@ 
 
 				// Definie date debut et fin par defaut
 				$dateactstart = $objp->date_debut;
-				if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				elseif (!$dateactstart) $dateactstart = time();
+				if (GETPOST('remonth')) {
+					$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+				} elseif (!$dateactstart) {
+					$dateactstart = time();
+				}
 
 				$dateactend = $objp->date_fin;
-				if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				elseif (!$dateactend)
+				if (GETPOST('endmonth')) {
+					$dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+				} elseif (!$dateactend)
 				{
 					if ($objp->fk_product > 0)
 					{
@@ -1924,12 +2030,16 @@ 
 
 				// Definie date debut et fin par defaut
 				$dateactstart = $objp->date_debut_reelle;
-				if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				elseif (!$dateactstart) $dateactstart = time();
+				if (GETPOST('remonth')) {
+					$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+				} elseif (!$dateactstart) {
+					$dateactstart = time();
+				}
 
 				$dateactend = $objp->date_fin_reelle;
-				if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				elseif (!$dateactend)
+				if (GETPOST('endmonth')) {
+					$dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+				} elseif (!$dateactend)
 				{
 					if ($objp->fk_product > 0)
 					{
@@ -1939,7 +2049,9 @@ 
 					}
 				}
 				$now = dol_now();
-				if ($dateactend > $now) $dateactend = $now;
+				if ($dateactend > $now) {
+					$dateactend = $now;
+				}
 
 				print '<tr class="oddeven"><td colspan="2" class="nohover">';
 				if ($objp->statut >= 4)
@@ -1991,7 +2103,10 @@ 
 	   		if ($action != 'editline')
 			{
 				$forcetoshowtitlelines = 1;
-				if (empty($object->multicurrency_code)) $object->multicurrency_code = $conf->currency; // TODO Remove this when multicurrency supported on contracts
+				if (empty($object->multicurrency_code)) {
+					$object->multicurrency_code = $conf->currency;
+				}
+				// TODO Remove this when multicurrency supported on contracts
 
 				// Add free products/services
 				$object->formAddObjectLine(1, $mysoc, $soc);
@@ -2026,33 +2141,47 @@ 
 					if ($object->statut == 1) {
 						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						}
 					}
 				}
 
 				if ($object->statut == 0 && $nbofservices)
 				{
-					if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
+					if ($user->rights->contrat->creer) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
+					}
 				}
 				if ($object->statut == 1)
 				{
-					if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
+					if ($user->rights->contrat->creer) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
+					}
 				}
 
 				if (!empty($conf->facture->enabled) && $object->statut > 0)
 				{
 					$langs->load("bills");
-					if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+					if ($user->rights->facture->creer) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+					}
 				}
 
 				if (!empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
 				{
 					$langs->load("orders");
-					if ($user->rights->commande->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
+					if ($user->rights->commande->creer) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
+					}
 				}
 
 				// Clone
@@ -2088,8 +2217,11 @@ 
 				}
                 if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0)
                 {
-                    if ($action == 'showclosedlines') print '<div class="inline-block divButAction"><a class="butAction" id="btnhideclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=hideclosedlines">'.$langs->trans("HideClosedServices").'</a></div>';
-                    else print '<div class="inline-block divButAction"><a class="butAction" id="btnshowclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=showclosedlines">'.$langs->trans("ShowClosedServices").'</a></div>';
+                    if ($action == 'showclosedlines') {
+                    	print '<div class="inline-block divButAction"><a class="butAction" id="btnhideclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=hideclosedlines">'.$langs->trans("HideClosedServices").'</a></div>';
+                    } else {
+                    	print '<div class="inline-block divButAction"><a class="butAction" id="btnshowclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=showclosedlines">'.$langs->trans("ShowClosedServices").'</a></div>';
+                    }
                 }
 				// On peut supprimer entite si
 				// - Droit de creer + mode brouillon (erreur creation)

htdocs/api/class/api_documents.class.php

Braces +43 added lines, -57 removed lines

@@ -201,8 +201,7 @@ 
 			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		elseif ($modulepart == 'commande' || $modulepart == 'order')
+		} elseif ($modulepart == 'commande' || $modulepart == 'order')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$this->order = new Commande($this->db);
@@ -215,8 +214,7 @@ 
 			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		elseif ($modulepart == 'propal' || $modulepart == 'proposal')
+		} elseif ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$this->propal = new Propal($this->db);
@@ -229,8 +227,7 @@ 
 			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		else
+		} else
 		{
 			throw new RestException(403, 'Generation not available for this modulepart');
 		}
@@ -293,8 +290,7 @@ 
 			}
 
 			$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
-		}
-		elseif ($modulepart == 'user')
+		} elseif ($modulepart == 'user')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
@@ -310,8 +306,7 @@ 
 			}
 
 			$upload_dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
-		}
-		elseif ($modulepart == 'adherent' || $modulepart == 'member')
+		} elseif ($modulepart == 'adherent' || $modulepart == 'member')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
@@ -326,8 +321,7 @@ 
 			}
 
 			$upload_dir = $conf->adherent->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'member');
-		}
-		elseif ($modulepart == 'propal' || $modulepart == 'proposal')
+		} elseif ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
@@ -342,8 +336,7 @@ 
 			}
 
 			$upload_dir = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');
-		}
-		elseif ($modulepart == 'commande' || $modulepart == 'order')
+		} elseif ($modulepart == 'commande' || $modulepart == 'order')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
@@ -358,8 +351,7 @@ 
 			}
 
 			$upload_dir = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
-		}
-		elseif ($modulepart == 'shipment' || $modulepart == 'expedition')
+		} elseif ($modulepart == 'shipment' || $modulepart == 'expedition')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
@@ -374,8 +366,7 @@ 
 			}
 
 			$upload_dir = $conf->expedition->dir_output."/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');
-		}
-		elseif ($modulepart == 'facture' || $modulepart == 'invoice')
+		} elseif ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -390,8 +381,7 @@ 
 			}
 
 			$upload_dir = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
-		}
-		elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+		} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 		{
 			$modulepart = 'supplier_invoice';
 
@@ -408,8 +398,7 @@ 
 			}
 
 			$upload_dir = $conf->fournisseur->dir_output."/facture/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
-		}
-        elseif ($modulepart == 'produit' || $modulepart == 'product')
+		} elseif ($modulepart == 'produit' || $modulepart == 'product')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -424,8 +413,7 @@ 
 			}
 
 			$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-		}
-		elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
+		} elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
@@ -440,8 +428,7 @@ 
 			}
 
 			$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
-		}
-		elseif ($modulepart == 'expensereport')
+		} elseif ($modulepart == 'expensereport')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 
@@ -456,8 +443,7 @@ 
 			}
 
 			$upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
-		}
-		elseif ($modulepart == 'categorie' || $modulepart == 'category')
+		} elseif ($modulepart == 'categorie' || $modulepart == 'category')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
@@ -472,8 +458,7 @@ 
 			}
 
 			$upload_dir = $conf->categorie->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'category').$object->id."/photos/".dol_sanitizeFileName($object->ref);
-		}
-		else
+		} else
 		{
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
@@ -543,8 +528,12 @@ 
 		}
 
 		$newfilecontent = '';
-		if (empty($fileencoding)) $newfilecontent = $filecontent;
-		if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
+		if (empty($fileencoding)) {
+			$newfilecontent = $filecontent;
+		}
+		if ($fileencoding == 'base64') {
+			$newfilecontent = base64_decode($filecontent);
+		}
 
 		$original_file = dol_sanitizeFileName($filename);
 
@@ -561,20 +550,17 @@ 
 
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
-			}
-			elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
 				$modulepart = 'supplier_invoice';
 
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$object = new FactureFournisseur($this->db);
-			}
-			elseif ($modulepart == 'project')
+			} elseif ($modulepart == 'project')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$object = new Project($this->db);
-			}
-			elseif ($modulepart == 'task' || $modulepart == 'project_task')
+			} elseif ($modulepart == 'task' || $modulepart == 'project_task')
 			{
 				$modulepart = 'project_task';
 
@@ -592,23 +578,19 @@ 
 					{
 						$tmpreldir = dol_sanitizeFileName($object->project->ref).'/';
 					}
-				}
-				else
+				} else
 				{
 					throw new RestException(500, 'Error while fetching Task '.$ref);
 				}
-			}
-			elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
+			} elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 				$object = new Product($this->db);
-			}
-			elseif ($modulepart == 'expensereport')
+			} elseif ($modulepart == 'expensereport')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 				$object = new ExpenseReport($this->db);
-			}
-			elseif ($modulepart == 'adherent' || $modulepart == 'member')
+			} elseif ($modulepart == 'adherent' || $modulepart == 'member')
 			{
 				$modulepart = 'adherent';
 				require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -627,8 +609,7 @@ 
 				if ($result == 0)
 				{
 					throw new RestException(404, "Object with ref '".$ref."' was not found.");
-			    }
-				elseif ($result < 0)
+			    } elseif ($result < 0)
 				{
 					throw new RestException(500, 'Error while fetching object.');
 				}
@@ -654,11 +635,14 @@ 
 			{
 				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
 			}
-		}
-		else
+		} else
 		{
-			if ($modulepart == 'invoice') $modulepart = 'facture';
-			if ($modulepart == 'member') $modulepart = 'adherent';
+			if ($modulepart == 'invoice') {
+				$modulepart = 'facture';
+			}
+			if ($modulepart == 'member') {
+				$modulepart = 'adherent';
+			}
 
 			$relativefile = $subdir;
 
@@ -674,10 +658,12 @@ 
 
 		$upload_dir = dol_sanitizePathName($upload_dir);
 
-		if (dol_mkdir($upload_dir) < 0) // needed by products
+		if (dol_mkdir($upload_dir) < 0) {
+			// needed by products
 		{
 		    throw new RestException(500, 'Error while trying to create directory.');
 		}
+		}
 
 		$destfile = $upload_dir.'/'.$original_file;
 		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/'.$original_file;
@@ -699,8 +685,7 @@ 
 			$nbofbyteswrote = fwrite($fhandle, $newfilecontent);
 			fclose($fhandle);
 			@chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
-		}
-		else
+		} else
 		{
 			throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
 		}
@@ -798,8 +783,9 @@ 
         // phpcs:enable
 		$result = array();
 		foreach (Documents::$DOCUMENT_FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
+			if (!isset($data[$field])) {
+							throw new RestException(400, "$field field missing");
+			}
 			$result[$field] = $data[$field];
 		}
 		return $result;

htdocs/loan/calcmens.php

Braces +10 added lines, -3 removed lines

@@ -24,9 +24,16 @@
  *  \brief File to calculate loan monthly payments
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+// Disables token renewal
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../main.inc.php';
 require DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';

htdocs/loan/schedule.php

Indentation +68 added lines, -68 removed lines

@@ -55,69 +55,69 @@ 
  */
 
 if ($action == 'createecheancier' && empty($pay_without_schedule)) {
-    $db->begin();
-    $i = 1;
-    while ($i < $object->nbterm + 1) {
-        $date = GETPOST('hi_date'.$i, 'int');
-        $mens = price2num(GETPOST('mens'.$i));
-        $int = price2num(GETPOST('hi_interets'.$i));
-        $insurance = price2num(GETPOST('hi_insurance'.$i));
-
-        $new_echeance = new LoanSchedule($db);
-
-        $new_echeance->fk_loan = $object->id;
-        $new_echeance->datec = dol_now();
-        $new_echeance->tms = dol_now();
-        $new_echeance->datep = $date;
-        $new_echeance->amount_capital = $mens - $int;
-        $new_echeance->amount_insurance = $insurance;
-        $new_echeance->amount_interest = $int;
-        $new_echeance->fk_typepayment = 3;
-        $new_echeance->fk_bank = 0;
-        $new_echeance->fk_user_creat = $user->id;
-        $new_echeance->fk_user_modif = $user->id;
-        $result = $new_echeance->create($user);
-        if ($result < 0) {
-            setEventMessages($new_echeance->error, $echeance->errors, 'errors');
-            $db->rollback();
-            unset($echeances->lines);
-            break;
-        }
-        $echeances->lines[] = $new_echeance;
-        $i++;
-    }
-    var_dump($result);
-    if ($result > 0) $db->commit();
+	$db->begin();
+	$i = 1;
+	while ($i < $object->nbterm + 1) {
+		$date = GETPOST('hi_date'.$i, 'int');
+		$mens = price2num(GETPOST('mens'.$i));
+		$int = price2num(GETPOST('hi_interets'.$i));
+		$insurance = price2num(GETPOST('hi_insurance'.$i));
+
+		$new_echeance = new LoanSchedule($db);
+
+		$new_echeance->fk_loan = $object->id;
+		$new_echeance->datec = dol_now();
+		$new_echeance->tms = dol_now();
+		$new_echeance->datep = $date;
+		$new_echeance->amount_capital = $mens - $int;
+		$new_echeance->amount_insurance = $insurance;
+		$new_echeance->amount_interest = $int;
+		$new_echeance->fk_typepayment = 3;
+		$new_echeance->fk_bank = 0;
+		$new_echeance->fk_user_creat = $user->id;
+		$new_echeance->fk_user_modif = $user->id;
+		$result = $new_echeance->create($user);
+		if ($result < 0) {
+			setEventMessages($new_echeance->error, $echeance->errors, 'errors');
+			$db->rollback();
+			unset($echeances->lines);
+			break;
+		}
+		$echeances->lines[] = $new_echeance;
+		$i++;
+	}
+	var_dump($result);
+	if ($result > 0) $db->commit();
 }
 
 if ($action == 'updateecheancier' && empty($pay_without_schedule)) {
-    $db->begin();
-    $i = 1;
-    while ($i < $object->nbterm + 1) {
-        $mens = price2num(GETPOST('mens'.$i));
-        $int = price2num(GETPOST('hi_interets'.$i));
-        $id = GETPOST('hi_rowid'.$i);
-        $insurance = price2num(GETPOST('hi_insurance'.$i));
-
-        $new_echeance = new LoanSchedule($db);
-        $new_echeance->fetch($id);
-        $new_echeance->tms = dol_now();
-        $new_echeance->amount_capital = $mens - $int;
-        $new_echeance->amount_insurance = $insurance;
-        $new_echeance->amount_interest = $int;
-        $new_echeance->fk_user_modif = $user->id;
-        $result = $new_echeance->update($user, 0);
-        if ($result < 0) {
-            setEventMessages(null, $new_echeance->errors, 'errors');
-            $db->rollback();
-            $echeances->fetchAll($object->id);
-            break;
-        }
-
-        $echeances->lines[$i-1] = $new_echeance;
-        $i++;
-    }
-    if ($result > 0) $db->commit();
+	$db->begin();
+	$i = 1;
+	while ($i < $object->nbterm + 1) {
+		$mens = price2num(GETPOST('mens'.$i));
+		$int = price2num(GETPOST('hi_interets'.$i));
+		$id = GETPOST('hi_rowid'.$i);
+		$insurance = price2num(GETPOST('hi_insurance'.$i));
+
+		$new_echeance = new LoanSchedule($db);
+		$new_echeance->fetch($id);
+		$new_echeance->tms = dol_now();
+		$new_echeance->amount_capital = $mens - $int;
+		$new_echeance->amount_insurance = $insurance;
+		$new_echeance->amount_interest = $int;
+		$new_echeance->fk_user_modif = $user->id;
+		$result = $new_echeance->update($user, 0);
+		if ($result < 0) {
+			setEventMessages(null, $new_echeance->errors, 'errors');
+			$db->rollback();
+			$echeances->fetchAll($object->id);
+			break;
+		}
+
+		$echeances->lines[$i-1] = $new_echeance;
+		$i++;
+	}
+	if ($result > 0) $db->commit();
 }
 
 /*
@@ -210,7 +210,7 @@ 
 <?php
 
 if ($pay_without_schedule == 1)
-    print '<div class="warning">'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'</div>'."\n";
+	print '<div class="warning">'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'</div>'."\n";
 
 print '<form name="createecheancier" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -298,15 +298,15 @@ 
 		print '<td class="center" id="capital'.$i.'">'.price($cap_rest, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_capital'.$i.'" id ="hi_capital'.$i.'" value="'.$cap_rest.'">';
 		print '<td class="center">';
 		if (!empty($line->fk_bank))
-        {
-            print $langs->trans('Paid');
-            if (!empty($line->fk_payment_loan))
-                print '&nbsp;<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$line->fk_payment_loan.'">('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')</a>';
-        }
+		{
+			print $langs->trans('Paid');
+			if (!empty($line->fk_payment_loan))
+				print '&nbsp;<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$line->fk_payment_loan.'">('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')</a>';
+		}
 		elseif (!$printed)
 		{
-		    print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
-		    $printed = true;
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
+			$printed = true;
 		}
 		print '</td>';
 		print '</tr>'."\n";

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
 // Security check
 $socid = 0;
 if (GETPOSTISSET('socid')) $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
 if (empty($user->rights->loan->calc)) accessforbidden();
 
 // Load translation files required by the page
@@ -114,7 +114,7 @@ 
             break;
         }
 
-        $echeances->lines[$i-1] = $new_echeance;
+        $echeances->lines[$i - 1] = $new_echeance;
         $i++;
     }
     if ($result > 0) $db->commit();
@@ -322,7 +322,7 @@ 
 
 if (count($echeances->lines) == 0) $label = $langs->trans("Create");
 else $label = $langs->trans("Save");
-print '<div class="center"><input class="button" type="submit" value="'.$label.'" '.(($pay_without_schedule == 1)?'disabled title="'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'"':'').'title=""></div>';
+print '<div class="center"><input class="button" type="submit" value="'.$label.'" '.(($pay_without_schedule == 1) ? 'disabled title="'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'"' : '').'title=""></div>';
 print '</form>';
 
 // End of page

Braces +40 added lines, -19 removed lines

@@ -35,9 +35,15 @@ 
 
 // Security check
 $socid = 0;
-if (GETPOSTISSET('socid')) $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
-if (empty($user->rights->loan->calc)) accessforbidden();
+if (GETPOSTISSET('socid')) {
+	$socid = GETPOST('socid', 'int');
+}
+if ($user->socid) {
+	$socid=$user->socid;
+}
+if (empty($user->rights->loan->calc)) {
+	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "loan"));
@@ -48,7 +54,9 @@ 
 $echeances = new LoanSchedule($db);
 $echeances->fetchAll($object->id);
 
-if ($object->paid > 0 && count($echeances->lines) == 0) $pay_without_schedule = 1;
+if ($object->paid > 0 && count($echeances->lines) == 0) {
+	$pay_without_schedule = 1;
+}
 
 /*
  * Actions
@@ -87,8 +95,10 @@ 
         $i++;
     }
     var_dump($result);
-    if ($result > 0) $db->commit();
-}
+    if ($result > 0) {
+    	$db->commit();
+    }
+    }
 
 if ($action == 'updateecheancier' && empty($pay_without_schedule)) {
     $db->begin();
@@ -117,8 +127,10 @@ 
         $echeances->lines[$i-1] = $new_echeance;
         $i++;
     }
-    if ($result > 0) $db->commit();
-}
+    if ($result > 0) {
+    	$db->commit();
+    }
+    }
 
 /*
  * View
@@ -144,11 +156,12 @@ 
 	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 	if ($user->rights->loan->write)
 	{
-		if ($action != 'classify')
-			//$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+		if ($action != 'classify') {
+					//$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 		if ($action == 'classify') {
 			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+		}
 			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
@@ -209,8 +222,9 @@ 
 </script>
 <?php
 
-if ($pay_without_schedule == 1)
+if ($pay_without_schedule == 1) {
     print '<div class="warning">'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'</div>'."\n";
+}
 
 print '<form name="createecheancier" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -226,7 +240,9 @@ 
 print '<table class="border centpercent">';
 print '<tr class="liste_titre">';
 $colspan = 6;
-if (count($echeances->lines) > 0) $colspan++;
+if (count($echeances->lines) > 0) {
+	$colspan++;
+}
 print '<th class="center" colspan="'.$colspan.'">';
 print $langs->trans("FinancialCommitment");
 print '</th>';
@@ -242,7 +258,9 @@ 
 print '<br>('.price($object->capital, 0, '', 1, -1, -1, $conf->currency).')';
 print '<input type="hidden" name="hi_capital0" id ="hi_capital0" value="'.$object->capital.'">';
 print '</th>';
-if (count($echeances->lines) > 0) print '<th class="center">'.$langs->trans('DoPayment').'</th>';
+if (count($echeances->lines) > 0) {
+	print '<th class="center">'.$langs->trans('DoPayment').'</th>';
+}
 print '</tr>'."\n";
 
 if ($object->nbterm > 0 && count($echeances->lines) == 0)
@@ -300,10 +318,10 @@ 
 		if (!empty($line->fk_bank))
         {
             print $langs->trans('Paid');
-            if (!empty($line->fk_payment_loan))
-                print '&nbsp;<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$line->fk_payment_loan.'">('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')</a>';
-        }
-		elseif (!$printed)
+            if (!empty($line->fk_payment_loan)) {
+                            print '&nbsp;<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$line->fk_payment_loan.'">('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')</a>';
+            }
+        } elseif (!$printed)
 		{
 		    print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
 		    $printed = true;
@@ -320,8 +338,11 @@ 
 
 print '</br>';
 
-if (count($echeances->lines) == 0) $label = $langs->trans("Create");
-else $label = $langs->trans("Save");
+if (count($echeances->lines) == 0) {
+	$label = $langs->trans("Create");
+} else {
+	$label = $langs->trans("Save");
+}
 print '<div class="center"><input class="button" type="submit" value="'.$label.'" '.(($pay_without_schedule == 1)?'disabled title="'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'"':'').'title=""></div>';
 print '</form>';
 

htdocs/loan/class/loan.class.php

Indentation +48 added lines, -48 removed lines

@@ -54,10 +54,10 @@ 
 	public $datestart;
 	public $dateend;
 
-    /**
-     * @var string Loan label
-     */
-    public $label;
+	/**
+	 * @var string Loan label
+	 */
+	public $label;
 
 	public $capital;
 	public $nbterm;
@@ -68,8 +68,8 @@ 
 	public $account_interest;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -85,29 +85,29 @@ 
 	public $insurance_amount;
 
 	/**
-     * @var int Bank ID
-     */
+	 * @var int Bank ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_project;
 
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
-    const STATUS_STARTED = 2;
+	const STATUS_STARTED = 2;
 
 
 	/**
@@ -375,7 +375,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payed completely
 	 *
@@ -384,7 +384,7 @@ 
 	 */
 	public function set_paid($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_PAID;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -397,7 +397,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payement started
 	 *
@@ -406,7 +406,7 @@ 
 	 */
 	public function set_started($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_STARTED;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -419,7 +419,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payement as unpaid
 	 *
@@ -428,7 +428,7 @@ 
 	 */
 	public function set_unpaid($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_UNPAID;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -453,7 +453,7 @@ 
 		return $this->LibStatut($this->paid, $mode, $alreadypaid);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label for given status
 	 *
@@ -476,11 +476,11 @@ 
 			global $langs;
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
-            $this->labelStatus[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
+			$this->labelStatus[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
 			if ($status == 0 && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Enabled');
-            $this->labelStatusShort[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
+			$this->labelStatusShort[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
 			if ($status == 0 && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
 		}
 
@@ -497,10 +497,10 @@ 
 	 *
 	 *  @param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *  @param	int		$maxlen						Label max length
-     *  @param  string  $option        				On what the link point to ('nolink', ...)
-     *  @param  int     $notooltip                  1=Disable tooltip
-     *  @param  string  $morecss                    Add more css on link
-     *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  string  $option        				On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *  @return	string								Chaine with URL
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
@@ -560,25 +560,25 @@ 
 	 */
 	public function initAsSpecimen()
 	{
-	    global $user, $langs, $conf;
-
-	    $now = dol_now();
-
-	    // Initialise parameters
-	    $this->id = 0;
-	    $this->fk_bank = 1;
-	    $this->label = 'SPECIMEN';
-	    $this->specimen = 1;
-	    $this->socid = 1;
-	    $this->account_capital = 16;
-	    $this->account_insurance = 616;
-	    $this->account_interest = 518;
-	    $this->datestart = $now;
-	    $this->dateend = $now + (3600 * 24 * 365);
-	    $this->note_public = 'SPECIMEN';
-	    $this->capital = 20000;
-	    $this->nbterm = 48;
-	    $this->rate = 4.3;
+		global $user, $langs, $conf;
+
+		$now = dol_now();
+
+		// Initialise parameters
+		$this->id = 0;
+		$this->fk_bank = 1;
+		$this->label = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->socid = 1;
+		$this->account_capital = 16;
+		$this->account_insurance = 616;
+		$this->account_interest = 518;
+		$this->datestart = $now;
+		$this->dateend = $now + (3600 * 24 * 365);
+		$this->note_public = 'SPECIMEN';
+		$this->capital = 20000;
+		$this->nbterm = 48;
+		$this->rate = 4.3;
 	}
 
 	/**
@@ -659,5 +659,5 @@ 
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
-    }
+	}
 }

Braces +63 added lines, -21 removed lines

@@ -188,17 +188,37 @@ 
 
 		// clean parameters
 		$newcapital = price2num($this->capital, 'MT');
-		if (empty($this->insurance_amount)) $this->insurance_amount = 0;
+		if (empty($this->insurance_amount)) {
+			$this->insurance_amount = 0;
+		}
 		$newinsuranceamount = price2num($this->insurance_amount, 'MT');
-		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->account_capital)) $this->account_capital = trim($this->account_capital);
-		if (isset($this->account_insurance)) $this->account_insurance = trim($this->account_insurance);
-		if (isset($this->account_interest)) $this->account_interest = trim($this->account_interest);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
-		if (isset($this->fk_project)) $this->fk_project = (int) $this->fk_project;
+		if (isset($this->note_private)) {
+			$this->note_private = trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->account_capital)) {
+			$this->account_capital = trim($this->account_capital);
+		}
+		if (isset($this->account_insurance)) {
+			$this->account_insurance = trim($this->account_insurance);
+		}
+		if (isset($this->account_interest)) {
+			$this->account_interest = trim($this->account_interest);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
+		if (isset($this->fk_project)) {
+			$this->fk_project = (int) $this->fk_project;
+		}
 
 		// Check parameters
 		if (!$newcapital > 0 || empty($this->datestart) || empty($this->dateend))
@@ -477,16 +497,24 @@ 
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
             $this->labelStatus[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
-			if ($status == 0 && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			if ($status == 0 && $alreadypaid > 0) {
+				$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			}
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Enabled');
             $this->labelStatusShort[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
-			if ($status == 0 && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			if ($status == 0 && $alreadypaid > 0) {
+				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			}
 		}
 
 		$statusType = 'status1';
-		if (($status == 0 && $alreadypaid > 0) || $status == self::STATUS_STARTED) $statusType = 'status3';
-		if ($status == 1) $statusType = 'status6';
+		if (($status == 0 && $alreadypaid > 0) || $status == self::STATUS_STARTED) {
+			$statusType = 'status3';
+		}
+		if ($status == 1) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -523,8 +551,12 @@ 
 		{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
@@ -537,15 +569,21 @@ 
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= ($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref);
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -602,7 +640,9 @@ 
 			$amount = 0;
 
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+			if ($obj) {
+				$amount = $obj->amount ? $obj->amount : 0;
+			}
 
 			$this->db->free($resql);
 			return $amount;
@@ -646,7 +686,9 @@ 
 					$this->user_modification = $muser;
 				}
 				$this->date_creation = $this->db->jdate($obj->datec);
-				if (empty($obj->fk_user_modif)) $obj->tms = "";
+				if (empty($obj->fk_user_modif)) {
+					$obj->tms = "";
+				}
 				$this->date_modification = $this->db->jdate($obj->tms);
 
 				$this->db->free($result);

htdocs/loan/class/paymentloan.class.php

Indentation +86 added lines, -86 removed lines

@@ -41,63 +41,63 @@ 
 	 */
 	public $table_element = 'payment_loan';
 
-    /**
-     * @var string String with name of icon for PaymentLoan
-     */
-    public $picto = 'money-bill-alt';
+	/**
+	 * @var string String with name of icon for PaymentLoan
+	 */
+	public $picto = 'money-bill-alt';
 
-    /**
-     * @var int Loan ID
-     */
-    public $fk_loan;
+	/**
+	 * @var int Loan ID
+	 */
+	public $fk_loan;
 
-    /**
-     * @var string Create date
-     */
-    public $datec = '';
+	/**
+	 * @var string Create date
+	 */
+	public $datec = '';
 
-    public $tms = '';
+	public $tms = '';
 
-    /**
-     * @var string Payment date
-     */
-    public $datep = '';
+	/**
+	 * @var string Payment date
+	 */
+	public $datep = '';
 
-    public $amounts = array(); // Array of amounts
+	public $amounts = array(); // Array of amounts
 
-    public $amount_capital; // Total amount of payment
+	public $amount_capital; // Total amount of payment
 
-    public $amount_insurance;
+	public $amount_insurance;
 
-    public $amount_interest;
+	public $amount_interest;
 
-    /**
-     * @var int Payment type ID
-     */
-    public $fk_typepayment;
+	/**
+	 * @var int Payment type ID
+	 */
+	public $fk_typepayment;
 
-    /**
-     * @var int Payment ID
-     */
-    public $num_payment;
+	/**
+	 * @var int Payment ID
+	 */
+	public $num_payment;
 
-    /**
-     * @var int Bank ID
-     */
-    public $fk_bank;
+	/**
+	 * @var int Bank ID
+	 */
+	public $fk_bank;
 
-    /**
-     * @var int User ID
-     */
-    public $fk_user_creat;
+	/**
+	 * @var int User ID
+	 */
+	public $fk_user_creat;
 
-    /**
-     * @var int user ID
-     */
-    public $fk_user_modif;
+	/**
+	 * @var int user ID
+	 */
+	public $fk_user_modif;
 
-    public $type_code;
-    public $type_label;
+	public $type_code;
+	public $type_label;
 
 
 	/**
@@ -367,23 +367,23 @@ 
 			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
-        // Set loan unpaid if loan has no other payment
-        if (!$error)
-        {
-            require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
-            $loan = new Loan($this->db);
-            $loan->fetch($this->fk_loan);
-            $sum_payment = $loan->getSumPayment();
-            if ($sum_payment == 0)
-            {
-                dol_syslog(get_class($this)."::delete : set loan to unpaid", LOG_DEBUG);
-                if ($loan->set_unpaid($user) < 1)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
-            }
-        }
+		// Set loan unpaid if loan has no other payment
+		if (!$error)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+			$loan = new Loan($this->db);
+			$loan->fetch($this->fk_loan);
+			$sum_payment = $loan->getSumPayment();
+			if ($sum_payment == 0)
+			{
+				dol_syslog(get_class($this)."::delete : set loan to unpaid", LOG_DEBUG);
+				if ($loan->set_unpaid($user) < 1)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
+			}
+		}
 
 		//if (! $error)
 		//{
@@ -435,7 +435,7 @@ 
 		global $conf;
 
 		$error = 0;
-        $this->db->begin();
+		$this->db->begin();
 
 		if (!empty($conf->banque->enabled))
 		{
@@ -448,7 +448,7 @@ 
 			if ($mode == 'payment_loan') $total = -$total;
 
 			// Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
+			$bank_line_id = $acc->addline(
 				$this->datep,
 				$this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
 				$label,
@@ -498,36 +498,36 @@ 
 		}
 
 
-        // Set loan payment started if no set
-        if (!$error)
-        {
-            require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
-            $loan = new Loan($this->db);
-            $loan->fetch($fk_loan);
-            if ($loan->paid == $loan::STATUS_UNPAID)
-            {
-                dol_syslog(get_class($this)."::addPaymentToBank : set loan payment to started", LOG_DEBUG);
-                if ($loan->set_started($user) < 1)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
-            }
-        }
+		// Set loan payment started if no set
+		if (!$error)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+			$loan = new Loan($this->db);
+			$loan->fetch($fk_loan);
+			if ($loan->paid == $loan::STATUS_UNPAID)
+			{
+				dol_syslog(get_class($this)."::addPaymentToBank : set loan payment to started", LOG_DEBUG);
+				if ($loan->set_started($user) < 1)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
+			}
+		}
 
 		if (!$error)
 		{
-            $this->db->commit();
+			$this->db->commit();
 			return 1;
 		}
 		else {
-            $this->db->rollback();
+			$this->db->rollback();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between loan's payment and the line generate in llx_bank
 	 *
@@ -536,14 +536,14 @@ 
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_loan SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-		    $this->fk_bank = $id_bank;
+			$this->fk_bank = $id_bank;
 			return 1;
 		} else {
 			$this->error = $this->db->error();
@@ -556,9 +556,9 @@ 
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=No picto
 	 * 	@param	int		$maxlen						Max length label
-     *	@param	int  	$notooltip					1=Disable tooltip
-     *	@param	string	$moretitle					Add more text to title tooltip
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@param	int  	$notooltip					1=Disable tooltip
+	 *	@param	string	$moretitle					Add more text to title tooltip
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)

Braces +99 added lines, -34 removed lines

@@ -133,23 +133,48 @@ 
 		}
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan = (int) $this->fk_loan;
-		if (isset($this->amount_capital))	$this->amount_capital = price2num($this->amount_capital ? $this->amount_capital : 0);
-		if (isset($this->amount_insurance)) $this->amount_insurance = price2num($this->amount_insurance ? $this->amount_insurance : 0);
-		if (isset($this->amount_interest))	$this->amount_interest = price2num($this->amount_interest ? $this->amount_interest : 0);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment = (int) $this->fk_typepayment;
-		if (isset($this->num_payment)) $this->num_payment = (int) $this->num_payment;
-		if (isset($this->note_private))     $this->note_private = trim($this->note_private);
-		if (isset($this->note_public))      $this->note_public = trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_loan)) {
+			$this->fk_loan = (int) $this->fk_loan;
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital = price2num($this->amount_capital ? $this->amount_capital : 0);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance = price2num($this->amount_insurance ? $this->amount_insurance : 0);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest = price2num($this->amount_interest ? $this->amount_interest : 0);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = (int) $this->fk_typepayment;
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = (int) $this->num_payment;
+		}
+		if (isset($this->note_private)) {
+			$this->note_private = trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 		$totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
 		$totalamount = price2num($totalamount);
 
 		// Check parameters
-		if ($totalamount == 0) return -1; // Negative amounts are accepted for reject prelevement but not null
+		if ($totalamount == 0) {
+			return -1;
+		}
+		// Negative amounts are accepted for reject prelevement but not null
 
 
 		$this->db->begin();
@@ -276,17 +301,39 @@ 
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan = (int) $this->fk_loan;
-		if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment = (int) $this->fk_typepayment;
-		if (isset($this->num_payment)) $this->num_payment = (int) $this->num_payment;
-		if (isset($this->note_private)) $this->note = trim($this->note_private);
-		if (isset($this->note_public)) $this->note = trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_loan)) {
+			$this->fk_loan = (int) $this->fk_loan;
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital = trim($this->amount_capital);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance = trim($this->amount_insurance);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest = trim($this->amount_interest);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = (int) $this->fk_typepayment;
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = (int) $this->num_payment;
+		}
+		if (isset($this->note_private)) {
+			$this->note = trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note = trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 		// Check parameters
 
@@ -445,7 +492,9 @@ 
 			$acc->fetch($accountid);
 
 			$total = $this->amount_capital;
-			if ($mode == 'payment_loan') $total = -$total;
+			if ($mode == 'payment_loan') {
+				$total = -$total;
+			}
 
 			// Insert payment into llx_bank
             $bank_line_id = $acc->addline(
@@ -473,7 +522,9 @@ 
 
 				// Add link 'payment_loan' in bank_url between payment and bank transaction
 				$url = '';
-				if ($mode == 'payment_loan') $url = DOL_URL_ROOT.'/loan/payment/card.php?id=';
+				if ($mode == 'payment_loan') {
+					$url = DOL_URL_ROOT.'/loan/payment/card.php?id=';
+				}
 				if ($url)
 				{
 					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
@@ -489,7 +540,9 @@ 
 				if ($mode == 'payment_loan')
 				{
 					$result = $acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label ? $this->label : ''), 'loan');
-					if ($result <= 0) dol_print_error($this->db);
+					if ($result <= 0) {
+						dol_print_error($this->db);
+					}
 				}
 			} else {
 				$this->error = $acc->error;
@@ -519,8 +572,7 @@ 
 		{
             $this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
             $this->db->rollback();
 			return -1;
 		}
@@ -565,27 +617,40 @@ 
 	{
 		global $langs, $conf;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1;
+		}
+		// Force disable tooltips
 
 		$result = '';
 		$label = '<u>'.$langs->trans("Loan").'</u>';
 		if (!empty($this->id)) {
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
 		}
-		if ($moretitle) $label .= ' - '.$moretitle;
+		if ($moretitle) {
+			$label .= ' - '.$moretitle;
+		}
 
 		$url = DOL_URL_ROOT.'/loan/payment/card.php?id='.$this->id;
 
 		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-		if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values = 1;
+		}
+		if ($add_save_lastsearch_values) {
+			$url .= '&save_lastsearch_values=1';
+		}
 
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;