Dolibarr / dolibarr

htdocs/product/dynamic_price/class/price_expression.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -297,7 +297,7 @@
     /**
      *  Update object into database
      *
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */

Indentation +196 added lines, -196 removed lines

@@ -32,39 +32,39 @@ 
 	var $db;							//!< To store db handler
 	var $error;							//!< To return error code (or message)
 	var $errors=array();				//!< To return several error codes (or messages)
-    var $id;
-    var $title;
+	var $id;
+	var $title;
 	var $expression;
-    public $table_element = "c_price_expression";
-
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-        $error=0;
+	public $table_element = "c_price_expression";
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		$error=0;
 
 		// Clean parameters
 		if (isset($this->title)) $this->title=trim($this->title);
 		if (isset($this->expression)) $this->expression=trim($this->expression);
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
 		$sql.= "title, expression";
 		$sql.= ") VALUES (";
@@ -75,32 +75,32 @@ 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action calls a trigger.
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-	            //// Call triggers
-	            //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-	            //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-	            //// End call triggers
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
 			}
-        }
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -108,166 +108,166 @@ 
 		else
 		{
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
-
-
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param		int		$id    	Id object
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    function fetch($id)
-    {
-        $sql = "SELECT title, expression";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE rowid = ".$id;
-
-    	dol_syslog(get_class($this)."::fetch");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id			= $id;
-                $this->title		= $obj->title;
-                $this->expression	= $obj->expression;
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *    List all price expressions
-     *
-     *    @return	array				Array of price expressions
-     */
-    function list_price_expression()
-    {
-        $sql = "SELECT rowid, title, expression";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " ORDER BY title";
-
-        dol_syslog(get_class($this)."::list_price_expression");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $price_expression_obj = new PriceExpression($this->db);
-                $price_expression_obj->id			= $record["rowid"];
-                $price_expression_obj->title		= $record["title"];
+	}
+
+
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param		int		$id    	Id object
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	function fetch($id)
+	{
+		$sql = "SELECT title, expression";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " WHERE rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id			= $id;
+				$this->title		= $obj->title;
+				$this->expression	= $obj->expression;
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+		else
+		{
+	  		$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *    List all price expressions
+	 *
+	 *    @return	array				Array of price expressions
+	 */
+	function list_price_expression()
+	{
+		$sql = "SELECT rowid, title, expression";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " ORDER BY title";
+
+		dol_syslog(get_class($this)."::list_price_expression");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$price_expression_obj = new PriceExpression($this->db);
+				$price_expression_obj->id			= $record["rowid"];
+				$price_expression_obj->title		= $record["title"];
 				$price_expression_obj->expression	= $record["expression"];
-                $retarray[]=$price_expression_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Returns any existing rowid with specified title
-     *
-     *  @param		String	$title  Title of expression
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 rowid
-     */
-    function find_title($title)
-    {
-        $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE title = '".$this->db->escape($title)."'";
-
-    	dol_syslog(get_class($this)."::find_title");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-            	return (int) $obj->rowid;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update($user=0, $notrigger=0)
-    {
+				$retarray[]=$price_expression_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Returns any existing rowid with specified title
+	 *
+	 *  @param		String	$title  Title of expression
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 rowid
+	 */
+	function find_title($title)
+	{
+		$sql = "SELECT rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " WHERE title = '".$this->db->escape($title)."'";
+
+		dol_syslog(get_class($this)."::find_title");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				return (int) $obj->rowid;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+		else
+		{
+	  		$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update($user=0, $notrigger=0)
+	{
 		$error=0;
 
 		// Clean parameters
 		if (isset($this->title)) $this->title=trim($this->title);
 		if (isset($this->expression)) $this->expression=trim($this->expression);
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 		$sql.= " title = ".(isset($this->title)?"'".$this->db->escape($this->title)."'":"''").",";
 		$sql.= " expression = ".(isset($this->expression)?"'".$this->db->escape($this->expression)."'":"''")."";
-        $sql.= " WHERE rowid = ".$this->id;
+		$sql.= " WHERE rowid = ".$this->id;
 
 		$this->db->begin();
 
-    	dol_syslog(get_class($this)."::update");
-        $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		dol_syslog(get_class($this)."::update");
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action calls a trigger.
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-	            //// Call triggers
-	            //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-	            //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-	            //// End call triggers
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
 			 }
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -277,16 +277,16 @@ 
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that deletes
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	function delete(User $user, $notrigger=0)
 	{
 		$error=0;
@@ -300,32 +300,32 @@ 
 			if (! $notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action calls a trigger.
+				// want this action calls a trigger.
 
-	            //// Call triggers
-	            //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-	            //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-	            //// End call triggers
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
 			}
 		}
 
 		if (! $error)
 		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-    		$sql.= " WHERE rowid = ".$rowid;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql.= " WHERE rowid = ".$rowid;
 
-	        dol_syslog(get_class($this)."::delete");
-    		$resql = $this->db->query($sql);
-        	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+			dol_syslog(get_class($this)."::delete");
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	        	dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;

Spacing +62 added lines, -62 removed lines

@@ -29,9 +29,9 @@ 
  */
 class PriceExpression
 {
-	var $db;							//!< To store db handler
-	var $error;							//!< To return error code (or message)
-	var $errors=array();				//!< To return several error codes (or messages)
+	var $db; //!< To store db handler
+	var $error; //!< To return error code (or message)
+	var $errors = array(); //!< To return several error codes (or messages)
     var $id;
     var $title;
 	var $expression;
@@ -56,33 +56,33 @@ 
      *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
 		// Clean parameters
-		if (isset($this->title)) $this->title=trim($this->title);
-		if (isset($this->expression)) $this->expression=trim($this->expression);
+		if (isset($this->title)) $this->title = trim($this->title);
+		if (isset($this->expression)) $this->expression = trim($this->expression);
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-		$sql.= "title, expression";
-		$sql.= ") VALUES (";
-		$sql.= " ".(isset($this->title)?"'".$this->db->escape($this->title)."'":"''").",";
-		$sql.= " ".(isset($this->expression)?"'".$this->db->escape($this->expression)."'":"''");
-		$sql.= ")";
+		$sql .= "title, expression";
+		$sql .= ") VALUES (";
+		$sql .= " ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
+		$sql .= " ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''");
+		$sql .= ")";
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action calls a trigger.
@@ -97,13 +97,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -122,19 +122,19 @@ 
     function fetch($id)
     {
         $sql = "SELECT title, expression";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE rowid = ".$id;
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " WHERE rowid = ".$id;
 
     	dol_syslog(get_class($this)."::fetch");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
             if ($obj)
             {
-                $this->id			= $id;
-                $this->title		= $obj->title;
-                $this->expression	= $obj->expression;
+                $this->id = $id;
+                $this->title = $obj->title;
+                $this->expression = $obj->expression;
                 return 1;
             }
             else
@@ -144,7 +144,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -157,11 +157,11 @@ 
     function list_price_expression()
     {
         $sql = "SELECT rowid, title, expression";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " ORDER BY title";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " ORDER BY title";
 
         dol_syslog(get_class($this)."::list_price_expression");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $retarray = array();
@@ -169,10 +169,10 @@ 
             while ($record = $this->db->fetch_array($resql))
             {
                 $price_expression_obj = new PriceExpression($this->db);
-                $price_expression_obj->id			= $record["rowid"];
-                $price_expression_obj->title		= $record["title"];
+                $price_expression_obj->id = $record["rowid"];
+                $price_expression_obj->title = $record["title"];
 				$price_expression_obj->expression	= $record["expression"];
-                $retarray[]=$price_expression_obj;
+                $retarray[] = $price_expression_obj;
             }
 
             $this->db->free($resql);
@@ -180,7 +180,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -195,11 +195,11 @@ 
     function find_title($title)
     {
         $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE title = '".$this->db->escape($title)."'";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " WHERE title = '".$this->db->escape($title)."'";
 
     	dol_syslog(get_class($this)."::find_title");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -214,7 +214,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -227,29 +227,29 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=0, $notrigger=0)
+    function update($user = 0, $notrigger = 0)
     {
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->title)) $this->title=trim($this->title);
-		if (isset($this->expression)) $this->expression=trim($this->expression);
+		if (isset($this->title)) $this->title = trim($this->title);
+		if (isset($this->expression)) $this->expression = trim($this->expression);
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-		$sql.= " title = ".(isset($this->title)?"'".$this->db->escape($this->title)."'":"''").",";
-		$sql.= " expression = ".(isset($this->expression)?"'".$this->db->escape($this->expression)."'":"''")."";
-        $sql.= " WHERE rowid = ".$this->id;
+		$sql .= " title = ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
+		$sql .= " expression = ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''")."";
+        $sql .= " WHERE rowid = ".$this->id;
 
 		$this->db->begin();
 
     	dol_syslog(get_class($this)."::update");
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action calls a trigger.
@@ -264,13 +264,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -287,17 +287,17 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete(User $user, $notrigger=0)
+	function delete(User $user, $notrigger = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		$rowid = $this->id;
 		
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action calls a trigger.
@@ -309,26 +309,26 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
     		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-    		$sql.= " WHERE rowid = ".$rowid;
+    		$sql .= " WHERE rowid = ".$rowid;
 
 	        dol_syslog(get_class($this)."::delete");
     		$resql = $this->db->query($sql);
-        	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	        	dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -345,7 +345,7 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$this->id=0;
-		$this->expression='';
+		$this->id = 0;
+		$this->expression = '';
 	}
 }

Braces +20 added lines, -20 removed lines

@@ -61,8 +61,12 @@ 
         $error=0;
 
 		// Clean parameters
-		if (isset($this->title)) $this->title=trim($this->title);
-		if (isset($this->expression)) $this->expression=trim($this->expression);
+		if (isset($this->title)) {
+			$this->title=trim($this->title);
+		}
+		if (isset($this->expression)) {
+			$this->expression=trim($this->expression);
+		}
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
@@ -104,8 +108,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -136,13 +139,11 @@ 
                 $this->title		= $obj->title;
                 $this->expression	= $obj->expression;
                 return 1;
-            }
-            else
+            } else
             {
                 return 0;
             }
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -177,8 +178,7 @@ 
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -206,13 +206,11 @@ 
             if ($obj)
             {
             	return (int) $obj->rowid;
-            }
-            else
+            } else
             {
                 return 0;
             }
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -232,8 +230,12 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->title)) $this->title=trim($this->title);
-		if (isset($this->expression)) $this->expression=trim($this->expression);
+		if (isset($this->title)) {
+			$this->title=trim($this->title);
+		}
+		if (isset($this->expression)) {
+			$this->expression=trim($this->expression);
+		}
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
@@ -271,8 +273,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -329,8 +330,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

htdocs/product/dynamic_price/class/price_global_variable.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -297,7 +297,7 @@
     /**
      *  Update object into database
      *
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */

Indentation +303 added lines, -303 removed lines

@@ -29,307 +29,307 @@
  */
 class PriceGlobalVariable
 {
-    var $db;							//!< To store db handler
-    var $error;							//!< To return error code (or message)
-    var $errors=array();				//!< To return several error codes (or messages)
-    var $id;
-    var $code;
-    var $description;
-    var $value;
-    public $table_element = "c_price_global_variable";
-
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-        $error=0;
-
-        $this->checkParameters();
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql.= "code, description, value";
-        $sql.= ") VALUES (";
-        $sql.= " ".(isset($this->code)?"'".$this->db->escape($this->code)."'":"''").",";
-        $sql.= " ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " ".$this->value;
-        $sql.= ")";
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
-
-
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param		int		$id    	Id object
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    function fetch($id)
-    {
-        $sql = "SELECT code, description, value";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE rowid = ".$id;
-
-        dol_syslog(get_class($this)."::fetch");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id			= $id;
-                $this->code			= $obj->code;
-                $this->description	= $obj->description;
-                $this->value		= $obj->value;
-                $this->checkParameters();
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update($user=0, $notrigger=0)
-    {
-        $error=0;
-
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " code = ".(isset($this->code)?"'".$this->db->escape($this->code)."'":"''").",";
-        $sql.= " description = ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " value = ".$this->value;
-        $sql.= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update");
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-             }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-
-    /**
-     *  Delete object in database
-     *
-     * 	@param	int		$rowid		 Row id of global variable
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    function delete($rowid, $user, $notrigger=0)
-    {
-        $error=0;
-
-        $this->db->begin();
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
-
-        if (! $error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " WHERE rowid = ".$rowid;
-
-            dol_syslog(get_class($this)."::delete");
-            $resql = $this->db->query($sql);
-            if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *	Initialise object with example values
-     *	Id must be 0 if object instance is a specimen
-     *
-     *	@return	void
-     */
-    function initAsSpecimen()
-    {
-        $this->id=0;
-        $this->code='';
-        $this->description='';
-        $this->value='';
-    }
-
-    /**
-     *	Checks if all parameters are in order
-     *
-     *	@return	void
-     */
-    function checkParameters()
-    {
-        // Clean parameters
-        if (isset($this->code)) $this->code=trim($this->code);
-        if (isset($this->description)) $this->description=trim($this->description);
-
-        // Check parameters
-        if (empty($this->value) || !is_numeric($this->value)) $this->value=0;
-    }
-
-    /**
-     *    List all price global variables
-     *
-     *    @return	array				Array of price global variables
-     */
-    function listGlobalVariables()
-    {
-        $sql = "SELECT rowid, code, description, value";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " ORDER BY code";
-
-        dol_syslog(get_class($this)."::listGlobalVariables");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $variable_obj = new PriceGlobalVariable($this->db);
-                $variable_obj->id			= $record["rowid"];
-                $variable_obj->code			= $record["code"];
-                $variable_obj->description	= $record["description"];
-                $variable_obj->value			= $record["value"];
-                $variable_obj->checkParameters();
-                $retarray[]=$variable_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
+	var $db;							//!< To store db handler
+	var $error;							//!< To return error code (or message)
+	var $errors=array();				//!< To return several error codes (or messages)
+	var $id;
+	var $code;
+	var $description;
+	var $value;
+	public $table_element = "c_price_global_variable";
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		$error=0;
+
+		$this->checkParameters();
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql.= "code, description, value";
+		$sql.= ") VALUES (";
+		$sql.= " ".(isset($this->code)?"'".$this->db->escape($this->code)."'":"''").",";
+		$sql.= " ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
+		$sql.= " ".$this->value;
+		$sql.= ")";
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param		int		$id    	Id object
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	function fetch($id)
+	{
+		$sql = "SELECT code, description, value";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " WHERE rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id			= $id;
+				$this->code			= $obj->code;
+				$this->description	= $obj->description;
+				$this->value		= $obj->value;
+				$this->checkParameters();
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update($user=0, $notrigger=0)
+	{
+		$error=0;
+
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= " code = ".(isset($this->code)?"'".$this->db->escape($this->code)."'":"''").",";
+		$sql.= " description = ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
+		$sql.= " value = ".$this->value;
+		$sql.= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update");
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			 }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database
+	 *
+	 * 	@param	int		$rowid		 Row id of global variable
+	 *	@param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	function delete($rowid, $user, $notrigger=0)
+	{
+		$error=0;
+
+		$this->db->begin();
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql.= " WHERE rowid = ".$rowid;
+
+			dol_syslog(get_class($this)."::delete");
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *	Initialise object with example values
+	 *	Id must be 0 if object instance is a specimen
+	 *
+	 *	@return	void
+	 */
+	function initAsSpecimen()
+	{
+		$this->id=0;
+		$this->code='';
+		$this->description='';
+		$this->value='';
+	}
+
+	/**
+	 *	Checks if all parameters are in order
+	 *
+	 *	@return	void
+	 */
+	function checkParameters()
+	{
+		// Clean parameters
+		if (isset($this->code)) $this->code=trim($this->code);
+		if (isset($this->description)) $this->description=trim($this->description);
+
+		// Check parameters
+		if (empty($this->value) || !is_numeric($this->value)) $this->value=0;
+	}
+
+	/**
+	 *    List all price global variables
+	 *
+	 *    @return	array				Array of price global variables
+	 */
+	function listGlobalVariables()
+	{
+		$sql = "SELECT rowid, code, description, value";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " ORDER BY code";
+
+		dol_syslog(get_class($this)."::listGlobalVariables");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$variable_obj = new PriceGlobalVariable($this->db);
+				$variable_obj->id			= $record["rowid"];
+				$variable_obj->code			= $record["code"];
+				$variable_obj->description	= $record["description"];
+				$variable_obj->value			= $record["value"];
+				$variable_obj->checkParameters();
+				$retarray[]=$variable_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
 }

Spacing +62 added lines, -62 removed lines

@@ -29,9 +29,9 @@ 
  */
 class PriceGlobalVariable
 {
-    var $db;							//!< To store db handler
-    var $error;							//!< To return error code (or message)
-    var $errors=array();				//!< To return several error codes (or messages)
+    var $db; //!< To store db handler
+    var $error; //!< To return error code (or message)
+    var $errors = array(); //!< To return several error codes (or messages)
     var $id;
     var $code;
     var $description;
@@ -57,32 +57,32 @@ 
      *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->checkParameters();
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql.= "code, description, value";
-        $sql.= ") VALUES (";
-        $sql.= " ".(isset($this->code)?"'".$this->db->escape($this->code)."'":"''").",";
-        $sql.= " ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " ".$this->value;
-        $sql.= ")";
+        $sql .= "code, description, value";
+        $sql .= ") VALUES (";
+        $sql .= " ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
+        $sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+        $sql .= " ".$this->value;
+        $sql .= ")";
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (! $error)
+        if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Uncomment this and change MYOBJECT to your own tag if you
                 // want this action calls a trigger.
@@ -97,13 +97,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -122,19 +122,19 @@ 
     function fetch($id)
     {
         $sql = "SELECT code, description, value";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE rowid = ".$id;
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " WHERE rowid = ".$id;
 
         dol_syslog(get_class($this)."::fetch");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
             if ($obj)
             {
-                $this->id			= $id;
+                $this->id = $id;
                 $this->code			= $obj->code;
-                $this->description	= $obj->description;
+                $this->description = $obj->description;
                 $this->value		= $obj->value;
                 $this->checkParameters();
                 return 1;
@@ -146,7 +146,7 @@ 
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -158,28 +158,28 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=0, $notrigger=0)
+    function update($user = 0, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->checkParameters();
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " code = ".(isset($this->code)?"'".$this->db->escape($this->code)."'":"''").",";
-        $sql.= " description = ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " value = ".$this->value;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " code = ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
+        $sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+        $sql .= " value = ".$this->value;
+        $sql .= " WHERE rowid = ".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::update");
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Uncomment this and change MYOBJECT to your own tag if you
                 // want this action calls a trigger.
@@ -194,13 +194,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -218,15 +218,15 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return	int					 <0 if KO, >0 if OK
      */
-    function delete($rowid, $user, $notrigger=0)
+    function delete($rowid, $user, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->db->begin();
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Uncomment this and change MYOBJECT to your own tag if you
                 // want this action calls a trigger.
@@ -238,26 +238,26 @@ 
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " WHERE rowid = ".$rowid;
+            $sql .= " WHERE rowid = ".$rowid;
 
             dol_syslog(get_class($this)."::delete");
             $resql = $this->db->query($sql);
-            if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
         }
 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -274,10 +274,10 @@ 
      */
     function initAsSpecimen()
     {
-        $this->id=0;
-        $this->code='';
-        $this->description='';
-        $this->value='';
+        $this->id = 0;
+        $this->code = '';
+        $this->description = '';
+        $this->value = '';
     }
 
     /**
@@ -288,11 +288,11 @@ 
     function checkParameters()
     {
         // Clean parameters
-        if (isset($this->code)) $this->code=trim($this->code);
-        if (isset($this->description)) $this->description=trim($this->description);
+        if (isset($this->code)) $this->code = trim($this->code);
+        if (isset($this->description)) $this->description = trim($this->description);
 
         // Check parameters
-        if (empty($this->value) || !is_numeric($this->value)) $this->value=0;
+        if (empty($this->value) || !is_numeric($this->value)) $this->value = 0;
     }
 
     /**
@@ -303,11 +303,11 @@ 
     function listGlobalVariables()
     {
         $sql = "SELECT rowid, code, description, value";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " ORDER BY code";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " ORDER BY code";
 
         dol_syslog(get_class($this)."::listGlobalVariables");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $retarray = array();
@@ -315,12 +315,12 @@ 
             while ($record = $this->db->fetch_array($resql))
             {
                 $variable_obj = new PriceGlobalVariable($this->db);
-                $variable_obj->id			= $record["rowid"];
-                $variable_obj->code			= $record["code"];
-                $variable_obj->description	= $record["description"];
-                $variable_obj->value			= $record["value"];
+                $variable_obj->id = $record["rowid"];
+                $variable_obj->code = $record["code"];
+                $variable_obj->description = $record["description"];
+                $variable_obj->value = $record["value"];
                 $variable_obj->checkParameters();
-                $retarray[]=$variable_obj;
+                $retarray[] = $variable_obj;
             }
 
             $this->db->free($resql);
@@ -328,7 +328,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }

Braces +15 added lines, -15 removed lines

@@ -104,8 +104,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return $this->id;
@@ -138,13 +137,11 @@ 
                 $this->value		= $obj->value;
                 $this->checkParameters();
                 return 1;
-            }
-            else
+            } else
             {
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -201,8 +198,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -258,8 +254,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -288,11 +283,17 @@ 
     function checkParameters()
     {
         // Clean parameters
-        if (isset($this->code)) $this->code=trim($this->code);
-        if (isset($this->description)) $this->description=trim($this->description);
+        if (isset($this->code)) {
+        	$this->code=trim($this->code);
+        }
+        if (isset($this->description)) {
+        	$this->description=trim($this->description);
+        }
 
         // Check parameters
-        if (empty($this->value) || !is_numeric($this->value)) $this->value=0;
+        if (empty($this->value) || !is_numeric($this->value)) {
+        	$this->value=0;
+        }
     }
 
     /**
@@ -325,8 +326,7 @@ 
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;

htdocs/product/stock/class/entrepot.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -673,7 +673,7 @@
 	 * Return array of children warehouses ids from $id warehouse (recursive function)
 	 *
 	 * @param	int		$id					id parent warehouse
-	 * @param	array()	$TChildWarehouses	array which will contain all children (param by reference)
+	 * @param	integer[]	$TChildWarehouses	array which will contain all children (param by reference)
 	 * @return	array()	$TChildWarehouses	array which will contain all children
 	 */
 	function get_children_warehouses($id, &$TChildWarehouses) {

Indentation +85 added lines, -85 removed lines

@@ -160,7 +160,7 @@ 
 	 */
 	function update($id, $user)
 	{
-	    if (empty($id)) $id = $this->id;
+		if (empty($id)) $id = $this->id;
 
 		// Check if new parent is already a child of current warehouse
 		if(!empty($this->fk_parent))
@@ -227,10 +227,10 @@ 
 
 		if (! $error && empty($notrigger))
 		{
-            // Call trigger
-            $result=$this->call_trigger('WAREHOUSE_DELETE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('WAREHOUSE_DELETE',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		$elements = array('stock_mouvement','product_stock','product_warehouse_properties');
@@ -331,7 +331,7 @@ 
 				$this->country_id     = $obj->country_id;
 
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-	            $tmp=getCountry($this->country_id,'all');
+				$tmp=getCountry($this->country_id,'all');
 				$this->country=$tmp['label'];
 				$this->country_code=$tmp['code'];
 
@@ -394,7 +394,7 @@ 
 		}
 		else
 		{
-	        dol_print_error($this->db);
+			dol_print_error($this->db);
 		}
 	}
 
@@ -560,7 +560,7 @@ 
 	 *	@param		int		$withpicto		with pictogram
 	 *	@param		string	$option			Where the link point to
 	 *  @param      int     $showfullpath   0=Show ref only. 1=Show full path instead of Ref (this->fk_parent must be defined)
-     *  @param	    int   	$notooltip		1=Disable tooltip
+	 *  @param	    int   	$notooltip		1=Disable tooltip
 	 *	@return		string					String with URL
 	 */
 	function getNomUrl($withpicto=0, $option='',$showfullpath=0, $notooltip=0)
@@ -568,66 +568,66 @@ 
 		global $conf, $langs;
 		$langs->load("stocks");
 
-        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 = '';
+		$result='';
+		$label = '';
 
-        $label = '<u>' . $langs->trans("ShowWarehouse").'</u>';
-        $label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . (empty($this->label)?$this->libelle:$this->label);
-        if (! empty($this->lieu))
-            $label.= '<br><b>' . $langs->trans('LocationSummary').':</b> '.$this->lieu;
+		$label = '<u>' . $langs->trans("ShowWarehouse").'</u>';
+		$label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . (empty($this->label)?$this->libelle:$this->label);
+		if (! empty($this->lieu))
+			$label.= '<br><b>' . $langs->trans('LocationSummary').':</b> '.$this->lieu;
 
-        $url = DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id;
 
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowWarehouse");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
-        }
+		$linkclose='';
+		if (empty($notooltip))
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowWarehouse");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
+		}
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
 
-        if ($withpicto) $result.=($link.img_object(($notooltip?'':$label), 'stock', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
+		if ($withpicto) $result.=($link.img_object(($notooltip?'':$label), 'stock', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
 		$result.=$linkstart.($showfullpath ? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label)).$linkend;
 		return $result;
 	}
 
 	/**
-     *  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
-     */
-    function initAsSpecimen()
-    {
-        global $user,$langs,$conf,$mysoc;
-
-        $now=dol_now();
-
-        // Initialize parameters
-        $this->id=0;
-        $this->libelle = 'WAREHOUSE SPECIMEN';
-        $this->description = 'WAREHOUSE SPECIMEN '.dol_print_date($now,'dayhourlog');
+	 *  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
+	 */
+	function initAsSpecimen()
+	{
+		global $user,$langs,$conf,$mysoc;
+
+		$now=dol_now();
+
+		// Initialize parameters
+		$this->id=0;
+		$this->libelle = 'WAREHOUSE SPECIMEN';
+		$this->description = 'WAREHOUSE SPECIMEN '.dol_print_date($now,'dayhourlog');
 		$this->statut=1;
-        $this->specimen=1;
+		$this->specimen=1;
 
 		$this->lieu='Location test';
-        $this->address='21 jump street';
-        $this->zip='99999';
-        $this->town='MyTown';
-        $this->country_id=1;
-        $this->country_code='FR';
-    }
+		$this->address='21 jump street';
+		$this->zip='99999';
+		$this->town='MyTown';
+		$this->country_id=1;
+		$this->country_code='FR';
+	}
 
 	/**
 	 *	Return full path to current warehouse
@@ -636,37 +636,37 @@ 
 	 */
 	function get_full_arbo()
 	{
-        global $user,$langs,$conf;
-
-        $TArbo = array(empty($this->label)?$this->libelle:$this->label);
-
-        $protection=100; // We limit depth of warehouses to 100
-
-        $warehousetmp = new Entrepot($this->db);
-
-        $parentid = $this->fk_parent;       // If parent_id not defined on current object, we do not start consecutive searches of parents
-        $i=0;
-        while ($parentid > 0 && $i < $protection)
-        {
-            $sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid = '.$parentid;
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $objarbo = $this->db->fetch_object($resql);
-                if ($objarbo)
-                {
-                	$warehousetmp->fetch($parentid);
-                	$TArbo[] = $warehousetmp->label;
-                 	$parentid = $objarbo->fk_parent;
-                }
-                else break;
-            }
-            else dol_print_error($this->db);
-
-            $i++;
-        }
-
-        return implode(' >> ', array_reverse($TArbo));
+		global $user,$langs,$conf;
+
+		$TArbo = array(empty($this->label)?$this->libelle:$this->label);
+
+		$protection=100; // We limit depth of warehouses to 100
+
+		$warehousetmp = new Entrepot($this->db);
+
+		$parentid = $this->fk_parent;       // If parent_id not defined on current object, we do not start consecutive searches of parents
+		$i=0;
+		while ($parentid > 0 && $i < $protection)
+		{
+			$sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid = '.$parentid;
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$objarbo = $this->db->fetch_object($resql);
+				if ($objarbo)
+				{
+					$warehousetmp->fetch($parentid);
+					$TArbo[] = $warehousetmp->label;
+				 	$parentid = $objarbo->fk_parent;
+				}
+				else break;
+			}
+			else dol_print_error($this->db);
+
+			$i++;
+		}
+
+		return implode(' >> ', array_reverse($TArbo));
 	}
 
 	/**

Spacing +117 added lines, -117 removed lines

@@ -33,9 +33,9 @@ 
  */
 class Entrepot extends CommonObject
 {
-	public $element='stock';
-	public $table_element='entrepot';
-	public $picto='stock';
+	public $element = 'stock';
+	public $table_element = 'entrepot';
+	public $picto = 'stock';
 
 	/**
 	 * Warehouse closed, inactive
@@ -107,7 +107,7 @@ 
 			return 0;
 		}
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
@@ -115,7 +115,7 @@ 
 		$sql .= " VALUES (".$conf->entity.",'".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->libelle)."', ".($this->fk_parent > 0 ? $this->fk_parent : "NULL").")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."entrepot");
@@ -136,14 +136,14 @@ 
 				}
 			}
 			else {
-				$this->error="Failed to get insert id";
+				$this->error = "Failed to get insert id";
 				dol_syslog(get_class($this)."::create return -2");
 				return -2;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::create Error ".$this->db->error());
 			$this->db->rollback();
 			return -1;
@@ -163,43 +163,43 @@ 
 	    if (empty($id)) $id = $this->id;
 
 		// Check if new parent is already a child of current warehouse
-		if(!empty($this->fk_parent))
+		if (!empty($this->fk_parent))
 		{
 			$TChildWarehouses = array($id);
 			$TChildWarehouses = $this->get_children_warehouses($this->id, $TChildWarehouses);
-			if(in_array($this->fk_parent, $TChildWarehouses))
+			if (in_array($this->fk_parent, $TChildWarehouses))
 			{
 				$this->error = 'ErrorCannotAddThisParentWarehouse';
 				return -2;
 			}
 		}
 
-		$this->libelle=trim($this->libelle);
-		$this->description=trim($this->description);
+		$this->libelle = trim($this->libelle);
+		$this->description = trim($this->description);
 
-		$this->lieu=trim($this->lieu);
+		$this->lieu = trim($this->lieu);
 
-		$this->address=trim($this->address);
-		$this->zip=trim($this->zip);
-		$this->town=trim($this->town);
-		$this->country_id=($this->country_id > 0 ? $this->country_id : 0);
+		$this->address = trim($this->address);
+		$this->zip = trim($this->zip);
+		$this->town = trim($this->town);
+		$this->country_id = ($this->country_id > 0 ? $this->country_id : 0);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."entrepot ";
-		$sql .= " SET label = '" . $this->db->escape($this->libelle) ."'";
-		$sql .= ", fk_parent = " . (($this->fk_parent > 0) ? $this->fk_parent : "NULL");
-		$sql .= ", description = '" . $this->db->escape($this->description) ."'";
-		$sql .= ", statut = " . $this->statut;
-		$sql .= ", lieu = '" . $this->db->escape($this->lieu) ."'";
-		$sql .= ", address = '" . $this->db->escape($this->address) ."'";
-		$sql .= ", zip = '" . $this->db->escape($this->zip) ."'";
-		$sql .= ", town = '" . $this->db->escape($this->town) ."'";
-		$sql .= ", fk_pays = " . $this->country_id;
-		$sql .= " WHERE rowid = " . $id;
+		$sql .= " SET label = '".$this->db->escape($this->libelle)."'";
+		$sql .= ", fk_parent = ".(($this->fk_parent > 0) ? $this->fk_parent : "NULL");
+		$sql .= ", description = '".$this->db->escape($this->description)."'";
+		$sql .= ", statut = ".$this->statut;
+		$sql .= ", lieu = '".$this->db->escape($this->lieu)."'";
+		$sql .= ", address = '".$this->db->escape($this->address)."'";
+		$sql .= ", zip = '".$this->db->escape($this->zip)."'";
+		$sql .= ", town = '".$this->db->escape($this->town)."'";
+		$sql .= ", fk_pays = ".$this->country_id;
+		$sql .= " WHERE rowid = ".$id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->db->commit();
@@ -208,7 +208,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -221,28 +221,28 @@ 
 	 *  @param      int     $notrigger     1=No trigger
 	 *	@return		int					   <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		$this->db->begin();
 
-		if (! $error && empty($notrigger))
+		if (!$error && empty($notrigger))
 		{
             // Call trigger
-            $result=$this->call_trigger('WAREHOUSE_DELETE',$user);
+            $result = $this->call_trigger('WAREHOUSE_DELETE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
 		}
 
-		$elements = array('stock_mouvement','product_stock','product_warehouse_properties');
-		foreach($elements as $table)
+		$elements = array('stock_mouvement', 'product_stock', 'product_warehouse_properties');
+		foreach ($elements as $table)
 		{
-			if (! $error)
+			if (!$error)
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
-				$sql.= " WHERE fk_entrepot = " . $this->id;
+				$sql .= " WHERE fk_entrepot = ".$this->id;
 				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-				$result=$this->db->query($sql);
-				if (! $result)
+				$result = $this->db->query($sql);
+				if (!$result)
 				{
 					$error++;
 					$this->errors[] = $this->db->lasterror();
@@ -250,19 +250,19 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."entrepot";
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-			$resql1=$this->db->query($sql);
+			$resql1 = $this->db->query($sql);
 
 			// Update denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET stock = (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-			$resql2=$this->db->query($sql);
+			$resql2 = $this->db->query($sql);
 
 			if ($resql1 && $resql2)
 			{
@@ -272,14 +272,14 @@ 
 			else
 			{
 				$this->db->rollback();
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -2;
 			}
 		}
 		else
 		{
 			$this->db->rollback();
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 
@@ -293,7 +293,7 @@ 
 	 *	@param		string	$ref	Warehouse label
 	 *	@return		int				>0 if OK, <0 if KO
 	 */
-	function fetch($id, $ref='')
+	function fetch($id, $ref = '')
 	{
 		global $conf;
 
@@ -301,12 +301,12 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot";
 		if ($id)
 		{
-			$sql.= " WHERE rowid = '".$id."'";
+			$sql .= " WHERE rowid = '".$id."'";
 		}
 		else
 		{
-			$sql.= " WHERE entity = " .$conf->entity;
-			if ($ref) $sql.= " AND label = '".$this->db->escape($ref)."'";
+			$sql .= " WHERE entity = ".$conf->entity;
+			if ($ref) $sql .= " AND label = '".$this->db->escape($ref)."'";
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -315,13 +315,13 @@ 
 		{
 			if ($this->db->num_rows($result) > 0)
 			{
-				$obj=$this->db->fetch_object($result);
+				$obj = $this->db->fetch_object($result);
 
 				$this->id             = $obj->rowid;
 				$this->fk_parent      = $obj->fk_parent;
 				$this->ref            = $obj->rowid;
 				$this->label          = $obj->label;
-				$this->libelle        = $obj->label;            // deprecated
+				$this->libelle        = $obj->label; // deprecated
 				$this->description    = $obj->description;
 				$this->statut         = $obj->statut;
 				$this->lieu           = $obj->lieu;
@@ -331,9 +331,9 @@ 
 				$this->country_id     = $obj->country_id;
 
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-	            $tmp=getCountry($this->country_id,'all');
-				$this->country=$tmp['label'];
-				$this->country_code=$tmp['code'];
+	            $tmp = getCountry($this->country_id, 'all');
+				$this->country = $tmp['label'];
+				$this->country_code = $tmp['code'];
 
 				return 1;
 			}
@@ -344,7 +344,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -359,11 +359,11 @@ 
 	function info($id)
 	{
 		$sql = "SELECT e.rowid, e.datec, e.tms as datem, e.fk_user_author";
-		$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
-		$sql.= " WHERE e.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
+		$sql .= " WHERE e.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::info", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -375,7 +375,7 @@ 
 				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation     = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_valid) {
@@ -405,19 +405,19 @@ 
 	 *	@param	int		$status		Status
 	 * 	@return array				Array list of warehouses
 	 */
-	function list_array($status=1)
+	function list_array($status = 1)
 	{
 		$liste = array();
 
 		$sql = "SELECT rowid, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."entrepot";
-		$sql.= " WHERE entity IN (".getEntity('stock').")";
-		$sql.= " AND statut = ".$status;
+		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot";
+		$sql .= " WHERE entity IN (".getEntity('stock').")";
+		$sql .= " AND statut = ".$status;
 
 		$result = $this->db->query($sql);
 		$i = 0;
 		$num = $this->db->num_rows($result);
-		if ( $result )
+		if ($result)
 		{
 			while ($i < $num)
 			{
@@ -437,25 +437,25 @@ 
 	 */
 	function nb_different_products()
 	{
-		$ret=array();
+		$ret = array();
 
 		$sql = "SELECT count(distinct p.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-		$sql.= ", ".MAIN_DB_PREFIX."product as p";
-		$sql.= " WHERE ps.fk_entrepot = ".$this->id;
-		$sql.= " AND ps.fk_product = p.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+		$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		$sql .= " WHERE ps.fk_entrepot = ".$this->id;
+		$sql .= " AND ps.fk_product = p.rowid";
 
 		//print $sql;
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$obj = $this->db->fetch_object($result);
-			$ret['nb']=$obj->nb;
+			$ret['nb'] = $obj->nb;
 			$this->db->free($result);
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 
@@ -469,26 +469,26 @@ 
 	 */
 	function nb_products()
 	{
-		$ret=array();
+		$ret = array();
 
 		$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-		$sql.= ", ".MAIN_DB_PREFIX."product as p";
-		$sql.= " WHERE ps.fk_entrepot = ".$this->id;
-		$sql.= " AND ps.fk_product = p.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+		$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		$sql .= " WHERE ps.fk_entrepot = ".$this->id;
+		$sql .= " AND ps.fk_product = p.rowid";
 
 		//print $sql;
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$obj = $this->db->fetch_object($result);
-			$ret['nb']=$obj->nb;
-			$ret['value']=$obj->value;
+			$ret['nb'] = $obj->nb;
+			$ret['value'] = $obj->value;
 			$this->db->free($result);
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 
@@ -501,9 +501,9 @@ 
 	 *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *	@return     string      		Label of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	/**
@@ -513,7 +513,7 @@ 
 	 *	@param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *	@return string      		Label of status
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
 		global $langs;
 
@@ -563,41 +563,41 @@ 
      *  @param	    int   	$notooltip		1=Disable tooltip
 	 *	@return		string					String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='',$showfullpath=0, $notooltip=0)
+	function getNomUrl($withpicto = 0, $option = '', $showfullpath = 0, $notooltip = 0)
 	{
 		global $conf, $langs;
 		$langs->load("stocks");
 
-        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='';
+        $result = '';
         $label = '';
 
-        $label = '<u>' . $langs->trans("ShowWarehouse").'</u>';
-        $label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . (empty($this->label)?$this->libelle:$this->label);
-        if (! empty($this->lieu))
-            $label.= '<br><b>' . $langs->trans('LocationSummary').':</b> '.$this->lieu;
+        $label = '<u>'.$langs->trans("ShowWarehouse").'</u>';
+        $label .= '<br><b>'.$langs->trans('Ref').':</b> '.(empty($this->label) ? $this->libelle : $this->label);
+        if (!empty($this->lieu))
+            $label .= '<br><b>'.$langs->trans('LocationSummary').':</b> '.$this->lieu;
 
         $url = DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id;
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowWarehouse");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowWarehouse");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip"';
         }
 
         $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
-        if ($withpicto) $result.=($link.img_object(($notooltip?'':$label), 'stock', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
-		$result.=$linkstart.($showfullpath ? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label)).$linkend;
+        if ($withpicto) $result .= ($link.img_object(($notooltip ? '' : $label), 'stock', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend.' ');
+		$result .= $linkstart.($showfullpath ? $this->get_full_arbo() : (empty($this->label) ? $this->libelle : $this->label)).$linkend;
 		return $result;
 	}
 
@@ -610,23 +610,23 @@ 
      */
     function initAsSpecimen()
     {
-        global $user,$langs,$conf,$mysoc;
+        global $user, $langs, $conf, $mysoc;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Initialize parameters
-        $this->id=0;
+        $this->id = 0;
         $this->libelle = 'WAREHOUSE SPECIMEN';
-        $this->description = 'WAREHOUSE SPECIMEN '.dol_print_date($now,'dayhourlog');
-		$this->statut=1;
-        $this->specimen=1;
-
-		$this->lieu='Location test';
-        $this->address='21 jump street';
-        $this->zip='99999';
-        $this->town='MyTown';
-        $this->country_id=1;
-        $this->country_code='FR';
+        $this->description = 'WAREHOUSE SPECIMEN '.dol_print_date($now, 'dayhourlog');
+		$this->statut = 1;
+        $this->specimen = 1;
+
+		$this->lieu = 'Location test';
+        $this->address = '21 jump street';
+        $this->zip = '99999';
+        $this->town = 'MyTown';
+        $this->country_id = 1;
+        $this->country_code = 'FR';
     }
 
 	/**
@@ -636,16 +636,16 @@ 
 	 */
 	function get_full_arbo()
 	{
-        global $user,$langs,$conf;
+        global $user, $langs, $conf;
 
-        $TArbo = array(empty($this->label)?$this->libelle:$this->label);
+        $TArbo = array(empty($this->label) ? $this->libelle : $this->label);
 
-        $protection=100; // We limit depth of warehouses to 100
+        $protection = 100; // We limit depth of warehouses to 100
 
         $warehousetmp = new Entrepot($this->db);
 
-        $parentid = $this->fk_parent;       // If parent_id not defined on current object, we do not start consecutive searches of parents
-        $i=0;
+        $parentid = $this->fk_parent; // If parent_id not defined on current object, we do not start consecutive searches of parents
+        $i = 0;
         while ($parentid > 0 && $i < $protection)
         {
             $sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid = '.$parentid;
@@ -683,8 +683,8 @@ 
 				WHERE fk_parent = '.$id;
 
 		$resql = $this->db->query($sql);
-		if($resql) {
-			while($res = $this->db->fetch_object($resql)) {
+		if ($resql) {
+			while ($res = $this->db->fetch_object($resql)) {
 				$TChildWarehouses[] = $res->rowid;
 				$this->get_children_warehouses($res->rowid, $TChildWarehouses);
 			}

Braces +45 added lines, -38 removed lines

@@ -80,8 +80,7 @@ 
 		{
 			$this->statuts[self::STATUS_OPEN_ALL] = 'OpenAll';
 			$this->statuts[self::STATUS_OPEN_INTERNAL] = 'OpenInternal';
-		}
-		else
+		} else
 		{
 			$this->statuts[self::STATUS_OPEN_ALL] = 'Opened';
 		}
@@ -127,21 +126,18 @@ 
 				{
 					$this->db->commit();
 					return $id;
-				}
-				else
+				} else
 				{
 					dol_syslog(get_class($this)."::create return -3");
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				$this->error="Failed to get insert id";
 				dol_syslog(get_class($this)."::create return -2");
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			dol_syslog(get_class($this)."::create Error ".$this->db->error());
@@ -160,7 +156,9 @@ 
 	 */
 	function update($id, $user)
 	{
-	    if (empty($id)) $id = $this->id;
+	    if (empty($id)) {
+	    	$id = $this->id;
+	    }
 
 		// Check if new parent is already a child of current warehouse
 		if(!empty($this->fk_parent))
@@ -204,8 +202,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			$this->error=$this->db->lasterror();
@@ -268,15 +265,13 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				$this->error=$this->db->lasterror();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			$this->error=$this->db->lasterror();
@@ -302,11 +297,12 @@ 
 		if ($id)
 		{
 			$sql.= " WHERE rowid = '".$id."'";
-		}
-		else
+		} else
 		{
 			$sql.= " WHERE entity = " .$conf->entity;
-			if ($ref) $sql.= " AND label = '".$this->db->escape($ref)."'";
+			if ($ref) {
+				$sql.= " AND label = '".$this->db->escape($ref)."'";
+			}
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -336,13 +332,11 @@ 
 				$this->country_code=$tmp['code'];
 
 				return 1;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -391,8 +385,7 @@ 
 
 			$this->db->free($result);
 
-		}
-		else
+		} else
 		{
 	        dol_print_error($this->db);
 		}
@@ -452,8 +445,7 @@ 
 			$obj = $this->db->fetch_object($result);
 			$ret['nb']=$obj->nb;
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -485,8 +477,7 @@ 
 			$ret['nb']=$obj->nb;
 			$ret['value']=$obj->value;
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -533,22 +524,30 @@ 
 		}
 		if ($mode == 2)
 		{
-			if ($statut > 0) $picto = 'statut4';
+			if ($statut > 0) {
+				$picto = 'statut4';
+			}
 			return img_picto($label, $picto).' '.$label;
 		}
 		if ($mode == 3)
 		{
-			if ($statut > 0) $picto = 'statut4';
+			if ($statut > 0) {
+				$picto = 'statut4';
+			}
 			return img_picto($label, $picto).' '.$label;
 		}
 		if ($mode == 4)
 		{
-			if ($statut > 0) $picto = 'statut4';
+			if ($statut > 0) {
+				$picto = 'statut4';
+			}
 			return img_picto($label, $picto).' '.$label;
 		}
 		if ($mode == 5)
 		{
-			if ($statut > 0) $picto = 'statut4';
+			if ($statut > 0) {
+				$picto = 'statut4';
+			}
 			return $label.' '.img_picto($label, $picto);
 		}
 	}
@@ -568,15 +567,19 @@ 
 		global $conf, $langs;
 		$langs->load("stocks");
 
-        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 = '';
 
         $label = '<u>' . $langs->trans("ShowWarehouse").'</u>';
         $label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . (empty($this->label)?$this->libelle:$this->label);
-        if (! empty($this->lieu))
-            $label.= '<br><b>' . $langs->trans('LocationSummary').':</b> '.$this->lieu;
+        if (! empty($this->lieu)) {
+                    $label.= '<br><b>' . $langs->trans('LocationSummary').':</b> '.$this->lieu;
+        }
 
         $url = DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id;
 
@@ -596,7 +599,9 @@ 
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($link.img_object(($notooltip?'':$label), 'stock', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
+        if ($withpicto) {
+        	$result.=($link.img_object(($notooltip?'':$label), 'stock', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
+        }
 		$result.=$linkstart.($showfullpath ? $this->get_full_arbo() : (empty($this->label)?$this->libelle:$this->label)).$linkend;
 		return $result;
 	}
@@ -658,10 +663,12 @@ 
                 	$warehousetmp->fetch($parentid);
                 	$TArbo[] = $warehousetmp->label;
                  	$parentid = $objarbo->fk_parent;
+                } else {
+                	break;
                 }
-                else break;
+            } else {
+            	dol_print_error($this->db);
             }
-            else dol_print_error($this->db);
 
             $i++;
         }

htdocs/projet/class/task.class.php

Doc Comments +5 added lines, -5 removed lines

@@ -650,16 +650,16 @@
      * Return list of tasks for all projects or for one particular project
      * Sort order is on project, then on position of task, and last on start date of first level task
      *
-     * @param	User	$usert				Object user to limit tasks affected to a particular user
-     * @param	User	$userp				Object user to limit projects of a particular user and public projects
+     * @param	integer	$usert				Object user to limit tasks affected to a particular user
+     * @param	integer	$userp				Object user to limit projects of a particular user and public projects
      * @param	int		$projectid			Project id
      * @param	int		$socid				Third party id
      * @param	int		$mode				0=Return list of tasks and their projects, 1=Return projects and tasks if exists
      * @param	string	$filteronprojref	Filter on project ref
-     * @param	string	$filteronprojstatus	Filter on project status
+     * @param	integer	$filteronprojstatus	Filter on project status
      * @param	string	$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
-     * @param	string	$filteronprojuser	Filter on user that is a contact of project
-     * @param	string	$filterontaskuser	Filter on user assigned to task
+     * @param	integer	$filteronprojuser	Filter on user that is a contact of project
+     * @param	integer	$filterontaskuser	Filter on user assigned to task
      * @return 	array						Array of tasks
      */
     function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $filteronprojref='', $filteronprojstatus=-1, $morewherefilter='',$filteronprojuser=0,$filterontaskuser=0)

Indentation +1332 added lines, -1332 removed lines

@@ -31,25 +31,25 @@ 
  */
 class Task extends CommonObject
 {
-    public $element='project_task';		//!< Id that identify managed objects
-    public $table_element='projet_task';	//!< Name of table without prefix where object is stored
-    public $fk_element='fk_task';
-    public $picto = 'task';
-    protected $childtables=array('projet_task_time','projet_task_comment');    // To test if we can delete object
-
-    var $fk_task_parent;
-    var $label;
-    var $description;
-    var $duration_effective;		// total of time spent on this task
-    var $planned_workload;
-    var $date_c;
-    var $date_start;
-    var $date_end;
-    var $progress;
-    var $fk_statut;
-    var $priority;
-    var $fk_user_creat;
-    var $fk_user_valid;
+	public $element='project_task';		//!< Id that identify managed objects
+	public $table_element='projet_task';	//!< Name of table without prefix where object is stored
+	public $fk_element='fk_task';
+	public $picto = 'task';
+	protected $childtables=array('projet_task_time','projet_task_comment');    // To test if we can delete object
+
+	var $fk_task_parent;
+	var $label;
+	var $description;
+	var $duration_effective;		// total of time spent on this task
+	var $planned_workload;
+	var $date_c;
+	var $date_start;
+	var $date_end;
+	var $progress;
+	var $fk_statut;
+	var $priority;
+	var $fk_user_creat;
+	var $fk_user_valid;
 	var $rang;
 
 	var $timespent_min_date;
@@ -61,1294 +61,1294 @@ 
 	// For detail of lines of timespent record, there is the property ->lines in common
 
 	// Var used to call method addTimeSpent(). Bad practice.
-    var $timespent_id;
-    var $timespent_duration;
-    var $timespent_old_duration;
-    var $timespent_date;
-    var $timespent_datehour;		// More accurate start date (same than timespent_date but includes hours, minutes and seconds)
-    var $timespent_withhour;		// 1 = we entered also start hours for timesheet line
-    var $timespent_fk_user;
-    var $timespent_note;
-
-    var $comments = array();
-
-    public $oldcopy;
-
-
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-    }
-
-
-    /**
-     *  Create into database
-     *
-     *  @param	User	$user        	User that create
-     *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return int 		        	<0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-        global $conf, $langs;
-
-        $error=0;
-
-        // Clean parameters
-        $this->label = trim($this->label);
-        $this->description = trim($this->description);
-
-        // Check parameters
-        // Put here code to add control on parameters values
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task (";
-        $sql.= "fk_projet";
+	var $timespent_id;
+	var $timespent_duration;
+	var $timespent_old_duration;
+	var $timespent_date;
+	var $timespent_datehour;		// More accurate start date (same than timespent_date but includes hours, minutes and seconds)
+	var $timespent_withhour;		// 1 = we entered also start hours for timesheet line
+	var $timespent_fk_user;
+	var $timespent_note;
+
+	var $comments = array();
+
+	public $oldcopy;
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+
+	/**
+	 *  Create into database
+	 *
+	 *  @param	User	$user        	User that create
+	 *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int 		        	<0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf, $langs;
+
+		$error=0;
+
+		// Clean parameters
+		$this->label = trim($this->label);
+		$this->description = trim($this->description);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task (";
+		$sql.= "fk_projet";
 		$sql.= ", ref";
-        $sql.= ", fk_task_parent";
-        $sql.= ", label";
-        $sql.= ", description";
-        $sql.= ", datec";
-        $sql.= ", fk_user_creat";
-        $sql.= ", dateo";
-        $sql.= ", datee";
-        $sql.= ", planned_workload";
-        $sql.= ", progress";
-        $sql.= ") VALUES (";
-        $sql.= $this->fk_project;
+		$sql.= ", fk_task_parent";
+		$sql.= ", label";
+		$sql.= ", description";
+		$sql.= ", datec";
+		$sql.= ", fk_user_creat";
+		$sql.= ", dateo";
+		$sql.= ", datee";
+		$sql.= ", planned_workload";
+		$sql.= ", progress";
+		$sql.= ") VALUES (";
+		$sql.= $this->fk_project;
 		$sql.= ", ".(!empty($this->ref)?"'".$this->db->escape($this->ref)."'":'null');
-        $sql.= ", ".$this->fk_task_parent;
-        $sql.= ", '".$this->db->escape($this->label)."'";
-        $sql.= ", '".$this->db->escape($this->description)."'";
-        $sql.= ", '".$this->db->idate($this->date_c)."'";
-        $sql.= ", ".$user->id;
-        $sql.= ", ".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null');
-        $sql.= ", ".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null');
-        $sql.= ", ".(($this->planned_workload!='' && $this->planned_workload >= 0)?$this->planned_workload:'null');
-        $sql.= ", ".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null');
-        $sql.= ")";
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task");
-
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('TASK_CREATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-
-        // Update extrafield
-        if (! $error)
-        {
-        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-        	{
-        		$result=$this->insertExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        		}
-        	}
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
-
-
-    /**
-     *  Load object in memory from database
-     *
-     *  @param	int		$id			Id object
-     *  @param	int		$ref		ref object
-     *  @return int 		        <0 if KO, 0 if not found, >0 if OK
-     */
-    function fetch($id,$ref='')
-    {
-        global $langs;
-
-        $sql = "SELECT";
-        $sql.= " t.rowid,";
+		$sql.= ", ".$this->fk_task_parent;
+		$sql.= ", '".$this->db->escape($this->label)."'";
+		$sql.= ", '".$this->db->escape($this->description)."'";
+		$sql.= ", '".$this->db->idate($this->date_c)."'";
+		$sql.= ", ".$user->id;
+		$sql.= ", ".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null');
+		$sql.= ", ".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null');
+		$sql.= ", ".(($this->planned_workload!='' && $this->planned_workload >= 0)?$this->planned_workload:'null');
+		$sql.= ", ".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null');
+		$sql.= ")";
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task");
+
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('TASK_CREATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+
+		// Update extrafield
+		if (! $error)
+		{
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id			Id object
+	 *  @param	int		$ref		ref object
+	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
+	 */
+	function fetch($id,$ref='')
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
 		$sql.= " t.ref,";
-        $sql.= " t.fk_projet,";
-        $sql.= " t.fk_task_parent,";
-        $sql.= " t.label,";
-        $sql.= " t.description,";
-        $sql.= " t.duration_effective,";
-        $sql.= " t.planned_workload,";
-        $sql.= " t.datec,";
-        $sql.= " t.dateo,";
-        $sql.= " t.datee,";
-        $sql.= " t.fk_user_creat,";
-        $sql.= " t.fk_user_valid,";
-        $sql.= " t.fk_statut,";
-        $sql.= " t.progress,";
-        $sql.= " t.priority,";
-        $sql.= " t.note_private,";
+		$sql.= " t.fk_projet,";
+		$sql.= " t.fk_task_parent,";
+		$sql.= " t.label,";
+		$sql.= " t.description,";
+		$sql.= " t.duration_effective,";
+		$sql.= " t.planned_workload,";
+		$sql.= " t.datec,";
+		$sql.= " t.dateo,";
+		$sql.= " t.datee,";
+		$sql.= " t.fk_user_creat,";
+		$sql.= " t.fk_user_valid,";
+		$sql.= " t.fk_statut,";
+		$sql.= " t.progress,";
+		$sql.= " t.priority,";
+		$sql.= " t.note_private,";
 		$sql.= " t.note_public,";
 		$sql.= " t.rang";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as t";
-        $sql.= " WHERE ";
-        if (!empty($ref)) {
-        	$sql.="t.ref = '".$this->db->escape($ref)."'";
-        }else {
-        	$sql.="t.rowid = ".$id;
-        }
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $num_rows = $this->db->num_rows($resql);
-
-            if ($num_rows)
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id					= $obj->rowid;
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as t";
+		$sql.= " WHERE ";
+		if (!empty($ref)) {
+			$sql.="t.ref = '".$this->db->escape($ref)."'";
+		}else {
+			$sql.="t.rowid = ".$id;
+		}
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num_rows = $this->db->num_rows($resql);
+
+			if ($num_rows)
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id					= $obj->rowid;
 				$this->ref					= $obj->ref;
-                $this->fk_project			= $obj->fk_projet;
-                $this->fk_task_parent		= $obj->fk_task_parent;
-                $this->label				= $obj->label;
-                $this->description			= $obj->description;
-                $this->duration_effective	= $obj->duration_effective;
-                $this->planned_workload		= $obj->planned_workload;
-                $this->date_c				= $this->db->jdate($obj->datec);
-                $this->date_start			= $this->db->jdate($obj->dateo);
-                $this->date_end				= $this->db->jdate($obj->datee);
-                $this->fk_user_creat		= $obj->fk_user_creat;
-                $this->fk_user_valid		= $obj->fk_user_valid;
-                $this->fk_statut			= $obj->fk_statut;
-                $this->progress				= $obj->progress;
-                $this->priority				= $obj->priority;
-                $this->note_private			= $obj->note_private;
-                $this->note_public			= $obj->note_public;
+				$this->fk_project			= $obj->fk_projet;
+				$this->fk_task_parent		= $obj->fk_task_parent;
+				$this->label				= $obj->label;
+				$this->description			= $obj->description;
+				$this->duration_effective	= $obj->duration_effective;
+				$this->planned_workload		= $obj->planned_workload;
+				$this->date_c				= $this->db->jdate($obj->datec);
+				$this->date_start			= $this->db->jdate($obj->dateo);
+				$this->date_end				= $this->db->jdate($obj->datee);
+				$this->fk_user_creat		= $obj->fk_user_creat;
+				$this->fk_user_valid		= $obj->fk_user_valid;
+				$this->fk_statut			= $obj->fk_statut;
+				$this->progress				= $obj->progress;
+				$this->priority				= $obj->priority;
+				$this->note_private			= $obj->note_private;
+				$this->note_public			= $obj->note_public;
 				$this->rang					= $obj->rang;
 
-                // Retreive all extrafield for thirdparty
-               	$this->fetch_optionals();
-            }
-
-            $this->db->free($resql);
-
-            if ($num_rows) {
-            	$this->fetchComments();
-            	return 1;
-            }else {
-            	return 0;
-            }
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Update database
-     *
-     *  @param	User	$user        	User that modify
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return int			         	<=0 if KO, >0 if OK
-     */
-    function update($user=null, $notrigger=0)
-    {
-        global $conf, $langs;
-        $error=0;
-
-        // Clean parameters
-        if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-        if (isset($this->fk_task_parent)) $this->fk_task_parent=trim($this->fk_task_parent);
-        if (isset($this->label)) $this->label=trim($this->label);
-        if (isset($this->description)) $this->description=trim($this->description);
-        if (isset($this->duration_effective)) $this->duration_effective=trim($this->duration_effective);
-        if (isset($this->planned_workload)) $this->planned_workload=trim($this->planned_workload);
-
-        // Check parameters
-        // Put here code to add control on parameters values
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
-        $sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"'".$this->db->escape($this->id)."'").",";
-        $sql.= " fk_task_parent=".(isset($this->fk_task_parent)?$this->fk_task_parent:"null").",";
-        $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
-        $sql.= " duration_effective=".(isset($this->duration_effective)?$this->duration_effective:"null").",";
-        $sql.= " planned_workload=".((isset($this->planned_workload) && $this->planned_workload != '')?$this->planned_workload:"null").",";
-        $sql.= " dateo=".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null').",";
-        $sql.= " datee=".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null').",";
-        $sql.= " progress=".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null').",";
-        $sql.= " rang=".((!empty($this->rang))?$this->rang:"0");
-        $sql.= " WHERE rowid=".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('TASK_MODIFY',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-
-        //Update extrafield
-        if (!$error) {
-        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-        	{
-        		$result=$this->insertExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        		}
-        	}
-        }
-
-        if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
-        {
-            // We remove directory
-            if ($conf->projet->dir_output)
-            {
-                $project = new Project($this->db);
-                $project->fetch($this->fk_project);
-
-                $olddir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->oldcopy->ref);
-                $newdir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->ref);
-                if (file_exists($olddir))
-                {
-                    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-                    $res=dol_move($olddir, $newdir);
-                    if (! $res)
-                    {
-                        $langs->load("errors");
-                        $this->error=$langs->trans('ErrorFailToRenameDir',$olddir,$newdir);
-                        $error++;
-                    }
-                }
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-
-    /**
-     *	Delete task from database
-     *
-     *	@param	User	$user        	User that delete
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    function delete($user, $notrigger=0)
-    {
-
-        global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-        $error=0;
-
-        $this->db->begin();
-
-        if ($this->hasChildren() > 0)
-        {
-            dol_syslog(get_class($this)."::delete Can't delete record as it has some sub tasks", LOG_WARNING);
-            $this->error='ErrorRecordHasSubTasks';
-            $this->db->rollback();
-            return 0;
-        }
-
-        $objectisused = $this->isObjectUsed($this->id);
-        if (! empty($objectisused))
-        {
-            dol_syslog(get_class($this)."::delete Can't delete record as it has some child", LOG_WARNING);
-            $this->error='ErrorRecordHasChildren';
-            $this->db->rollback();
-            return 0;
-        }
-
-        if (! $error)
-        {
-            // Delete linked contacts
-            $res = $this->delete_linked_contact();
-            if ($res < 0)
-            {
-                $this->error='ErrorFailToDeleteLinkedContact';
-                //$error++;
-                $this->db->rollback();
-                return 0;
-            }
-        }
-
-        if (! $error)
-        {
-	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
-	        $sql.= " WHERE fk_task=".$this->id;
-
-	        $resql = $this->db->query($sql);
-	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        }
-
-        if (! $error)
-        {
-	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields";
-	        $sql.= " WHERE fk_object=".$this->id;
-
-	        $resql = $this->db->query($sql);
-	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        }
-
-        if (! $error)
-        {
-	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
-	        $sql.= " WHERE rowid=".$this->id;
-
-	        $resql = $this->db->query($sql);
-	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        }
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('TASK_DELETE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
+				// Retreive all extrafield for thirdparty
+			   	$this->fetch_optionals();
+			}
+
+			$this->db->free($resql);
+
+			if ($num_rows) {
+				$this->fetchComments();
+				return 1;
+			}else {
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update database
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int			         	<=0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
+		if (isset($this->ref)) $this->ref=trim($this->ref);
+		if (isset($this->fk_task_parent)) $this->fk_task_parent=trim($this->fk_task_parent);
+		if (isset($this->label)) $this->label=trim($this->label);
+		if (isset($this->description)) $this->description=trim($this->description);
+		if (isset($this->duration_effective)) $this->duration_effective=trim($this->duration_effective);
+		if (isset($this->planned_workload)) $this->planned_workload=trim($this->planned_workload);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
+		$sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
+		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"'".$this->db->escape($this->id)."'").",";
+		$sql.= " fk_task_parent=".(isset($this->fk_task_parent)?$this->fk_task_parent:"null").",";
+		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
+		$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
+		$sql.= " duration_effective=".(isset($this->duration_effective)?$this->duration_effective:"null").",";
+		$sql.= " planned_workload=".((isset($this->planned_workload) && $this->planned_workload != '')?$this->planned_workload:"null").",";
+		$sql.= " dateo=".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null').",";
+		$sql.= " datee=".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null').",";
+		$sql.= " progress=".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null').",";
+		$sql.= " rang=".((!empty($this->rang))?$this->rang:"0");
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('TASK_MODIFY',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+
+		//Update extrafield
+		if (!$error) {
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
+
+		if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
+		{
+			// We remove directory
+			if ($conf->projet->dir_output)
+			{
+				$project = new Project($this->db);
+				$project->fetch($this->fk_project);
+
+				$olddir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->oldcopy->ref);
+				$newdir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->ref);
+				if (file_exists($olddir))
+				{
+					include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+					$res=dol_move($olddir, $newdir);
+					if (! $res)
+					{
+						$langs->load("errors");
+						$this->error=$langs->trans('ErrorFailToRenameDir',$olddir,$newdir);
+						$error++;
+					}
+				}
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 *	Delete task from database
+	 *
+	 *	@param	User	$user        	User that delete
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+
+		global $conf, $langs;
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+		$error=0;
+
+		$this->db->begin();
+
+		if ($this->hasChildren() > 0)
+		{
+			dol_syslog(get_class($this)."::delete Can't delete record as it has some sub tasks", LOG_WARNING);
+			$this->error='ErrorRecordHasSubTasks';
+			$this->db->rollback();
+			return 0;
+		}
+
+		$objectisused = $this->isObjectUsed($this->id);
+		if (! empty($objectisused))
+		{
+			dol_syslog(get_class($this)."::delete Can't delete record as it has some child", LOG_WARNING);
+			$this->error='ErrorRecordHasChildren';
+			$this->db->rollback();
+			return 0;
+		}
+
+		if (! $error)
+		{
+			// Delete linked contacts
+			$res = $this->delete_linked_contact();
+			if ($res < 0)
+			{
+				$this->error='ErrorFailToDeleteLinkedContact';
+				//$error++;
+				$this->db->rollback();
+				return 0;
+			}
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
+			$sql.= " WHERE fk_task=".$this->id;
+
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields";
+			$sql.= " WHERE fk_object=".$this->id;
+
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
+			$sql.= " WHERE rowid=".$this->id;
+
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('TASK_DELETE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			//Delete associated link file
+			if ($conf->projet->dir_output)
+			{
+				$projectstatic=new Project($this->db);
+				$projectstatic->fetch($this->fk_project);
+
+				$dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($projectstatic->ref) . '/' . dol_sanitizeFileName($this->id);
+				dol_syslog(get_class($this)."::delete dir=".$dir, LOG_DEBUG);
+				if (file_exists($dir))
+				{
+					require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+					$res = @dol_delete_dir_recursive($dir);
+					if (!$res)
+					{
+						$this->error = 'ErrorFailToDeleteDir';
+						$this->db->rollback();
+						return 0;
+					}
+				}
+			}
+
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 *	Return nb of children
+	 *
+	 *	@return	int		<0 if KO, 0 if no children, >0 if OK
+	 */
+	function hasChildren()
+	{
+		$error=0;
+		$ret=0;
+
+		$sql = "SELECT COUNT(*) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
+		$sql.= " WHERE fk_task_parent=".$this->id;
+
+		dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		else
+		{
+			$obj=$this->db->fetch_object($resql);
+			if ($obj) $ret=$obj->nb;
+			$this->db->free($resql);
+		}
+
+		if (! $error)
+		{
+			return $ret;
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+	/**
+	 *	Return nb of time spent
+	 *
+	 *	@return	int		<0 if KO, 0 if no children, >0 if OK
+	 */
+	function hasTimeSpent()
+	{
+		$error=0;
+		$ret=0;
+
+		$sql = "SELECT COUNT(*) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time";
+		$sql.= " WHERE fk_task=".$this->id;
+
+		dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		else
+		{
+			$obj=$this->db->fetch_object($resql);
+			if ($obj) $ret=$obj->nb;
+			$this->db->free($resql);
+		}
+
+		if (! $error)
+		{
+			return $ret;
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Return clicable name (with picto eventually)
+	 *
+	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param	string	$option			'withproject' or ''
+	 *  @param	string	$mode			Mode 'task', 'time', 'contact', 'note', document' define page to link to.
+	 * 	@param	int		$addlabel		0=Default, 1=Add label into string, >1=Add first chars into string
+	 *  @param	string	$sep			Separator between ref and label if option addlabel is set
+	 *  @param	int   	$notooltip		1=Disable tooltip
+	 *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string					Chaine avec URL
+	 */
+	function getNomUrl($withpicto=0,$option='',$mode='task', $addlabel=0, $sep=' - ', $notooltip=0, $save_lastsearch_value=-1)
+	{
+		global $conf, $langs, $user;
+
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+
+		$result='';
+		$label = '<u>' . $langs->trans("ShowTask") . '</u>';
+		if (! empty($this->ref))
+			$label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		if (! empty($this->label))
+			$label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+		if ($this->date_start || $this->date_end)
+		{
+			$label .= "<br>".get_date_range($this->date_start,$this->date_end,'',$langs,0);
+		}
+
+		$url = DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option=='withproject'?'&withproject=1':'');
+		// 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';
+
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowTask");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
+		}
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		$picto='projecttask';
+
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend . (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		return $result;
+	}
+
+	/**
+	 *  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
+	 */
+	function initAsSpecimen()
+	{
+		$this->id=0;
+
+		$this->fk_projet='';
+		$this->ref='TK01';
+		$this->fk_task_parent='';
+		$this->label='Specimen task TK01';
+		$this->duration_effective='';
+		$this->fk_user_creat='';
+		$this->progress='25';
+		$this->fk_statut='';
+		$this->note='This is a specimen task not';
+	}
+
+	/**
+	 * Return list of tasks for all projects or for one particular project
+	 * Sort order is on project, then on position of task, and last on start date of first level task
+	 *
+	 * @param	User	$usert				Object user to limit tasks affected to a particular user
+	 * @param	User	$userp				Object user to limit projects of a particular user and public projects
+	 * @param	int		$projectid			Project id
+	 * @param	int		$socid				Third party id
+	 * @param	int		$mode				0=Return list of tasks and their projects, 1=Return projects and tasks if exists
+	 * @param	string	$filteronprojref	Filter on project ref
+	 * @param	string	$filteronprojstatus	Filter on project status
+	 * @param	string	$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
+	 * @param	string	$filteronprojuser	Filter on user that is a contact of project
+	 * @param	string	$filterontaskuser	Filter on user assigned to task
+	 * @return 	array						Array of tasks
+	 */
+	function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $filteronprojref='', $filteronprojstatus=-1, $morewherefilter='',$filteronprojuser=0,$filterontaskuser=0)
+	{
+		global $conf;
+
+		$tasks = array();
+
+		//print $usert.'-'.$userp.'-'.$projectid.'-'.$socid.'-'.$mode.'<br>';
+
+		// List of tasks (does not care about permissions. Filtering will be done later)
+		$sql = "SELECT p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus,";
+		$sql.= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
+		$sql.= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
+		$sql.= " s.rowid as thirdparty_id, s.nom as thirdparty_name";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+		if ($mode == 0)
+		{
+			if ($filteronprojuser > 0)
+			{
+				$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
+				$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+			}
+			$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+			if ($filterontaskuser > 0)
+			{
+				$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
+				$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
+			}
+			$sql.= " WHERE p.entity IN (".getEntity('project').")";
+			$sql.= " AND t.fk_projet = p.rowid";
+		}
+		elseif ($mode == 1)
+		{
+			if ($filteronprojuser > 0)
+			{
+				$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
+				$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+			}
+			if ($filterontaskuser > 0)
+			{
+				$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+				$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
+				$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
+			}
+			else
+			{
+				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
+			}
+			$sql.= " WHERE p.entity IN (".getEntity('project').")";
+		}
+		else return 'BadValueForParameterMode';
+
+		if ($filteronprojuser > 0)
+		{
+			$sql.= " AND p.rowid = ec.element_id";
+			$sql.= " AND ctc.rowid = ec.fk_c_type_contact";
+			$sql.= " AND ctc.element = 'project'";
+			$sql.= " AND ec.fk_socpeople = ".$filteronprojuser;
+			$sql.= " AND ec.statut = 4";
+			$sql.= " AND ctc.source = 'internal'";
+		}
+		if ($filterontaskuser > 0)
+		{
+			$sql.= " AND t.fk_projet = p.rowid";
+			$sql.= " AND p.rowid = ec2.element_id";
+			$sql.= " AND ctc2.rowid = ec2.fk_c_type_contact";
+			$sql.= " AND ctc2.element = 'project_task'";
+			$sql.= " AND ec2.fk_socpeople = ".$filterontaskuser;
+			$sql.= " AND ec2.statut = 4";
+			$sql.= " AND ctc2.source = 'internal'";
+		}
+		if ($socid)	$sql.= " AND p.fk_soc = ".$socid;
+		if ($projectid) $sql.= " AND p.rowid in (".$projectid.")";
+		if ($filteronprojref) $sql.= " AND p.ref LIKE '%".$filteronprojref."%'";
+		if ($filteronprojstatus > -1) $sql.= " AND p.fk_statut = ".$filteronprojstatus;
+		if ($morewherefilter) $sql.=$morewherefilter;
+		$sql.= " ORDER BY p.ref, t.rang, t.dateo";
+
+		//print $sql;exit;
+		dol_syslog(get_class($this)."::getTasksArray", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			// Loop on each record found, so each couple (project id, task id)
+			while ($i < $num)
+			{
+				$error=0;
+
+				$obj = $this->db->fetch_object($resql);
+
+				if ((! $obj->public) && (is_object($userp)))	// If not public project and we ask a filter on project owned by a user
+				{
+					if (! $this->getUserRolesForProjectsOrTasks($userp, 0, $obj->projectid, 0))
+					{
+						$error++;
+					}
+				}
+				if (is_object($usert))							// If we ask a filter on a user affected to a task
+				{
+					if (! $this->getUserRolesForProjectsOrTasks(0, $usert, $obj->projectid, $obj->taskid))
+					{
+						$error++;
+					}
+				}
+
+				if (! $error)
+				{
+					$tasks[$i] = new Task($this->db);
+					$tasks[$i]->id				= $obj->taskid;
+					$tasks[$i]->ref				= $obj->taskref;
+					$tasks[$i]->fk_project		= $obj->projectid;
+					$tasks[$i]->projectref		= $obj->ref;
+					$tasks[$i]->projectlabel	= $obj->plabel;
+					$tasks[$i]->projectstatus	= $obj->projectstatus;
+					$tasks[$i]->label			= $obj->label;
+					$tasks[$i]->description		= $obj->description;
+					$tasks[$i]->fk_parent		= $obj->fk_task_parent;      // deprecated
+					$tasks[$i]->fk_task_parent	= $obj->fk_task_parent;
+					$tasks[$i]->duration		= $obj->duration_effective;
+					$tasks[$i]->planned_workload= $obj->planned_workload;
+					$tasks[$i]->progress		= $obj->progress;
+					$tasks[$i]->fk_statut		= $obj->status;
+					$tasks[$i]->public			= $obj->public;
+					$tasks[$i]->date_start		= $this->db->jdate($obj->date_start);
+					$tasks[$i]->date_end		= $this->db->jdate($obj->date_end);
+					$tasks[$i]->rang	   		= $obj->rang;
+
+					$tasks[$i]->thirdparty_id	= $obj->thirdparty_id;
+					$tasks[$i]->thirdparty_name	= $obj->thirdparty_name;
+				}
+
+				$i++;
+			}
+			$this->db->free($resql);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+
+		return $tasks;
+	}
+
+	/**
+	 * Return list of roles for a user for each projects or each tasks (or a particular project or a particular task).
+	 *
+	 * @param	User	$userp			      Return roles on project for this internal user. If set, usert and taskid must not be defined.
+	 * @param	User	$usert			      Return roles on task for this internal user. If set userp must NOT be defined. -1 means no filter.
+	 * @param 	int		$projectid		      Project id list separated with , to filter on project
+	 * @param 	int		$taskid			      Task id to filter on a task
+	 * @param	integer	$filteronprojstatus	  Filter on project status if userp is set. Not used if userp not defined.
+	 * @return 	array					      Array (projectid => 'list of roles for project' or taskid => 'list of roles for task')
+	 */
+	function getUserRolesForProjectsOrTasks($userp, $usert, $projectid='', $taskid=0, $filteronprojstatus=-1)
+	{
+		$arrayroles = array();
+
+		dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks userp=".is_object($userp)." usert=".is_object($usert)." projectid=".$projectid." taskid=".$taskid);
+
+		// We want role of user for a projet or role of user for a task. Both are not possible.
+		if (empty($userp) && empty($usert))
 		{
-			//Delete associated link file
-	        if ($conf->projet->dir_output)
-	        {
-	        	$projectstatic=new Project($this->db);
-	        	$projectstatic->fetch($this->fk_project);
-
-	            $dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($projectstatic->ref) . '/' . dol_sanitizeFileName($this->id);
-	            dol_syslog(get_class($this)."::delete dir=".$dir, LOG_DEBUG);
-	            if (file_exists($dir))
-	            {
-	            	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-	                $res = @dol_delete_dir_recursive($dir);
-	                if (!$res)
-	                {
-	                    $this->error = 'ErrorFailToDeleteDir';
-	                    $this->db->rollback();
-	                    return 0;
-	                }
-	            }
-	        }
-
-            $this->db->commit();
-
-	        return 1;
-        }
-    }
-
-    /**
-     *	Return nb of children
-     *
-     *	@return	int		<0 if KO, 0 if no children, >0 if OK
-     */
-    function hasChildren()
-    {
-    	$error=0;
-        $ret=0;
-
-        $sql = "SELECT COUNT(*) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
-        $sql.= " WHERE fk_task_parent=".$this->id;
-
-        dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        else
-        {
-            $obj=$this->db->fetch_object($resql);
-            if ($obj) $ret=$obj->nb;
-            $this->db->free($resql);
-        }
-
-        if (! $error)
-        {
-            return $ret;
-        }
-        else
-        {
-            return -1;
-        }
-    }
+			$this->error="CallWithWrongParameters";
+			return -1;
+		}
+		if (! empty($userp) && ! empty($usert))
+		{
+			$this->error="CallWithWrongParameters";
+			return -1;
+		}
+
+		/* Liste des taches et role sur les projets ou taches */
+		$sql = "SELECT pt.rowid as pid, ec.element_id, ctc.code, ctc.source";
+		if ($userp) $sql.= " FROM ".MAIN_DB_PREFIX."projet as pt";
+		if ($usert && $filteronprojstatus > -1) $sql.= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."projet_task as pt";
+		if ($usert && $filteronprojstatus <= -1) $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
+		$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
+		$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+		$sql.= " WHERE pt.rowid = ec.element_id";
+		if ($userp && $filteronprojstatus > -1) $sql.= " AND pt.fk_statut = ".$filteronprojstatus;
+		if ($usert && $filteronprojstatus > -1) $sql.= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".$filteronprojstatus;
+		if ($userp) $sql.= " AND ctc.element = 'project'";
+		if ($usert) $sql.= " AND ctc.element = 'project_task'";
+		$sql.= " AND ctc.rowid = ec.fk_c_type_contact";
+		if ($userp) $sql.= " AND ec.fk_socpeople = ".$userp->id;
+		if ($usert) $sql.= " AND ec.fk_socpeople = ".$usert->id;
+		$sql.= " AND ec.statut = 4";
+		$sql.= " AND ctc.source = 'internal'";
+		if ($projectid)
+		{
+			if ($userp) $sql.= " AND pt.rowid in (".$projectid.")";
+			if ($usert) $sql.= " AND pt.fk_projet in (".$projectid.")";
+		}
+		if ($taskid)
+		{
+			if ($userp) $sql.= " ERROR SHOULD NOT HAPPENS";
+			if ($usert) $sql.= " AND pt.rowid = ".$taskid;
+		}
+		//print $sql;
+
+		dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks execute request", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				if (empty($arrayroles[$obj->pid])) $arrayroles[$obj->pid] = $obj->code;
+				else $arrayroles[$obj->pid].=','.$obj->code;
+				$i++;
+			}
+			$this->db->free($resql);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+
+		return $arrayroles;
+	}
+
 
 	/**
-     *	Return nb of time spent
-     *
-     *	@return	int		<0 if KO, 0 if no children, >0 if OK
-     */
-    function hasTimeSpent()
-    {
-    	$error=0;
-        $ret=0;
-
-        $sql = "SELECT COUNT(*) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time";
-        $sql.= " WHERE fk_task=".$this->id;
-
-        dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        else
-        {
-            $obj=$this->db->fetch_object($resql);
-            if ($obj) $ret=$obj->nb;
-            $this->db->free($resql);
-        }
-
-        if (! $error)
-        {
-            return $ret;
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Return clicable name (with picto eventually)
-     *
-     *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param	string	$option			'withproject' or ''
-     *  @param	string	$mode			Mode 'task', 'time', 'contact', 'note', document' define page to link to.
-     * 	@param	int		$addlabel		0=Default, 1=Add label into string, >1=Add first chars into string
-     *  @param	string	$sep			Separator between ref and label if option addlabel is set
-     *  @param	int   	$notooltip		1=Disable tooltip
-     *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string					Chaine avec URL
-     */
-    function getNomUrl($withpicto=0,$option='',$mode='task', $addlabel=0, $sep=' - ', $notooltip=0, $save_lastsearch_value=-1)
-    {
-        global $conf, $langs, $user;
-
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-        $result='';
-        $label = '<u>' . $langs->trans("ShowTask") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->label))
-            $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
-        if ($this->date_start || $this->date_end)
-        {
-        	$label .= "<br>".get_date_range($this->date_start,$this->date_end,'',$langs,0);
-        }
-
-        $url = DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option=='withproject'?'&withproject=1':'');
-        // 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';
-
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowTask");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
-        }
-
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
-
-        $picto='projecttask';
-
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend . (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
-        return $result;
-    }
-
-    /**
-     *  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
-     */
-    function initAsSpecimen()
-    {
-        $this->id=0;
-
-        $this->fk_projet='';
-		$this->ref='TK01';
-        $this->fk_task_parent='';
-        $this->label='Specimen task TK01';
-        $this->duration_effective='';
-        $this->fk_user_creat='';
-        $this->progress='25';
-        $this->fk_statut='';
-        $this->note='This is a specimen task not';
-    }
-
-    /**
-     * Return list of tasks for all projects or for one particular project
-     * Sort order is on project, then on position of task, and last on start date of first level task
-     *
-     * @param	User	$usert				Object user to limit tasks affected to a particular user
-     * @param	User	$userp				Object user to limit projects of a particular user and public projects
-     * @param	int		$projectid			Project id
-     * @param	int		$socid				Third party id
-     * @param	int		$mode				0=Return list of tasks and their projects, 1=Return projects and tasks if exists
-     * @param	string	$filteronprojref	Filter on project ref
-     * @param	string	$filteronprojstatus	Filter on project status
-     * @param	string	$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
-     * @param	string	$filteronprojuser	Filter on user that is a contact of project
-     * @param	string	$filterontaskuser	Filter on user assigned to task
-     * @return 	array						Array of tasks
-     */
-    function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $filteronprojref='', $filteronprojstatus=-1, $morewherefilter='',$filteronprojuser=0,$filterontaskuser=0)
-    {
-        global $conf;
-
-        $tasks = array();
-
-        //print $usert.'-'.$userp.'-'.$projectid.'-'.$socid.'-'.$mode.'<br>';
-
-        // List of tasks (does not care about permissions. Filtering will be done later)
-        $sql = "SELECT p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus,";
-        $sql.= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
-        $sql.= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
-        $sql.= " s.rowid as thirdparty_id, s.nom as thirdparty_name";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-        if ($mode == 0)
-        {
-            if ($filteronprojuser > 0)
-            {
-                $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-                $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-            }
-            $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-            if ($filterontaskuser > 0)
-            {
-                $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
-                $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
-            }
-            $sql.= " WHERE p.entity IN (".getEntity('project').")";
-            $sql.= " AND t.fk_projet = p.rowid";
-        }
-        elseif ($mode == 1)
-        {
-            if ($filteronprojuser > 0)
-            {
-                $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-                $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-            }
-            if ($filterontaskuser > 0)
-            {
-                $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-                $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
-                $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
-            }
-            else
-            {
-                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
-            }
-            $sql.= " WHERE p.entity IN (".getEntity('project').")";
-        }
-        else return 'BadValueForParameterMode';
-
-        if ($filteronprojuser > 0)
-        {
-            $sql.= " AND p.rowid = ec.element_id";
-            $sql.= " AND ctc.rowid = ec.fk_c_type_contact";
-            $sql.= " AND ctc.element = 'project'";
-            $sql.= " AND ec.fk_socpeople = ".$filteronprojuser;
-            $sql.= " AND ec.statut = 4";
-            $sql.= " AND ctc.source = 'internal'";
-        }
-        if ($filterontaskuser > 0)
-        {
-            $sql.= " AND t.fk_projet = p.rowid";
-            $sql.= " AND p.rowid = ec2.element_id";
-            $sql.= " AND ctc2.rowid = ec2.fk_c_type_contact";
-            $sql.= " AND ctc2.element = 'project_task'";
-            $sql.= " AND ec2.fk_socpeople = ".$filterontaskuser;
-            $sql.= " AND ec2.statut = 4";
-            $sql.= " AND ctc2.source = 'internal'";
-        }
-        if ($socid)	$sql.= " AND p.fk_soc = ".$socid;
-        if ($projectid) $sql.= " AND p.rowid in (".$projectid.")";
-        if ($filteronprojref) $sql.= " AND p.ref LIKE '%".$filteronprojref."%'";
-        if ($filteronprojstatus > -1) $sql.= " AND p.fk_statut = ".$filteronprojstatus;
-        if ($morewherefilter) $sql.=$morewherefilter;
-        $sql.= " ORDER BY p.ref, t.rang, t.dateo";
-
-        //print $sql;exit;
-        dol_syslog(get_class($this)."::getTasksArray", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            // Loop on each record found, so each couple (project id, task id)
-            while ($i < $num)
-            {
-                $error=0;
-
-                $obj = $this->db->fetch_object($resql);
-
-                if ((! $obj->public) && (is_object($userp)))	// If not public project and we ask a filter on project owned by a user
-                {
-                    if (! $this->getUserRolesForProjectsOrTasks($userp, 0, $obj->projectid, 0))
-                    {
-                        $error++;
-                    }
-                }
-                if (is_object($usert))							// If we ask a filter on a user affected to a task
-                {
-                    if (! $this->getUserRolesForProjectsOrTasks(0, $usert, $obj->projectid, $obj->taskid))
-                    {
-                        $error++;
-                    }
-                }
-
-                if (! $error)
-                {
-					$tasks[$i] = new Task($this->db);
-                    $tasks[$i]->id				= $obj->taskid;
-					$tasks[$i]->ref				= $obj->taskref;
-                    $tasks[$i]->fk_project		= $obj->projectid;
-                    $tasks[$i]->projectref		= $obj->ref;
-                    $tasks[$i]->projectlabel	= $obj->plabel;
-                    $tasks[$i]->projectstatus	= $obj->projectstatus;
-                    $tasks[$i]->label			= $obj->label;
-                    $tasks[$i]->description		= $obj->description;
-                    $tasks[$i]->fk_parent		= $obj->fk_task_parent;      // deprecated
-                    $tasks[$i]->fk_task_parent	= $obj->fk_task_parent;
-                    $tasks[$i]->duration		= $obj->duration_effective;
-                    $tasks[$i]->planned_workload= $obj->planned_workload;
-                    $tasks[$i]->progress		= $obj->progress;
-                    $tasks[$i]->fk_statut		= $obj->status;
-                    $tasks[$i]->public			= $obj->public;
-                    $tasks[$i]->date_start		= $this->db->jdate($obj->date_start);
-                    $tasks[$i]->date_end		= $this->db->jdate($obj->date_end);
-                    $tasks[$i]->rang	   		= $obj->rang;
-
-                    $tasks[$i]->thirdparty_id	= $obj->thirdparty_id;
-                    $tasks[$i]->thirdparty_name	= $obj->thirdparty_name;
-                }
-
-                $i++;
-            }
-            $this->db->free($resql);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-
-        return $tasks;
-    }
-
-    /**
-     * Return list of roles for a user for each projects or each tasks (or a particular project or a particular task).
-     *
-     * @param	User	$userp			      Return roles on project for this internal user. If set, usert and taskid must not be defined.
-     * @param	User	$usert			      Return roles on task for this internal user. If set userp must NOT be defined. -1 means no filter.
-     * @param 	int		$projectid		      Project id list separated with , to filter on project
-     * @param 	int		$taskid			      Task id to filter on a task
-     * @param	integer	$filteronprojstatus	  Filter on project status if userp is set. Not used if userp not defined.
-     * @return 	array					      Array (projectid => 'list of roles for project' or taskid => 'list of roles for task')
-     */
-    function getUserRolesForProjectsOrTasks($userp, $usert, $projectid='', $taskid=0, $filteronprojstatus=-1)
-    {
-        $arrayroles = array();
-
-        dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks userp=".is_object($userp)." usert=".is_object($usert)." projectid=".$projectid." taskid=".$taskid);
-
-        // We want role of user for a projet or role of user for a task. Both are not possible.
-        if (empty($userp) && empty($usert))
-        {
-            $this->error="CallWithWrongParameters";
-            return -1;
-        }
-        if (! empty($userp) && ! empty($usert))
-        {
-            $this->error="CallWithWrongParameters";
-            return -1;
-        }
-
-        /* Liste des taches et role sur les projets ou taches */
-        $sql = "SELECT pt.rowid as pid, ec.element_id, ctc.code, ctc.source";
-        if ($userp) $sql.= " FROM ".MAIN_DB_PREFIX."projet as pt";
-        if ($usert && $filteronprojstatus > -1) $sql.= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."projet_task as pt";
-        if ($usert && $filteronprojstatus <= -1) $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
-        $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-        $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-        $sql.= " WHERE pt.rowid = ec.element_id";
-        if ($userp && $filteronprojstatus > -1) $sql.= " AND pt.fk_statut = ".$filteronprojstatus;
-        if ($usert && $filteronprojstatus > -1) $sql.= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".$filteronprojstatus;
-        if ($userp) $sql.= " AND ctc.element = 'project'";
-        if ($usert) $sql.= " AND ctc.element = 'project_task'";
-        $sql.= " AND ctc.rowid = ec.fk_c_type_contact";
-        if ($userp) $sql.= " AND ec.fk_socpeople = ".$userp->id;
-        if ($usert) $sql.= " AND ec.fk_socpeople = ".$usert->id;
-        $sql.= " AND ec.statut = 4";
-        $sql.= " AND ctc.source = 'internal'";
-        if ($projectid)
-        {
-            if ($userp) $sql.= " AND pt.rowid in (".$projectid.")";
-            if ($usert) $sql.= " AND pt.fk_projet in (".$projectid.")";
-        }
-        if ($taskid)
-        {
-            if ($userp) $sql.= " ERROR SHOULD NOT HAPPENS";
-            if ($usert) $sql.= " AND pt.rowid = ".$taskid;
-        }
-        //print $sql;
-
-        dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks execute request", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-                if (empty($arrayroles[$obj->pid])) $arrayroles[$obj->pid] = $obj->code;
-                else $arrayroles[$obj->pid].=','.$obj->code;
-                $i++;
-            }
-            $this->db->free($resql);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-
-        return $arrayroles;
-    }
-
-
-    /**
-     * 	Return list of id of contacts of task
-     *
-     *	@param	string	$source		Source
-     *  @return array				Array of id of contacts
-     */
-    function getListContactId($source='internal')
-    {
-        $contactAlreadySelected = array();
-        $tab = $this->liste_contact(-1,$source);
-        //var_dump($tab);
-        $num=count($tab);
-        $i = 0;
-        while ($i < $num)
-        {
-            if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-            else  $contactAlreadySelected[$i] = $tab[$i]['id'];
-            $i++;
-        }
-        return $contactAlreadySelected;
-    }
-
-
-    /**
-     *  Add time spent
-     *
-     *  @param	User	$user           User object
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return	int                     <=0 if KO, >0 if OK
-     */
-    function addTimeSpent($user, $notrigger=0)
-    {
-        global $conf,$langs;
-
-        dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
-
-        $ret = 0;
-
-        // Check parameters
-        if (! is_object($user))
-        {
-        	dol_print_error('',"Method addTimeSpent was called with wrong parameter user");
-        	return -1;
-        }
-
-        // Clean parameters
-        if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
+	 * 	Return list of id of contacts of task
+	 *
+	 *	@param	string	$source		Source
+	 *  @return array				Array of id of contacts
+	 */
+	function getListContactId($source='internal')
+	{
+		$contactAlreadySelected = array();
+		$tab = $this->liste_contact(-1,$source);
+		//var_dump($tab);
+		$num=count($tab);
+		$i = 0;
+		while ($i < $num)
+		{
+			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
+			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			$i++;
+		}
+		return $contactAlreadySelected;
+	}
+
+
+	/**
+	 *  Add time spent
+	 *
+	 *  @param	User	$user           User object
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return	int                     <=0 if KO, >0 if OK
+	 */
+	function addTimeSpent($user, $notrigger=0)
+	{
+		global $conf,$langs;
+
+		dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
+
+		$ret = 0;
+
+		// Check parameters
+		if (! is_object($user))
+		{
+			dol_print_error('',"Method addTimeSpent was called with wrong parameter user");
+			return -1;
+		}
+
+		// Clean parameters
+		if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
 		if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
 
-        $this->db->begin();
-
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_time (";
-        $sql.= "fk_task";
-        $sql.= ", task_date";
-        $sql.= ", task_datehour";
-        $sql.= ", task_date_withhour";
-        $sql.= ", task_duration";
-        $sql.= ", fk_user";
-        $sql.= ", note";
-        $sql.= ") VALUES (";
-        $sql.= $this->id;
-        $sql.= ", '".$this->db->idate($this->timespent_date)."'";
-        $sql.= ", '".$this->db->idate($this->timespent_datehour)."'";
-        $sql.= ", ".(empty($this->timespent_withhour)?0:1);
-        $sql.= ", ".$this->timespent_duration;
-        $sql.= ", ".$this->timespent_fk_user;
-        $sql.= ", ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null");
-        $sql.= ")";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_time");
-            $ret = $tasktime_id;
+		$this->db->begin();
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_time (";
+		$sql.= "fk_task";
+		$sql.= ", task_date";
+		$sql.= ", task_datehour";
+		$sql.= ", task_date_withhour";
+		$sql.= ", task_duration";
+		$sql.= ", fk_user";
+		$sql.= ", note";
+		$sql.= ") VALUES (";
+		$sql.= $this->id;
+		$sql.= ", '".$this->db->idate($this->timespent_date)."'";
+		$sql.= ", '".$this->db->idate($this->timespent_datehour)."'";
+		$sql.= ", ".(empty($this->timespent_withhour)?0:1);
+		$sql.= ", ".$this->timespent_duration;
+		$sql.= ", ".$this->timespent_fk_user;
+		$sql.= ", ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null");
+		$sql.= ")";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_time");
+			$ret = $tasktime_id;
 			$this->timespent_id = $ret;
 
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('TASK_TIMESPENT_CREATE',$user);
-                if ($result < 0) { $ret=-1; }
-                // End call triggers
-            }
-        }
-        else
-		{
-            $this->error=$this->db->lasterror();
-            $ret = -1;
-        }
-
-        if ($ret > 0)
-        {
-        	// Recalculate amount of time spent for task and update denormalized field
-            $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
-            $sql.= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->id.")";
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('TASK_TIMESPENT_CREATE',$user);
+				if ($result < 0) { $ret=-1; }
+				// End call triggers
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$ret = -1;
+		}
+
+		if ($ret > 0)
+		{
+			// Recalculate amount of time spent for task and update denormalized field
+			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
+			$sql.= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->id.")";
 			if (isset($this->progress)) $sql.= ", progress = " . $this->progress;	// Do not overwrite value if not provided
-            $sql.= " WHERE rowid = ".$this->id;
-
-            dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
-            if (! $this->db->query($sql) )
-            {
-                $this->error=$this->db->lasterror();
-                $ret = -2;
-            }
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
-            $sql.= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")";	// set average hour rate of user
-            $sql.= " WHERE rowid = ".$tasktime_id;
-
-            dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
-            if (! $this->db->query($sql) )
-            {
-                $this->error=$this->db->lasterror();
-                $ret = -2;
-            }
-        }
-
-        if ($ret >0)
-        {
-        	$this->db->commit();
-        }
-        else
-		{
-        	$this->db->rollback();
-        }
-        return $ret;
-    }
-
-    /**
-     *  Calculate total of time spent for task
-     *
-     *  @param  int     $userid     Filter on user id. 0=No filter
-     *  @return array		        Array of info for task array('min_date', 'max_date', 'total_duration', 'total_amount', 'nblines', 'nblinesnull')
-     */
-    function getSummaryOfTimeSpent($userid=0)
-    {
-        global $langs;
-
-        $id=$this->id;
-        if (empty($id))
-        {
-            dol_syslog("getSummaryOfTimeSpent called on a not loaded task", LOG_ERR);
-            return -1;
-        }
-
-        $result=array();
-
-        $sql = "SELECT";
-        $sql.= " MIN(t.task_datehour) as min_date,";
-        $sql.= " MAX(t.task_datehour) as max_date,";
-        $sql.= " SUM(t.task_duration) as total_duration,";
-        $sql.= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as total_amount,";
-        $sql.= " COUNT(t.rowid) as nblines,";
-        $sql.= " SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-        $sql.= " WHERE t.fk_task = ".$id;
-        if ($userid > 0) $sql.=" AND t.fk_user = ".$userid;
-
-        dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-
-            $result['min_date'] = $obj->min_date;               // deprecated. use the ->timespent_xxx instead
-            $result['max_date'] = $obj->max_date;               // deprecated. use the ->timespent_xxx instead
-            $result['total_duration'] = $obj->total_duration;   // deprecated. use the ->timespent_xxx instead
-
-            $this->timespent_min_date=$this->db->jdate($obj->min_date);
-            $this->timespent_max_date=$this->db->jdate($obj->max_date);
-            $this->timespent_total_duration=$obj->total_duration;
-            $this->timespent_total_amount=$obj->total_amount;
-            $this->timespent_nblinesnull=($obj->nblinesnull?$obj->nblinesnull:0);
-            $this->timespent_nblines=($obj->nblines?$obj->nblines:0);
-
-            $this->db->free($resql);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-        return $result;
-    }
-
-    /**
-     *  Calculate quantity and value of time consumed using the thm (hourly amount value of work for user entering time)
-     *
-     *	@param		User		$fuser		Filter on a dedicated user
-     *  @param		string		$dates		Start date (ex 00:00:00)
-     *  @param		string		$datee		End date (ex 23:59:59)
-     *  @return 	array	        		Array of info for task array('amount','nbseconds','nblinesnull')
-     */
-    function getSumOfAmount($fuser='', $dates='', $datee='')
-    {
-        global $langs;
-
-        if (empty($id)) $id=$this->id;
-
-        $result=array();
-
-        $sql = "SELECT";
-        $sql.= " SUM(t.task_duration) as nbseconds,";
-        $sql.= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as amount, SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-        $sql.= " WHERE t.fk_task = ".$id;
-        if (is_object($fuser) && $fuser->id > 0)
-        {
-        	$sql.=" AND fk_user = ".$fuser->id;
-        }
-    	if ($dates > 0)
+			$sql.= " WHERE rowid = ".$this->id;
+
+			dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
+			if (! $this->db->query($sql) )
+			{
+				$this->error=$this->db->lasterror();
+				$ret = -2;
+			}
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
+			$sql.= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")";	// set average hour rate of user
+			$sql.= " WHERE rowid = ".$tasktime_id;
+
+			dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
+			if (! $this->db->query($sql) )
+			{
+				$this->error=$this->db->lasterror();
+				$ret = -2;
+			}
+		}
+
+		if ($ret >0)
+		{
+			$this->db->commit();
+		}
+		else
+		{
+			$this->db->rollback();
+		}
+		return $ret;
+	}
+
+	/**
+	 *  Calculate total of time spent for task
+	 *
+	 *  @param  int     $userid     Filter on user id. 0=No filter
+	 *  @return array		        Array of info for task array('min_date', 'max_date', 'total_duration', 'total_amount', 'nblines', 'nblinesnull')
+	 */
+	function getSummaryOfTimeSpent($userid=0)
+	{
+		global $langs;
+
+		$id=$this->id;
+		if (empty($id))
+		{
+			dol_syslog("getSummaryOfTimeSpent called on a not loaded task", LOG_ERR);
+			return -1;
+		}
+
+		$result=array();
+
+		$sql = "SELECT";
+		$sql.= " MIN(t.task_datehour) as min_date,";
+		$sql.= " MAX(t.task_datehour) as max_date,";
+		$sql.= " SUM(t.task_duration) as total_duration,";
+		$sql.= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as total_amount,";
+		$sql.= " COUNT(t.rowid) as nblines,";
+		$sql.= " SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+		$sql.= " WHERE t.fk_task = ".$id;
+		if ($userid > 0) $sql.=" AND t.fk_user = ".$userid;
+
+		dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+
+			$result['min_date'] = $obj->min_date;               // deprecated. use the ->timespent_xxx instead
+			$result['max_date'] = $obj->max_date;               // deprecated. use the ->timespent_xxx instead
+			$result['total_duration'] = $obj->total_duration;   // deprecated. use the ->timespent_xxx instead
+
+			$this->timespent_min_date=$this->db->jdate($obj->min_date);
+			$this->timespent_max_date=$this->db->jdate($obj->max_date);
+			$this->timespent_total_duration=$obj->total_duration;
+			$this->timespent_total_amount=$obj->total_amount;
+			$this->timespent_nblinesnull=($obj->nblinesnull?$obj->nblinesnull:0);
+			$this->timespent_nblines=($obj->nblines?$obj->nblines:0);
+
+			$this->db->free($resql);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+		return $result;
+	}
+
+	/**
+	 *  Calculate quantity and value of time consumed using the thm (hourly amount value of work for user entering time)
+	 *
+	 *	@param		User		$fuser		Filter on a dedicated user
+	 *  @param		string		$dates		Start date (ex 00:00:00)
+	 *  @param		string		$datee		End date (ex 23:59:59)
+	 *  @return 	array	        		Array of info for task array('amount','nbseconds','nblinesnull')
+	 */
+	function getSumOfAmount($fuser='', $dates='', $datee='')
+	{
+		global $langs;
+
+		if (empty($id)) $id=$this->id;
+
+		$result=array();
+
+		$sql = "SELECT";
+		$sql.= " SUM(t.task_duration) as nbseconds,";
+		$sql.= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as amount, SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+		$sql.= " WHERE t.fk_task = ".$id;
+		if (is_object($fuser) && $fuser->id > 0)
+		{
+			$sql.=" AND fk_user = ".$fuser->id;
+		}
+		if ($dates > 0)
 		{
 			$datefieldname="task_datehour";
 			$sql.=" AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
-    	if ($datee > 0)
+		if ($datee > 0)
 		{
 			$datefieldname="task_datehour";
 			$sql.=" AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
 		}
 		//print $sql;
 
-        dol_syslog(get_class($this)."::getSumOfAmount", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-
-            $result['amount'] = $obj->amount;
-            $result['nbseconds'] = $obj->nbseconds;
-            $result['nblinesnull'] = $obj->nblinesnull;
-
-            $this->db->free($resql);
-            return $result;
-        }
-        else
-		{
-            dol_print_error($this->db);
-            return $result;
-        }
-    }
-
-    /**
-     *  Load one record of time spent
-     *
-     *  @param	int		$id 	Id object
-     *  @return int		        <0 if KO, >0 if OK
-     */
-    function fetchTimeSpent($id)
-    {
-        global $langs;
-
-        $sql = "SELECT";
-        $sql.= " t.rowid,";
-        $sql.= " t.fk_task,";
-        $sql.= " t.task_date,";
-        $sql.= " t.task_datehour,";
-        $sql.= " t.task_date_withhour,";
-        $sql.= " t.task_duration,";
-        $sql.= " t.fk_user,";
-        $sql.= " t.note";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-        $sql.= " WHERE t.rowid = ".$id;
-
-        dol_syslog(get_class($this)."::fetchTimeSpent", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->timespent_id			= $obj->rowid;
-                $this->id					= $obj->fk_task;
-                $this->timespent_date		= $this->db->jdate($obj->task_date);
-                $this->timespent_datehour   = $this->db->jdate($obj->task_datehour);
-                $this->timespent_withhour   = $obj->task_date_withhour;
-                $this->timespent_duration	= $obj->task_duration;
-                $this->timespent_fk_user	= $obj->fk_user;
-                $this->timespent_note		= $obj->note;
-            }
-
-            $this->db->free($resql);
-
-            return 1;
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *	Update time spent
-     *
-     *  @param	User	$user           User id
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return	int						<0 if KO, >0 if OK
-     */
-    function updateTimeSpent($user, $notrigger=0)
-    {
-    	global $conf,$langs;
-
-        $ret = 0;
-
-        // Clean parameters
-        if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
-        if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
-
-        $this->db->begin();
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
-        $sql.= " task_date = '".$this->db->idate($this->timespent_date)."',";
-        $sql.= " task_datehour = '".$this->db->idate($this->timespent_datehour)."',";
-        $sql.= " task_date_withhour = ".(empty($this->timespent_withhour)?0:1).",";
-        $sql.= " task_duration = ".$this->timespent_duration.",";
-        $sql.= " fk_user = ".$this->timespent_fk_user.",";
-        $sql.= " note = ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null");
-        $sql.= " WHERE rowid = ".$this->timespent_id;
-
-        dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
-        if ($this->db->query($sql) )
-        {
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('TASK_TIMESPENT_MODIFY',$user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    $ret = -1;
-                }
-                else $ret = 1;
-                // End call triggers
-            }
-            else $ret = 1;
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            $this->db->rollback();
-            $ret = -1;
-        }
-
-        if ($ret == 1 && ($this->timespent_old_duration != $this->timespent_duration))
-        {
-            $newDuration = $this->timespent_duration - $this->timespent_old_duration;
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
-            $sql.= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->db->escape($this->id).")";
-            $sql.= " WHERE rowid = ".$this->id;
-
-            dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
-            if (! $this->db->query($sql) )
-            {
-                $this->error=$this->db->lasterror();
-                $this->db->rollback();
-                $ret = -2;
-            }
-        }
-
-        if ($ret >= 0) $this->db->commit();
-        return $ret;
-    }
-
-    /**
-     *  Delete time spent
-     *
-     *  @param	User	$user        	User that delete
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return	int						<0 if KO, >0 if OK
-     */
-    function delTimeSpent($user, $notrigger=0)
-    {
-        global $conf, $langs;
-
-        $error=0;
-
-        $this->db->begin();
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
-        $sql.= " WHERE rowid = ".$this->timespent_id;
-
-        dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('TASK_TIMESPENT_DELETE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-
-        if (! $error)
-        {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
-            $sql.= " SET duration_effective = duration_effective - ".$this->db->escape($this->timespent_duration?$this->timespent_duration:0);
-            $sql.= " WHERE rowid = ".$this->id;
-
-            dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
-            if ($this->db->query($sql) )
-            {
-                $result = 0;
-            }
-            else
-            {
-                $this->error=$this->db->lasterror();
-                $result = -2;
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delTimeSpent ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-     /**	Load an object from its id and create a new one in database
+		dol_syslog(get_class($this)."::getSumOfAmount", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+
+			$result['amount'] = $obj->amount;
+			$result['nbseconds'] = $obj->nbseconds;
+			$result['nblinesnull'] = $obj->nblinesnull;
+
+			$this->db->free($resql);
+			return $result;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return $result;
+		}
+	}
+
+	/**
+	 *  Load one record of time spent
+	 *
+	 *  @param	int		$id 	Id object
+	 *  @return int		        <0 if KO, >0 if OK
+	 */
+	function fetchTimeSpent($id)
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.fk_task,";
+		$sql.= " t.task_date,";
+		$sql.= " t.task_datehour,";
+		$sql.= " t.task_date_withhour,";
+		$sql.= " t.task_duration,";
+		$sql.= " t.fk_user,";
+		$sql.= " t.note";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+		$sql.= " WHERE t.rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetchTimeSpent", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->timespent_id			= $obj->rowid;
+				$this->id					= $obj->fk_task;
+				$this->timespent_date		= $this->db->jdate($obj->task_date);
+				$this->timespent_datehour   = $this->db->jdate($obj->task_datehour);
+				$this->timespent_withhour   = $obj->task_date_withhour;
+				$this->timespent_duration	= $obj->task_duration;
+				$this->timespent_fk_user	= $obj->fk_user;
+				$this->timespent_note		= $obj->note;
+			}
+
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update time spent
+	 *
+	 *  @param	User	$user           User id
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return	int						<0 if KO, >0 if OK
+	 */
+	function updateTimeSpent($user, $notrigger=0)
+	{
+		global $conf,$langs;
+
+		$ret = 0;
+
+		// Clean parameters
+		if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
+		if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
+		$sql.= " task_date = '".$this->db->idate($this->timespent_date)."',";
+		$sql.= " task_datehour = '".$this->db->idate($this->timespent_datehour)."',";
+		$sql.= " task_date_withhour = ".(empty($this->timespent_withhour)?0:1).",";
+		$sql.= " task_duration = ".$this->timespent_duration.",";
+		$sql.= " fk_user = ".$this->timespent_fk_user.",";
+		$sql.= " note = ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null");
+		$sql.= " WHERE rowid = ".$this->timespent_id;
+
+		dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
+		if ($this->db->query($sql) )
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('TASK_TIMESPENT_MODIFY',$user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					$ret = -1;
+				}
+				else $ret = 1;
+				// End call triggers
+			}
+			else $ret = 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			$ret = -1;
+		}
+
+		if ($ret == 1 && ($this->timespent_old_duration != $this->timespent_duration))
+		{
+			$newDuration = $this->timespent_duration - $this->timespent_old_duration;
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
+			$sql.= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->db->escape($this->id).")";
+			$sql.= " WHERE rowid = ".$this->id;
+
+			dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
+			if (! $this->db->query($sql) )
+			{
+				$this->error=$this->db->lasterror();
+				$this->db->rollback();
+				$ret = -2;
+			}
+		}
+
+		if ($ret >= 0) $this->db->commit();
+		return $ret;
+	}
+
+	/**
+	 *  Delete time spent
 	 *
-	 *	@param	int		$fromid     			Id of object to clone
-	 *  @param	int		$project_id				Id of project to attach clone task
-	 *  @param	int		$parent_task_id			Id of task to attach clone task
-	 *  @param	bool	$clone_change_dt		recalculate date of task regarding new project start date
-	 *	@param	bool	$clone_affectation		clone affectation of project
-	 *	@param	bool	$clone_time				clone time of project
-	 *	@param	bool	$clone_file				clone file of project
-	 *  @param	bool	$clone_note				clone note of project
-	 *	@param	bool	$clone_prog				clone progress of project
-	 * 	@return	int								New id of clone
+	 *  @param	User	$user        	User that delete
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return	int						<0 if KO, >0 if OK
 	 */
+	function delTimeSpent($user, $notrigger=0)
+	{
+		global $conf, $langs;
+
+		$error=0;
+
+		$this->db->begin();
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
+		$sql.= " WHERE rowid = ".$this->timespent_id;
+
+		dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('TASK_TIMESPENT_DELETE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+
+		if (! $error)
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
+			$sql.= " SET duration_effective = duration_effective - ".$this->db->escape($this->timespent_duration?$this->timespent_duration:0);
+			$sql.= " WHERE rowid = ".$this->id;
+
+			dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
+			if ($this->db->query($sql) )
+			{
+				$result = 0;
+			}
+			else
+			{
+				$this->error=$this->db->lasterror();
+				$result = -2;
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delTimeSpent ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	 /**	Load an object from its id and create a new one in database
+	  *
+	  *	@param	int		$fromid     			Id of object to clone
+	  *  @param	int		$project_id				Id of project to attach clone task
+	  *  @param	int		$parent_task_id			Id of task to attach clone task
+	  *  @param	bool	$clone_change_dt		recalculate date of task regarding new project start date
+	  *	@param	bool	$clone_affectation		clone affectation of project
+	  *	@param	bool	$clone_time				clone time of project
+	  *	@param	bool	$clone_file				clone file of project
+	  *  @param	bool	$clone_note				clone note of project
+	  *	@param	bool	$clone_prog				clone progress of project
+	  * 	@return	int								New id of clone
+	  */
 	function createFromClone($fromid,$project_id,$parent_task_id,$clone_change_dt=false,$clone_affectation=false,$clone_time=false,$clone_file=false,$clone_note=false,$clone_prog=false)
 	{
 		global $user,$langs,$conf;
@@ -1387,39 +1387,39 @@ 
 
 		$clone_task->id					= 0;
 		$clone_task->ref				= $defaultref;
-        $clone_task->fk_project			= $project_id;
-        $clone_task->fk_task_parent		= $parent_task_id;
-        $clone_task->date_c				= $datec;
-        $clone_task->planned_workload	= $origin_task->planned_workload;
+		$clone_task->fk_project			= $project_id;
+		$clone_task->fk_task_parent		= $parent_task_id;
+		$clone_task->date_c				= $datec;
+		$clone_task->planned_workload	= $origin_task->planned_workload;
 		$clone_task->rang				= $origin_task->rang;
 
-        //Manage Task Date
-        if ($clone_change_dt)
-        {
-        	$projectstatic=new Project($this->db);
-        	$projectstatic->fetch($ori_project_id);
+		//Manage Task Date
+		if ($clone_change_dt)
+		{
+			$projectstatic=new Project($this->db);
+			$projectstatic->fetch($ori_project_id);
 
-        	//Origin project strat date
-	    	$orign_project_dt_start = $projectstatic->date_start;
+			//Origin project strat date
+			$orign_project_dt_start = $projectstatic->date_start;
 
-	    	//Calcultate new task start date with difference between origin proj start date and origin task start date
-	    	if (!empty($clone_task->date_start))
-	    	{
+			//Calcultate new task start date with difference between origin proj start date and origin task start date
+			if (!empty($clone_task->date_start))
+			{
 				$clone_task->date_start			= $now + $clone_task->date_start - $orign_project_dt_start;
-	    	}
+			}
 
-	    	//Calcultate new task end date with difference between origin proj end date and origin task end date
-	    	if (!empty($clone_task->date_end))
-	    	{
+			//Calcultate new task end date with difference between origin proj end date and origin task end date
+			if (!empty($clone_task->date_end))
+			{
 				$clone_task->date_end			= $now + $clone_task->date_end - $orign_project_dt_start;
-	    	}
+			}
 
-        }
+		}
 
 		if (!$clone_prog)
-        {
-        	    $clone_task->progress=0;
-        }
+		{
+				$clone_task->progress=0;
+		}
 
 		// Create clone
 		$result=$clone_task->create($user);
@@ -1437,15 +1437,15 @@ 
 			$clone_task_id=$clone_task->id;
 			$clone_task_ref = $clone_task->ref;
 
-       		//Note Update
+	   		//Note Update
 			if (!$clone_note)
-       		{
-        	    $clone_task->note_private='';
-    			$clone_task->note_public='';
-        	}
-        	else
-        	{
-        		$this->db->begin();
+	   		{
+				$clone_task->note_private='';
+				$clone_task->note_public='';
+			}
+			else
+			{
+				$this->db->begin();
 				$res=$clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES),'_public');
 				if ($res < 0)
 				{
@@ -1470,7 +1470,7 @@ 
 				{
 					$this->db->commit();
 				}
-        	}
+			}
 
 			//Duplicate file
 			if ($clone_file)
@@ -1479,18 +1479,18 @@ 
 
 				//retreive project origin ref to know folder to copy
 				$projectstatic=new Project($this->db);
-	        	$projectstatic->fetch($ori_project_id);
-	        	$ori_project_ref=$projectstatic->ref;
-
-	        	if ($ori_project_id!=$project_id)
-	        	{
-	        		$projectstatic->fetch($project_id);
-	        		$clone_project_ref=$projectstatic->ref;
-	        	}
-	        	else
-	        	{
-	        		$clone_project_ref=$ori_project_ref;
-	        	}
+				$projectstatic->fetch($ori_project_id);
+				$ori_project_ref=$projectstatic->ref;
+
+				if ($ori_project_id!=$project_id)
+				{
+					$projectstatic->fetch($project_id);
+					$clone_project_ref=$projectstatic->ref;
+				}
+				else
+				{
+					$clone_project_ref=$ori_project_ref;
+				}
 
 				$clone_task_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($clone_project_ref). "/" . dol_sanitizeFileName($clone_task_ref);
 				$ori_task_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($ori_project_ref). "/" . dol_sanitizeFileName($fromid);
@@ -1657,8 +1657,8 @@ 
 			if ($statut==3) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
 			if ($statut==4) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
 			if ($statut==5) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut5');*/
-		    //return $this->progress.' %';
-		    return '&nbsp;';
+			//return $this->progress.' %';
+			return '&nbsp;';
 		}
 	}
 
@@ -1820,16 +1820,16 @@ 
 	 */
 	public function hasDelay()
 	{
-	    global $conf;
+		global $conf;
 
-        if (! ($this->progress >= 0 && $this->progress < 100)) {
-            return false;
-        }
+		if (! ($this->progress >= 0 && $this->progress < 100)) {
+			return false;
+		}
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $datetouse = ($this->date_end > 0) ? $this->date_end : ($this->datee > 0 ? $this->datee : 0);
+		$datetouse = ($this->date_end > 0) ? $this->date_end : ($this->datee > 0 ? $this->datee : 0);
 
-        return ($datetouse > 0 && ($datetouse < ($now - $conf->projet->task->warning_delay)));
+		return ($datetouse > 0 && ($datetouse < ($now - $conf->projet->task->warning_delay)));
 	}
 }
\ No newline at end of file

Spacing +529 added lines, -529 removed lines

@@ -31,16 +31,16 @@ 
  */
 class Task extends CommonObject
 {
-    public $element='project_task';		//!< Id that identify managed objects
-    public $table_element='projet_task';	//!< Name of table without prefix where object is stored
-    public $fk_element='fk_task';
+    public $element = 'project_task'; //!< Id that identify managed objects
+    public $table_element = 'projet_task'; //!< Name of table without prefix where object is stored
+    public $fk_element = 'fk_task';
     public $picto = 'task';
-    protected $childtables=array('projet_task_time','projet_task_comment');    // To test if we can delete object
+    protected $childtables = array('projet_task_time', 'projet_task_comment'); // To test if we can delete object
 
     var $fk_task_parent;
     var $label;
     var $description;
-    var $duration_effective;		// total of time spent on this task
+    var $duration_effective; // total of time spent on this task
     var $planned_workload;
     var $date_c;
     var $date_start;
@@ -65,8 +65,8 @@ 
     var $timespent_duration;
     var $timespent_old_duration;
     var $timespent_date;
-    var $timespent_datehour;		// More accurate start date (same than timespent_date but includes hours, minutes and seconds)
-    var $timespent_withhour;		// 1 = we entered also start hours for timesheet line
+    var $timespent_datehour; // More accurate start date (same than timespent_date but includes hours, minutes and seconds)
+    var $timespent_withhour; // 1 = we entered also start hours for timesheet line
     var $timespent_fk_user;
     var $timespent_note;
 
@@ -93,11 +93,11 @@ 
      *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
      *  @return int 		        	<0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
         global $conf, $langs;
 
-        $error=0;
+        $error = 0;
 
         // Clean parameters
         $this->label = trim($this->label);
@@ -108,56 +108,56 @@ 
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task (";
-        $sql.= "fk_projet";
-		$sql.= ", ref";
-        $sql.= ", fk_task_parent";
-        $sql.= ", label";
-        $sql.= ", description";
-        $sql.= ", datec";
-        $sql.= ", fk_user_creat";
-        $sql.= ", dateo";
-        $sql.= ", datee";
-        $sql.= ", planned_workload";
-        $sql.= ", progress";
-        $sql.= ") VALUES (";
-        $sql.= $this->fk_project;
-		$sql.= ", ".(!empty($this->ref)?"'".$this->db->escape($this->ref)."'":'null');
-        $sql.= ", ".$this->fk_task_parent;
-        $sql.= ", '".$this->db->escape($this->label)."'";
-        $sql.= ", '".$this->db->escape($this->description)."'";
-        $sql.= ", '".$this->db->idate($this->date_c)."'";
-        $sql.= ", ".$user->id;
-        $sql.= ", ".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null');
-        $sql.= ", ".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null');
-        $sql.= ", ".(($this->planned_workload!='' && $this->planned_workload >= 0)?$this->planned_workload:'null');
-        $sql.= ", ".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null');
-        $sql.= ")";
+        $sql .= "fk_projet";
+		$sql .= ", ref";
+        $sql .= ", fk_task_parent";
+        $sql .= ", label";
+        $sql .= ", description";
+        $sql .= ", datec";
+        $sql .= ", fk_user_creat";
+        $sql .= ", dateo";
+        $sql .= ", datee";
+        $sql .= ", planned_workload";
+        $sql .= ", progress";
+        $sql .= ") VALUES (";
+        $sql .= $this->fk_project;
+		$sql .= ", ".(!empty($this->ref) ? "'".$this->db->escape($this->ref)."'" : 'null');
+        $sql .= ", ".$this->fk_task_parent;
+        $sql .= ", '".$this->db->escape($this->label)."'";
+        $sql .= ", '".$this->db->escape($this->description)."'";
+        $sql .= ", '".$this->db->idate($this->date_c)."'";
+        $sql .= ", ".$user->id;
+        $sql .= ", ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
+        $sql .= ", ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
+        $sql .= ", ".(($this->planned_workload != '' && $this->planned_workload >= 0) ? $this->planned_workload : 'null');
+        $sql .= ", ".(($this->progress != '' && $this->progress >= 0) ? $this->progress : 'null');
+        $sql .= ")";
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (! $error)
+        if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task");
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('TASK_CREATE',$user);
+                $result = $this->call_trigger('TASK_CREATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
         }
 
         // Update extrafield
-        if (! $error)
+        if (!$error)
         {
         	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
         	{
-        		$result=$this->insertExtraFields();
+        		$result = $this->insertExtraFields();
         		if ($result < 0)
         		{
         			$error++;
@@ -168,13 +168,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -191,40 +191,40 @@ 
      *  @param	int		$ref		ref object
      *  @return int 		        <0 if KO, 0 if not found, >0 if OK
      */
-    function fetch($id,$ref='')
+    function fetch($id, $ref = '')
     {
         global $langs;
 
         $sql = "SELECT";
-        $sql.= " t.rowid,";
-		$sql.= " t.ref,";
-        $sql.= " t.fk_projet,";
-        $sql.= " t.fk_task_parent,";
-        $sql.= " t.label,";
-        $sql.= " t.description,";
-        $sql.= " t.duration_effective,";
-        $sql.= " t.planned_workload,";
-        $sql.= " t.datec,";
-        $sql.= " t.dateo,";
-        $sql.= " t.datee,";
-        $sql.= " t.fk_user_creat,";
-        $sql.= " t.fk_user_valid,";
-        $sql.= " t.fk_statut,";
-        $sql.= " t.progress,";
-        $sql.= " t.priority,";
-        $sql.= " t.note_private,";
-		$sql.= " t.note_public,";
-		$sql.= " t.rang";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as t";
-        $sql.= " WHERE ";
+        $sql .= " t.rowid,";
+		$sql .= " t.ref,";
+        $sql .= " t.fk_projet,";
+        $sql .= " t.fk_task_parent,";
+        $sql .= " t.label,";
+        $sql .= " t.description,";
+        $sql .= " t.duration_effective,";
+        $sql .= " t.planned_workload,";
+        $sql .= " t.datec,";
+        $sql .= " t.dateo,";
+        $sql .= " t.datee,";
+        $sql .= " t.fk_user_creat,";
+        $sql .= " t.fk_user_valid,";
+        $sql .= " t.fk_statut,";
+        $sql .= " t.progress,";
+        $sql .= " t.priority,";
+        $sql .= " t.note_private,";
+		$sql .= " t.note_public,";
+		$sql .= " t.rang";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t";
+        $sql .= " WHERE ";
         if (!empty($ref)) {
-        	$sql.="t.ref = '".$this->db->escape($ref)."'";
-        }else {
-        	$sql.="t.rowid = ".$id;
+        	$sql .= "t.ref = '".$this->db->escape($ref)."'";
+        } else {
+        	$sql .= "t.rowid = ".$id;
         }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $num_rows = $this->db->num_rows($resql);
@@ -233,25 +233,25 @@ 
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id					= $obj->rowid;
-				$this->ref					= $obj->ref;
-                $this->fk_project			= $obj->fk_projet;
-                $this->fk_task_parent		= $obj->fk_task_parent;
-                $this->label				= $obj->label;
-                $this->description			= $obj->description;
-                $this->duration_effective	= $obj->duration_effective;
-                $this->planned_workload		= $obj->planned_workload;
-                $this->date_c				= $this->db->jdate($obj->datec);
-                $this->date_start			= $this->db->jdate($obj->dateo);
+                $this->id = $obj->rowid;
+				$this->ref = $obj->ref;
+                $this->fk_project = $obj->fk_projet;
+                $this->fk_task_parent = $obj->fk_task_parent;
+                $this->label = $obj->label;
+                $this->description = $obj->description;
+                $this->duration_effective = $obj->duration_effective;
+                $this->planned_workload = $obj->planned_workload;
+                $this->date_c = $this->db->jdate($obj->datec);
+                $this->date_start = $this->db->jdate($obj->dateo);
                 $this->date_end				= $this->db->jdate($obj->datee);
                 $this->fk_user_creat		= $obj->fk_user_creat;
                 $this->fk_user_valid		= $obj->fk_user_valid;
                 $this->fk_statut			= $obj->fk_statut;
                 $this->progress				= $obj->progress;
                 $this->priority				= $obj->priority;
-                $this->note_private			= $obj->note_private;
-                $this->note_public			= $obj->note_public;
-				$this->rang					= $obj->rang;
+                $this->note_private = $obj->note_private;
+                $this->note_public = $obj->note_public;
+				$this->rang = $obj->rang;
 
                 // Retreive all extrafield for thirdparty
                	$this->fetch_optionals();
@@ -262,13 +262,13 @@ 
             if ($num_rows) {
             	$this->fetchComments();
             	return 1;
-            }else {
+            } else {
             	return 0;
             }
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -281,50 +281,50 @@ 
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
      *  @return int			         	<=0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
         global $conf, $langs;
-        $error=0;
+        $error = 0;
 
         // Clean parameters
-        if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-        if (isset($this->fk_task_parent)) $this->fk_task_parent=trim($this->fk_task_parent);
-        if (isset($this->label)) $this->label=trim($this->label);
-        if (isset($this->description)) $this->description=trim($this->description);
-        if (isset($this->duration_effective)) $this->duration_effective=trim($this->duration_effective);
-        if (isset($this->planned_workload)) $this->planned_workload=trim($this->planned_workload);
+        if (isset($this->fk_project)) $this->fk_project = trim($this->fk_project);
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+        if (isset($this->fk_task_parent)) $this->fk_task_parent = trim($this->fk_task_parent);
+        if (isset($this->label)) $this->label = trim($this->label);
+        if (isset($this->description)) $this->description = trim($this->description);
+        if (isset($this->duration_effective)) $this->duration_effective = trim($this->duration_effective);
+        if (isset($this->planned_workload)) $this->planned_workload = trim($this->planned_workload);
 
         // Check parameters
         // Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
-        $sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"'".$this->db->escape($this->id)."'").",";
-        $sql.= " fk_task_parent=".(isset($this->fk_task_parent)?$this->fk_task_parent:"null").",";
-        $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
-        $sql.= " duration_effective=".(isset($this->duration_effective)?$this->duration_effective:"null").",";
-        $sql.= " planned_workload=".((isset($this->planned_workload) && $this->planned_workload != '')?$this->planned_workload:"null").",";
-        $sql.= " dateo=".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null').",";
-        $sql.= " datee=".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null').",";
-        $sql.= " progress=".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null').",";
-        $sql.= " rang=".((!empty($this->rang))?$this->rang:"0");
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
+		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "'".$this->db->escape($this->id)."'").",";
+        $sql .= " fk_task_parent=".(isset($this->fk_task_parent) ? $this->fk_task_parent : "null").",";
+        $sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+        $sql .= " description=".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "null").",";
+        $sql .= " duration_effective=".(isset($this->duration_effective) ? $this->duration_effective : "null").",";
+        $sql .= " planned_workload=".((isset($this->planned_workload) && $this->planned_workload != '') ? $this->planned_workload : "null").",";
+        $sql .= " dateo=".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null').",";
+        $sql .= " datee=".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null').",";
+        $sql .= " progress=".(($this->progress != '' && $this->progress >= 0) ? $this->progress : 'null').",";
+        $sql .= " rang=".((!empty($this->rang)) ? $this->rang : "0");
+        $sql .= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('TASK_MODIFY',$user);
+                $result = $this->call_trigger('TASK_MODIFY', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -334,7 +334,7 @@ 
         if (!$error) {
         	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
         	{
-        		$result=$this->insertExtraFields();
+        		$result = $this->insertExtraFields();
         		if ($result < 0)
         		{
         			$error++;
@@ -342,7 +342,7 @@ 
         	}
         }
 
-        if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
+        if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
         {
             // We remove directory
             if ($conf->projet->dir_output)
@@ -354,12 +354,12 @@ 
                 $newdir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->ref);
                 if (file_exists($olddir))
                 {
-                    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-                    $res=dol_move($olddir, $newdir);
-                    if (! $res)
+                    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+                    $res = dol_move($olddir, $newdir);
+                    if (!$res)
                     {
                         $langs->load("errors");
-                        $this->error=$langs->trans('ErrorFailToRenameDir',$olddir,$newdir);
+                        $this->error = $langs->trans('ErrorFailToRenameDir', $olddir, $newdir);
                         $error++;
                     }
                 }
@@ -369,13 +369,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -392,79 +392,79 @@ 
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
      *	@return	int						<0 if KO, >0 if OK
      */
-    function delete($user, $notrigger=0)
+    function delete($user, $notrigger = 0)
     {
 
         global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error=0;
+        $error = 0;
 
         $this->db->begin();
 
         if ($this->hasChildren() > 0)
         {
             dol_syslog(get_class($this)."::delete Can't delete record as it has some sub tasks", LOG_WARNING);
-            $this->error='ErrorRecordHasSubTasks';
+            $this->error = 'ErrorRecordHasSubTasks';
             $this->db->rollback();
             return 0;
         }
 
         $objectisused = $this->isObjectUsed($this->id);
-        if (! empty($objectisused))
+        if (!empty($objectisused))
         {
             dol_syslog(get_class($this)."::delete Can't delete record as it has some child", LOG_WARNING);
-            $this->error='ErrorRecordHasChildren';
+            $this->error = 'ErrorRecordHasChildren';
             $this->db->rollback();
             return 0;
         }
 
-        if (! $error)
+        if (!$error)
         {
             // Delete linked contacts
             $res = $this->delete_linked_contact();
             if ($res < 0)
             {
-                $this->error='ErrorFailToDeleteLinkedContact';
+                $this->error = 'ErrorFailToDeleteLinkedContact';
                 //$error++;
                 $this->db->rollback();
                 return 0;
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
 	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
-	        $sql.= " WHERE fk_task=".$this->id;
+	        $sql .= " WHERE fk_task=".$this->id;
 
 	        $resql = $this->db->query($sql);
-	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+	        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
         }
 
-        if (! $error)
+        if (!$error)
         {
 	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields";
-	        $sql.= " WHERE fk_object=".$this->id;
+	        $sql .= " WHERE fk_object=".$this->id;
 
 	        $resql = $this->db->query($sql);
-	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+	        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
         }
 
-        if (! $error)
+        if (!$error)
         {
 	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
-	        $sql.= " WHERE rowid=".$this->id;
+	        $sql .= " WHERE rowid=".$this->id;
 
 	        $resql = $this->db->query($sql);
-	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+	        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
         }
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('TASK_DELETE',$user);
+                $result = $this->call_trigger('TASK_DELETE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -473,27 +473,27 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
 		{
 			//Delete associated link file
 	        if ($conf->projet->dir_output)
 	        {
-	        	$projectstatic=new Project($this->db);
+	        	$projectstatic = new Project($this->db);
 	        	$projectstatic->fetch($this->fk_project);
 
-	            $dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($projectstatic->ref) . '/' . dol_sanitizeFileName($this->id);
+	            $dir = $conf->projet->dir_output."/".dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($this->id);
 	            dol_syslog(get_class($this)."::delete dir=".$dir, LOG_DEBUG);
 	            if (file_exists($dir))
 	            {
-	            	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	            	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	                $res = @dol_delete_dir_recursive($dir);
 	                if (!$res)
 	                {
@@ -517,24 +517,24 @@ 
      */
     function hasChildren()
     {
-    	$error=0;
-        $ret=0;
+    	$error = 0;
+        $ret = 0;
 
         $sql = "SELECT COUNT(*) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
-        $sql.= " WHERE fk_task_parent=".$this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task";
+        $sql .= " WHERE fk_task_parent=".$this->id;
 
         dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
         else
         {
-            $obj=$this->db->fetch_object($resql);
-            if ($obj) $ret=$obj->nb;
+            $obj = $this->db->fetch_object($resql);
+            if ($obj) $ret = $obj->nb;
             $this->db->free($resql);
         }
 
-        if (! $error)
+        if (!$error)
         {
             return $ret;
         }
@@ -551,24 +551,24 @@ 
      */
     function hasTimeSpent()
     {
-    	$error=0;
-        $ret=0;
+    	$error = 0;
+        $ret = 0;
 
         $sql = "SELECT COUNT(*) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time";
-        $sql.= " WHERE fk_task=".$this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time";
+        $sql .= " WHERE fk_task=".$this->id;
 
         dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
         else
         {
-            $obj=$this->db->fetch_object($resql);
-            if ($obj) $ret=$obj->nb;
+            $obj = $this->db->fetch_object($resql);
+            if ($obj) $ret = $obj->nb;
             $this->db->free($resql);
         }
 
-        if (! $error)
+        if (!$error)
         {
             return $ret;
         }
@@ -591,50 +591,50 @@ 
      *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
      *	@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0,$option='',$mode='task', $addlabel=0, $sep=' - ', $notooltip=0, $save_lastsearch_value=-1)
+    function getNomUrl($withpicto = 0, $option = '', $mode = 'task', $addlabel = 0, $sep = ' - ', $notooltip = 0, $save_lastsearch_value = -1)
     {
         global $conf, $langs, $user;
 
-        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("ShowTask") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->label))
-            $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+        $result = '';
+        $label = '<u>'.$langs->trans("ShowTask").'</u>';
+        if (!empty($this->ref))
+            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+        if (!empty($this->label))
+            $label .= '<br><b>'.$langs->trans('LabelTask').':</b> '.$this->label;
         if ($this->date_start || $this->date_end)
         {
-        	$label .= "<br>".get_date_range($this->date_start,$this->date_end,'',$langs,0);
+        	$label .= "<br>".get_date_range($this->date_start, $this->date_end, '', $langs, 0);
         }
 
-        $url = DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option=='withproject'?'&withproject=1':'');
+        $url = DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option == 'withproject' ? '&withproject=1' : '');
         // 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';
+        $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';
 
         $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowTask");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowTask");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip"';
         }
 
         $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
-        $picto='projecttask';
+        $picto = 'projecttask';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend . (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+        if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+        if ($withpicto && $withpicto != 2) $result .= ' ';
+        if ($withpicto != 2) $result .= $linkstart.$this->ref.$linkend.(($addlabel && $this->label) ? $sep.dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
         return $result;
     }
 
@@ -647,17 +647,17 @@ 
      */
     function initAsSpecimen()
     {
-        $this->id=0;
-
-        $this->fk_projet='';
-		$this->ref='TK01';
-        $this->fk_task_parent='';
-        $this->label='Specimen task TK01';
-        $this->duration_effective='';
-        $this->fk_user_creat='';
-        $this->progress='25';
-        $this->fk_statut='';
-        $this->note='This is a specimen task not';
+        $this->id = 0;
+
+        $this->fk_projet = '';
+		$this->ref = 'TK01';
+        $this->fk_task_parent = '';
+        $this->label = 'Specimen task TK01';
+        $this->duration_effective = '';
+        $this->fk_user_creat = '';
+        $this->progress = '25';
+        $this->fk_statut = '';
+        $this->note = 'This is a specimen task not';
     }
 
     /**
@@ -676,7 +676,7 @@ 
      * @param	string	$filterontaskuser	Filter on user assigned to task
      * @return 	array						Array of tasks
      */
-    function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $filteronprojref='', $filteronprojstatus=-1, $morewherefilter='',$filteronprojuser=0,$filterontaskuser=0)
+    function getTasksArray($usert = 0, $userp = 0, $projectid = 0, $socid = 0, $mode = 0, $filteronprojref = '', $filteronprojstatus = -1, $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0)
     {
         global $conf;
 
@@ -686,73 +686,73 @@ 
 
         // List of tasks (does not care about permissions. Filtering will be done later)
         $sql = "SELECT p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus,";
-        $sql.= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
-        $sql.= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
-        $sql.= " s.rowid as thirdparty_id, s.nom as thirdparty_name";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+        $sql .= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
+        $sql .= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
+        $sql .= " s.rowid as thirdparty_id, s.nom as thirdparty_name";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
         if ($mode == 0)
         {
             if ($filteronprojuser > 0)
             {
-                $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-                $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+                $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+                $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
             }
-            $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+            $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
             if ($filterontaskuser > 0)
             {
-                $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
-                $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
+                $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
+                $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
             }
-            $sql.= " WHERE p.entity IN (".getEntity('project').")";
-            $sql.= " AND t.fk_projet = p.rowid";
+            $sql .= " WHERE p.entity IN (".getEntity('project').")";
+            $sql .= " AND t.fk_projet = p.rowid";
         }
         elseif ($mode == 1)
         {
             if ($filteronprojuser > 0)
             {
-                $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-                $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+                $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+                $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
             }
             if ($filterontaskuser > 0)
             {
-                $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-                $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
-                $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
+                $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+                $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
+                $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
             }
             else
             {
-                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
+                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
             }
-            $sql.= " WHERE p.entity IN (".getEntity('project').")";
+            $sql .= " WHERE p.entity IN (".getEntity('project').")";
         }
         else return 'BadValueForParameterMode';
 
         if ($filteronprojuser > 0)
         {
-            $sql.= " AND p.rowid = ec.element_id";
-            $sql.= " AND ctc.rowid = ec.fk_c_type_contact";
-            $sql.= " AND ctc.element = 'project'";
-            $sql.= " AND ec.fk_socpeople = ".$filteronprojuser;
-            $sql.= " AND ec.statut = 4";
-            $sql.= " AND ctc.source = 'internal'";
+            $sql .= " AND p.rowid = ec.element_id";
+            $sql .= " AND ctc.rowid = ec.fk_c_type_contact";
+            $sql .= " AND ctc.element = 'project'";
+            $sql .= " AND ec.fk_socpeople = ".$filteronprojuser;
+            $sql .= " AND ec.statut = 4";
+            $sql .= " AND ctc.source = 'internal'";
         }
         if ($filterontaskuser > 0)
         {
-            $sql.= " AND t.fk_projet = p.rowid";
-            $sql.= " AND p.rowid = ec2.element_id";
-            $sql.= " AND ctc2.rowid = ec2.fk_c_type_contact";
-            $sql.= " AND ctc2.element = 'project_task'";
-            $sql.= " AND ec2.fk_socpeople = ".$filterontaskuser;
-            $sql.= " AND ec2.statut = 4";
-            $sql.= " AND ctc2.source = 'internal'";
-        }
-        if ($socid)	$sql.= " AND p.fk_soc = ".$socid;
-        if ($projectid) $sql.= " AND p.rowid in (".$projectid.")";
-        if ($filteronprojref) $sql.= " AND p.ref LIKE '%".$filteronprojref."%'";
-        if ($filteronprojstatus > -1) $sql.= " AND p.fk_statut = ".$filteronprojstatus;
-        if ($morewherefilter) $sql.=$morewherefilter;
-        $sql.= " ORDER BY p.ref, t.rang, t.dateo";
+            $sql .= " AND t.fk_projet = p.rowid";
+            $sql .= " AND p.rowid = ec2.element_id";
+            $sql .= " AND ctc2.rowid = ec2.fk_c_type_contact";
+            $sql .= " AND ctc2.element = 'project_task'";
+            $sql .= " AND ec2.fk_socpeople = ".$filterontaskuser;
+            $sql .= " AND ec2.statut = 4";
+            $sql .= " AND ctc2.source = 'internal'";
+        }
+        if ($socid)	$sql .= " AND p.fk_soc = ".$socid;
+        if ($projectid) $sql .= " AND p.rowid in (".$projectid.")";
+        if ($filteronprojref) $sql .= " AND p.ref LIKE '%".$filteronprojref."%'";
+        if ($filteronprojstatus > -1) $sql .= " AND p.fk_statut = ".$filteronprojstatus;
+        if ($morewherefilter) $sql .= $morewherefilter;
+        $sql .= " ORDER BY p.ref, t.rang, t.dateo";
 
         //print $sql;exit;
         dol_syslog(get_class($this)."::getTasksArray", LOG_DEBUG);
@@ -764,49 +764,49 @@ 
             // Loop on each record found, so each couple (project id, task id)
             while ($i < $num)
             {
-                $error=0;
+                $error = 0;
 
                 $obj = $this->db->fetch_object($resql);
 
-                if ((! $obj->public) && (is_object($userp)))	// If not public project and we ask a filter on project owned by a user
+                if ((!$obj->public) && (is_object($userp)))	// If not public project and we ask a filter on project owned by a user
                 {
-                    if (! $this->getUserRolesForProjectsOrTasks($userp, 0, $obj->projectid, 0))
+                    if (!$this->getUserRolesForProjectsOrTasks($userp, 0, $obj->projectid, 0))
                     {
                         $error++;
                     }
                 }
                 if (is_object($usert))							// If we ask a filter on a user affected to a task
                 {
-                    if (! $this->getUserRolesForProjectsOrTasks(0, $usert, $obj->projectid, $obj->taskid))
+                    if (!$this->getUserRolesForProjectsOrTasks(0, $usert, $obj->projectid, $obj->taskid))
                     {
                         $error++;
                     }
                 }
 
-                if (! $error)
+                if (!$error)
                 {
 					$tasks[$i] = new Task($this->db);
-                    $tasks[$i]->id				= $obj->taskid;
-					$tasks[$i]->ref				= $obj->taskref;
+                    $tasks[$i]->id = $obj->taskid;
+					$tasks[$i]->ref = $obj->taskref;
                     $tasks[$i]->fk_project		= $obj->projectid;
                     $tasks[$i]->projectref		= $obj->ref;
                     $tasks[$i]->projectlabel	= $obj->plabel;
-                    $tasks[$i]->projectstatus	= $obj->projectstatus;
-                    $tasks[$i]->label			= $obj->label;
+                    $tasks[$i]->projectstatus = $obj->projectstatus;
+                    $tasks[$i]->label = $obj->label;
                     $tasks[$i]->description		= $obj->description;
-                    $tasks[$i]->fk_parent		= $obj->fk_task_parent;      // deprecated
-                    $tasks[$i]->fk_task_parent	= $obj->fk_task_parent;
+                    $tasks[$i]->fk_parent = $obj->fk_task_parent; // deprecated
+                    $tasks[$i]->fk_task_parent = $obj->fk_task_parent;
                     $tasks[$i]->duration		= $obj->duration_effective;
-                    $tasks[$i]->planned_workload= $obj->planned_workload;
+                    $tasks[$i]->planned_workload = $obj->planned_workload;
                     $tasks[$i]->progress		= $obj->progress;
-                    $tasks[$i]->fk_statut		= $obj->status;
-                    $tasks[$i]->public			= $obj->public;
-                    $tasks[$i]->date_start		= $this->db->jdate($obj->date_start);
+                    $tasks[$i]->fk_statut = $obj->status;
+                    $tasks[$i]->public = $obj->public;
+                    $tasks[$i]->date_start = $this->db->jdate($obj->date_start);
                     $tasks[$i]->date_end		= $this->db->jdate($obj->date_end);
                     $tasks[$i]->rang	   		= $obj->rang;
 
-                    $tasks[$i]->thirdparty_id	= $obj->thirdparty_id;
-                    $tasks[$i]->thirdparty_name	= $obj->thirdparty_name;
+                    $tasks[$i]->thirdparty_id = $obj->thirdparty_id;
+                    $tasks[$i]->thirdparty_name = $obj->thirdparty_name;
                 }
 
                 $i++;
@@ -831,7 +831,7 @@ 
      * @param	integer	$filteronprojstatus	  Filter on project status if userp is set. Not used if userp not defined.
      * @return 	array					      Array (projectid => 'list of roles for project' or taskid => 'list of roles for task')
      */
-    function getUserRolesForProjectsOrTasks($userp, $usert, $projectid='', $taskid=0, $filteronprojstatus=-1)
+    function getUserRolesForProjectsOrTasks($userp, $usert, $projectid = '', $taskid = 0, $filteronprojstatus = -1)
     {
         $arrayroles = array();
 
@@ -840,41 +840,41 @@ 
         // We want role of user for a projet or role of user for a task. Both are not possible.
         if (empty($userp) && empty($usert))
         {
-            $this->error="CallWithWrongParameters";
+            $this->error = "CallWithWrongParameters";
             return -1;
         }
-        if (! empty($userp) && ! empty($usert))
+        if (!empty($userp) && !empty($usert))
         {
-            $this->error="CallWithWrongParameters";
+            $this->error = "CallWithWrongParameters";
             return -1;
         }
 
         /* Liste des taches et role sur les projets ou taches */
         $sql = "SELECT pt.rowid as pid, ec.element_id, ctc.code, ctc.source";
-        if ($userp) $sql.= " FROM ".MAIN_DB_PREFIX."projet as pt";
-        if ($usert && $filteronprojstatus > -1) $sql.= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."projet_task as pt";
-        if ($usert && $filteronprojstatus <= -1) $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
-        $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-        $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-        $sql.= " WHERE pt.rowid = ec.element_id";
-        if ($userp && $filteronprojstatus > -1) $sql.= " AND pt.fk_statut = ".$filteronprojstatus;
-        if ($usert && $filteronprojstatus > -1) $sql.= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".$filteronprojstatus;
-        if ($userp) $sql.= " AND ctc.element = 'project'";
-        if ($usert) $sql.= " AND ctc.element = 'project_task'";
-        $sql.= " AND ctc.rowid = ec.fk_c_type_contact";
-        if ($userp) $sql.= " AND ec.fk_socpeople = ".$userp->id;
-        if ($usert) $sql.= " AND ec.fk_socpeople = ".$usert->id;
-        $sql.= " AND ec.statut = 4";
-        $sql.= " AND ctc.source = 'internal'";
+        if ($userp) $sql .= " FROM ".MAIN_DB_PREFIX."projet as pt";
+        if ($usert && $filteronprojstatus > -1) $sql .= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."projet_task as pt";
+        if ($usert && $filteronprojstatus <= -1) $sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
+        $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+        $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+        $sql .= " WHERE pt.rowid = ec.element_id";
+        if ($userp && $filteronprojstatus > -1) $sql .= " AND pt.fk_statut = ".$filteronprojstatus;
+        if ($usert && $filteronprojstatus > -1) $sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".$filteronprojstatus;
+        if ($userp) $sql .= " AND ctc.element = 'project'";
+        if ($usert) $sql .= " AND ctc.element = 'project_task'";
+        $sql .= " AND ctc.rowid = ec.fk_c_type_contact";
+        if ($userp) $sql .= " AND ec.fk_socpeople = ".$userp->id;
+        if ($usert) $sql .= " AND ec.fk_socpeople = ".$usert->id;
+        $sql .= " AND ec.statut = 4";
+        $sql .= " AND ctc.source = 'internal'";
         if ($projectid)
         {
-            if ($userp) $sql.= " AND pt.rowid in (".$projectid.")";
-            if ($usert) $sql.= " AND pt.fk_projet in (".$projectid.")";
+            if ($userp) $sql .= " AND pt.rowid in (".$projectid.")";
+            if ($usert) $sql .= " AND pt.fk_projet in (".$projectid.")";
         }
         if ($taskid)
         {
-            if ($userp) $sql.= " ERROR SHOULD NOT HAPPENS";
-            if ($usert) $sql.= " AND pt.rowid = ".$taskid;
+            if ($userp) $sql .= " ERROR SHOULD NOT HAPPENS";
+            if ($usert) $sql .= " AND pt.rowid = ".$taskid;
         }
         //print $sql;
 
@@ -888,7 +888,7 @@ 
             {
                 $obj = $this->db->fetch_object($resql);
                 if (empty($arrayroles[$obj->pid])) $arrayroles[$obj->pid] = $obj->code;
-                else $arrayroles[$obj->pid].=','.$obj->code;
+                else $arrayroles[$obj->pid] .= ','.$obj->code;
                 $i++;
             }
             $this->db->free($resql);
@@ -908,12 +908,12 @@ 
      *	@param	string	$source		Source
      *  @return array				Array of id of contacts
      */
-    function getListContactId($source='internal')
+    function getListContactId($source = 'internal')
     {
         $contactAlreadySelected = array();
-        $tab = $this->liste_contact(-1,$source);
+        $tab = $this->liste_contact(-1, $source);
         //var_dump($tab);
-        $num=count($tab);
+        $num = count($tab);
         $i = 0;
         while ($i < $num)
         {
@@ -932,18 +932,18 @@ 
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
      *  @return	int                     <=0 if KO, >0 if OK
      */
-    function addTimeSpent($user, $notrigger=0)
+    function addTimeSpent($user, $notrigger = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
         dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
 
         $ret = 0;
 
         // Check parameters
-        if (! is_object($user))
+        if (!is_object($user))
         {
-        	dol_print_error('',"Method addTimeSpent was called with wrong parameter user");
+        	dol_print_error('', "Method addTimeSpent was called with wrong parameter user");
         	return -1;
         }
 
@@ -954,41 +954,41 @@ 
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_time (";
-        $sql.= "fk_task";
-        $sql.= ", task_date";
-        $sql.= ", task_datehour";
-        $sql.= ", task_date_withhour";
-        $sql.= ", task_duration";
-        $sql.= ", fk_user";
-        $sql.= ", note";
-        $sql.= ") VALUES (";
-        $sql.= $this->id;
-        $sql.= ", '".$this->db->idate($this->timespent_date)."'";
-        $sql.= ", '".$this->db->idate($this->timespent_datehour)."'";
-        $sql.= ", ".(empty($this->timespent_withhour)?0:1);
-        $sql.= ", ".$this->timespent_duration;
-        $sql.= ", ".$this->timespent_fk_user;
-        $sql.= ", ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null");
-        $sql.= ")";
-
-        $resql=$this->db->query($sql);
+        $sql .= "fk_task";
+        $sql .= ", task_date";
+        $sql .= ", task_datehour";
+        $sql .= ", task_date_withhour";
+        $sql .= ", task_duration";
+        $sql .= ", fk_user";
+        $sql .= ", note";
+        $sql .= ") VALUES (";
+        $sql .= $this->id;
+        $sql .= ", '".$this->db->idate($this->timespent_date)."'";
+        $sql .= ", '".$this->db->idate($this->timespent_datehour)."'";
+        $sql .= ", ".(empty($this->timespent_withhour) ? 0 : 1);
+        $sql .= ", ".$this->timespent_duration;
+        $sql .= ", ".$this->timespent_fk_user;
+        $sql .= ", ".(isset($this->timespent_note) ? "'".$this->db->escape($this->timespent_note)."'" : "null");
+        $sql .= ")";
+
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_time");
             $ret = $tasktime_id;
 			$this->timespent_id = $ret;
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('TASK_TIMESPENT_CREATE',$user);
-                if ($result < 0) { $ret=-1; }
+                $result = $this->call_trigger('TASK_TIMESPENT_CREATE', $user);
+                if ($result < 0) { $ret = -1; }
                 // End call triggers
             }
         }
         else
 		{
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $ret = -1;
         }
 
@@ -996,30 +996,30 @@ 
         {
         	// Recalculate amount of time spent for task and update denormalized field
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
-            $sql.= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->id.")";
-			if (isset($this->progress)) $sql.= ", progress = " . $this->progress;	// Do not overwrite value if not provided
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->id.")";
+			if (isset($this->progress)) $sql .= ", progress = ".$this->progress; // Do not overwrite value if not provided
+            $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
-            if (! $this->db->query($sql) )
+            if (!$this->db->query($sql))
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $ret = -2;
             }
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
-            $sql.= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")";	// set average hour rate of user
-            $sql.= " WHERE rowid = ".$tasktime_id;
+            $sql .= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")"; // set average hour rate of user
+            $sql .= " WHERE rowid = ".$tasktime_id;
 
             dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
-            if (! $this->db->query($sql) )
+            if (!$this->db->query($sql))
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $ret = -2;
             }
         }
 
-        if ($ret >0)
+        if ($ret > 0)
         {
         	$this->db->commit();
         }
@@ -1036,46 +1036,46 @@ 
      *  @param  int     $userid     Filter on user id. 0=No filter
      *  @return array		        Array of info for task array('min_date', 'max_date', 'total_duration', 'total_amount', 'nblines', 'nblinesnull')
      */
-    function getSummaryOfTimeSpent($userid=0)
+    function getSummaryOfTimeSpent($userid = 0)
     {
         global $langs;
 
-        $id=$this->id;
+        $id = $this->id;
         if (empty($id))
         {
             dol_syslog("getSummaryOfTimeSpent called on a not loaded task", LOG_ERR);
             return -1;
         }
 
-        $result=array();
+        $result = array();
 
         $sql = "SELECT";
-        $sql.= " MIN(t.task_datehour) as min_date,";
-        $sql.= " MAX(t.task_datehour) as max_date,";
-        $sql.= " SUM(t.task_duration) as total_duration,";
-        $sql.= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as total_amount,";
-        $sql.= " COUNT(t.rowid) as nblines,";
-        $sql.= " SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-        $sql.= " WHERE t.fk_task = ".$id;
-        if ($userid > 0) $sql.=" AND t.fk_user = ".$userid;
+        $sql .= " MIN(t.task_datehour) as min_date,";
+        $sql .= " MAX(t.task_datehour) as max_date,";
+        $sql .= " SUM(t.task_duration) as total_duration,";
+        $sql .= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as total_amount,";
+        $sql .= " COUNT(t.rowid) as nblines,";
+        $sql .= " SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+        $sql .= " WHERE t.fk_task = ".$id;
+        if ($userid > 0) $sql .= " AND t.fk_user = ".$userid;
 
         dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
 
-            $result['min_date'] = $obj->min_date;               // deprecated. use the ->timespent_xxx instead
-            $result['max_date'] = $obj->max_date;               // deprecated. use the ->timespent_xxx instead
-            $result['total_duration'] = $obj->total_duration;   // deprecated. use the ->timespent_xxx instead
+            $result['min_date'] = $obj->min_date; // deprecated. use the ->timespent_xxx instead
+            $result['max_date'] = $obj->max_date; // deprecated. use the ->timespent_xxx instead
+            $result['total_duration'] = $obj->total_duration; // deprecated. use the ->timespent_xxx instead
 
-            $this->timespent_min_date=$this->db->jdate($obj->min_date);
-            $this->timespent_max_date=$this->db->jdate($obj->max_date);
-            $this->timespent_total_duration=$obj->total_duration;
-            $this->timespent_total_amount=$obj->total_amount;
-            $this->timespent_nblinesnull=($obj->nblinesnull?$obj->nblinesnull:0);
-            $this->timespent_nblines=($obj->nblines?$obj->nblines:0);
+            $this->timespent_min_date = $this->db->jdate($obj->min_date);
+            $this->timespent_max_date = $this->db->jdate($obj->max_date);
+            $this->timespent_total_duration = $obj->total_duration;
+            $this->timespent_total_amount = $obj->total_amount;
+            $this->timespent_nblinesnull = ($obj->nblinesnull ? $obj->nblinesnull : 0);
+            $this->timespent_nblines = ($obj->nblines ? $obj->nblines : 0);
 
             $this->db->free($resql);
         }
@@ -1094,37 +1094,37 @@ 
      *  @param		string		$datee		End date (ex 23:59:59)
      *  @return 	array	        		Array of info for task array('amount','nbseconds','nblinesnull')
      */
-    function getSumOfAmount($fuser='', $dates='', $datee='')
+    function getSumOfAmount($fuser = '', $dates = '', $datee = '')
     {
         global $langs;
 
-        if (empty($id)) $id=$this->id;
+        if (empty($id)) $id = $this->id;
 
-        $result=array();
+        $result = array();
 
         $sql = "SELECT";
-        $sql.= " SUM(t.task_duration) as nbseconds,";
-        $sql.= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as amount, SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-        $sql.= " WHERE t.fk_task = ".$id;
+        $sql .= " SUM(t.task_duration) as nbseconds,";
+        $sql .= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as amount, SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+        $sql .= " WHERE t.fk_task = ".$id;
         if (is_object($fuser) && $fuser->id > 0)
         {
-        	$sql.=" AND fk_user = ".$fuser->id;
+        	$sql .= " AND fk_user = ".$fuser->id;
         }
     	if ($dates > 0)
 		{
-			$datefieldname="task_datehour";
-			$sql.=" AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
+			$datefieldname = "task_datehour";
+			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
     	if ($datee > 0)
 		{
-			$datefieldname="task_datehour";
-			$sql.=" AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
+			$datefieldname = "task_datehour";
+			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
 		}
 		//print $sql;
 
         dol_syslog(get_class($this)."::getSumOfAmount", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -1154,33 +1154,33 @@ 
         global $langs;
 
         $sql = "SELECT";
-        $sql.= " t.rowid,";
-        $sql.= " t.fk_task,";
-        $sql.= " t.task_date,";
-        $sql.= " t.task_datehour,";
-        $sql.= " t.task_date_withhour,";
-        $sql.= " t.task_duration,";
-        $sql.= " t.fk_user,";
-        $sql.= " t.note";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-        $sql.= " WHERE t.rowid = ".$id;
+        $sql .= " t.rowid,";
+        $sql .= " t.fk_task,";
+        $sql .= " t.task_date,";
+        $sql .= " t.task_datehour,";
+        $sql .= " t.task_date_withhour,";
+        $sql .= " t.task_duration,";
+        $sql .= " t.fk_user,";
+        $sql .= " t.note";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+        $sql .= " WHERE t.rowid = ".$id;
 
         dol_syslog(get_class($this)."::fetchTimeSpent", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->timespent_id			= $obj->rowid;
-                $this->id					= $obj->fk_task;
-                $this->timespent_date		= $this->db->jdate($obj->task_date);
+                $this->timespent_id = $obj->rowid;
+                $this->id = $obj->fk_task;
+                $this->timespent_date = $this->db->jdate($obj->task_date);
                 $this->timespent_datehour   = $this->db->jdate($obj->task_datehour);
                 $this->timespent_withhour   = $obj->task_date_withhour;
-                $this->timespent_duration	= $obj->task_duration;
-                $this->timespent_fk_user	= $obj->fk_user;
-                $this->timespent_note		= $obj->note;
+                $this->timespent_duration = $obj->task_duration;
+                $this->timespent_fk_user = $obj->fk_user;
+                $this->timespent_note = $obj->note;
             }
 
             $this->db->free($resql);
@@ -1189,7 +1189,7 @@ 
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -1201,9 +1201,9 @@ 
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
      *  @return	int						<0 if KO, >0 if OK
      */
-    function updateTimeSpent($user, $notrigger=0)
+    function updateTimeSpent($user, $notrigger = 0)
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
         $ret = 0;
 
@@ -1214,21 +1214,21 @@ 
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
-        $sql.= " task_date = '".$this->db->idate($this->timespent_date)."',";
-        $sql.= " task_datehour = '".$this->db->idate($this->timespent_datehour)."',";
-        $sql.= " task_date_withhour = ".(empty($this->timespent_withhour)?0:1).",";
-        $sql.= " task_duration = ".$this->timespent_duration.",";
-        $sql.= " fk_user = ".$this->timespent_fk_user.",";
-        $sql.= " note = ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null");
-        $sql.= " WHERE rowid = ".$this->timespent_id;
+        $sql .= " task_date = '".$this->db->idate($this->timespent_date)."',";
+        $sql .= " task_datehour = '".$this->db->idate($this->timespent_datehour)."',";
+        $sql .= " task_date_withhour = ".(empty($this->timespent_withhour) ? 0 : 1).",";
+        $sql .= " task_duration = ".$this->timespent_duration.",";
+        $sql .= " fk_user = ".$this->timespent_fk_user.",";
+        $sql .= " note = ".(isset($this->timespent_note) ? "'".$this->db->escape($this->timespent_note)."'" : "null");
+        $sql .= " WHERE rowid = ".$this->timespent_id;
 
         dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
-        if ($this->db->query($sql) )
+        if ($this->db->query($sql))
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('TASK_TIMESPENT_MODIFY',$user);
+                $result = $this->call_trigger('TASK_TIMESPENT_MODIFY', $user);
                 if ($result < 0)
                 {
                     $this->db->rollback();
@@ -1241,7 +1241,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             $ret = -1;
         }
@@ -1251,13 +1251,13 @@ 
             $newDuration = $this->timespent_duration - $this->timespent_old_duration;
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
-            $sql.= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->db->escape($this->id).")";
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->db->escape($this->id).")";
+            $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
-            if (! $this->db->query($sql) )
+            if (!$this->db->query($sql))
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 $ret = -2;
             }
@@ -1274,46 +1274,46 @@ 
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
      *  @return	int						<0 if KO, >0 if OK
      */
-    function delTimeSpent($user, $notrigger=0)
+    function delTimeSpent($user, $notrigger = 0)
     {
         global $conf, $langs;
 
-        $error=0;
+        $error = 0;
 
         $this->db->begin();
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
-        $sql.= " WHERE rowid = ".$this->timespent_id;
+        $sql .= " WHERE rowid = ".$this->timespent_id;
 
         dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('TASK_TIMESPENT_DELETE',$user);
+                $result = $this->call_trigger('TASK_TIMESPENT_DELETE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
-            $sql.= " SET duration_effective = duration_effective - ".$this->db->escape($this->timespent_duration?$this->timespent_duration:0);
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " SET duration_effective = duration_effective - ".$this->db->escape($this->timespent_duration ? $this->timespent_duration : 0);
+            $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
-            if ($this->db->query($sql) )
+            if ($this->db->query($sql))
             {
                 $result = 0;
             }
             else
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $result = -2;
             }
         }
@@ -1321,13 +1321,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::delTimeSpent ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -1349,21 +1349,21 @@ 
 	 *	@param	bool	$clone_prog				clone progress of project
 	 * 	@return	int								New id of clone
 	 */
-	function createFromClone($fromid,$project_id,$parent_task_id,$clone_change_dt=false,$clone_affectation=false,$clone_time=false,$clone_file=false,$clone_note=false,$clone_prog=false)
+	function createFromClone($fromid, $project_id, $parent_task_id, $clone_change_dt = false, $clone_affectation = false, $clone_time = false, $clone_file = false, $clone_note = false, $clone_prog = false)
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
 		//Use 00:00 of today if time is use on task.
-		$now=dol_mktime(0,0,0,dol_print_date(dol_now(),'%m'),dol_print_date(dol_now(),'%d'),dol_print_date(dol_now(),'%Y'));
+		$now = dol_mktime(0, 0, 0, dol_print_date(dol_now(), '%m'), dol_print_date(dol_now(), '%d'), dol_print_date(dol_now(), '%Y'));
 
 		$datec = $now;
 
-		$clone_task=new Task($this->db);
-		$origin_task=new Task($this->db);
+		$clone_task = new Task($this->db);
+		$origin_task = new Task($this->db);
 
-		$clone_task->context['createfromclone']='createfromclone';
+		$clone_task->context['createfromclone'] = 'createfromclone';
 
 		$this->db->begin();
 
@@ -1374,29 +1374,29 @@ 
 
 		$origin_task->fetch($fromid);
 
-		$defaultref='';
-		$obj = empty($conf->global->PROJECT_TASK_ADDON)?'mod_task_simple':$conf->global->PROJECT_TASK_ADDON;
-		if (! empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+		$defaultref = '';
+		$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+		if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
 		{
-			require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
 			$modTask = new $obj;
-			$defaultref = $modTask->getNextValue(0,$clone_task);
+			$defaultref = $modTask->getNextValue(0, $clone_task);
 		}
 
 		$ori_project_id					= $clone_task->fk_project;
 
 		$clone_task->id					= 0;
 		$clone_task->ref				= $defaultref;
-        $clone_task->fk_project			= $project_id;
-        $clone_task->fk_task_parent		= $parent_task_id;
-        $clone_task->date_c				= $datec;
-        $clone_task->planned_workload	= $origin_task->planned_workload;
-		$clone_task->rang				= $origin_task->rang;
+        $clone_task->fk_project = $project_id;
+        $clone_task->fk_task_parent = $parent_task_id;
+        $clone_task->date_c = $datec;
+        $clone_task->planned_workload = $origin_task->planned_workload;
+		$clone_task->rang = $origin_task->rang;
 
         //Manage Task Date
         if ($clone_change_dt)
         {
-        	$projectstatic=new Project($this->db);
+        	$projectstatic = new Project($this->db);
         	$projectstatic->fetch($ori_project_id);
 
         	//Origin project strat date
@@ -1405,51 +1405,51 @@ 
 	    	//Calcultate new task start date with difference between origin proj start date and origin task start date
 	    	if (!empty($clone_task->date_start))
 	    	{
-				$clone_task->date_start			= $now + $clone_task->date_start - $orign_project_dt_start;
+				$clone_task->date_start = $now + $clone_task->date_start - $orign_project_dt_start;
 	    	}
 
 	    	//Calcultate new task end date with difference between origin proj end date and origin task end date
 	    	if (!empty($clone_task->date_end))
 	    	{
-				$clone_task->date_end			= $now + $clone_task->date_end - $orign_project_dt_start;
+				$clone_task->date_end = $now + $clone_task->date_end - $orign_project_dt_start;
 	    	}
 
         }
 
 		if (!$clone_prog)
         {
-        	    $clone_task->progress=0;
+        	    $clone_task->progress = 0;
         }
 
 		// Create clone
-		$result=$clone_task->create($user);
+		$result = $clone_task->create($user);
 
 		// Other options
 		if ($result < 0)
 		{
-			$this->error=$clone_task->error;
+			$this->error = $clone_task->error;
 			$error++;
 		}
 
 		// End
-		if (! $error)
+		if (!$error)
 		{
-			$clone_task_id=$clone_task->id;
+			$clone_task_id = $clone_task->id;
 			$clone_task_ref = $clone_task->ref;
 
        		//Note Update
 			if (!$clone_note)
        		{
-        	    $clone_task->note_private='';
-    			$clone_task->note_public='';
+        	    $clone_task->note_private = '';
+    			$clone_task->note_public = '';
         	}
         	else
         	{
         		$this->db->begin();
-				$res=$clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES),'_public');
+				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
 				{
-					$this->error.=$clone_task->error;
+					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
 				}
@@ -1459,10 +1459,10 @@ 
 				}
 
 				$this->db->begin();
-				$res=$clone_task->update_note(dol_html_entity_decode($clone_task->note_private, ENT_QUOTES), '_private');
+				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_private, ENT_QUOTES), '_private');
 				if ($res < 0)
 				{
-					$this->error.=$clone_task->error;
+					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
 				}
@@ -1478,39 +1478,39 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 				//retreive project origin ref to know folder to copy
-				$projectstatic=new Project($this->db);
+				$projectstatic = new Project($this->db);
 	        	$projectstatic->fetch($ori_project_id);
-	        	$ori_project_ref=$projectstatic->ref;
+	        	$ori_project_ref = $projectstatic->ref;
 
-	        	if ($ori_project_id!=$project_id)
+	        	if ($ori_project_id != $project_id)
 	        	{
 	        		$projectstatic->fetch($project_id);
-	        		$clone_project_ref=$projectstatic->ref;
+	        		$clone_project_ref = $projectstatic->ref;
 	        	}
 	        	else
 	        	{
-	        		$clone_project_ref=$ori_project_ref;
+	        		$clone_project_ref = $ori_project_ref;
 	        	}
 
-				$clone_task_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($clone_project_ref). "/" . dol_sanitizeFileName($clone_task_ref);
-				$ori_task_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($ori_project_ref). "/" . dol_sanitizeFileName($fromid);
+				$clone_task_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($clone_project_ref)."/".dol_sanitizeFileName($clone_task_ref);
+				$ori_task_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($ori_project_ref)."/".dol_sanitizeFileName($fromid);
 
-				$filearray=dol_dir_list($ori_task_dir,"files",0,'','(\.meta|_preview.*\.png)$','',SORT_ASC,1);
-				foreach($filearray as $key => $file)
+				$filearray = dol_dir_list($ori_task_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
+				foreach ($filearray as $key => $file)
 				{
 					if (!file_exists($clone_task_dir))
 					{
 						if (dol_mkdir($clone_task_dir) < 0)
 						{
-							$this->error.=$langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
+							$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
 							$error++;
 						}
 					}
 
-					$rescopy = dol_copy($ori_task_dir . '/' . $file['name'], $clone_task_dir . '/' . $file['name'],0,1);
+					$rescopy = dol_copy($ori_task_dir.'/'.$file['name'], $clone_task_dir.'/'.$file['name'], 0, 1);
 					if (is_numeric($rescopy) && $rescopy < 0)
 					{
-						$this->error.=$langs->trans("ErrorFailToCopyFile",$ori_task_dir . '/' . $file['name'],$clone_task_dir . '/' . $file['name']);
+						$this->error .= $langs->trans("ErrorFailToCopyFile", $ori_task_dir.'/'.$file['name'], $clone_task_dir.'/'.$file['name']);
 						$error++;
 					}
 				}
@@ -1522,10 +1522,10 @@ 
 				$origin_task = new Task($this->db);
 				$origin_task->fetch($fromid);
 
-				foreach(array('internal','external') as $source)
+				foreach (array('internal', 'external') as $source)
 				{
-					$tab = $origin_task->liste_contact(-1,$source);
-					$num=count($tab);
+					$tab = $origin_task->liste_contact(-1, $source);
+					$num = count($tab);
 					$i = 0;
 					while ($i < $num)
 					{
@@ -1533,14 +1533,14 @@ 
 						if ($clone_task->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 						{
 							$langs->load("errors");
-							$this->error.=$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
 						}
 						else
 						{
-							if ($clone_task->error!='')
+							if ($clone_task->error != '')
 							{
-								$this->error.=$clone_task->error;
+								$this->error .= $clone_task->error;
 								$error++;
 							}
 						}
@@ -1549,7 +1549,7 @@ 
 				}
 			}
 
-			if($clone_time)
+			if ($clone_time)
 			{
 				//TODO clone time of affectation
 			}
@@ -1557,7 +1557,7 @@ 
 
 		unset($clone_task->context['createfromclone']);
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return $clone_task_id;
@@ -1565,7 +1565,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : " . $this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -1577,9 +1577,9 @@ 
 	 *	@param	integer	$mode		0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * 	@return	string	  			Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->fk_statut,$mode);
+		return $this->LibStatut($this->fk_statut, $mode);
 	}
 
 	/**
@@ -1589,19 +1589,19 @@ 
 	 *	@param	integer		$mode		0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * 	@return	string	  				Label
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
 		// list of Statut of the task
-		$this->statuts[0]='Draft';
-		$this->statuts[1]='Validated';
-		$this->statuts[2]='Running';
-		$this->statuts[3]='Finish';
-		$this->statuts[4]='Transfered';
-		$this->statuts_short[0]='Draft';
-		$this->statuts_short[1]='Validated';
-		$this->statuts_short[2]='Running';
-		$this->statuts_short[3]='Finish';
-		$this->statuts_short[4]='Transfered';
+		$this->statuts[0] = 'Draft';
+		$this->statuts[1] = 'Validated';
+		$this->statuts[2] = 'Running';
+		$this->statuts[3] = 'Finish';
+		$this->statuts[4] = 'Transfered';
+		$this->statuts_short[0] = 'Draft';
+		$this->statuts_short[1] = 'Validated';
+		$this->statuts_short[2] = 'Running';
+		$this->statuts_short[3] = 'Finish';
+		$this->statuts_short[4] = 'Transfered';
 
 		global $langs;
 
@@ -1615,39 +1615,39 @@ 
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut1').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut3').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==3) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==4) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==5) return img_picto($langs->trans($this->statuts_short[$statut]),'statut5').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 0) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 2) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 3) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 4) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 5) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5').' '.$langs->trans($this->statuts_short[$statut]);
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut1');
-			if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut3');
-			if ($statut==3) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==4) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
-			if ($statut==5) return img_picto($langs->trans($this->statuts_short[$statut]),'statut5');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
+			if ($statut == 1) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1');
+			if ($statut == 2) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3');
+			if ($statut == 3) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+			if ($statut == 4) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+			if ($statut == 5) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5');
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==3) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==4) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==5) return img_picto($langs->trans($this->statuts_short[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 0) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 2) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 3) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 4) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 5) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
-			if ($statut==1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut1');
-			if ($statut==2) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut3');
-			if ($statut==3) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==4) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
-			if ($statut==5) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut5');
+			if ($statut == 0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
+			if ($statut == 1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut1');
+			if ($statut == 2) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut3');
+			if ($statut == 3) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+			if ($statut == 4) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+			if ($statut == 5) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut5');
 		}
 		if ($mode == 6)
 		{
@@ -1672,19 +1672,19 @@ 
 	 *  @param  int			$hideref        Hide ref
 	 *  @return int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("projects");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'nodefault';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->PROJECT_TASK_ADDON_PDF)) {
+			} elseif (!empty($conf->global->PROJECT_TASK_ADDON_PDF)) {
 				$modele = $conf->global->PROJECT_TASK_ADDON_PDF;
 			}
 		}
@@ -1705,43 +1705,43 @@ 
 	{
 		global $conf, $langs;
 		
-		$mine=0; $socid=$user->societe_id;
+		$mine = 0; $socid = $user->societe_id;
 		
 		$projectstatic = new Project($this->db);
-		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$socid);
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, $mine, 1, $socid);
 		
 		// List of tasks (does not care about permissions. Filtering will be done later)
 		$sql = "SELECT p.rowid as projectid, p.fk_statut as projectstatus,";
-		$sql.= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
-		$sql.= " t.dateo as date_start, t.datee as datee";
-		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-		$sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
-		$sql.= " AND p.fk_statut = 1";
-		$sql.= " AND t.fk_projet = p.rowid";
-		$sql.= " AND t.progress < 100";         // tasks to do
-		if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		$sql .= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
+		$sql .= " t.dateo as date_start, t.datee as datee";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+		$sql .= " WHERE p.entity IN (".getEntity('project', 0).')';
+		$sql .= " AND p.fk_statut = 1";
+		$sql .= " AND t.fk_projet = p.rowid";
+		$sql .= " AND t.progress < 100"; // tasks to do
+		if ($mine || !$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")";
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id.") OR (s.rowid IS NULL))";
 		//print $sql;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$task_static = new Task($this->db);
 			
 			$response = new WorkboardResponse();
-			$response->warning_delay = $conf->projet->task->warning_delay/60/60/24;
+			$response->warning_delay = $conf->projet->task->warning_delay / 60 / 60 / 24;
 			$response->label = $langs->trans("OpenedTasks");
 			if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
 			else $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
-			$response->img = img_object('',"task");
+			$response->img = img_object('', "task");
 			
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$response->nbtodo++;
 				
@@ -1759,7 +1759,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -1774,33 +1774,33 @@ 
 	{
 		global $user;
 		
-		$mine=0; $socid=$user->societe_id;
+		$mine = 0; $socid = $user->societe_id;
 		
 		$projectstatic = new Project($this->db);
-		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$socid);
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, $mine, 1, $socid);
 		
 		// List of tasks (does not care about permissions. Filtering will be done later)
 		$sql = "SELECT count(p.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-		$sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
-		$sql.= " AND t.fk_projet = p.rowid";         // tasks to do
-		if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+		$sql .= " WHERE p.entity IN (".getEntity('project', 0).')';
+		$sql .= " AND t.fk_projet = p.rowid"; // tasks to do
+		if ($mine || !$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")";
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id.") OR (s.rowid IS NULL))";
 		
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$this->nb["tasks"]=$obj->nb;
+				$this->nb["tasks"] = $obj->nb;
 			}
 			$this->db->free($resql);
 			return 1;
@@ -1808,7 +1808,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -1822,7 +1822,7 @@ 
 	{
 	    global $conf;
 
-        if (! ($this->progress >= 0 && $this->progress < 100)) {
+        if (!($this->progress >= 0 && $this->progress < 100)) {
             return false;
         }
 

Braces +290 added lines, -148 removed lines

@@ -155,9 +155,11 @@ 
         // Update extrafield
         if (! $error)
         {
-        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+        		// For avoid conflicts if trigger used
         	{
         		$result=$this->insertExtraFields();
+        	}
         		if ($result < 0)
         		{
         			$error++;
@@ -175,8 +177,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return $this->id;
@@ -219,7 +220,7 @@ 
         $sql.= " WHERE ";
         if (!empty($ref)) {
         	$sql.="t.ref = '".$this->db->escape($ref)."'";
-        }else {
+        } else {
         	$sql.="t.rowid = ".$id;
         }
 
@@ -262,11 +263,10 @@ 
             if ($num_rows) {
             	$this->fetchComments();
             	return 1;
-            }else {
+            } else {
             	return 0;
             }
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -287,13 +287,27 @@ 
         $error=0;
 
         // Clean parameters
-        if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-        if (isset($this->fk_task_parent)) $this->fk_task_parent=trim($this->fk_task_parent);
-        if (isset($this->label)) $this->label=trim($this->label);
-        if (isset($this->description)) $this->description=trim($this->description);
-        if (isset($this->duration_effective)) $this->duration_effective=trim($this->duration_effective);
-        if (isset($this->planned_workload)) $this->planned_workload=trim($this->planned_workload);
+        if (isset($this->fk_project)) {
+        	$this->fk_project=trim($this->fk_project);
+        }
+		if (isset($this->ref)) {
+			$this->ref=trim($this->ref);
+		}
+        if (isset($this->fk_task_parent)) {
+        	$this->fk_task_parent=trim($this->fk_task_parent);
+        }
+        if (isset($this->label)) {
+        	$this->label=trim($this->label);
+        }
+        if (isset($this->description)) {
+        	$this->description=trim($this->description);
+        }
+        if (isset($this->duration_effective)) {
+        	$this->duration_effective=trim($this->duration_effective);
+        }
+        if (isset($this->planned_workload)) {
+        	$this->planned_workload=trim($this->planned_workload);
+        }
 
         // Check parameters
         // Put here code to add control on parameters values
@@ -332,9 +346,11 @@ 
 
         //Update extrafield
         if (!$error) {
-        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+        		// For avoid conflicts if trigger used
         	{
         		$result=$this->insertExtraFields();
+        	}
         		if ($result < 0)
         		{
         			$error++;
@@ -376,8 +392,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -480,8 +495,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
 		{
 			//Delete associated link file
 	        if ($conf->projet->dir_output)
@@ -526,19 +540,19 @@ 
 
         dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        else
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } else
         {
             $obj=$this->db->fetch_object($resql);
-            if ($obj) $ret=$obj->nb;
+            if ($obj) {
+            	$ret=$obj->nb;
+            }
             $this->db->free($resql);
         }
 
         if (! $error)
         {
             return $ret;
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -560,19 +574,19 @@ 
 
         dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        else
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } else
         {
             $obj=$this->db->fetch_object($resql);
-            if ($obj) $ret=$obj->nb;
+            if ($obj) {
+            	$ret=$obj->nb;
+            }
             $this->db->free($resql);
         }
 
         if (! $error)
         {
             return $ret;
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -595,14 +609,19 @@ 
     {
         global $conf, $langs, $user;
 
-        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("ShowTask") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->label))
-            $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+        if (! empty($this->ref)) {
+                    $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        }
+        if (! empty($this->label)) {
+                    $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+        }
         if ($this->date_start || $this->date_end)
         {
         	$label .= "<br>".get_date_range($this->date_start,$this->date_end,'',$langs,0);
@@ -611,8 +630,12 @@ 
         $url = DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option=='withproject'?'&withproject=1':'');
         // 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 = '';
         if (empty($notooltip))
@@ -632,9 +655,15 @@ 
 
         $picto='projecttask';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend . (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+        if ($withpicto) {
+        	$result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+        	$result.=' ';
+        }
+        if ($withpicto != 2) {
+        	$result.=$linkstart.$this->ref.$linkend . (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+        }
         return $result;
     }
 
@@ -706,8 +735,7 @@ 
             }
             $sql.= " WHERE p.entity IN (".getEntity('project').")";
             $sql.= " AND t.fk_projet = p.rowid";
-        }
-        elseif ($mode == 1)
+        } elseif ($mode == 1)
         {
             if ($filteronprojuser > 0)
             {
@@ -719,14 +747,14 @@ 
                 $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
                 $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
                 $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
-            }
-            else
+            } else
             {
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
             }
             $sql.= " WHERE p.entity IN (".getEntity('project').")";
+        } else {
+        	return 'BadValueForParameterMode';
         }
-        else return 'BadValueForParameterMode';
 
         if ($filteronprojuser > 0)
         {
@@ -747,11 +775,21 @@ 
             $sql.= " AND ec2.statut = 4";
             $sql.= " AND ctc2.source = 'internal'";
         }
-        if ($socid)	$sql.= " AND p.fk_soc = ".$socid;
-        if ($projectid) $sql.= " AND p.rowid in (".$projectid.")";
-        if ($filteronprojref) $sql.= " AND p.ref LIKE '%".$filteronprojref."%'";
-        if ($filteronprojstatus > -1) $sql.= " AND p.fk_statut = ".$filteronprojstatus;
-        if ($morewherefilter) $sql.=$morewherefilter;
+        if ($socid) {
+        	$sql.= " AND p.fk_soc = ".$socid;
+        }
+        if ($projectid) {
+        	$sql.= " AND p.rowid in (".$projectid.")";
+        }
+        if ($filteronprojref) {
+        	$sql.= " AND p.ref LIKE '%".$filteronprojref."%'";
+        }
+        if ($filteronprojstatus > -1) {
+        	$sql.= " AND p.fk_statut = ".$filteronprojstatus;
+        }
+        if ($morewherefilter) {
+        	$sql.=$morewherefilter;
+        }
         $sql.= " ORDER BY p.ref, t.rang, t.dateo";
 
         //print $sql;exit;
@@ -768,18 +806,22 @@ 
 
                 $obj = $this->db->fetch_object($resql);
 
-                if ((! $obj->public) && (is_object($userp)))	// If not public project and we ask a filter on project owned by a user
+                if ((! $obj->public) && (is_object($userp))) {
+                	// If not public project and we ask a filter on project owned by a user
                 {
                     if (! $this->getUserRolesForProjectsOrTasks($userp, 0, $obj->projectid, 0))
                     {
                         $error++;
+                }
                     }
                 }
-                if (is_object($usert))							// If we ask a filter on a user affected to a task
+                if (is_object($usert)) {
+                	// If we ask a filter on a user affected to a task
                 {
                     if (! $this->getUserRolesForProjectsOrTasks(0, $usert, $obj->projectid, $obj->taskid))
                     {
                         $error++;
+                }
                     }
                 }
 
@@ -812,8 +854,7 @@ 
                 $i++;
             }
             $this->db->free($resql);
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -851,30 +892,56 @@ 
 
         /* Liste des taches et role sur les projets ou taches */
         $sql = "SELECT pt.rowid as pid, ec.element_id, ctc.code, ctc.source";
-        if ($userp) $sql.= " FROM ".MAIN_DB_PREFIX."projet as pt";
-        if ($usert && $filteronprojstatus > -1) $sql.= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."projet_task as pt";
-        if ($usert && $filteronprojstatus <= -1) $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
+        if ($userp) {
+        	$sql.= " FROM ".MAIN_DB_PREFIX."projet as pt";
+        }
+        if ($usert && $filteronprojstatus > -1) {
+        	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."projet_task as pt";
+        }
+        if ($usert && $filteronprojstatus <= -1) {
+        	$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
+        }
         $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
         $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
         $sql.= " WHERE pt.rowid = ec.element_id";
-        if ($userp && $filteronprojstatus > -1) $sql.= " AND pt.fk_statut = ".$filteronprojstatus;
-        if ($usert && $filteronprojstatus > -1) $sql.= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".$filteronprojstatus;
-        if ($userp) $sql.= " AND ctc.element = 'project'";
-        if ($usert) $sql.= " AND ctc.element = 'project_task'";
+        if ($userp && $filteronprojstatus > -1) {
+        	$sql.= " AND pt.fk_statut = ".$filteronprojstatus;
+        }
+        if ($usert && $filteronprojstatus > -1) {
+        	$sql.= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".$filteronprojstatus;
+        }
+        if ($userp) {
+        	$sql.= " AND ctc.element = 'project'";
+        }
+        if ($usert) {
+        	$sql.= " AND ctc.element = 'project_task'";
+        }
         $sql.= " AND ctc.rowid = ec.fk_c_type_contact";
-        if ($userp) $sql.= " AND ec.fk_socpeople = ".$userp->id;
-        if ($usert) $sql.= " AND ec.fk_socpeople = ".$usert->id;
+        if ($userp) {
+        	$sql.= " AND ec.fk_socpeople = ".$userp->id;
+        }
+        if ($usert) {
+        	$sql.= " AND ec.fk_socpeople = ".$usert->id;
+        }
         $sql.= " AND ec.statut = 4";
         $sql.= " AND ctc.source = 'internal'";
         if ($projectid)
         {
-            if ($userp) $sql.= " AND pt.rowid in (".$projectid.")";
-            if ($usert) $sql.= " AND pt.fk_projet in (".$projectid.")";
+            if ($userp) {
+            	$sql.= " AND pt.rowid in (".$projectid.")";
+            }
+            if ($usert) {
+            	$sql.= " AND pt.fk_projet in (".$projectid.")";
+            }
         }
         if ($taskid)
         {
-            if ($userp) $sql.= " ERROR SHOULD NOT HAPPENS";
-            if ($usert) $sql.= " AND pt.rowid = ".$taskid;
+            if ($userp) {
+            	$sql.= " ERROR SHOULD NOT HAPPENS";
+            }
+            if ($usert) {
+            	$sql.= " AND pt.rowid = ".$taskid;
+            }
         }
         //print $sql;
 
@@ -887,13 +954,15 @@ 
             while ($i < $num)
             {
                 $obj = $this->db->fetch_object($resql);
-                if (empty($arrayroles[$obj->pid])) $arrayroles[$obj->pid] = $obj->code;
-                else $arrayroles[$obj->pid].=','.$obj->code;
+                if (empty($arrayroles[$obj->pid])) {
+                	$arrayroles[$obj->pid] = $obj->code;
+                } else {
+                	$arrayroles[$obj->pid].=','.$obj->code;
+                }
                 $i++;
             }
             $this->db->free($resql);
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -917,8 +986,11 @@ 
         $i = 0;
         while ($i < $num)
         {
-            if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-            else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+            if ($source == 'thirdparty') {
+            	$contactAlreadySelected[$i] = $tab[$i]['socid'];
+            } else {
+            	$contactAlreadySelected[$i] = $tab[$i]['id'];
+            }
             $i++;
         }
         return $contactAlreadySelected;
@@ -948,8 +1020,12 @@ 
         }
 
         // Clean parameters
-        if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
-		if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
+        if (isset($this->timespent_note)) {
+        	$this->timespent_note = trim($this->timespent_note);
+        }
+		if (empty($this->timespent_datehour)) {
+			$this->timespent_datehour = $this->timespent_date;
+		}
 
         $this->db->begin();
 
@@ -985,8 +1061,7 @@ 
                 if ($result < 0) { $ret=-1; }
                 // End call triggers
             }
-        }
-        else
+        } else
 		{
             $this->error=$this->db->lasterror();
             $ret = -1;
@@ -997,7 +1072,10 @@ 
         	// Recalculate amount of time spent for task and update denormalized field
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
             $sql.= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->id.")";
-			if (isset($this->progress)) $sql.= ", progress = " . $this->progress;	// Do not overwrite value if not provided
+			if (isset($this->progress)) {
+				$sql.= ", progress = " . $this->progress;
+			}
+			// Do not overwrite value if not provided
             $sql.= " WHERE rowid = ".$this->id;
 
             dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
@@ -1022,8 +1100,7 @@ 
         if ($ret >0)
         {
         	$this->db->commit();
-        }
-        else
+        } else
 		{
         	$this->db->rollback();
         }
@@ -1058,7 +1135,9 @@ 
         $sql.= " SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
         $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
         $sql.= " WHERE t.fk_task = ".$id;
-        if ($userid > 0) $sql.=" AND t.fk_user = ".$userid;
+        if ($userid > 0) {
+        	$sql.=" AND t.fk_user = ".$userid;
+        }
 
         dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -1078,8 +1157,7 @@ 
             $this->timespent_nblines=($obj->nblines?$obj->nblines:0);
 
             $this->db->free($resql);
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -1098,7 +1176,9 @@ 
     {
         global $langs;
 
-        if (empty($id)) $id=$this->id;
+        if (empty($id)) {
+        	$id=$this->id;
+        }
 
         $result=array();
 
@@ -1135,8 +1215,7 @@ 
 
             $this->db->free($resql);
             return $result;
-        }
-        else
+        } else
 		{
             dol_print_error($this->db);
             return $result;
@@ -1186,8 +1265,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -1208,8 +1286,12 @@ 
         $ret = 0;
 
         // Clean parameters
-        if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
-        if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
+        if (empty($this->timespent_datehour)) {
+        	$this->timespent_datehour = $this->timespent_date;
+        }
+        if (isset($this->timespent_note)) {
+        	$this->timespent_note = trim($this->timespent_note);
+        }
 
         $this->db->begin();
 
@@ -1233,13 +1315,14 @@ 
                 {
                     $this->db->rollback();
                     $ret = -1;
+                } else {
+                	$ret = 1;
                 }
-                else $ret = 1;
                 // End call triggers
+            } else {
+            	$ret = 1;
             }
-            else $ret = 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->db->rollback();
@@ -1263,7 +1346,9 @@ 
             }
         }
 
-        if ($ret >= 0) $this->db->commit();
+        if ($ret >= 0) {
+        	$this->db->commit();
+        }
         return $ret;
     }
 
@@ -1310,8 +1395,7 @@ 
             if ($this->db->query($sql) )
             {
                 $result = 0;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->lasterror();
                 $result = -2;
@@ -1328,8 +1412,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -1442,8 +1525,7 @@ 
        		{
         	    $clone_task->note_private='';
     			$clone_task->note_public='';
-        	}
-        	else
+        	} else
         	{
         		$this->db->begin();
 				$res=$clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES),'_public');
@@ -1452,8 +1534,7 @@ 
 					$this->error.=$clone_task->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 				}
@@ -1465,8 +1546,7 @@ 
 					$this->error.=$clone_task->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 				}
@@ -1486,8 +1566,7 @@ 
 	        	{
 	        		$projectstatic->fetch($project_id);
 	        		$clone_project_ref=$projectstatic->ref;
-	        	}
-	        	else
+	        	} else
 	        	{
 	        		$clone_project_ref=$ori_project_ref;
 	        	}
@@ -1535,8 +1614,7 @@ 
 							$langs->load("errors");
 							$this->error.=$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
-						}
-						else
+						} else
 						{
 							if ($clone_task->error!='')
 							{
@@ -1561,8 +1639,7 @@ 
 		{
 			$this->db->commit();
 			return $clone_task_id;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : " . $this->error, LOG_ERR);
@@ -1615,39 +1692,87 @@ 
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut1').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut3').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==3) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==4) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==5) return img_picto($langs->trans($this->statuts_short[$statut]),'statut5').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut==0) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts_short[$statut]);
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut1').' '.$langs->trans($this->statuts_short[$statut]);
+			}
+			if ($statut==2) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut3').' '.$langs->trans($this->statuts_short[$statut]);
+			}
+			if ($statut==3) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			}
+			if ($statut==4) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts_short[$statut]);
+			}
+			if ($statut==5) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut5').' '.$langs->trans($this->statuts_short[$statut]);
+			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut1');
-			if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut3');
-			if ($statut==3) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==4) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
-			if ($statut==5) return img_picto($langs->trans($this->statuts_short[$statut]),'statut5');
+			if ($statut==0) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut1');
+			}
+			if ($statut==2) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut3');
+			}
+			if ($statut==3) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			}
+			if ($statut==4) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			}
+			if ($statut==5) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut5');
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==3) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==4) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==5) return img_picto($langs->trans($this->statuts_short[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==0) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==2) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==3) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==4) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==5) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]);
+			}
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
-			if ($statut==1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut1');
-			if ($statut==2) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut3');
-			if ($statut==3) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==4) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
-			if ($statut==5) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut5');
+			if ($statut==0) {
+				return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
+			}
+			if ($statut==1) {
+				return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut1');
+			}
+			if ($statut==2) {
+				return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut3');
+			}
+			if ($statut==3) {
+				return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			}
+			if ($statut==4) {
+				return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			}
+			if ($statut==5) {
+				return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut5');
+			}
 		}
 		if ($mode == 6)
 		{
@@ -1716,17 +1841,25 @@ 
 		$sql.= " t.dateo as date_start, t.datee as datee";
 		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		if (! $user->rights->societe->client->voir && ! $socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		}
 		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
 		$sql.= " AND p.fk_statut = 1";
 		$sql.= " AND t.fk_projet = p.rowid";
 		$sql.= " AND t.progress < 100";         // tasks to do
-		if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		if ($mine || ! $user->rights->projet->all->lire) {
+			$sql.= " AND p.rowid IN (".$projectsListId.")";
+		}
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		if ($socid) {
+			$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		}
+		if (! $user->rights->societe->client->voir && ! $socid) {
+			$sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		}
 		//print $sql;
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -1736,8 +1869,11 @@ 
 			$response = new WorkboardResponse();
 			$response->warning_delay = $conf->projet->task->warning_delay/60/60/24;
 			$response->label = $langs->trans("OpenedTasks");
-			if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
-			else $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
+			if ($user->rights->projet->all->lire) {
+				$response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
+			} else {
+				$response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
+			}
 			$response->img = img_object('',"task");
 			
 			// This assignment in condition is not a bug. It allows walking the results.
@@ -1756,8 +1892,7 @@ 
 			}
 			
 			return $response;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -1783,15 +1918,23 @@ 
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		if (! $user->rights->societe->client->voir && ! $socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		}
 		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
 		$sql.= " AND t.fk_projet = p.rowid";         // tasks to do
-		if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		if ($mine || ! $user->rights->projet->all->lire) {
+			$sql.= " AND p.rowid IN (".$projectsListId.")";
+		}
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		if ($socid) {
+			$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		}
+		if (! $user->rights->societe->client->voir && ! $socid) {
+			$sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		}
 		
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -1804,8 +1947,7 @@ 
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();

htdocs/user/class/api_deprecated_user.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
 	 * Delete account <b>Warning: Deprecated</b>
 	 *
 	 * @param   int     $id Account ID
-	 * @return  array
+	 * @return  integer
      * 
 	 * @url	DELETE user/{id}
 	 */

Indentation +66 added lines, -66 removed lines

@@ -90,41 +90,41 @@ 
 	 * @param   int   $contactid   Id of contact
 	 * @param   array   $request_data   Request datas
 	 * @return  int     ID of user
-     * 
+	 * 
 	 * @url	POST /contact/{contactid}/createUser
 	 */
 	function createFromContact($contactid, $request_data = NULL) {
 		//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
 			//throw new RestException(401);
-        //}
+		//}
         
-        if (!isset($request_data["login"]))
-    				throw new RestException(400, "login field missing");
-        if (!isset($request_data["password"]))
-    				throw new RestException(400, "password field missing");
-        if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
-          throw new RestException(401);
-        }
-    		$contact = new Contact($this->db);
-        $contact->fetch($contactid);
-        if ($contact->id <= 0) {
-          throw new RestException(404, 'Contact not found');
-        }
+		if (!isset($request_data["login"]))
+					throw new RestException(400, "login field missing");
+		if (!isset($request_data["password"]))
+					throw new RestException(400, "password field missing");
+		if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
+		  throw new RestException(401);
+		}
+			$contact = new Contact($this->db);
+		$contact->fetch($contactid);
+		if ($contact->id <= 0) {
+		  throw new RestException(404, 'Contact not found');
+		}
     
-        if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
-          throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
-        }
-        // Check mandatory fields
-        $login = $request_data["login"];
-        $password = $request_data["password"];
-        $result = $this->useraccount->create_from_contact($contact,$login,$password);
-        if ($result <= 0) {
-          throw new RestException(500, "User not created");
-        }
-        // password parameter not used in create_from_contact
-        $this->useraccount->setPassword($this->useraccount,$password);
+		if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
+		  throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+		}
+		// Check mandatory fields
+		$login = $request_data["login"];
+		$password = $request_data["password"];
+		$result = $this->useraccount->create_from_contact($contact,$login,$password);
+		if ($result <= 0) {
+		  throw new RestException(500, "User not created");
+		}
+		// password parameter not used in create_from_contact
+		$this->useraccount->setPassword($this->useraccount,$password);
         
-        return $result;
+		return $result;
 	}
 	
 	
@@ -137,31 +137,31 @@ 
 	 * @url POST user/
 	 */
 	function post($request_data = NULL) {
-	    // check user authorization
-	    //if(! DolibarrApiAccess::$user->rights->user->creer) {
-	    //   throw new RestException(401, "User creation not allowed");
-	    //}
-	    // check mandatory fields
-	    /*if (!isset($request_data["login"]))
+		// check user authorization
+		//if(! DolibarrApiAccess::$user->rights->user->creer) {
+		//   throw new RestException(401, "User creation not allowed");
+		//}
+		// check mandatory fields
+		/*if (!isset($request_data["login"]))
 	        throw new RestException(400, "login field missing");
 	    if (!isset($request_data["password"]))
 	        throw new RestException(400, "password field missing");
 	    if (!isset($request_data["lastname"]))
 	         throw new RestException(400, "lastname field missing");*/
-	    //assign field values
-        $xxx=var_export($request_data, true);
-        dol_syslog("xxx=".$xxx);
-        foreach ($request_data as $field => $value)
-	    {
-	          $this->useraccount->$field = $value;
-	    }
+		//assign field values
+		$xxx=var_export($request_data, true);
+		dol_syslog("xxx=".$xxx);
+		foreach ($request_data as $field => $value)
+		{
+			  $this->useraccount->$field = $value;
+		}
 	    
-        $result = $this->useraccount->create(DolibarrApiAccess::$user);
-	    if ($result <=0) {
-	         throw new RestException(500, "User not created : ".$this->useraccount->error);
-	    }
-	    return array('id'=>$result);
-    }                
+		$result = $this->useraccount->create(DolibarrApiAccess::$user);
+		if ($result <=0) {
+			 throw new RestException(500, "User not created : ".$this->useraccount->error);
+		}
+		return array('id'=>$result);
+	}                
 	
     
 	/**
@@ -170,7 +170,7 @@ 
 	 * @param int   $id             Id of account to update
 	 * @param array $request_data   Datas   
 	 * @return int 
-     * 
+	 * 
 	 * @url	PUT user/{id}
 	 */
 	function put($id, $request_data = NULL) {
@@ -191,49 +191,49 @@ 
 
 		foreach ($request_data as $field => $value)
 		{
-            if ($field == 'id') continue;
-		    $this->useraccount->$field = $value;
+			if ($field == 'id') continue;
+			$this->useraccount->$field = $value;
 		}
 
 		if ($this->useraccount->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
 			return $this->get($id);
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
+	/**
 	 * add user to group <b>Warning: Deprecated</b>
 	 *
 	 * @param   int     $id User ID
 	 * @param   int     $group Group ID
 	 * @return  int
-     * 
+	 * 
 	 * @url	GET user/{id}/setGroup/{group}
 	 */
 	function setGroup($id,$group) {
 		//if (!DolibarrApiAccess::$user->rights->user->user->supprimer) {
 			//throw new RestException(401);
 		//}
-        $result = $this->useraccount->fetch($id);
-        if (!$result)
-        {
-          throw new RestException(404, 'User not found');
-        }
+		$result = $this->useraccount->fetch($id);
+		if (!$result)
+		{
+		  throw new RestException(404, 'User not found');
+		}
     
-        if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-        {
-          throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
+		{
+		  throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+		}
     
-        return $this->useraccount->SetInGroup($group,1);
-    }
+		return $this->useraccount->SetInGroup($group,1);
+	}
 
 	/**
 	 * Delete account <b>Warning: Deprecated</b>
 	 *
 	 * @param   int     $id Account ID
 	 * @return  array
-     * 
+	 * 
 	 * @url	DELETE user/{id}
 	 */
 	function delete($id) {
@@ -256,7 +256,7 @@ 
 
 	/**
 	 * Validate fields before create or update object
-     * 
+	 * 
 	 * @param   array|null     $data   Data to validate
 	 * @return  array
 	 * @throws RestException

Spacing +11 added lines, -11 removed lines

@@ -78,7 +78,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->_cleanObjectDatas($this->useraccount);
@@ -112,17 +112,17 @@ 
         }
     
         if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
-          throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+          throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
         // Check mandatory fields
         $login = $request_data["login"];
         $password = $request_data["password"];
-        $result = $this->useraccount->create_from_contact($contact,$login,$password);
+        $result = $this->useraccount->create_from_contact($contact, $login, $password);
         if ($result <= 0) {
           throw new RestException(500, "User not created");
         }
         // password parameter not used in create_from_contact
-        $this->useraccount->setPassword($this->useraccount,$password);
+        $this->useraccount->setPassword($this->useraccount, $password);
         
         return $result;
 	}
@@ -149,7 +149,7 @@ 
 	    if (!isset($request_data["lastname"]))
 	         throw new RestException(400, "lastname field missing");*/
 	    //assign field values
-        $xxx=var_export($request_data, true);
+        $xxx = var_export($request_data, true);
         dol_syslog("xxx=".$xxx);
         foreach ($request_data as $field => $value)
 	    {
@@ -157,7 +157,7 @@ 
 	    }
 	    
         $result = $this->useraccount->create(DolibarrApiAccess::$user);
-	    if ($result <=0) {
+	    if ($result <= 0) {
 	         throw new RestException(500, "User not created : ".$this->useraccount->error);
 	    }
 	    return array('id'=>$result);
@@ -186,7 +186,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		foreach ($request_data as $field => $value)
@@ -210,7 +210,7 @@ 
      * 
 	 * @url	GET user/{id}/setGroup/{group}
 	 */
-	function setGroup($id,$group) {
+	function setGroup($id, $group) {
 		//if (!DolibarrApiAccess::$user->rights->user->user->supprimer) {
 			//throw new RestException(401);
 		//}
@@ -222,10 +222,10 @@ 
     
         if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
         {
-          throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+          throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
     
-        return $this->useraccount->SetInGroup($group,1);
+        return $this->useraccount->SetInGroup($group, 1);
     }
 
 	/**
@@ -248,7 +248,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->useraccount->delete($id);

Braces +15 added lines, -9 removed lines

@@ -98,10 +98,12 @@ 
 			//throw new RestException(401);
         //}
         
-        if (!isset($request_data["login"]))
-    				throw new RestException(400, "login field missing");
-        if (!isset($request_data["password"]))
-    				throw new RestException(400, "password field missing");
+        if (!isset($request_data["login"])) {
+            				throw new RestException(400, "login field missing");
+        }
+        if (!isset($request_data["password"])) {
+            				throw new RestException(400, "password field missing");
+        }
         if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
           throw new RestException(401);
         }
@@ -191,12 +193,15 @@ 
 
 		foreach ($request_data as $field => $value)
 		{
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+            	continue;
+            }
 		    $this->useraccount->$field = $value;
 		}
 
-		if ($this->useraccount->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
-			return $this->get($id);
+		if ($this->useraccount->update($id, DolibarrApiAccess::$user, 1, '', '', 'update')) {
+					return $this->get($id);
+		}
 
         return false;
     }
@@ -265,8 +270,9 @@ 
 		$account = array();
 		foreach (UserApi::$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");
+			}
 			$account[$field] = $data[$field];
 		}
 		return $account;

htdocs/fourn/class/fournisseur.commande.class.php

Doc Comments +9 added lines, -9 removed lines

@@ -643,7 +643,7 @@ 
      *  Returns the following order reference not used depending on the numbering model activated
      *                  defined within COMMANDE_SUPPLIER_ADDON_NUMBER
      *
-     *  @param	    Company		$soc  		company object
+     *  @param	    Societe		$soc  		company object
      *  @return     string                  free reference for the invoice
      */
     public function getNextNumRef($soc)
@@ -1337,9 +1337,9 @@ 
      *  @param		bool	$notrigger				Disable triggers
      *  @param		int		$date_start				Date start of service
      *  @param		int		$date_end				Date end of service
-	 *  @param		array	$array_options			extrafields array
+	 *  @param		integer	$array_options			extrafields array
      *  @param 		string	$fk_unit 				Code of the unit to use. Null to use the default one
-	 *  @param 		string	$pu_ht_devise			Amount in currency
+	 *  @param 		integer	$pu_ht_devise			Amount in currency
 	 *  @param		string	$origin					'order', ...
 	 *  @param		int		$origin_id				Id of origin object
      *	@return     int             				<=0 if KO, >0 if OK
@@ -1580,7 +1580,7 @@ 
      * @param 	int			$product				Id of product to dispatch
      * @param 	double		$qty					Qty to dispatch
      * @param 	int			$entrepot				Id of warehouse to add product
-     * @param 	double		$price					Unit Price for PMP value calculation (Unit price without Tax and taking into account discount)
+     * @param 	integer		$price					Unit Price for PMP value calculation (Unit price without Tax and taking into account discount)
      * @param	string		$comment				Comment for stock movement
 	 * @param	date		$eatby					eat-by date
 	 * @param	date		$sellby					sell-by date
@@ -2267,17 +2267,17 @@ 
      *	@param     	double		$qty             	Quantity
      *	@param     	double		$remise_percent  	Pourcentage de remise de la ligne
      *	@param     	double		$txtva          	Taux TVA
-     *  @param     	double		$txlocaltax1	    Localtax1 tax
-     *  @param     	double		$txlocaltax2   		Localtax2 tax
+     *  @param     	integer		$txlocaltax1	    Localtax1 tax
+     *  @param     	integer		$txlocaltax2   		Localtax2 tax
      *  @param     	double		$price_base_type 	Type of price base
      *	@param		int			$info_bits			Miscellaneous informations
      *	@param		int			$type				Type of line (0=product, 1=service)
      *  @param		int			$notrigger			Disable triggers
      *  @param      timestamp   $date_start     	Date start of service
      *  @param      timestamp   $date_end       	Date end of service
-	 *  @param		array		$array_options		Extrafields array
+	 *  @param		integer		$array_options		Extrafields array
      * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * 	@param		double		$pu_ht_devise		Unit price in currency
+	 * 	@param		integer		$pu_ht_devise		Unit price in currency
      *	@return    	int         	    			< 0 if error, > 0 if ok
      */
     public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit=null, $pu_ht_devise = 0)
@@ -2720,7 +2720,7 @@ 
      * Return the max number delivery delay in day
      *
      * @param	Translate	$langs		Language object
-     * @return 							Translated string
+     * @return 							string string
      */
     public function getMaxDeliveryTimeDay($langs)
 	{

Indentation +2954 added lines, -2954 removed lines

@@ -39,217 +39,217 @@ 
  */
 class CommandeFournisseur extends CommonOrder
 {
-    public $element='order_supplier';
-    public $table_element='commande_fournisseur';
-    public $table_element_line = 'commande_fournisseurdet';
-    public $fk_element = 'fk_commande';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto='order';
+	public $element='order_supplier';
+	public $table_element='commande_fournisseur';
+	public $table_element_line = 'commande_fournisseurdet';
+	public $fk_element = 'fk_commande';
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $picto='order';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
-    public $id;
+	public $id;
 
 	/**
 	 * Supplier order reference
 	 * @var string
 	 */
-    public $ref;
-    public $ref_supplier;
-    public $brouillon;
-    public $statut;			// 0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
-    //                                                              -> 7=Canceled/Never received -> (reopen) 3=Process runing
-    //									              -> 6=Canceled -> (reopen) 2=Approved
-    //  		                                      -> 9=Refused  -> (reopen) 1=Validated
-    //  Note: billed or not is on another field "billed"
-    public $statuts;           // List of status
-
-    public $socid;
-    public $fourn_id;
-    public $date;
-    public $date_valid;
-    public $date_approve;
-    public $date_approve2;		// Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
-    public $date_commande;
-
-    /**
-     * Delivery date
-     */
-    public $date_livraison;
-    public $total_ht;
-    public $total_tva;
-    public $total_localtax1;   // Total Local tax 1
-    public $total_localtax2;   // Total Local tax 2
-    public $total_ttc;
-    public $source;
+	public $ref;
+	public $ref_supplier;
+	public $brouillon;
+	public $statut;			// 0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
+	//                                                              -> 7=Canceled/Never received -> (reopen) 3=Process runing
+	//									              -> 6=Canceled -> (reopen) 2=Approved
+	//  		                                      -> 9=Refused  -> (reopen) 1=Validated
+	//  Note: billed or not is on another field "billed"
+	public $statuts;           // List of status
+
+	public $socid;
+	public $fourn_id;
+	public $date;
+	public $date_valid;
+	public $date_approve;
+	public $date_approve2;		// Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
+	public $date_commande;
+
+	/**
+	 * Delivery date
+	 */
+	public $date_livraison;
+	public $total_ht;
+	public $total_tva;
+	public $total_localtax1;   // Total Local tax 1
+	public $total_localtax2;   // Total Local tax 2
+	public $total_ttc;
+	public $source;
 	/**
 	 * @deprecated
 	 * @see note_private, note_public
 	 */
-    public $note;
+	public $note;
 	public $note_private;
-    public $note_public;
-    public $model_pdf;
-    public $fk_project;
-    public $cond_reglement_id;
-    public $cond_reglement_code;
-    public $fk_account;
-    public $mode_reglement_id;
-    public $mode_reglement_code;
-    public $user_author_id;
-    public $user_valid_id;
-    public $user_approve_id;
-    public $user_approve_id2;	// Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
+	public $note_public;
+	public $model_pdf;
+	public $fk_project;
+	public $cond_reglement_id;
+	public $cond_reglement_code;
+	public $fk_account;
+	public $mode_reglement_id;
+	public $mode_reglement_code;
+	public $user_author_id;
+	public $user_valid_id;
+	public $user_approve_id;
+	public $user_approve_id2;	// Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
 
 	//Incoterms
-    public $fk_incoterms;
-    public $location_incoterms;
-    public $libelle_incoterms;  //Used into tooltip
+	public $fk_incoterms;
+	public $location_incoterms;
+	public $libelle_incoterms;  //Used into tooltip
 
-    public $extraparams=array();
+	public $extraparams=array();
 
 	/**
 	 * @var CommandeFournisseurLigne[]
 	 */
 	public $lines = array();
 	//Add for supplier_proposal
-    public $origin;
-    public $origin_id;
-    public $linked_objects=array();
+	public $origin;
+	public $origin_id;
+	public $linked_objects=array();
 
 	// Multicurrency
-    public $fk_multicurrency;
-    public $multicurrency_code;
-    public $multicurrency_tx;
-    public $multicurrency_total_ht;
-    public $multicurrency_total_tva;
-    public $multicurrency_total_ttc;
+	public $fk_multicurrency;
+	public $multicurrency_code;
+	public $multicurrency_tx;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
+
+	/**
+	 * Draft status
+	 */
+	const STATUS_DRAFT = 0;
 
-    /**
-     * Draft status
-     */
-    const STATUS_DRAFT = 0;
 
 
+	/**
+	 * 	Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf;
+
+		$this->db = $db;
+		$this->products = array();
+
+		// List of language codes for status
+		$this->statuts[0] = 'StatusOrderDraft';
+		$this->statuts[1] = 'StatusOrderValidated';
+		$this->statuts[2] = 'StatusOrderApproved';
+		if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusOrderOnProcess';
+		else $this->statuts[3] = 'StatusOrderOnProcessWithValidation';
+		$this->statuts[4] = 'StatusOrderReceivedPartially';
+		$this->statuts[5] = 'StatusOrderReceivedAll';
+		$this->statuts[6] = 'StatusOrderCanceled';	// Approved->Canceled
+		$this->statuts[7] = 'StatusOrderCanceled';	// Process running->canceled
+		//$this->statuts[8] = 'StatusOrderBilled';	// Everything is finished, order received totally and bill received
+		$this->statuts[9] = 'StatusOrderRefused';
+	}
+
 
 	/**
-     * 	Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $conf;
-
-        $this->db = $db;
-        $this->products = array();
-
-        // List of language codes for status
-        $this->statuts[0] = 'StatusOrderDraft';
-        $this->statuts[1] = 'StatusOrderValidated';
-        $this->statuts[2] = 'StatusOrderApproved';
-        if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusOrderOnProcess';
-        else $this->statuts[3] = 'StatusOrderOnProcessWithValidation';
-        $this->statuts[4] = 'StatusOrderReceivedPartially';
-        $this->statuts[5] = 'StatusOrderReceivedAll';
-        $this->statuts[6] = 'StatusOrderCanceled';	// Approved->Canceled
-        $this->statuts[7] = 'StatusOrderCanceled';	// Process running->canceled
-        //$this->statuts[8] = 'StatusOrderBilled';	// Everything is finished, order received totally and bill received
-        $this->statuts[9] = 'StatusOrderRefused';
-    }
-
-
-    /**
-     *	Get object and lines from database
-     *
-     * 	@param	int		$id			Id of order to load
-     * 	@param	string	$ref		Ref of object
-     *	@return int 		        >0 if OK, <0 if KO, 0 if not found
-     */
-    public function fetch($id,$ref='')
-    {
-        global $conf;
-
-        // Check parameters
-        if (empty($id) && empty($ref)) return -1;
-
-        $sql = "SELECT c.rowid, c.ref, ref_supplier, c.fk_soc, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_vat,";
-        $sql.= " c.localtax1, c.localtax2, ";
-        $sql.= " c.date_creation, c.date_valid, c.date_approve, c.date_approve2,";
-        $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve, c.fk_user_approve2,";
-        $sql.= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
-        $sql.= " c.fk_account,";
-        $sql.= " c.note_private, c.note_public, c.model_pdf, c.extraparams, c.billed,";
+	 *	Get object and lines from database
+	 *
+	 * 	@param	int		$id			Id of order to load
+	 * 	@param	string	$ref		Ref of object
+	 *	@return int 		        >0 if OK, <0 if KO, 0 if not found
+	 */
+	public function fetch($id,$ref='')
+	{
+		global $conf;
+
+		// Check parameters
+		if (empty($id) && empty($ref)) return -1;
+
+		$sql = "SELECT c.rowid, c.ref, ref_supplier, c.fk_soc, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_vat,";
+		$sql.= " c.localtax1, c.localtax2, ";
+		$sql.= " c.date_creation, c.date_valid, c.date_approve, c.date_approve2,";
+		$sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve, c.fk_user_approve2,";
+		$sql.= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
+		$sql.= " c.fk_account,";
+		$sql.= " c.note_private, c.note_public, c.model_pdf, c.extraparams, c.billed,";
 		$sql.= " c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc,";
-        $sql.= " cm.libelle as methode_commande,";
-        $sql.= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
-        $sql.= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle";
-        $sql.= ', c.fk_incoterms, c.location_incoterms';
-        $sql.= ', i.libelle as libelle_incoterms';
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (c.fk_cond_reglement = cr.rowid AND cr.entity = " . getEntity('c_payment_term') . ")";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON (c.fk_mode_reglement = p.id AND p.entity = " . getEntity('c_paiement') . ")";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_input_method as cm ON cm.rowid = c.fk_input_method";
+		$sql.= " cm.libelle as methode_commande,";
+		$sql.= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
+		$sql.= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle";
+		$sql.= ', c.fk_incoterms, c.location_incoterms';
+		$sql.= ', i.libelle as libelle_incoterms';
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (c.fk_cond_reglement = cr.rowid AND cr.entity = " . getEntity('c_payment_term') . ")";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON (c.fk_mode_reglement = p.id AND p.entity = " . getEntity('c_paiement') . ")";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_input_method as cm ON cm.rowid = c.fk_input_method";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
-        $sql.= " WHERE c.entity = ".$conf->entity;
-        if ($ref) $sql.= " AND c.ref='".$this->db->escape($ref)."'";
-        else $sql.= " AND c.rowid=".$id;
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if (! $obj)
-            {
-                $this->error='Bill with id '.$id.' not found';
-                dol_syslog(get_class($this).'::fetch '.$this->error);
-                return 0;
-            }
-
-            $this->id					= $obj->rowid;
-            $this->ref					= $obj->ref;
-            $this->ref_supplier			= $obj->ref_supplier;
-            $this->socid				= $obj->fk_soc;
-            $this->fourn_id				= $obj->fk_soc;
-            $this->statut				= $obj->fk_statut;
-            $this->billed				= $obj->billed;
-            $this->user_author_id		= $obj->fk_user_author;
-            $this->user_valid_id		= $obj->fk_user_valid;
-            $this->user_approve_id		= $obj->fk_user_approve;
-            $this->user_approve_id2		= $obj->fk_user_approve2;
-            $this->total_ht				= $obj->total_ht;
-            $this->total_tva			= $obj->total_vat;
-            $this->total_localtax1		= $obj->localtax1;
-            $this->total_localtax2		= $obj->localtax2;
-            $this->total_ttc			= $obj->total_ttc;
-            $this->date					= $this->db->jdate($obj->date_creation);
-            $this->date_valid			= $this->db->jdate($obj->date_valid);
-            $this->date_approve			= $this->db->jdate($obj->date_approve);
-            $this->date_approve2		= $this->db->jdate($obj->date_approve2);
-            $this->date_commande		= $this->db->jdate($obj->date_commande); // date we make the order to supplier
+		$sql.= " WHERE c.entity = ".$conf->entity;
+		if ($ref) $sql.= " AND c.ref='".$this->db->escape($ref)."'";
+		else $sql.= " AND c.rowid=".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if (! $obj)
+			{
+				$this->error='Bill with id '.$id.' not found';
+				dol_syslog(get_class($this).'::fetch '.$this->error);
+				return 0;
+			}
+
+			$this->id					= $obj->rowid;
+			$this->ref					= $obj->ref;
+			$this->ref_supplier			= $obj->ref_supplier;
+			$this->socid				= $obj->fk_soc;
+			$this->fourn_id				= $obj->fk_soc;
+			$this->statut				= $obj->fk_statut;
+			$this->billed				= $obj->billed;
+			$this->user_author_id		= $obj->fk_user_author;
+			$this->user_valid_id		= $obj->fk_user_valid;
+			$this->user_approve_id		= $obj->fk_user_approve;
+			$this->user_approve_id2		= $obj->fk_user_approve2;
+			$this->total_ht				= $obj->total_ht;
+			$this->total_tva			= $obj->total_vat;
+			$this->total_localtax1		= $obj->localtax1;
+			$this->total_localtax2		= $obj->localtax2;
+			$this->total_ttc			= $obj->total_ttc;
+			$this->date					= $this->db->jdate($obj->date_creation);
+			$this->date_valid			= $this->db->jdate($obj->date_valid);
+			$this->date_approve			= $this->db->jdate($obj->date_approve);
+			$this->date_approve2		= $this->db->jdate($obj->date_approve2);
+			$this->date_commande		= $this->db->jdate($obj->date_commande); // date we make the order to supplier
 			$this->date_livraison       = $this->db->jdate($obj->date_livraison);
-            $this->remise_percent		= $obj->remise_percent;
-            $this->methode_commande_id	= $obj->fk_input_method;
-            $this->methode_commande		= $obj->methode_commande;
-
-            $this->source				= $obj->source;
-            $this->fk_project			= $obj->fk_project;
-            $this->cond_reglement_id	= $obj->fk_cond_reglement;
-            $this->cond_reglement_code	= $obj->cond_reglement_code;
-            $this->cond_reglement		= $obj->cond_reglement_libelle;
-            $this->cond_reglement_doc	= $obj->cond_reglement_libelle;
-            $this->fk_account           = $obj->fk_account;
-            $this->mode_reglement_id	= $obj->fk_mode_reglement;
-            $this->mode_reglement_code	= $obj->mode_reglement_code;
-            $this->mode_reglement		= $obj->mode_reglement_libelle;
-            $this->note					= $obj->note_private;    // deprecated
-            $this->note_private			= $obj->note_private;
-            $this->note_public			= $obj->note_public;
-            $this->modelpdf				= $obj->model_pdf;
+			$this->remise_percent		= $obj->remise_percent;
+			$this->methode_commande_id	= $obj->fk_input_method;
+			$this->methode_commande		= $obj->methode_commande;
+
+			$this->source				= $obj->source;
+			$this->fk_project			= $obj->fk_project;
+			$this->cond_reglement_id	= $obj->fk_cond_reglement;
+			$this->cond_reglement_code	= $obj->cond_reglement_code;
+			$this->cond_reglement		= $obj->cond_reglement_libelle;
+			$this->cond_reglement_doc	= $obj->cond_reglement_libelle;
+			$this->fk_account           = $obj->fk_account;
+			$this->mode_reglement_id	= $obj->fk_mode_reglement;
+			$this->mode_reglement_code	= $obj->mode_reglement_code;
+			$this->mode_reglement		= $obj->mode_reglement_libelle;
+			$this->note					= $obj->note_private;    // deprecated
+			$this->note_private			= $obj->note_private;
+			$this->note_public			= $obj->note_public;
+			$this->modelpdf				= $obj->model_pdf;
 
 			//Incoterms
 			$this->fk_incoterms = $obj->fk_incoterms;
@@ -264,86 +264,86 @@ 
 			$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 			$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-            $this->extraparams			= (array) json_decode($obj->extraparams, true);
+			$this->extraparams			= (array) json_decode($obj->extraparams, true);
 
-            $this->db->free($resql);
+			$this->db->free($resql);
 
-            // Retrieve all extrafields
-            // fetch optionals attributes and labels
-            require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-            $extrafields=new ExtraFields($this->db);
-            $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-            $this->fetch_optionals($this->id,$extralabels);
+			// Retrieve all extrafields
+			// fetch optionals attributes and labels
+			require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+			$this->fetch_optionals($this->id,$extralabels);
 
-            if ($this->statut == 0) $this->brouillon = 1;
+			if ($this->statut == 0) $this->brouillon = 1;
 
 			$this->fetchObjectLinked();
 
 			//$result=$this->fetch_lines();
-            $this->lines=array();
-
-            $sql = "SELECT l.rowid, l.ref as ref_supplier, l.fk_product, l.product_type, l.label, l.description, l.qty,";
-            $sql.= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
-            $sql.= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
-            $sql.= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
-            $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
-	        $sql.= " l.fk_unit,";
-            $sql.= " l.date_start, l.date_end,";
+			$this->lines=array();
+
+			$sql = "SELECT l.rowid, l.ref as ref_supplier, l.fk_product, l.product_type, l.label, l.description, l.qty,";
+			$sql.= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
+			$sql.= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
+			$sql.= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
+			$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
+			$sql.= " l.fk_unit,";
+			$sql.= " l.date_start, l.date_end,";
 			$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
-            $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
-            $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-            $sql.= " WHERE l.fk_commande = ".$this->id;
-            $sql.= " ORDER BY l.rang, l.rowid";
-            //print $sql;
-
-            dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-                $num = $this->db->num_rows($result);
-                $i = 0;
-
-                while ($i < $num)
-                {
-                    $objp                  = $this->db->fetch_object($result);
-
-                    $line                 = new CommandeFournisseurLigne($this->db);
-
-                    $line->id                  = $objp->rowid;
-                    $line->desc                = $objp->description;
-                    $line->description         = $objp->description;
-                    $line->qty                 = $objp->qty;
-                    $line->tva_tx              = $objp->tva_tx;
-                    $line->localtax1_tx		   = $objp->localtax1_tx;
-                    $line->localtax2_tx		   = $objp->localtax2_tx;
-                    $line->localtax1_type	   = $objp->localtax1_type;
-                    $line->localtax2_type	   = $objp->localtax2_type;
-                    $line->subprice            = $objp->subprice;
-                    $line->pu_ht	           = $objp->subprice;
-                    $line->remise_percent      = $objp->remise_percent;
-
-                    $line->vat_src_code        = $objp->vat_src_code;
-                    $line->total_ht            = $objp->total_ht;
-                    $line->total_tva           = $objp->total_tva;
-                    $line->total_localtax1	   = $objp->total_localtax1;
-                    $line->total_localtax2	   = $objp->total_localtax2;
-                    $line->total_ttc           = $objp->total_ttc;
-                    $line->product_type        = $objp->product_type;
-
-                    $line->fk_product          = $objp->fk_product;
-
-                    $line->libelle             = $objp->product_label;
-                    $line->product_label       = $objp->product_label;
-                    $line->product_desc        = $objp->product_desc;
-
-                    $line->ref                 = $objp->product_ref;    // Ref of product
-                    $line->product_ref         = $objp->product_ref;    // Ref of product
-                    $line->ref_fourn           = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
-                    $line->ref_supplier        = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
-
-                    $line->date_start          = $this->db->jdate($objp->date_start);
-                    $line->date_end            = $this->db->jdate($objp->date_end);
-	                $line->fk_unit             = $objp->fk_unit;
+			$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
+			$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+			$sql.= " WHERE l.fk_commande = ".$this->id;
+			$sql.= " ORDER BY l.rang, l.rowid";
+			//print $sql;
+
+			dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
+				$i = 0;
+
+				while ($i < $num)
+				{
+					$objp                  = $this->db->fetch_object($result);
+
+					$line                 = new CommandeFournisseurLigne($this->db);
+
+					$line->id                  = $objp->rowid;
+					$line->desc                = $objp->description;
+					$line->description         = $objp->description;
+					$line->qty                 = $objp->qty;
+					$line->tva_tx              = $objp->tva_tx;
+					$line->localtax1_tx		   = $objp->localtax1_tx;
+					$line->localtax2_tx		   = $objp->localtax2_tx;
+					$line->localtax1_type	   = $objp->localtax1_type;
+					$line->localtax2_type	   = $objp->localtax2_type;
+					$line->subprice            = $objp->subprice;
+					$line->pu_ht	           = $objp->subprice;
+					$line->remise_percent      = $objp->remise_percent;
+
+					$line->vat_src_code        = $objp->vat_src_code;
+					$line->total_ht            = $objp->total_ht;
+					$line->total_tva           = $objp->total_tva;
+					$line->total_localtax1	   = $objp->total_localtax1;
+					$line->total_localtax2	   = $objp->total_localtax2;
+					$line->total_ttc           = $objp->total_ttc;
+					$line->product_type        = $objp->product_type;
+
+					$line->fk_product          = $objp->fk_product;
+
+					$line->libelle             = $objp->product_label;
+					$line->product_label       = $objp->product_label;
+					$line->product_desc        = $objp->product_desc;
+
+					$line->ref                 = $objp->product_ref;    // Ref of product
+					$line->product_ref         = $objp->product_ref;    // Ref of product
+					$line->ref_fourn           = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
+					$line->ref_supplier        = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
+
+					$line->date_start          = $this->db->jdate($objp->date_start);
+					$line->date_end            = $this->db->jdate($objp->date_end);
+					$line->fk_unit             = $objp->fk_unit;
 
 					// Multicurrency
 					$line->fk_multicurrency 		= $objp->fk_multicurrency;
@@ -353,924 +353,924 @@ 
 					$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
 					$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
 
-	                $line->special_code        = $objp->special_code;
-	                $line->fk_parent_line      = $objp->fk_parent_line;
-
-                    $line->rang                = $objp->rang;
-
-                    $this->lines[$i]      = $line;
-
-                    $i++;
-                }
-                $this->db->free($result);
-
-                return 1;
-            }
-            else
-            {
-                $this->error=$this->db->error()." sql=".$sql;
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->error()." sql=".$sql;
-            return -1;
-        }
-    }
-
-    /**
-     *	Validate an order
-     *
-     *	@param	User	$user			Validator User
-     *	@param	int		$idwarehouse	Id of warehouse to use for stock decrease
-     *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function valid($user,$idwarehouse=0,$notrigger=0)
-    {
-        global $langs,$conf;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $error=0;
-
-        dol_syslog(get_class($this)."::valid");
-        $result = 0;
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->commande->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->supplier_order_advance->validate)))
-        {
-            $this->db->begin();
-
-            // Definition of supplier order numbering model name
-            $soc = new Societe($this->db);
-            $soc->fetch($this->fourn_id);
-
-            // Check if object has a temporary ref
-            if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-            {
-                $num = $this->getNextNumRef($soc);
-            }
-            else
-			{
-                $num = $this->ref;
-            }
-            $this->newref = $num;
-
-            $sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur";
-            $sql.= " SET ref='".$this->db->escape($num)."',";
-            $sql.= " fk_statut = 1,";
-            $sql.= " date_valid='".$this->db->idate(dol_now())."',";
-            $sql.= " fk_user_valid = ".$user->id;
-            $sql.= " WHERE rowid = ".$this->id;
-            $sql.= " AND fk_statut = 0";
-
-            $resql=$this->db->query($sql);
-            if (! $resql)
-            {
-                dol_print_error($this->db);
-                $error++;
-            }
-
-            if (! $error && ! $notrigger)
-            {
+					$line->special_code        = $objp->special_code;
+					$line->fk_parent_line      = $objp->fk_parent_line;
+
+					$line->rang                = $objp->rang;
+
+					$this->lines[$i]      = $line;
+
+					$i++;
+				}
+				$this->db->free($result);
+
+				return 1;
+			}
+			else
+			{
+				$this->error=$this->db->error()." sql=".$sql;
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error()." sql=".$sql;
+			return -1;
+		}
+	}
+
+	/**
+	 *	Validate an order
+	 *
+	 *	@param	User	$user			Validator User
+	 *	@param	int		$idwarehouse	Id of warehouse to use for stock decrease
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function valid($user,$idwarehouse=0,$notrigger=0)
+	{
+		global $langs,$conf;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error=0;
+
+		dol_syslog(get_class($this)."::valid");
+		$result = 0;
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->commande->creer))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->supplier_order_advance->validate)))
+		{
+			$this->db->begin();
+
+			// Definition of supplier order numbering model name
+			$soc = new Societe($this->db);
+			$soc->fetch($this->fourn_id);
+
+			// Check if object has a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+			{
+				$num = $this->getNextNumRef($soc);
+			}
+			else
+			{
+				$num = $this->ref;
+			}
+			$this->newref = $num;
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur";
+			$sql.= " SET ref='".$this->db->escape($num)."',";
+			$sql.= " fk_statut = 1,";
+			$sql.= " date_valid='".$this->db->idate(dol_now())."',";
+			$sql.= " fk_user_valid = ".$user->id;
+			$sql.= " WHERE rowid = ".$this->id;
+			$sql.= " AND fk_statut = 0";
+
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				dol_print_error($this->db);
+				$error++;
+			}
+
+			if (! $error && ! $notrigger)
+			{
 				// Call trigger
 				$result=$this->call_trigger('ORDER_SUPPLIER_VALIDATE',$user);
 				if ($result < 0) $error++;
 				// End call triggers
-            }
-
-            if (! $error)
-            {
-	            $this->oldref = $this->ref;
-
-                // Rename directory if dir was a temporary ref
-                if (preg_match('/^[\(]?PROV/i', $this->ref))
-                {
-                    // We rename directory ($this->ref = ancienne ref, $num = nouvelle ref)
-                    // in order not to lose the attached files
-                    $oldref = dol_sanitizeFileName($this->ref);
-                    $newref = dol_sanitizeFileName($num);
-                    $dirsource = $conf->fournisseur->dir_output.'/commande/'.$oldref;
-                    $dirdest = $conf->fournisseur->dir_output.'/commande/'.$newref;
-                    if (file_exists($dirsource))
-                    {
-                        dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
-
-                        if (@rename($dirsource, $dirdest))
-                        {
-                            dol_syslog("Rename ok");
-                            // Rename docs starting with $oldref with $newref
-	                        $listoffiles=dol_dir_list($conf->fournisseur->dir_output.'/commande/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-	                        foreach($listoffiles as $fileentry)
-	                        {
-	                        	$dirsource=$fileentry['name'];
-	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
-	                        	@rename($dirsource, $dirdest);
-	                        }
-                        }
-                    }
-                }
-            }
-
-            if (! $error)
-            {
-                $result = 1;
-                $this->statut = 1;
-                $this->ref = $num;
-            }
-
-            if (! $error)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error='NotAuthorized';
-            dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
-
-    /**
-     *  Return label of the status of object
-     *
+			}
+
+			if (! $error)
+			{
+				$this->oldref = $this->ref;
+
+				// Rename directory if dir was a temporary ref
+				if (preg_match('/^[\(]?PROV/i', $this->ref))
+				{
+					// We rename directory ($this->ref = ancienne ref, $num = nouvelle ref)
+					// in order not to lose the attached files
+					$oldref = dol_sanitizeFileName($this->ref);
+					$newref = dol_sanitizeFileName($num);
+					$dirsource = $conf->fournisseur->dir_output.'/commande/'.$oldref;
+					$dirdest = $conf->fournisseur->dir_output.'/commande/'.$newref;
+					if (file_exists($dirsource))
+					{
+						dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
+
+						if (@rename($dirsource, $dirdest))
+						{
+							dol_syslog("Rename ok");
+							// Rename docs starting with $oldref with $newref
+							$listoffiles=dol_dir_list($conf->fournisseur->dir_output.'/commande/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+							foreach($listoffiles as $fileentry)
+							{
+								$dirsource=$fileentry['name'];
+								$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+								$dirsource=$fileentry['path'].'/'.$dirsource;
+								$dirdest=$fileentry['path'].'/'.$dirdest;
+								@rename($dirsource, $dirdest);
+							}
+						}
+					}
+				}
+			}
+
+			if (! $error)
+			{
+				$result = 1;
+				$this->statut = 1;
+				$this->ref = $num;
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error='NotAuthorized';
+			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+	/**
+	 *  Return label of the status of object
+	 *
 	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
-     *  @return 	string        			Label
-     */
-    public function getLibStatut($mode=0)
-    {
-        return $this->LibStatut($this->statut,$mode,$this->billed);
-    }
-
-    /**
-     *  Return label of a status
-     *
-     * 	@param  int		$statut		Id statut
-     *  @param  int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
-     *  @param  int     $billed     1=Billed
-     *  @return string				Label of status
-     */
-    function LibStatut($statut,$mode=0,$billed=0)
-    {
-        global $langs;
-        $langs->load('orders');
-
-        $billedtext='';
+	 *  @return 	string        			Label
+	 */
+	public function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->statut,$mode,$this->billed);
+	}
+
+	/**
+	 *  Return label of a status
+	 *
+	 * 	@param  int		$statut		Id statut
+	 *  @param  int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
+	 *  @param  int     $billed     1=Billed
+	 *  @return string				Label of status
+	 */
+	function LibStatut($statut,$mode=0,$billed=0)
+	{
+		global $langs;
+		$langs->load('orders');
+
+		$billedtext='';
 		//if ($statut==5 && $this->billed == 1) $statut = 8;
-        if ($billed == 1) $billedtext=$langs->trans("Billed");
-
-        // List of language codes for status
-        $statutshort[0] = 'StatusOrderDraftShort';
-        $statutshort[1] = 'StatusOrderValidatedShort';
-        $statutshort[2] = 'StatusOrderApprovedShort';
-        $statutshort[3] = 'StatusOrderOnProcessShort';
-        $statutshort[4] = 'StatusOrderReceivedPartiallyShort';
-        $statutshort[5] = 'StatusOrderReceivedAllShort';
-        $statutshort[6] = 'StatusOrderCanceledShort';
-        $statutshort[7] = 'StatusOrderCanceledShort';
-        //$statutshort[8] = 'StatusOrderBilledShort';
-        $statutshort[9] = 'StatusOrderRefusedShort';
-
-        if ($mode == 0)
-        {
-            return $langs->trans($this->statuts[$statut]);
-        }
-        if ($mode == 1)
-        {
-            return $langs->trans($statutshort[$statut]);
-        }
-        if ($mode == 2)
-        {
-            return $langs->trans($this->statuts[$statut]);
-        }
-        if ($mode == 3)
-        {
-            if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-            if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
-            if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
+		if ($billed == 1) $billedtext=$langs->trans("Billed");
+
+		// List of language codes for status
+		$statutshort[0] = 'StatusOrderDraftShort';
+		$statutshort[1] = 'StatusOrderValidatedShort';
+		$statutshort[2] = 'StatusOrderApprovedShort';
+		$statutshort[3] = 'StatusOrderOnProcessShort';
+		$statutshort[4] = 'StatusOrderReceivedPartiallyShort';
+		$statutshort[5] = 'StatusOrderReceivedAllShort';
+		$statutshort[6] = 'StatusOrderCanceledShort';
+		$statutshort[7] = 'StatusOrderCanceledShort';
+		//$statutshort[8] = 'StatusOrderBilledShort';
+		$statutshort[9] = 'StatusOrderRefusedShort';
+
+		if ($mode == 0)
+		{
+			return $langs->trans($this->statuts[$statut]);
+		}
+		if ($mode == 1)
+		{
+			return $langs->trans($statutshort[$statut]);
+		}
+		if ($mode == 2)
+		{
+			return $langs->trans($this->statuts[$statut]);
+		}
+		if ($mode == 3)
+		{
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
+			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
 			if ($statut==8) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
-        }
-        if ($mode == 4)
-        {
-            if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+			if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
+		}
+		if ($mode == 4)
+		{
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+			if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+			if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+			if ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
 			if ($statut==8) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-        }
-        if ($mode == 5)
-        {
-            if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-            if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut1');
-            if ($statut==2) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==3) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==4) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==5) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==6 || $statut==7) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
-            if ($statut==8) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==9) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
-        }
-    }
-
-
-    /**
-     *	Return clicable name (with picto eventually)
-     *
-     *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param		string	$option						On what the link points
-     *  @param	    int   	$notooltip					1=Disable tooltip
-     *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return		string								Chain with URL
-     */
-    public function getNomUrl($withpicto=0, $option='', $notooltip=0, $save_lastsearch_value=-1)
-    {
-        global $langs, $conf;
-
-        $result='';
-        $label = '<u>' . $langs->trans("ShowOrder") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->ref_supplier))
-            $label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-
-        $picto='order';
-        $url = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$this->id;
-
-        if ($option !== 'nolink')
-        {
-        	// 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';
-        }
-
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowOrder");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
-        }
-
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
-
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        $result.=$linkstart.$this->ref.$linkend;
-        return $result;
-    }
-
-
-    /**
-     *  Returns the following order reference not used depending on the numbering model activated
-     *                  defined within COMMANDE_SUPPLIER_ADDON_NUMBER
-     *
-     *  @param	    Company		$soc  		company object
-     *  @return     string                  free reference for the invoice
-     */
-    public function getNextNumRef($soc)
-    {
-        global $db, $langs, $conf;
-        $langs->load("orders");
-
-        if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER))
-        {
-            $mybool = false;
-
-            $file = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER.'.php';
-            $classname=$conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
-
-            // Include file with class
-            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
-            foreach ($dirmodels as $reldir) {
-
-                $dir = dol_buildpath($reldir."core/modules/supplier_order/");
-
-                // Load file with numbering class (if found)
-                $mybool|=@include_once $dir.$file;
-            }
-
-            if (! $mybool)
-            {
-                dol_print_error('',"Failed to include file ".$file);
-                return '';
-            }
-
-            $obj = new $classname();
-            $numref = $obj->getNextValue($soc,$this);
-
-            if ( $numref != "")
-            {
-                return $numref;
-            }
-            else
-			{
-                $this->error = $obj->error;
-                return -1;
-            }
-        }
-        else
-		{
-            $this->error = "Error_COMMANDE_SUPPLIER_ADDON_NotDefined";
-            return -2;
-        }
-    }
+			if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+		}
+		if ($mode == 5)
+		{
+			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut1');
+			if ($statut==2) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==3) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==4) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			if ($statut==5) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut==6 || $statut==7) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
+			if ($statut==8) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut==9) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
+		}
+	}
+
+
+	/**
+	 *	Return clicable name (with picto eventually)
+	 *
+	 *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param		string	$option						On what the link points
+	 *  @param	    int   	$notooltip					1=Disable tooltip
+	 *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return		string								Chain with URL
+	 */
+	public function getNomUrl($withpicto=0, $option='', $notooltip=0, $save_lastsearch_value=-1)
+	{
+		global $langs, $conf;
+
+		$result='';
+		$label = '<u>' . $langs->trans("ShowOrder") . '</u>';
+		if (! empty($this->ref))
+			$label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		if (! empty($this->ref_supplier))
+			$label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
+		if (! empty($this->total_ht))
+			$label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+		if (! empty($this->total_tva))
+			$label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+		if (! empty($this->total_ttc))
+			$label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+
+		$picto='order';
+		$url = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$this->id;
+
+		if ($option !== 'nolink')
+		{
+			// 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';
+		}
+
+		$linkclose='';
+		if (empty($notooltip))
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowOrder");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
+		}
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2) $result.=' ';
+		$result.=$linkstart.$this->ref.$linkend;
+		return $result;
+	}
+
+
+	/**
+	 *  Returns the following order reference not used depending on the numbering model activated
+	 *                  defined within COMMANDE_SUPPLIER_ADDON_NUMBER
+	 *
+	 *  @param	    Company		$soc  		company object
+	 *  @return     string                  free reference for the invoice
+	 */
+	public function getNextNumRef($soc)
+	{
+		global $db, $langs, $conf;
+		$langs->load("orders");
+
+		if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER))
+		{
+			$mybool = false;
+
+			$file = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER.'.php';
+			$classname=$conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+			foreach ($dirmodels as $reldir) {
+
+				$dir = dol_buildpath($reldir."core/modules/supplier_order/");
+
+				// Load file with numbering class (if found)
+				$mybool|=@include_once $dir.$file;
+			}
+
+			if (! $mybool)
+			{
+				dol_print_error('',"Failed to include file ".$file);
+				return '';
+			}
+
+			$obj = new $classname();
+			$numref = $obj->getNextValue($soc,$this);
+
+			if ( $numref != "")
+			{
+				return $numref;
+			}
+			else
+			{
+				$this->error = $obj->error;
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error = "Error_COMMANDE_SUPPLIER_ADDON_NotDefined";
+			return -2;
+		}
+	}
 	/**
-     *	Class invoiced the supplier order
-     *
-     *  @param      User        $user       Object user making the change
-     *	@return     int     	            <0 if KO, >0 if KO
-     */
-    public function classifyBilled(User $user)
-    {
-        $error=0;
-        $this->db->begin();
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur SET billed = 1';
-        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ';
-        if ($this->db->query($sql))
-        {
-        	if (! $error)
-        	{
-        	    // Call trigger
-        	    $result=$this->call_trigger('ORDER_SUPPLIER_CLASSIFY_BILLED',$user);
-        	    if ($result < 0) $error++;
-        	    // End call triggers
-        	}
-
-        	if (! $error)
-        	{
-        	    $this->billed=1;
-
-        	    $this->db->commit();
-        	    return 1;
-        	}
-        	else
-        	{
-        	    $this->db->rollback();
-                return -1;
-        	}
-        }
-        else
-        {
-        	dol_print_error($this->db);
-
-        	$this->db->rollback();
+	 *	Class invoiced the supplier order
+	 *
+	 *  @param      User        $user       Object user making the change
+	 *	@return     int     	            <0 if KO, >0 if KO
+	 */
+	public function classifyBilled(User $user)
+	{
+		$error=0;
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur SET billed = 1';
+		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ';
+		if ($this->db->query($sql))
+		{
+			if (! $error)
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_SUPPLIER_CLASSIFY_BILLED',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->billed=1;
+
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+
+			$this->db->rollback();
 			return -1;
-        }
-    }
-
-    /**
-     * 	Approve a supplier order
-     *
-     *	@param	User	$user			Object user
-     *	@param	int		$idwarehouse	Id of warhouse for stock change
-     *  @param	int		$secondlevel	0=Standard approval, 1=Second level approval (used when option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function approve($user, $idwarehouse=0, $secondlevel=0)
-    {
-        global $langs,$conf;
+		}
+	}
+
+	/**
+	 * 	Approve a supplier order
+	 *
+	 *	@param	User	$user			Object user
+	 *	@param	int		$idwarehouse	Id of warhouse for stock change
+	 *  @param	int		$secondlevel	0=Standard approval, 1=Second level approval (used when option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function approve($user, $idwarehouse=0, $secondlevel=0)
+	{
+		global $langs,$conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error=0;
+		$error=0;
 
-        dol_syslog(get_class($this)."::approve");
+		dol_syslog(get_class($this)."::approve");
 
-        if ($user->rights->fournisseur->commande->approuver)
-        {
-        	$now = dol_now();
+		if ($user->rights->fournisseur->commande->approuver)
+		{
+			$now = dol_now();
 
-            $this->db->begin();
+			$this->db->begin();
 
 			// Definition of order numbering model name
-            $soc = new Societe($this->db);
-            $soc->fetch($this->fourn_id);
+			$soc = new Societe($this->db);
+			$soc->fetch($this->fourn_id);
 
-            // Check if object has a temporary ref
-            if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-            {
-                $num = $this->getNextNumRef($soc);
-            }
-            else
+			// Check if object has a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+			{
+				$num = $this->getNextNumRef($soc);
+			}
+			else
 			{
-                $num = $this->ref;
-            }
-            $this->newref = $num;
+				$num = $this->ref;
+			}
+			$this->newref = $num;
 
-            // Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated)
+			// Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated)
 			$movetoapprovestatus=true;
 			$comment='';
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
 			$sql.= " SET ref='".$this->db->escape($num)."',";
 			if (empty($secondlevel))	// standard or first level approval
 			{
-	            $sql.= " date_approve='".$this->db->idate($now)."',";
-    	        $sql.= " fk_user_approve = ".$user->id;
-    	        if (! empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
-    	        {
-    	        	if (empty($this->user_approve_id2))
-    	        	{
-    	        	    $movetoapprovestatus=false;		// second level approval not done
-    	        	    $comment=' (first level)';
-    	        	}
-    	        }
+				$sql.= " date_approve='".$this->db->idate($now)."',";
+				$sql.= " fk_user_approve = ".$user->id;
+				if (! empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
+				{
+					if (empty($this->user_approve_id2))
+					{
+						$movetoapprovestatus=false;		// second level approval not done
+						$comment=' (first level)';
+					}
+				}
 			}
 			else	// request a second level approval
 			{
-            	$sql.= " date_approve2='".$this->db->idate($now)."',";
-            	$sql.= " fk_user_approve2 = ".$user->id;
-    	        if (empty($this->user_approve_id)) $movetoapprovestatus=false;		// first level approval not done
-    	        $comment=' (second level)';
+				$sql.= " date_approve2='".$this->db->idate($now)."',";
+				$sql.= " fk_user_approve2 = ".$user->id;
+				if (empty($this->user_approve_id)) $movetoapprovestatus=false;		// first level approval not done
+				$comment=' (second level)';
 			}
 			// If double approval is required and first approval, we keep status to 1 = validated
 			if ($movetoapprovestatus) $sql.= ", fk_statut = 2";
 			else $sql.= ", fk_statut = 1";
-            $sql.= " WHERE rowid = ".$this->id;
-            $sql.= " AND fk_statut = 1";
+			$sql.= " WHERE rowid = ".$this->id;
+			$sql.= " AND fk_statut = 1";
 
-            if ($this->db->query($sql))
-            {
-            	if (! empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT))
-	            {
+			if ($this->db->query($sql))
+			{
+				if (! empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT))
+				{
 					$result=$this->add_contact($user->id, 'SALESREPFOLL', 'internal', 1);
 					if ($result < 0 && $result != -2)	// -2 means already exists
 					{
 						$error++;
 					}
-	            }
-
-                // If stock is incremented on validate order, we must increment it
-                if (! $error && $movetoapprovestatus && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER))
-                {
-                    require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-                    $langs->load("agenda");
-
-                    $cpt=count($this->lines);
-                    for ($i = 0; $i < $cpt; $i++)
-                    {
-                        // Product with reference
-                        if ($this->lines[$i]->fk_product > 0)
-                        {
-                            $this->line = $this->lines[$i];
-                            $mouvP = new MouvementStock($this->db);
-                            $mouvP->origin = &$this;
-                            // We decrement stock of product (and sub-products)
-	                        $up_ht_disc=$this->lines[$i]->subprice;
-    	                    if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
-                            $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr",$this->ref));
-                            if ($result < 0) { $error++; }
-                            unset($this->line);
-                        }
-                    }
-                }
-
-                if (! $error)
-                {
+				}
+
+				// If stock is incremented on validate order, we must increment it
+				if (! $error && $movetoapprovestatus && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER))
+				{
+					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+					$langs->load("agenda");
+
+					$cpt=count($this->lines);
+					for ($i = 0; $i < $cpt; $i++)
+					{
+						// Product with reference
+						if ($this->lines[$i]->fk_product > 0)
+						{
+							$this->line = $this->lines[$i];
+							$mouvP = new MouvementStock($this->db);
+							$mouvP->origin = &$this;
+							// We decrement stock of product (and sub-products)
+							$up_ht_disc=$this->lines[$i]->subprice;
+							if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+							$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr",$this->ref));
+							if ($result < 0) { $error++; }
+							unset($this->line);
+						}
+					}
+				}
+
+				if (! $error)
+				{
 					// Call trigger
 					$result=$this->call_trigger('ORDER_SUPPLIER_APPROVE',$user);
 					if ($result < 0) $error++;
 					// End call triggers
-                }
+				}
 
-                if (! $error)
-                {
-                	$this->ref = $this->newref;
+				if (! $error)
+				{
+					$this->ref = $this->newref;
 
-                	if ($movetoapprovestatus) $this->statut = 2;
+					if ($movetoapprovestatus) $this->statut = 2;
 					else $this->statut = 1;
-           			if (empty($secondlevel))	// standard or first level approval
+		   			if (empty($secondlevel))	// standard or first level approval
 					{
-			            $this->date_approve = $now;
-		    	        $this->user_approve_id = $user->id;
+						$this->date_approve = $now;
+						$this->user_approve_id = $user->id;
 					}
 					else	// request a second level approval
 					{
-			            $this->date_approve2 = $now;
-		    	        $this->user_approve_id2 = $user->id;
+						$this->date_approve2 = $now;
+						$this->user_approve_id2 = $user->id;
 					}
 
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error=$this->db->lasterror();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
-        }
-        return -1;
-    }
-
-    /**
-     * 	Refuse an order
-     *
-     * 	@param		User	$user		User making action
-     *	@return		int					0 if Ok, <0 if Ko
-     */
-    public function refuse($user)
-    {
-        global $conf, $langs;
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error=$this->db->lasterror();
+				return -1;
+			}
+		}
+		else
+		{
+			dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
+		}
+		return -1;
+	}
+
+	/**
+	 * 	Refuse an order
+	 *
+	 * 	@param		User	$user		User making action
+	 *	@return		int					0 if Ok, <0 if Ko
+	 */
+	public function refuse($user)
+	{
+		global $conf, $langs;
 
 		$error=0;
 
-        dol_syslog(get_class($this)."::refuse");
-        $result = 0;
-        if ($user->rights->fournisseur->commande->approuver)
-        {
-            $this->db->begin();
+		dol_syslog(get_class($this)."::refuse");
+		$result = 0;
+		if ($user->rights->fournisseur->commande->approuver)
+		{
+			$this->db->begin();
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 9";
-            $sql .= " WHERE rowid = ".$this->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 9";
+			$sql .= " WHERE rowid = ".$this->id;
 
-            if ($this->db->query($sql))
-            {
-                $result = 0;
+			if ($this->db->query($sql))
+			{
+				$result = 0;
 
-                if ($error == 0)
-                {
+				if ($error == 0)
+				{
 					// Call trigger
 					$result=$this->call_trigger('ORDER_SUPPLIER_REFUSE',$user);
 					if ($result < 0)
-                    {
-                        $error++;
-                        $this->db->rollback();
-                    }
-                    else
-                    	$this->db->commit();
+					{
+						$error++;
+						$this->db->rollback();
+					}
+					else
+						$this->db->commit();
 					// End call triggers
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::refuse Error -1");
-                $result = -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::refuse Not Authorized");
-        }
-        return $result ;
-    }
-
-    /**
-     * 	Cancel an approved order.
-     *	The cancellation is done after approval
-     *
-     * 	@param	User	$user			User making action
-     *	@param	int		$idwarehouse	Id warehouse to use for stock change (not used for supplier orders).
-     * 	@return	int						>0 if Ok, <0 if Ko
-     */
-    function Cancel($user, $idwarehouse=-1)
-    {
-        global $langs,$conf;
+				}
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error=$this->db->lasterror();
+				dol_syslog(get_class($this)."::refuse Error -1");
+				$result = -1;
+			}
+		}
+		else
+		{
+			dol_syslog(get_class($this)."::refuse Not Authorized");
+		}
+		return $result ;
+	}
+
+	/**
+	 * 	Cancel an approved order.
+	 *	The cancellation is done after approval
+	 *
+	 * 	@param	User	$user			User making action
+	 *	@param	int		$idwarehouse	Id warehouse to use for stock change (not used for supplier orders).
+	 * 	@return	int						>0 if Ok, <0 if Ko
+	 */
+	function Cancel($user, $idwarehouse=-1)
+	{
+		global $langs,$conf;
 
 		$error=0;
 
-        //dol_syslog("CommandeFournisseur::Cancel");
-        $result = 0;
-        if ($user->rights->fournisseur->commande->commander)
-        {
-            $statut = 6;
+		//dol_syslog("CommandeFournisseur::Cancel");
+		$result = 0;
+		if ($user->rights->fournisseur->commande->commander)
+		{
+			$statut = 6;
 
-            $this->db->begin();
+			$this->db->begin();
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".$statut;
-            $sql .= " WHERE rowid = ".$this->id;
-            dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
-            if ($this->db->query($sql))
-            {
-                $result = 0;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".$statut;
+			$sql .= " WHERE rowid = ".$this->id;
+			dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
+			if ($this->db->query($sql))
+			{
+				$result = 0;
 
 				// Call trigger
 				$result=$this->call_trigger('ORDER_SUPPLIER_CANCEL',$user);
 				if ($result < 0) $error++;
 				// End call triggers
 
-                if ($error == 0)
-                {
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::cancel ".$this->error);
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::cancel Not Authorized");
-            return -1;
-        }
-    }
-
-
-    /**
-     * 	Submit a supplier order to supplier
-     *
-     * 	@param		User	$user		User making change
-     * 	@param		date	$date		Date
-     * 	@param		int		$methode	Method
-     * 	@param		string	$comment	Comment
-     * 	@return		int			        <0 if KO, >0 if OK
-     */
-    public function commande($user, $date, $methode, $comment='')
-    {
-        global $langs;
-        dol_syslog(get_class($this)."::commande");
-        $error = 0;
-        if ($user->rights->fournisseur->commande->commander)
-        {
-            $this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_input_method=".$methode.", date_commande='".$this->db->idate($date)."'";
-            $sql .= " WHERE rowid = ".$this->id;
-
-            dol_syslog(get_class($this)."::commande", LOG_DEBUG);
-            if ($this->db->query($sql))
-            {
-                $this->statut = 3;
-                $this->methode_commande_id = $methode;
-                $this->date_commande = $date;
-
-                // Call trigger
-                $result=$this->call_trigger('ORDER_SUPPLIER_SUBMIT',$user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-            else
-            {
-                $error++;
-                $this->error = $this->db->lasterror();
-                $this->errors[] = $this->db->lasterror();
-            }
-
-            if (! $error)
-            {
-                $this->db->commit();
-            }
-            else
-            {
-                $this->db->rollback();
-            }
-        }
-        else
-        {
-            $error++;
-            $this->error = $langs->trans('NotAuthorized');
-            $this->errors[] = $langs->trans('NotAuthorized');
-            dol_syslog(get_class($this)."::commande User not Authorized", LOG_WARNING);
-        }
-
-        return ($error ? -1 : 1);
-    }
-
-    /**
-     *  Create order with draft status
-     *
-     *  @param      User	$user       User making creation
-     *	@param		int		$notrigger	Disable all triggers
-     *  @return     int         		<0 if KO, Id of supplier order if OK
-     */
-    public function create($user, $notrigger=0)
-    {
-        global $langs,$conf,$hookmanager;
-
-        $this->db->begin();
-
-		$error=0;
-        $now=dol_now();
-
-        // Clean parameters
-        if (empty($this->source)) $this->source = 0;
-
-		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
+				if ($error == 0)
+				{
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error=$this->db->lasterror();
+				dol_syslog(get_class($this)."::cancel ".$this->error);
+				return -1;
+			}
+		}
+		else
+		{
+			dol_syslog(get_class($this)."::cancel Not Authorized");
+			return -1;
+		}
+	}
+
+
+	/**
+	 * 	Submit a supplier order to supplier
+	 *
+	 * 	@param		User	$user		User making change
+	 * 	@param		date	$date		Date
+	 * 	@param		int		$methode	Method
+	 * 	@param		string	$comment	Comment
+	 * 	@return		int			        <0 if KO, >0 if OK
+	 */
+	public function commande($user, $date, $methode, $comment='')
+	{
+		global $langs;
+		dol_syslog(get_class($this)."::commande");
+		$error = 0;
+		if ($user->rights->fournisseur->commande->commander)
+		{
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_input_method=".$methode.", date_commande='".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+
+			dol_syslog(get_class($this)."::commande", LOG_DEBUG);
+			if ($this->db->query($sql))
+			{
+				$this->statut = 3;
+				$this->methode_commande_id = $methode;
+				$this->date_commande = $date;
+
+				// Call trigger
+				$result=$this->call_trigger('ORDER_SUPPLIER_SUBMIT',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+			else
+			{
+				$error++;
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+			}
+			else
+			{
+				$this->db->rollback();
+			}
+		}
+		else
+		{
+			$error++;
+			$this->error = $langs->trans('NotAuthorized');
+			$this->errors[] = $langs->trans('NotAuthorized');
+			dol_syslog(get_class($this)."::commande User not Authorized", LOG_WARNING);
+		}
+
+		return ($error ? -1 : 1);
+	}
+
+	/**
+	 *  Create order with draft status
+	 *
+	 *  @param      User	$user       User making creation
+	 *	@param		int		$notrigger	Disable all triggers
+	 *  @return     int         		<0 if KO, Id of supplier order if OK
+	 */
+	public function create($user, $notrigger=0)
+	{
+		global $langs,$conf,$hookmanager;
+
+		$this->db->begin();
+
+		$error=0;
+		$now=dol_now();
+
+		// Clean parameters
+		if (empty($this->source)) $this->source = 0;
+
+		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
 		}
 
-        // We set order into draft status
-        $this->brouillon = 1;
-
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur (";
-        $sql.= "ref";
-        $sql.= ", ref_supplier";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", entity";
-        $sql.= ", fk_soc";
-        $sql.= ", fk_projet";
-        $sql.= ", date_creation";
+		// We set order into draft status
+		$this->brouillon = 1;
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur (";
+		$sql.= "ref";
+		$sql.= ", ref_supplier";
+		$sql.= ", note_private";
+		$sql.= ", note_public";
+		$sql.= ", entity";
+		$sql.= ", fk_soc";
+		$sql.= ", fk_projet";
+		$sql.= ", date_creation";
 		$sql.= ", date_livraison";
-        $sql.= ", fk_user_author";
-        $sql.= ", fk_statut";
-        $sql.= ", source";
-        $sql.= ", model_pdf";
-        $sql.= ", fk_mode_reglement";
+		$sql.= ", fk_user_author";
+		$sql.= ", fk_statut";
+		$sql.= ", source";
+		$sql.= ", model_pdf";
+		$sql.= ", fk_mode_reglement";
 		$sql.= ", fk_cond_reglement";
-        $sql.= ", fk_account";
+		$sql.= ", fk_account";
 		$sql.= ", fk_incoterms, location_incoterms";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ") ";
-        $sql.= " VALUES (";
-        $sql.= "''";
-        $sql.= ", '".$this->db->escape($this->ref_supplier)."'";
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", ".$conf->entity;
-        $sql.= ", ".$this->socid;
-        $sql.= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
-        $sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ", fk_multicurrency";
+		$sql.= ", multicurrency_code";
+		$sql.= ", multicurrency_tx";
+		$sql.= ") ";
+		$sql.= " VALUES (";
+		$sql.= "''";
+		$sql.= ", '".$this->db->escape($this->ref_supplier)."'";
+		$sql.= ", '".$this->db->escape($this->note_private)."'";
+		$sql.= ", '".$this->db->escape($this->note_public)."'";
+		$sql.= ", ".$conf->entity;
+		$sql.= ", ".$this->socid;
+		$sql.= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+		$sql.= ", '".$this->db->idate($now)."'";
 		$sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
-        $sql.= ", ".$user->id;
-        $sql.= ", 0";
-        $sql.= ", ".$this->db->escape($this->source);
-        $sql.= ", '".$conf->global->COMMANDE_SUPPLIER_ADDON_PDF."'";
-        $sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
-        $sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", ".$user->id;
+		$sql.= ", 0";
+		$sql.= ", ".$this->db->escape($this->source);
+		$sql.= ", '".$conf->global->COMMANDE_SUPPLIER_ADDON_PDF."'";
+		$sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
+		$sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
+		$sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
+		$sql.= ", ".(int) $this->fk_incoterms;
+		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ")";
+		$sql.= ")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."commande_fournisseur");
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."commande_fournisseur");
 
 			if ($this->id) {
 				$num=count($this->lines);
 
-	            // insert products details into database
-	            for ($i=0;$i<$num;$i++)
-	            {
-	                $result = $this->addline(              // This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
-	                    $this->lines[$i]->desc,
-	                    $this->lines[$i]->subprice,
-	                    $this->lines[$i]->qty,
-	                    $this->lines[$i]->tva_tx,
-	                    $this->lines[$i]->localtax1_tx,
-	                    $this->lines[$i]->localtax2_tx,
-	                    $this->lines[$i]->fk_product,
-	                    0,
-	                    $this->lines[$i]->ref_fourn,   // $this->lines[$i]->ref_fourn comes from field ref into table of lines. Value may ba a ref that does not exists anymore, so we first try with value of product
-	                    $this->lines[$i]->remise_percent,
-	                    'HT',
-	                    0,
-	                    $this->lines[$i]->product_type,
-	                    $this->lines[$i]->info_bits,
-                        false,
-	                    $this->lines[$i]->date_start,
-                        $this->lines[$i]->date_end,
-                        0,
-                        $this->lines[$i]->fk_unit
-	                );
-	                if ($result < 0)
-	                {
-	                    dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);	// do not use dol_print_error here as it may be a functionnal error
-	                    $this->db->rollback();
-	                    return -1;
-	                }
-	            }
-
-	            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-	            $sql.= " SET ref='(PROV".$this->id.")'";
-	            $sql.= " WHERE rowid=".$this->id;
-	            dol_syslog(get_class($this)."::create", LOG_DEBUG);
-	            if ($this->db->query($sql))
-	            {
+				// insert products details into database
+				for ($i=0;$i<$num;$i++)
+				{
+					$result = $this->addline(              // This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
+						$this->lines[$i]->desc,
+						$this->lines[$i]->subprice,
+						$this->lines[$i]->qty,
+						$this->lines[$i]->tva_tx,
+						$this->lines[$i]->localtax1_tx,
+						$this->lines[$i]->localtax2_tx,
+						$this->lines[$i]->fk_product,
+						0,
+						$this->lines[$i]->ref_fourn,   // $this->lines[$i]->ref_fourn comes from field ref into table of lines. Value may ba a ref that does not exists anymore, so we first try with value of product
+						$this->lines[$i]->remise_percent,
+						'HT',
+						0,
+						$this->lines[$i]->product_type,
+						$this->lines[$i]->info_bits,
+						false,
+						$this->lines[$i]->date_start,
+						$this->lines[$i]->date_end,
+						0,
+						$this->lines[$i]->fk_unit
+					);
+					if ($result < 0)
+					{
+						dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);	// do not use dol_print_error here as it may be a functionnal error
+						$this->db->rollback();
+						return -1;
+					}
+				}
+
+				$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+				$sql.= " SET ref='(PROV".$this->id.")'";
+				$sql.= " WHERE rowid=".$this->id;
+				dol_syslog(get_class($this)."::create", LOG_DEBUG);
+				if ($this->db->query($sql))
+				{
 					// Add link with price request and supplier order
 					if ($this->id)
-                    {
-                        $this->ref="(PROV".$this->id.")";
-
-                        // Add object linked
-                        if (is_array($this->linked_objects) && ! empty($this->linked_objects))
-                        {
-                        	foreach($this->linked_objects as $origin => $origin_id)
-                        	{
-                        		$ret = $this->add_object_linked($origin, $origin_id);
-                        		if (! $ret)
-                        		{
-                        			dol_print_error($this->db);
-                        			$error++;
-                        		}
-                        	}
-                        }
-                    }
-
-	                if (! $error)
-                    {
-                    	$result=$this->insertExtraFields();
-	                    if ($result < 0) $error++;
-                    }
+					{
+						$this->ref="(PROV".$this->id.")";
+
+						// Add object linked
+						if (is_array($this->linked_objects) && ! empty($this->linked_objects))
+						{
+							foreach($this->linked_objects as $origin => $origin_id)
+							{
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (! $ret)
+								{
+									dol_print_error($this->db);
+									$error++;
+								}
+							}
+						}
+					}
+
+					if (! $error)
+					{
+						$result=$this->insertExtraFields();
+						if ($result < 0) $error++;
+					}
 
 					if (! $error && ! $notrigger)
-	                {
+					{
 						// Call trigger
 						$result=$this->call_trigger('ORDER_SUPPLIER_CREATE',$user);
 						if ($result < 0)
-	                    {
-	                        $this->db->rollback();
-	                        return -1;
-	                    }
+						{
+							$this->db->rollback();
+							return -1;
+						}
 						// End call triggers
-	                }
-
-	                $this->db->commit();
-	                return $this->id;
-	            }
-	            else
-	            {
-	                $this->error=$this->db->lasterror();
-	                $this->db->rollback();
-	                return -2;
-	            }
-            }
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Load an object from its id and create a new one in database
-     *
-     *	@return		int							New id of clone
-     */
-    public function createFromClone()
-    {
-        global $conf,$user,$langs,$hookmanager;
-
-        $error=0;
+					}
+
+					$this->db->commit();
+					return $this->id;
+				}
+				else
+				{
+					$this->error=$this->db->lasterror();
+					$this->db->rollback();
+					return -2;
+				}
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Load an object from its id and create a new one in database
+	 *
+	 *	@return		int							New id of clone
+	 */
+	public function createFromClone()
+	{
+		global $conf,$user,$langs,$hookmanager;
+
+		$error=0;
 
 		$this->context['createfromclone'] = 'createfromclone';
 
@@ -1279,1431 +1279,1431 @@ 
 		// Load source object
 		$objFrom = clone $this;
 
-        $this->id=0;
-        $this->statut=0;
-
-        // Clear fields
-        $this->user_author_id     = $user->id;
-        $this->user_valid         = '';
-        $this->date_creation      = '';
-        $this->date_validation    = '';
-        $this->ref_supplier       = '';
-        $this->user_approve_id    = '';
-        $this->user_approve_id2   = '';
-        $this->date_approve       = '';
-        $this->date_approve2      = '';
-
-        // Create clone
-        $result=$this->create($user);
-        if ($result < 0) $error++;
-
-        if (! $error)
-        {
-            // Hook of thirdparty module
-            if (is_object($hookmanager))
-            {
-                $parameters=array('objFrom'=>$objFrom);
-                $action='';
-                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
-            }
+		$this->id=0;
+		$this->statut=0;
+
+		// Clear fields
+		$this->user_author_id     = $user->id;
+		$this->user_valid         = '';
+		$this->date_creation      = '';
+		$this->date_validation    = '';
+		$this->ref_supplier       = '';
+		$this->user_approve_id    = '';
+		$this->user_approve_id2   = '';
+		$this->date_approve       = '';
+		$this->date_approve2      = '';
+
+		// Create clone
+		$result=$this->create($user);
+		if ($result < 0) $error++;
+
+		if (! $error)
+		{
+			// Hook of thirdparty module
+			if (is_object($hookmanager))
+			{
+				$parameters=array('objFrom'=>$objFrom);
+				$action='';
+				$reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+			}
 
 			// Call trigger
 			$result=$this->call_trigger('ORDER_SUPPLIER_CLONE',$user);
 			if ($result < 0) $error++;
 			// End call triggers
-        }
+		}
 
 		unset($this->context['createfromclone']);
 
 		// End
-        if (! $error)
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Add order line
-     *
-     *	@param      string	$desc            		Description
-     *	@param      float	$pu_ht              	Unit price
-     *	@param      float	$qty             		Quantity
-     *	@param      float	$txtva           		Taux tva
-     *	@param      float	$txlocaltax1        	Localtax1 tax
-     *  @param      float	$txlocaltax2        	Localtax2 tax
-     *	@param      int		$fk_product      		Id product
-     *  @param      int		$fk_prod_fourn_price	Id supplier price
-     *  @param      string	$fourn_ref				Supplier reference price
-     *	@param      float	$remise_percent  		Remise
-     *	@param      string	$price_base_type		HT or TTC
-     *	@param		float	$pu_ttc					Unit price TTC
-     *	@param		int		$type					Type of line (0=product, 1=service)
-     *	@param		int		$info_bits				More information
-     *  @param		bool	$notrigger				Disable triggers
-     *  @param		int		$date_start				Date start of service
-     *  @param		int		$date_end				Date end of service
+		if (! $error)
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Add order line
+	 *
+	 *	@param      string	$desc            		Description
+	 *	@param      float	$pu_ht              	Unit price
+	 *	@param      float	$qty             		Quantity
+	 *	@param      float	$txtva           		Taux tva
+	 *	@param      float	$txlocaltax1        	Localtax1 tax
+	 *  @param      float	$txlocaltax2        	Localtax2 tax
+	 *	@param      int		$fk_product      		Id product
+	 *  @param      int		$fk_prod_fourn_price	Id supplier price
+	 *  @param      string	$fourn_ref				Supplier reference price
+	 *	@param      float	$remise_percent  		Remise
+	 *	@param      string	$price_base_type		HT or TTC
+	 *	@param		float	$pu_ttc					Unit price TTC
+	 *	@param		int		$type					Type of line (0=product, 1=service)
+	 *	@param		int		$info_bits				More information
+	 *  @param		bool	$notrigger				Disable triggers
+	 *  @param		int		$date_start				Date start of service
+	 *  @param		int		$date_end				Date end of service
 	 *  @param		array	$array_options			extrafields array
-     *  @param 		string	$fk_unit 				Code of the unit to use. Null to use the default one
+	 *  @param 		string	$fk_unit 				Code of the unit to use. Null to use the default one
 	 *  @param 		string	$pu_ht_devise			Amount in currency
 	 *  @param		string	$origin					'order', ...
 	 *  @param		int		$origin_id				Id of origin object
-     *	@return     int             				<=0 if KO, >0 if OK
-     */
+	 *	@return     int             				<=0 if KO, >0 if OK
+	 */
 	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $fk_prod_fourn_price=0, $fourn_ref='', $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $type=0, $info_bits=0, $notrigger=false, $date_start=null, $date_end=null, $array_options=0, $fk_unit=null, $pu_ht_devise=0, $origin='', $origin_id=0)
-    {
-        global $langs,$mysoc,$conf;
+	{
+		global $langs,$mysoc,$conf;
 
-        $error = 0;
+		$error = 0;
 
-        dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type, $fk_unit");
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type, $fk_unit");
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-        // Clean parameters
-        if (! $qty) $qty=1;
-        if (! $info_bits) $info_bits=0;
-        if (empty($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
+		// Clean parameters
+		if (! $qty) $qty=1;
+		if (! $info_bits) $info_bits=0;
+		if (empty($txtva)) $txtva=0;
+		if (empty($txlocaltax1)) $txlocaltax1=0;
+		if (empty($txlocaltax2)) $txlocaltax2=0;
 		if (empty($remise_percent)) $remise_percent=0;
 
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu_ht=price2num($pu_ht);
-        $pu_ttc=price2num($pu_ttc);
-        $txtva = price2num($txtva);
-        $txlocaltax1 = price2num($txlocaltax1);
-        $txlocaltax2 = price2num($txlocaltax2);
-        if ($price_base_type=='HT')
-        {
-            $pu=$pu_ht;
-        }
-        else
-        {
-            $pu=$pu_ttc;
-        }
-        $desc=trim($desc);
-        $ref_supplier=''; // Ref of supplier price when we add line
-
-        // Check parameters
-        if ($qty < 1 && ! $fk_product)
-        {
-            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Product"));
-            return -1;
-        }
-        if ($type < 0) return -1;
-
-        if ($this->statut == 0)
-        {
-            $this->db->begin();
-
-            if ($fk_product > 0)
-            {
-                if (empty($conf->global->SUPPLIER_ORDER_WITH_NOPRICEDEFINED))
-                {
-                    // Check quantity is enough
-                    dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." fourn_ref=".$fourn_ref);
-                    $prod = new Product($this->db, $fk_product);
-                    if ($prod->fetch($fk_product) > 0)
-                    {
-                        $product_type = $prod->type;
-                        $label = $prod->label;
-
-                        // We use 'none' instead of $fourn_ref, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
-                        // If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
-                        $result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', $this->fk_soc);   // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$fourn_ref/$this->fk_soc
-                        if ($result > 0)
-                        {
-                            $pu           = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
-                            $ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
-			    // is remise percent not keyed but present for the product we add it
-                            if ($remise_percent == 0 && $prod->remise_percent !=0)
-                            	$remise_percent =$prod->remise_percent;
-
-
-                        }
-                        if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
-                        {
-                            $langs->load("errors");
-                            $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
-                            $this->db->rollback();
-                            dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
-                            //$pu    = $prod->fourn_pu;     // We do not overwrite unit price
-                            //$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
-                            return -1;
-                        }
-                        if ($result == -1)
-                        {
-                            $langs->load("errors");
-                            $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
-                            $this->db->rollback();
-                            dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
-                            return -1;
-                        }
-                        if ($result < -1)
-                        {
-                            $this->error=$prod->error;
-                            $this->db->rollback();
-                            dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
-                            return -1;
-                        }
-                    }
-                    else
-    				{
-                        $this->error=$prod->error;
-                        return -1;
-                    }
-                }
-            }
-            else
-            {
-                $product_type = $type;
-            }
-
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et txtva
-            // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-            // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc,$this->thirdparty);
-
-            // Clean vat code
-            $vat_src_code='';
-            if (preg_match('/\((.*)\)/', $txtva, $reg))
-            {
-                $vat_src_code = $reg[1];
-                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-            }
-
-            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx,$pu_ht_devise);
-            $total_ht  = $tabprice[0];
-            $total_tva = $tabprice[1];
-            $total_ttc = $tabprice[2];
-            $total_localtax1 = $tabprice[9];
-            $total_localtax2 = $tabprice[10];
+		$remise_percent=price2num($remise_percent);
+		$qty=price2num($qty);
+		$pu_ht=price2num($pu_ht);
+		$pu_ttc=price2num($pu_ttc);
+		$txtva = price2num($txtva);
+		$txlocaltax1 = price2num($txlocaltax1);
+		$txlocaltax2 = price2num($txlocaltax2);
+		if ($price_base_type=='HT')
+		{
+			$pu=$pu_ht;
+		}
+		else
+		{
+			$pu=$pu_ttc;
+		}
+		$desc=trim($desc);
+		$ref_supplier=''; // Ref of supplier price when we add line
+
+		// Check parameters
+		if ($qty < 1 && ! $fk_product)
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Product"));
+			return -1;
+		}
+		if ($type < 0) return -1;
+
+		if ($this->statut == 0)
+		{
+			$this->db->begin();
+
+			if ($fk_product > 0)
+			{
+				if (empty($conf->global->SUPPLIER_ORDER_WITH_NOPRICEDEFINED))
+				{
+					// Check quantity is enough
+					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." fourn_ref=".$fourn_ref);
+					$prod = new Product($this->db, $fk_product);
+					if ($prod->fetch($fk_product) > 0)
+					{
+						$product_type = $prod->type;
+						$label = $prod->label;
+
+						// We use 'none' instead of $fourn_ref, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
+						// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+						$result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', $this->fk_soc);   // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$fourn_ref/$this->fk_soc
+						if ($result > 0)
+						{
+							$pu           = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
+							$ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
+				// is remise percent not keyed but present for the product we add it
+							if ($remise_percent == 0 && $prod->remise_percent !=0)
+								$remise_percent =$prod->remise_percent;
+
+
+						}
+						if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
+						{
+							$langs->load("errors");
+							$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
+							//$pu    = $prod->fourn_pu;     // We do not overwrite unit price
+							//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
+							return -1;
+						}
+						if ($result == -1)
+						{
+							$langs->load("errors");
+							$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
+							return -1;
+						}
+						if ($result < -1)
+						{
+							$this->error=$prod->error;
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
+							return -1;
+						}
+					}
+					else
+					{
+						$this->error=$prod->error;
+						return -1;
+					}
+				}
+			}
+			else
+			{
+				$product_type = $type;
+			}
+
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et txtva
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+
+			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc,$this->thirdparty);
+
+			// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+			}
+
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx,$pu_ht_devise);
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
 			$pu_ht = $tabprice[3];
 
 			// MultiCurrency
 			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-            $localtax1_type=$localtaxes_type[0];
+			$localtax1_type=$localtaxes_type[0];
 			$localtax2_type=$localtaxes_type[2];
 
-            $subprice = price2num($pu,'MU');
-
-            $rangmax = $this->line_max();
-            $rang = $rangmax + 1;
-
-            // Insert line
-            $this->line=new CommandeFournisseurLigne($this->db);
-
-            $this->line->context = $this->context;
-
-            $this->line->fk_commande=$this->id;
-            $this->line->label=$label;
-            $this->line->ref_fourn = $ref_supplier;
-            $this->line->ref_supplier = $ref_supplier;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
-            $this->line->tva_tx=$txtva;
-            $this->line->localtax1_tx=$txlocaltax1;
-            $this->line->localtax2_tx=$txlocaltax2;
-            $this->line->localtax1_type = $localtaxes_type[0];
-            $this->line->localtax2_type = $localtaxes_type[2];
-            $this->line->fk_product=$fk_product;
-            $this->line->product_type=$product_type;
-            $this->line->remise_percent=$remise_percent;
-            $this->line->subprice=$pu_ht;
-            $this->line->rang=$this->rang;
-            $this->line->info_bits=$info_bits;
-
-            $this->line->vat_src_code=$vat_src_code;
-            $this->line->total_ht=$total_ht;
-            $this->line->total_tva=$total_tva;
-            $this->line->total_localtax1=$total_localtax1;
-            $this->line->total_localtax2=$total_localtax2;
-            $this->line->total_ttc=$total_ttc;
-            $this->line->product_type=$type;
-            $this->line->special_code=$this->special_code;
-            $this->line->origin=$origin;
-            $this->line->origin_id=$origin_id;
-            $this->line->fk_unit=$fk_unit;
-
-            $this->line->date_start=$date_start;
-            $this->line->date_end=$date_end;
-
-            // Multicurrency
-            $this->line->fk_multicurrency			= $this->fk_multicurrency;
-            $this->line->multicurrency_code			= $this->multicurrency_code;
-            $this->line->multicurrency_subprice		= $pu_ht_devise;
-            $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
-
-            $this->line->subprice=$pu_ht;
-            $this->line->price=$this->line->subprice;
-
-            $this->line->remise_percent=$remise_percent;
-
-            if (is_array($array_options) && count($array_options)>0) {
-                $this->line->array_options=$array_options;
-            }
-
-            $result=$this->line->insert($notrigger);
-            if ($result > 0)
-            {
-                // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
-
-                // Mise a jour informations denormalisees au niveau de la commande meme
-                $result=$this->update_price(1,'auto',0,$this->thirdparty);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
-                if ($result > 0)
-                {
-                    $this->db->commit();
-                    return $this->line->id;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->error=$this->line->error;
-                $this->errors=$this->line->errors;
-                dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
-                $this->db->rollback();
-                return -1;
-            }
-        }
-    }
-
-
-    /**
-     * Save a receiving into the tracking table of receiving (commande_fournisseur_dispatch) and add product into stock warehouse.
-     *
-     * @param 	User		$user					User object making change
-     * @param 	int			$product				Id of product to dispatch
-     * @param 	double		$qty					Qty to dispatch
-     * @param 	int			$entrepot				Id of warehouse to add product
-     * @param 	double		$price					Unit Price for PMP value calculation (Unit price without Tax and taking into account discount)
-     * @param	string		$comment				Comment for stock movement
+			$subprice = price2num($pu,'MU');
+
+			$rangmax = $this->line_max();
+			$rang = $rangmax + 1;
+
+			// Insert line
+			$this->line=new CommandeFournisseurLigne($this->db);
+
+			$this->line->context = $this->context;
+
+			$this->line->fk_commande=$this->id;
+			$this->line->label=$label;
+			$this->line->ref_fourn = $ref_supplier;
+			$this->line->ref_supplier = $ref_supplier;
+			$this->line->desc=$desc;
+			$this->line->qty=$qty;
+			$this->line->tva_tx=$txtva;
+			$this->line->localtax1_tx=$txlocaltax1;
+			$this->line->localtax2_tx=$txlocaltax2;
+			$this->line->localtax1_type = $localtaxes_type[0];
+			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->fk_product=$fk_product;
+			$this->line->product_type=$product_type;
+			$this->line->remise_percent=$remise_percent;
+			$this->line->subprice=$pu_ht;
+			$this->line->rang=$this->rang;
+			$this->line->info_bits=$info_bits;
+
+			$this->line->vat_src_code=$vat_src_code;
+			$this->line->total_ht=$total_ht;
+			$this->line->total_tva=$total_tva;
+			$this->line->total_localtax1=$total_localtax1;
+			$this->line->total_localtax2=$total_localtax2;
+			$this->line->total_ttc=$total_ttc;
+			$this->line->product_type=$type;
+			$this->line->special_code=$this->special_code;
+			$this->line->origin=$origin;
+			$this->line->origin_id=$origin_id;
+			$this->line->fk_unit=$fk_unit;
+
+			$this->line->date_start=$date_start;
+			$this->line->date_end=$date_end;
+
+			// Multicurrency
+			$this->line->fk_multicurrency			= $this->fk_multicurrency;
+			$this->line->multicurrency_code			= $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= $pu_ht_devise;
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
+			$this->line->subprice=$pu_ht;
+			$this->line->price=$this->line->subprice;
+
+			$this->line->remise_percent=$remise_percent;
+
+			if (is_array($array_options) && count($array_options)>0) {
+				$this->line->array_options=$array_options;
+			}
+
+			$result=$this->line->insert($notrigger);
+			if ($result > 0)
+			{
+				// Reorder if child line
+				if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+
+				// Mise a jour informations denormalisees au niveau de la commande meme
+				$result=$this->update_price(1,'auto',0,$this->thirdparty);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+				if ($result > 0)
+				{
+					$this->db->commit();
+					return $this->line->id;
+				}
+				else
+				{
+					$this->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				$this->error=$this->line->error;
+				$this->errors=$this->line->errors;
+				dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -1;
+			}
+		}
+	}
+
+
+	/**
+	 * Save a receiving into the tracking table of receiving (commande_fournisseur_dispatch) and add product into stock warehouse.
+	 *
+	 * @param 	User		$user					User object making change
+	 * @param 	int			$product				Id of product to dispatch
+	 * @param 	double		$qty					Qty to dispatch
+	 * @param 	int			$entrepot				Id of warehouse to add product
+	 * @param 	double		$price					Unit Price for PMP value calculation (Unit price without Tax and taking into account discount)
+	 * @param	string		$comment				Comment for stock movement
 	 * @param	date		$eatby					eat-by date
 	 * @param	date		$sellby					sell-by date
 	 * @param	string		$batch					Lot number
 	 * @param	int			$fk_commandefourndet	Id of supplier order line
-     * @param	int			$notrigger          	1 = notrigger
-     * @return 	int						<0 if KO, >0 if OK
-     */
-    public function dispatchProduct($user, $product, $qty, $entrepot, $price=0, $comment='', $eatby='', $sellby='', $batch='', $fk_commandefourndet=0, $notrigger=0)
-    {
-        global $conf, $langs;
-
-        $error = 0;
-        require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
-
-        // Check parameters (if test are wrong here, there is bug into caller)
-        if ($entrepot <= 0)
-        {
-            $this->error='ErrorBadValueForParameterWarehouse';
-            return -1;
-        }
-        if ($qty <= 0)
-        {
-            $this->error='ErrorBadValueForParameterQty';
-            return -1;
-        }
-
-        $dispatchstatus = 1;
-        if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0;	// Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
-
-        $now=dol_now();
-
-        if (($this->statut == 3 || $this->statut == 4 || $this->statut == 5))
-        {
-            $this->db->begin();
-
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
-            $sql.= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch) VALUES";
-            $sql.= " ('".$this->id."','".$product."','".$qty."',".($entrepot>0?"'".$entrepot."'":"null").",'".$user->id."','".$this->db->idate($now)."','".$fk_commandefourndet."', ".$dispatchstatus.", '".$this->db->escape($comment)."', ";
-            $sql.= ($eatby?"'".$this->db->idate($eatby)."'":"null").", ".($sellby?"'".$this->db->idate($sellby)."'":"null").", ".($batch?"'".$batch."'":"null");
-            $sql.= ")";
-
-            dol_syslog(get_class($this)."::dispatchProduct", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                if (! $notrigger)
-                {
-                    global $conf, $langs, $user;
+	 * @param	int			$notrigger          	1 = notrigger
+	 * @return 	int						<0 if KO, >0 if OK
+	 */
+	public function dispatchProduct($user, $product, $qty, $entrepot, $price=0, $comment='', $eatby='', $sellby='', $batch='', $fk_commandefourndet=0, $notrigger=0)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+		require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+
+		// Check parameters (if test are wrong here, there is bug into caller)
+		if ($entrepot <= 0)
+		{
+			$this->error='ErrorBadValueForParameterWarehouse';
+			return -1;
+		}
+		if ($qty <= 0)
+		{
+			$this->error='ErrorBadValueForParameterQty';
+			return -1;
+		}
+
+		$dispatchstatus = 1;
+		if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0;	// Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
+
+		$now=dol_now();
+
+		if (($this->statut == 3 || $this->statut == 4 || $this->statut == 5))
+		{
+			$this->db->begin();
+
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
+			$sql.= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch) VALUES";
+			$sql.= " ('".$this->id."','".$product."','".$qty."',".($entrepot>0?"'".$entrepot."'":"null").",'".$user->id."','".$this->db->idate($now)."','".$fk_commandefourndet."', ".$dispatchstatus.", '".$this->db->escape($comment)."', ";
+			$sql.= ($eatby?"'".$this->db->idate($eatby)."'":"null").", ".($sellby?"'".$this->db->idate($sellby)."'":"null").", ".($batch?"'".$batch."'":"null");
+			$sql.= ")";
+
+			dol_syslog(get_class($this)."::dispatchProduct", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				if (! $notrigger)
+				{
+					global $conf, $langs, $user;
 					// Call trigger
 					$result=$this->call_trigger('LINEORDER_SUPPLIER_DISPATCH',$user);
 					if ($result < 0)
-                    {
-                        $error++;
-                        return -1;
-                    }
+					{
+						$error++;
+						return -1;
+					}
 					// End call triggers
-                }
-            }
-            else
-			{
-                $this->error=$this->db->lasterror();
-                $error++;
-            }
-
-            // Si module stock gere et que incrementation faite depuis un dispatching en stock
-            if (! $error && $entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
-            {
-
-                $mouv = new MouvementStock($this->db);
-                if ($product > 0)
-                {
-                	// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
-                	$mouv->origin = &$this;
+				}
+			}
+			else
+			{
+				$this->error=$this->db->lasterror();
+				$error++;
+			}
+
+			// Si module stock gere et que incrementation faite depuis un dispatching en stock
+			if (! $error && $entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+			{
+
+				$mouv = new MouvementStock($this->db);
+				if ($product > 0)
+				{
+					// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
+					$mouv->origin = &$this;
 					$result=$mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch);
-                    if ($result < 0)
-                    {
-                        $this->error=$mouv->error;
-                        $this->errors=$mouv->errors;
-                        dol_syslog(get_class($this)."::dispatchProduct ".$this->error." ".join(',',$this->errors), LOG_ERR);
-                        $error++;
-                    }
-                }
-            }
-
-            if ($error == 0)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-		{
-            $this->error='BadStatusForObject';
-            return -2;
-        }
-    }
-
-    /**
-     * 	Delete line
-     *
-     *	@param	int		$idline		Id of line to delete
-     *	@param	int		$notrigger	1=Disable call to triggers
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function deleteline($idline, $notrigger=0)
-    {
-        if ($this->statut == 0)
-        {
-            $line = new CommandeFournisseurLigne($this->db);
-
-            if ($line->fetch($idline) <= 0)
-            {
-                return 0;
-            }
-
-            if ($line->delete($notrigger) > 0)
-            {
-                $this->update_price();
-                return 1;
-            }
-            else
-            {
-                $this->error = $line->error;
-                $this->errors = $line->errors;
-                return -1;
-            }
-        }
-        else
-        {
-            return -2;
-        }
-    }
-
-    /**
-     *  Delete an order
-     *
-     *	@param	User	$user		Object user
-     *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function delete(User $user, $notrigger=0)
-    {
-        global $langs,$conf;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $error = 0;
-
-        $this->db->begin();
-
-        if (empty($notrigger))
-        {
-            // Call trigger
-            $result=$this->call_trigger('ORDER_SUPPLIER_DELETE',$user);
-            if ($result < 0)
-            {
-            	$this->errors[]='ErrorWhenRunningTrigger';
-            	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-            	return -1;
-            }
-            // End call triggers
-        }
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =". $this->id ;
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        if (! $this->db->query($sql) )
-        {
-            $this->error=$this->db->lasterror();
-            $this->errors[]=$this->db->lasterror();
-            $error++;
-        }
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id;
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        if ($resql = $this->db->query($sql) )
-        {
-            if ($this->db->affected_rows($resql) < 1)
-            {
-                $this->error=$this->db->lasterror();
-                $this->errors[]=$this->db->lasterror();
-                $error++;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            $this->errors[]=$this->db->lasterror();
-            $error++;
-        }
-
-        // Remove extrafields
-        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
-        {
-        	$result=$this->deleteExtraFields();
-        	if ($result < 0)
-        	{
-        		$this->error='FailToDeleteExtraFields';
-        		$this->errors[]='FailToDeleteExtraFields';
-        		$error++;
-        		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-        	}
-        }
+					if ($result < 0)
+					{
+						$this->error=$mouv->error;
+						$this->errors=$mouv->errors;
+						dol_syslog(get_class($this)."::dispatchProduct ".$this->error." ".join(',',$this->errors), LOG_ERR);
+						$error++;
+					}
+				}
+			}
 
-		// Delete linked object
-    	$res = $this->deleteObjectLinked();
-    	if ($res < 0) {
-    		$this->error='FailToDeleteObjectLinked';
-    		$this->errors[]='FailToDeleteObjectLinked';
-    		$error++;
-    	}
-
-        if (! $error)
-        {
-        	// We remove directory
-        	$ref = dol_sanitizeFileName($this->ref);
-        	if ($conf->fournisseur->commande->dir_output)
-        	{
-        		$dir = $conf->fournisseur->commande->dir_output . "/" . $ref ;
-        		$file = $dir . "/" . $ref . ".pdf";
-        		if (file_exists($file))
-        		{
-        			if (! dol_delete_file($file,0,0,0,$this)) // For triggers
-        			{
-        				$this->error='ErrorFailToDeleteFile';
-        				$this->errors[]='ErrorFailToDeleteFile';
-        				$error++;
-        			}
-        		}
-        		if (file_exists($dir))
-        		{
-        			$res=@dol_delete_dir_recursive($dir);
-        			if (! $res)
-        			{
-        				$this->error='ErrorFailToDeleteDir';
-        				$this->errors[]='ErrorFailToDeleteDir';
-        				$error++;
-        			}
-        		}
-        	}
-        }
+			if ($error == 0)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error='BadStatusForObject';
+			return -2;
+		}
+	}
 
-		if (! $error)
+	/**
+	 * 	Delete line
+	 *
+	 *	@param	int		$idline		Id of line to delete
+	 *	@param	int		$notrigger	1=Disable call to triggers
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function deleteline($idline, $notrigger=0)
+	{
+		if ($this->statut == 0)
 		{
-			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
-			$this->db->commit();
-			return 1;
+			$line = new CommandeFournisseurLigne($this->db);
+
+			if ($line->fetch($idline) <= 0)
+			{
+				return 0;
+			}
+
+			if ($line->delete($notrigger) > 0)
+			{
+				$this->update_price();
+				return 1;
+			}
+			else
+			{
+				$this->error = $line->error;
+				$this->errors = $line->errors;
+				return -1;
+			}
 		}
 		else
 		{
-			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-			$this->db->rollback();
-			return -$error;
+			return -2;
 		}
-    }
-
-    /**
-     *	Get list of order methods
-     *
-     *	@return 0 if Ok, <0 if Ko
-     */
-    function get_methodes_commande()
-    {
-        $sql = "SELECT rowid, libelle";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
-        $sql.= " WHERE active = 1";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $this->db->num_rows($resql);
-            $this->methodes_commande = array();
-            while ($i < $num)
-            {
-                $row = $this->db->fetch_row($resql);
-
-                $this->methodes_commande[$row[0]] = $row[1];
-
-                $i++;
-            }
-            return 0;
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-    /**
-	 * Return array of dispathed lines waiting to be approved for this order
+	}
+
+	/**
+	 *  Delete an order
 	 *
-	 * @param	int		$status		Filter on stats (-1 = no filter, 0 = lines draft to be approved, 1 = approved lines)
-	 * @return	array				Array of lines
-     */
-    public function getDispachedLines($status=-1)
-    {
-    	$ret = array();
+	 *	@param	User	$user		Object user
+	 *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger=0)
+	{
+		global $langs,$conf;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    	// List of already dispatched lines
-		$sql = "SELECT p.ref, p.label,";
-		$sql.= " e.rowid as warehouse_id, e.label as entrepot,";
-		$sql.= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product as p,";
-		$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
-		$sql.= " WHERE cfd.fk_commande = ".$this->id;
-		$sql.= " AND cfd.fk_product = p.rowid";
-		if ($status >= 0) $sql.=" AND cfd.status = ".$status;
-		$sql.= " ORDER BY cfd.rowid ASC";
+		$error = 0;
 
-		$resql = $this->db->query($sql);
-		if ($resql)
+		$this->db->begin();
+
+		if (empty($notrigger))
+		{
+			// Call trigger
+			$result=$this->call_trigger('ORDER_SUPPLIER_DELETE',$user);
+			if ($result < 0)
+			{
+				$this->errors[]='ErrorWhenRunningTrigger';
+				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+				return -1;
+			}
+			// End call triggers
+		}
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =". $this->id ;
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		if (! $this->db->query($sql) )
+		{
+			$this->error=$this->db->lasterror();
+			$this->errors[]=$this->db->lasterror();
+			$error++;
+		}
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id;
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		if ($resql = $this->db->query($sql) )
+		{
+			if ($this->db->affected_rows($resql) < 1)
+			{
+				$this->error=$this->db->lasterror();
+				$this->errors[]=$this->db->lasterror();
+				$error++;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->errors[]=$this->db->lasterror();
+			$error++;
+		}
+
+		// Remove extrafields
+		if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+		{
+			$result=$this->deleteExtraFields();
+			if ($result < 0)
+			{
+				$this->error='FailToDeleteExtraFields';
+				$this->errors[]='FailToDeleteExtraFields';
+				$error++;
+				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+			}
+		}
+
+		// Delete linked object
+		$res = $this->deleteObjectLinked();
+		if ($res < 0) {
+			$this->error='FailToDeleteObjectLinked';
+			$this->errors[]='FailToDeleteObjectLinked';
+			$error++;
+		}
+
+		if (! $error)
+		{
+			// We remove directory
+			$ref = dol_sanitizeFileName($this->ref);
+			if ($conf->fournisseur->commande->dir_output)
+			{
+				$dir = $conf->fournisseur->commande->dir_output . "/" . $ref ;
+				$file = $dir . "/" . $ref . ".pdf";
+				if (file_exists($file))
+				{
+					if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+					{
+						$this->error='ErrorFailToDeleteFile';
+						$this->errors[]='ErrorFailToDeleteFile';
+						$error++;
+					}
+				}
+				if (file_exists($dir))
+				{
+					$res=@dol_delete_dir_recursive($dir);
+					if (! $res)
+					{
+						$this->error='ErrorFailToDeleteDir';
+						$this->errors[]='ErrorFailToDeleteDir';
+						$error++;
+					}
+				}
+			}
+		}
+
+		if (! $error)
+		{
+			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+			$this->db->rollback();
+			return -$error;
+		}
+	}
+
+	/**
+	 *	Get list of order methods
+	 *
+	 *	@return 0 if Ok, <0 if Ko
+	 */
+	function get_methodes_commande()
+	{
+		$sql = "SELECT rowid, libelle";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
+		$sql.= " WHERE active = 1";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($resql);
+			$this->methodes_commande = array();
+			while ($i < $num)
+			{
+				$row = $this->db->fetch_row($resql);
+
+				$this->methodes_commande[$row[0]] = $row[1];
+
+				$i++;
+			}
+			return 0;
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+	/**
+	 * Return array of dispathed lines waiting to be approved for this order
+	 *
+	 * @param	int		$status		Filter on stats (-1 = no filter, 0 = lines draft to be approved, 1 = approved lines)
+	 * @return	array				Array of lines
+	 */
+	public function getDispachedLines($status=-1)
+	{
+		$ret = array();
+
+		// List of already dispatched lines
+		$sql = "SELECT p.ref, p.label,";
+		$sql.= " e.rowid as warehouse_id, e.label as entrepot,";
+		$sql.= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status";
+		$sql.= " FROM ".MAIN_DB_PREFIX."product as p,";
+		$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
+		$sql.= " WHERE cfd.fk_commande = ".$this->id;
+		$sql.= " AND cfd.fk_product = p.rowid";
+		if ($status >= 0) $sql.=" AND cfd.status = ".$status;
+		$sql.= " ORDER BY cfd.rowid ASC";
+
+		$resql = $this->db->query($sql);
+		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 
-			while ($i < $num)
-			{
-				$objp = $this->db->fetch_object($resql);
-				if ($objp) $ret[]=array('id'=>$objp->dispatchedlineid, 'productid'=>$objp->fk_product, 'warehouseid'=>$objp->warehouse_id);
+			while ($i < $num)
+			{
+				$objp = $this->db->fetch_object($resql);
+				if ($objp) $ret[]=array('id'=>$objp->dispatchedlineid, 'productid'=>$objp->fk_product, 'warehouseid'=>$objp->warehouse_id);
+
+				$i++;
+			}
+		}
+		else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
+
+		return $ret;
+	}
+
+
+	/**
+	 * 	Set a delivery in database for this supplier order
+	 *
+	 *	@param	User	$user		User that input data
+	 *	@param	date	$date		Date of reception
+	 *	@param	string	$type		Type of receipt ('tot' = total/done, 'par' = partial, 'nev' = never, 'can' = cancel)
+	 *	@param	string	$comment	Comment
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function Livraison($user, $date, $type, $comment)
+	{
+		global $conf, $langs;
+
+		$result = 0;
+		$error = 0;
+
+		dol_syslog(get_class($this)."::Livraison");
+
+		if ($user->rights->fournisseur->commande->receptionner)
+		{
+			if ($type == 'par') $statut = 4;
+			if ($type == 'tot')	$statut = 5;
+			if ($type == 'nev') $statut = 7;
+			if ($type == 'can') $statut = 7;
+
+			// Some checks to accept the record
+			if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
+			{
+				// If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done"
+				if (! $error && ($type == 'tot'))
+				{
+					$dispatchedlinearray=$this->getDispachedLines(0);
+					if (count($dispatchedlinearray) > 0)
+					{
+						$result=-1;
+						$error++;
+						$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
+						dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
+					}
+
+				}
+				if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot'))	// Accept to move to reception done, only if status of all line are ok (refuse denied)
+				{
+					$dispatcheddenied=$this->getDispachedLines(2);
+					if (count($dispatchedlinearray) > 0)
+					{
+						$result=-1;
+						$error++;
+						$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionDenied';
+						dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionDenied', LOG_DEBUG);
+					}
+				}
+			}
+
+			// TODO LDR01 Add a control test to accept only if ALL predefined products are received (same qty).
+
+
+			if (! $error && ! ($statut == 4 or $statut == 5 or $statut == 7))
+			{
+				$error++;
+				dol_syslog(get_class($this)."::Livraison Error -2", LOG_ERR);
+				$result = -2;
+			}
+
+			if (! $error)
+			{
+				$this->db->begin();
+
+				$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+				$sql.= " SET fk_statut = ".$statut;
+				$sql.= " WHERE rowid = ".$this->id;
+				$sql.= " AND fk_statut IN (3,4)";	// Process running or Partially received
+
+				dol_syslog(get_class($this)."::Livraison", LOG_DEBUG);
+				$resql=$this->db->query($sql);
+				if ($resql)
+				{
+					$result = 0;
+					$old_statut = $this->statut;
+					$this->statut = $statut;
+					$this->actionmsg2 = $comment;
+
+					// Call trigger
+					$result=$this->call_trigger('ORDER_SUPPLIER_RECEIVE',$user);
+					if ($result < 0) $error++;
+					// End call triggers
+
+					if (! $error)
+					{
+						$this->db->commit();
+					}
+					else
+					{
+						$this->statut = $old_statut;
+						$this->db->rollback();
+						$this->error=$this->db->lasterror();
+						$result = -1;
+					}
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error=$this->db->lasterror();
+					$result = -1;
+				}
+			}
+		}
+		else
+		{
+			$this->error = $langs->trans('NotAuthorized');
+			$this->errors[] = $langs->trans('NotAuthorized');
+			dol_syslog(get_class($this)."::Livraison Not Authorized");
+			$result = -3;
+		}
+		return $result ;
+	}
+
+	/**
+	 *	Set the planned delivery date
+	 *
+	 *	@param      User			$user        		Objet user making change
+	 *	@param      timestamp		$date_livraison     Planned delivery date
+	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         						<0 if KO, >0 if OK
+	 */
+	function set_date_livraison($user, $date_livraison, $notrigger=0)
+	{
+		if ($user->rights->fournisseur->commande->creer)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql.= " WHERE rowid = ".$this->id;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->date_livraison = $date_livraison;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_SUPPLIER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			return -2;
+		}
+	}
+
+	/**
+	 *	Set the id projet
+	 *
+	 *	@param      User			$user        		Objet utilisateur qui modifie
+	 *	@param      int				$id_projet    	 	Date de livraison
+	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         						<0 si ko, >0 si ok
+	 */
+	function set_id_projet($user, $id_projet, $notrigger=0)
+	{
+		if ($user->rights->fournisseur->commande->creer)
+		{
+			$error=0;
+
+			$this->db->begin();
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql.= " SET fk_projet = ".($id_projet > 0 ? (int) $id_projet : 'null');
+			$sql.= " WHERE rowid = ".$this->id;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[]=$this->db->error();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$this->oldcopy= clone $this;
+				$this->fk_projet = $id_projet;
+			}
+
+			if (! $notrigger && empty($error))
+			{
+				// Call trigger
+				$result=$this->call_trigger('ORDER_SUPPLIER_MODIFY',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				foreach($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error.=($this->error?', '.$errmsg:$errmsg);
+				}
+				$this->db->rollback();
+				return -1*$error;
+			}
+		}
+		else
+		{
+			return -2;
+		}
+	}
+
+	/**
+	 *  Update a supplier order from a customer order
+	 *
+	 *  @param  User	$user           User that create
+	 *  @param  int		$idc			Id of supplier order to update
+	 *  @param	int		$comclientid	Id of customer order to use as template
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function updateFromCommandeClient($user, $idc, $comclientid)
+	{
+		$comclient = new Commande($this->db);
+		$comclient->fetch($comclientid);
+
+		$this->id = $idc;
+
+		$this->lines = array();
+
+		$num=count($comclient->lines);
+		for ($i = 0; $i < $num; $i++)
+		{
+			$prod = new Product($this->db);
+			if ($prod->fetch($comclient->lines[$i]->fk_product) > 0)
+			{
+				$libelle  = $prod->libelle;
+				$ref      = $prod->ref;
+			}
+
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseurdet";
+			$sql .= " (fk_commande,label,description,fk_product, price, qty, tva_tx, localtax1_tx, localtax2_tx, remise_percent, subprice, remise, ref)";
+			$sql .= " VALUES (".$idc.", '" . $this->db->escape($libelle) . "','" . $this->db->escape($comclient->lines[$i]->desc) . "'";
+			$sql .= ",".$comclient->lines[$i]->fk_product.",'".price2num($comclient->lines[$i]->price)."'";
+			$sql .= ", '".$comclient->lines[$i]->qty."', ".$comclient->lines[$i]->tva_tx.", ".$comclient->lines[$i]->localtax1_tx.", ".$comclient->lines[$i]->localtax2_tx.", ".$comclient->lines[$i]->remise_percent;
+			$sql .= ", '".price2num($comclient->lines[$i]->subprice)."','0','".$ref."');";
+			if ($this->db->query($sql))
+			{
+				$this->update_price();
+			}
+		}
+
+		return 1;
+	}
+
+	/**
+	 *  Tag order with a particular status
+	 *
+	 *  @param      User	$user       Object user that change status
+	 *  @param      int		$status		New status
+	 *  @return     int         		<0 if KO, >0 if OK
+	 */
+	public function setStatus($user,$status)
+	{
+		global $conf,$langs;
+		$error=0;
+
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
+		$sql.= ' SET fk_statut='.$status;
+		$sql.= ' WHERE rowid = '.$this->id;
+
+		dol_syslog(get_class($this)."::setStatus", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Trigger names for each status
+			$trigger_name[0] = 'DRAFT';
+			$trigger_name[1] = 'VALIDATED';
+			$trigger_name[2] = 'APPROVED';
+			$trigger_name[3] = 'ONPROCESS';
+			$trigger_name[4] = 'RECEIVED_PARTIALLY';
+			$trigger_name[5] = 'RECEIVED_ALL';
+			$trigger_name[6] = 'CANCELED';
+			$trigger_name[7] = 'CANCELED';
+			$trigger_name[8] = 'BILLED';
+			$trigger_name[9] = 'REFUSED';
+
+			// Call trigger
+			$result=$this->call_trigger("ORDER_SUPPLIER_STATUS_".$trigger_name[$status],$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
+		else
+		{
+			$error++;
+			$this->error=$this->db->lasterror();
+			dol_syslog(get_class($this)."::setStatus ".$this->error);
+		}
+
+		if (! $error)
+		{
+			$this->statut = $status;
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update line
+	 *
+	 *	@param     	int			$rowid           	Id de la ligne de facture
+	 *	@param     	string		$desc            	Description de la ligne
+	 *	@param     	double		$pu              	Prix unitaire
+	 *	@param     	double		$qty             	Quantity
+	 *	@param     	double		$remise_percent  	Pourcentage de remise de la ligne
+	 *	@param     	double		$txtva          	Taux TVA
+	 *  @param     	double		$txlocaltax1	    Localtax1 tax
+	 *  @param     	double		$txlocaltax2   		Localtax2 tax
+	 *  @param     	double		$price_base_type 	Type of price base
+	 *	@param		int			$info_bits			Miscellaneous informations
+	 *	@param		int			$type				Type of line (0=product, 1=service)
+	 *  @param		int			$notrigger			Disable triggers
+	 *  @param      timestamp   $date_start     	Date start of service
+	 *  @param      timestamp   $date_end       	Date end of service
+	 *  @param		array		$array_options		Extrafields array
+	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 	@param		double		$pu_ht_devise		Unit price in currency
+	 *	@return    	int         	    			< 0 if error, > 0 if ok
+	 */
+	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit=null, $pu_ht_devise = 0)
+	{
+		global $mysoc, $conf;
+		dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit");
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		$error = 0;
+
+		if ($this->brouillon)
+		{
+			$this->db->begin();
+
+			// Clean parameters
+			if (empty($qty)) $qty=0;
+			if (empty($info_bits)) $info_bits=0;
+			if (empty($txtva)) $txtva=0;
+			if (empty($txlocaltax1)) $txlocaltax1=0;
+			if (empty($txlocaltax2)) $txlocaltax2=0;
+			if (empty($remise)) $remise=0;
+			if (empty($remise_percent)) $remise_percent=0;
+
+			$remise_percent=price2num($remise_percent);
+			$qty=price2num($qty);
+			if (! $qty) $qty=1;
+			$pu = price2num($pu);
+			$txtva=price2num($txtva);
+			$txlocaltax1=price2num($txlocaltax1);
+			$txlocaltax2=price2num($txlocaltax2);
+
+			// Check parameters
+			if ($type < 0) return -1;
+
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et txtva
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+
+			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc, $this->thirdparty);
+
+			// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+			}
+
+			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
+			$pu_ht  = $tabprice[3];
+			$pu_tva = $tabprice[4];
+			$pu_ttc = $tabprice[5];
+
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+			$pu_ht_devise = $tabprice[19];
+
+			$localtax1_type=$localtaxes_type[0];
+			$localtax2_type=$localtaxes_type[2];
+
+			$subprice = price2num($pu_ht,'MU');
+
+			//Fetch current line from the database and then clone the object and set it in $oldline property
+			$this->line=new CommandeFournisseurLigne($this->db);
+			$this->line->fetch($rowid);
+			$oldline = clone $this->line;
+			$this->line->oldline = $oldline;
+
+			$this->line->context = $this->context;
+
+			$this->line->fk_commande=$this->id;
+			//$this->line->label=$label;
+			$this->line->desc=$desc;
+			$this->line->qty=$qty;
+
+			$this->line->vat_src_code   = $vat_src_code;
+			$this->line->tva_tx         = $txtva;
+			$this->line->localtax1_tx   = $txlocaltax1;
+			$this->line->localtax2_tx   = $txlocaltax2;
+			$this->line->localtax1_type = $localtaxes_type[0];
+			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->remise_percent = $remise_percent;
+			$this->line->subprice       = $pu_ht;
+			$this->line->rang           = $this->rang;
+			$this->line->info_bits      = $info_bits;
+			$this->line->total_ht       = $total_ht;
+			$this->line->total_tva      = $total_tva;
+			$this->line->total_localtax1= $total_localtax1;
+			$this->line->total_localtax2= $total_localtax2;
+			$this->line->total_ttc      = $total_ttc;
+			$this->line->product_type   = $type;
+			$this->line->special_code   = $this->special_code;
+			$this->line->origin         = $this->origin;
+			$this->line->fk_unit        = $fk_unit;
+
+			$this->line->date_start     = $date_start;
+			$this->line->date_end       = $date_end;
+
+			// Multicurrency
+			$this->line->fk_multicurrency			= $this->fk_multicurrency;
+			$this->line->multicurrency_code			= $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= $pu_ht_devise;
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
+			$this->line->subprice=$pu_ht;
+			$this->line->price=$this->line->subprice;
+
+			$this->line->remise_percent=$remise_percent;
+
+			if (is_array($array_options) && count($array_options)>0) {
+				$this->line->array_options=$array_options;
+			}
+
+			$result=$this->line->update($notrigger);
+
+
+			// Mise a jour info denormalisees au niveau facture
+			if ($result >= 0)
+			{
+				$this->update_price('','auto');
+				$this->db->commit();
+				return $result;
+			}
+			else
+			{
+				$this->error=$this->db->lasterror();
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error="Order status makes operation forbidden";
+			dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
+			return -2;
+		}
+	}
+
+
+	/**
+	 *  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()
+	{
+		global $user,$langs,$conf;
+
+		dol_syslog(get_class($this)."::initAsSpecimen");
+
+		$now=dol_now();
+
+		// Find first product
+		$prodid=0;
+		$product=new ProductFournisseur($this->db);
+		$sql = "SELECT rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."product";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
+		$sql.=$this->db->order("rowid","ASC");
+		$sql.=$this->db->plimit(1);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			$prodid = $obj->rowid;
+		}
+
+		// Initialise parametres
+		$this->id=0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen=1;
+		$this->socid = 1;
+		$this->date = $now;
+		$this->date_commande = $now;
+		$this->date_lim_reglement=$this->date+3600*24*30;
+		$this->cond_reglement_code = 'RECEP';
+		$this->mode_reglement_code = 'CHQ';
+		$this->note_public='This is a comment (public)';
+		$this->note_private='This is a comment (private)';
+		$this->statut=0;
+
+		// Lines
+		$nbp = 5;
+		$xnbp = 0;
+		while ($xnbp < $nbp)
+		{
+			$line=new CommandeFournisseurLigne($this->db);
+			$line->desc=$langs->trans("Description")." ".$xnbp;
+			$line->qty=1;
+			$line->subprice=100;
+			$line->price=100;
+			$line->tva_tx=19.6;
+			$line->localtax1_tx=0;
+			$line->localtax2_tx=0;
+			if ($xnbp == 2)
+			{
+				$line->total_ht=50;
+				$line->total_ttc=59.8;
+				$line->total_tva=9.8;
+				$line->remise_percent=50;
+			}
+			else
+			{
+				$line->total_ht=100;
+				$line->total_ttc=119.6;
+				$line->total_tva=19.6;
+				$line->remise_percent=00;
+			}
+			$line->fk_product=$prodid;
+
+			$this->lines[$xnbp]=$line;
+
+			$this->total_ht       += $line->total_ht;
+			$this->total_tva      += $line->total_tva;
+			$this->total_ttc      += $line->total_ttc;
+
+			$xnbp++;
+		}
+	}
+
+	/**
+	 *	Charge les informations d'ordre info dans l'objet facture
+	 *
+	 *	@param  int		$id       	Id de la facture a charger
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT c.rowid, date_creation as datec, tms as datem, date_valid as date_validation, date_approve as datea, date_approve2 as datea2,';
+		$sql.= ' fk_user_author, fk_user_modif, fk_user_valid, fk_user_approve, fk_user_approve2';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur as c';
+		$sql.= ' WHERE c.rowid = '.$id;
+
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)   $this->user_creation_id = $obj->fk_user_author;
+				if ($obj->fk_user_valid)    $this->user_validation_id = $obj->fk_user_valid;
+				if ($obj->fk_user_modif)    $this->user_modification_id =$obj->fk_user_modif;
+				if ($obj->fk_user_approve)  $this->user_approve_id = $obj->fk_user_approve;
+				if ($obj->fk_user_approve2) $this->user_approve_id2 = $obj->fk_user_approve2;
+
+				$this->date_creation     = $this->db->idate($obj->datec);
+				$this->date_modification = $this->db->idate($obj->datem);
+				$this->date_approve      = $this->db->idate($obj->datea);
+				$this->date_approve2     = $this->db->idate($obj->datea2);
+				$this->date_validation   = $this->db->idate($obj->date_validation);
+			}
+			$this->db->free($result);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 *	Charge indicateurs this->nb de tableau de bord
+	 *
+	 *	@return     int         <0 si ko, >0 si ok
+	 */
+	function load_state_board()
+	{
+		global $conf, $user;
+
+		$this->nb=array();
+		$clause = "WHERE";
+
+		$sql = "SELECT count(co.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
+		if (!$user->rights->societe->client->voir && !$user->societe_id)
+		{
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = "AND";
+		}
+		$sql.= " ".$clause." co.entity = ".$conf->entity;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["supplier_orders"]=$obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *	@param          User	$user   Objet user
+	 *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 */
+	function load_board($user)
+	{
+		global $conf, $langs;
+
+		$clause = " WHERE";
 
-				$i++;
-			}
+		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date";
+		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
+		if (!$user->rights->societe->client->voir && !$user->societe_id)
+		{
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = " AND";
 		}
-		else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
+		$sql.= $clause." c.entity = ".$conf->entity;
+		$sql.= " AND (c.fk_statut BETWEEN 1 AND 2)";
+		if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
 
-		return $ret;
-    }
-
-
-    /**
-     * 	Set a delivery in database for this supplier order
-     *
-     *	@param	User	$user		User that input data
-     *	@param	date	$date		Date of reception
-     *	@param	string	$type		Type of receipt ('tot' = total/done, 'par' = partial, 'nev' = never, 'can' = cancel)
-     *	@param	string	$comment	Comment
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    function Livraison($user, $date, $type, $comment)
-    {
-    	global $conf, $langs;
-
-        $result = 0;
-		$error = 0;
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$commandestatic = new CommandeFournisseur($this->db);
 
-        dol_syslog(get_class($this)."::Livraison");
+			$response = new WorkboardResponse();
+			$response->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24;
+			$response->label=$langs->trans("SuppliersOrdersToProcess");
+			$response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2,3&mainmenu=commercial&leftmenu=orders_suppliers';
+			$response->img=img_object('',"order");
 
-        if ($user->rights->fournisseur->commande->receptionner)
-        {
-            if ($type == 'par') $statut = 4;
-            if ($type == 'tot')	$statut = 5;
-            if ($type == 'nev') $statut = 7;
-            if ($type == 'can') $statut = 7;
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
 
-            // Some checks to accept the record
-            if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
-            {
-				// If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done"
-	        	if (! $error && ($type == 'tot'))
-		    	{
-		    		$dispatchedlinearray=$this->getDispachedLines(0);
-		    		if (count($dispatchedlinearray) > 0)
-		    		{
-		    			$result=-1;
-		    			$error++;
-		    			$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
-		    			dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
-		    		}
-
-		    	}
-	    		if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot'))	// Accept to move to reception done, only if status of all line are ok (refuse denied)
-	    		{
-	    			$dispatcheddenied=$this->getDispachedLines(2);
-	    			if (count($dispatchedlinearray) > 0)
-	    			{
-		    			$result=-1;
-		    			$error++;
-		    			$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionDenied';
-		    			dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionDenied', LOG_DEBUG);
-	    			}
-	    		}
-            }
-
-            // TODO LDR01 Add a control test to accept only if ALL predefined products are received (same qty).
-
-
-            if (! $error && ! ($statut == 4 or $statut == 5 or $statut == 7))
-            {
-            	$error++;
-                dol_syslog(get_class($this)."::Livraison Error -2", LOG_ERR);
-                $result = -2;
-            }
-
-            if (! $error)
-            {
-                $this->db->begin();
-
-                $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-                $sql.= " SET fk_statut = ".$statut;
-                $sql.= " WHERE rowid = ".$this->id;
-                $sql.= " AND fk_statut IN (3,4)";	// Process running or Partially received
-
-                dol_syslog(get_class($this)."::Livraison", LOG_DEBUG);
-                $resql=$this->db->query($sql);
-                if ($resql)
-                {
-                    $result = 0;
-                    $old_statut = $this->statut;
-                    $this->statut = $statut;
-					$this->actionmsg2 = $comment;
+				$commandestatic->date_livraison = $this->db->jdate($obj->delivery_date);
+				$commandestatic->date_commande = $this->db->jdate($obj->date_commande);
+				$commandestatic->statut = $obj->fk_statut;
 
-                    // Call trigger
-                    $result=$this->call_trigger('ORDER_SUPPLIER_RECEIVE',$user);
-                    if ($result < 0) $error++;
-                    // End call triggers
-
-                    if (! $error)
-                    {
-                        $this->db->commit();
-                    }
-                    else
-                    {
-                        $this->statut = $old_statut;
-                        $this->db->rollback();
-                        $this->error=$this->db->lasterror();
-                        $result = -1;
-                    }
-                }
-                else
-                {
-                    $this->db->rollback();
-                    $this->error=$this->db->lasterror();
-                    $result = -1;
-                }
-            }
-        }
-        else
-        {
-            $this->error = $langs->trans('NotAuthorized');
-            $this->errors[] = $langs->trans('NotAuthorized');
-            dol_syslog(get_class($this)."::Livraison Not Authorized");
-            $result = -3;
-        }
-        return $result ;
-    }
+				if ($commandestatic->hasDelay()) {
+					$response->nbtodolate++;
+				}
+			}
 
-	/**
-     *	Set the planned delivery date
-     *
-     *	@param      User			$user        		Objet user making change
-     *	@param      timestamp		$date_livraison     Planned delivery date
-     *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
-     *	@return     int         						<0 if KO, >0 if OK
-     */
-    function set_date_livraison($user, $date_livraison, $notrigger=0)
-    {
-        if ($user->rights->fournisseur->commande->creer)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-        	$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-            $sql.= " WHERE rowid = ".$this->id;
-
-        	dol_syslog(__METHOD__, LOG_DEBUG);
-        	$resql=$this->db->query($sql);
-        	if (!$resql)
-        	{
-        		$this->errors[]=$this->db->error();
-        		$error++;
-        	}
-
-        	if (! $error)
-        	{
-        		$this->oldcopy= clone $this;
-        		$this->date_livraison = $date_livraison;
-        	}
-
-        	if (! $notrigger && empty($error))
-        	{
-        		// Call trigger
-        		$result=$this->call_trigger('ORDER_SUPPLIER_MODIFY',$user);
-        		if ($result < 0) $error++;
-        		// End call triggers
-        	}
-
-        	if (! $error)
-        	{
-        		$this->db->commit();
-        		return 1;
-        	}
-        	else
-        	{
-        		foreach($this->errors as $errmsg)
-        		{
-        			dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-        			$this->error.=($this->error?', '.$errmsg:$errmsg);
-        		}
-        		$this->db->rollback();
-        		return -1*$error;
-        	}
-        }
-        else
-        {
-            return -2;
-        }
-    }
+			return $response;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
 
 	/**
-     *	Set the id projet
-     *
-     *	@param      User			$user        		Objet utilisateur qui modifie
-     *	@param      int				$id_projet    	 	Date de livraison
-     *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
-     *	@return     int         						<0 si ko, >0 si ok
-     */
-    function set_id_projet($user, $id_projet, $notrigger=0)
-    {
-        if ($user->rights->fournisseur->commande->creer)
-        {
-        	$error=0;
-
-        	$this->db->begin();
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql.= " SET fk_projet = ".($id_projet > 0 ? (int) $id_projet : 'null');
-            $sql.= " WHERE rowid = ".$this->id;
-
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[]=$this->db->error();
-            	$error++;
-            }
-
-            if (! $error)
-            {
-            	$this->oldcopy= clone $this;
-            	$this->fk_projet = $id_projet;
-            }
-
-            if (! $notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result=$this->call_trigger('ORDER_SUPPLIER_MODIFY',$user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
-
-            if (! $error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1*$error;
-            }
-        }
-        else
-        {
-            return -2;
-        }
-    }
-
-    /**
-     *  Update a supplier order from a customer order
-     *
-     *  @param  User	$user           User that create
-     *  @param  int		$idc			Id of supplier order to update
-     *  @param	int		$comclientid	Id of customer order to use as template
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function updateFromCommandeClient($user, $idc, $comclientid)
-    {
-        $comclient = new Commande($this->db);
-        $comclient->fetch($comclientid);
-
-        $this->id = $idc;
-
-        $this->lines = array();
-
-        $num=count($comclient->lines);
-        for ($i = 0; $i < $num; $i++)
-        {
-            $prod = new Product($this->db);
-            if ($prod->fetch($comclient->lines[$i]->fk_product) > 0)
-            {
-                $libelle  = $prod->libelle;
-                $ref      = $prod->ref;
-            }
-
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseurdet";
-            $sql .= " (fk_commande,label,description,fk_product, price, qty, tva_tx, localtax1_tx, localtax2_tx, remise_percent, subprice, remise, ref)";
-            $sql .= " VALUES (".$idc.", '" . $this->db->escape($libelle) . "','" . $this->db->escape($comclient->lines[$i]->desc) . "'";
-            $sql .= ",".$comclient->lines[$i]->fk_product.",'".price2num($comclient->lines[$i]->price)."'";
-            $sql .= ", '".$comclient->lines[$i]->qty."', ".$comclient->lines[$i]->tva_tx.", ".$comclient->lines[$i]->localtax1_tx.", ".$comclient->lines[$i]->localtax2_tx.", ".$comclient->lines[$i]->remise_percent;
-            $sql .= ", '".price2num($comclient->lines[$i]->subprice)."','0','".$ref."');";
-            if ($this->db->query($sql))
-            {
-                $this->update_price();
-            }
-        }
-
-        return 1;
-    }
-
-    /**
-     *  Tag order with a particular status
-     *
-     *  @param      User	$user       Object user that change status
-     *  @param      int		$status		New status
-     *  @return     int         		<0 if KO, >0 if OK
-     */
-    public function setStatus($user,$status)
-    {
-        global $conf,$langs;
-        $error=0;
-
-        $this->db->begin();
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
-        $sql.= ' SET fk_statut='.$status;
-        $sql.= ' WHERE rowid = '.$this->id;
-
-        dol_syslog(get_class($this)."::setStatus", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Trigger names for each status
-            $trigger_name[0] = 'DRAFT';
-            $trigger_name[1] = 'VALIDATED';
-            $trigger_name[2] = 'APPROVED';
-            $trigger_name[3] = 'ONPROCESS';
-            $trigger_name[4] = 'RECEIVED_PARTIALLY';
-            $trigger_name[5] = 'RECEIVED_ALL';
-            $trigger_name[6] = 'CANCELED';
-            $trigger_name[7] = 'CANCELED';
-            $trigger_name[8] = 'BILLED';
-            $trigger_name[9] = 'REFUSED';
-
-            // Call trigger
-            $result=$this->call_trigger("ORDER_SUPPLIER_STATUS_".$trigger_name[$status],$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
-        else
-        {
-            $error++;
-            $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::setStatus ".$this->error);
-        }
-
-        if (! $error)
-        {
-            $this->statut = $status;
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Update line
-     *
-     *	@param     	int			$rowid           	Id de la ligne de facture
-     *	@param     	string		$desc            	Description de la ligne
-     *	@param     	double		$pu              	Prix unitaire
-     *	@param     	double		$qty             	Quantity
-     *	@param     	double		$remise_percent  	Pourcentage de remise de la ligne
-     *	@param     	double		$txtva          	Taux TVA
-     *  @param     	double		$txlocaltax1	    Localtax1 tax
-     *  @param     	double		$txlocaltax2   		Localtax2 tax
-     *  @param     	double		$price_base_type 	Type of price base
-     *	@param		int			$info_bits			Miscellaneous informations
-     *	@param		int			$type				Type of line (0=product, 1=service)
-     *  @param		int			$notrigger			Disable triggers
-     *  @param      timestamp   $date_start     	Date start of service
-     *  @param      timestamp   $date_end       	Date end of service
-	 *  @param		array		$array_options		Extrafields array
-     * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * 	@param		double		$pu_ht_devise		Unit price in currency
-     *	@return    	int         	    			< 0 if error, > 0 if ok
-     */
-    public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit=null, $pu_ht_devise = 0)
-    {
-    	global $mysoc, $conf;
-        dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit");
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-        $error = 0;
-
-        if ($this->brouillon)
-        {
-            $this->db->begin();
-
-            // Clean parameters
-            if (empty($qty)) $qty=0;
-            if (empty($info_bits)) $info_bits=0;
-            if (empty($txtva)) $txtva=0;
-            if (empty($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2)) $txlocaltax2=0;
-            if (empty($remise)) $remise=0;
-            if (empty($remise_percent)) $remise_percent=0;
-
-            $remise_percent=price2num($remise_percent);
-            $qty=price2num($qty);
-            if (! $qty) $qty=1;
-            $pu = price2num($pu);
-            $txtva=price2num($txtva);
-            $txlocaltax1=price2num($txlocaltax1);
-            $txlocaltax2=price2num($txlocaltax2);
-
-            // Check parameters
-            if ($type < 0) return -1;
-
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et txtva
-            // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-            // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc, $this->thirdparty);
-
-            // Clean vat code
-            $vat_src_code='';
-            if (preg_match('/\((.*)\)/', $txtva, $reg))
-            {
-                $vat_src_code = $reg[1];
-                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-            }
-
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
-            $total_ht  = $tabprice[0];
-            $total_tva = $tabprice[1];
-            $total_ttc = $tabprice[2];
-            $total_localtax1 = $tabprice[9];
-            $total_localtax2 = $tabprice[10];
-			$pu_ht  = $tabprice[3];
-			$pu_tva = $tabprice[4];
-			$pu_ttc = $tabprice[5];
+	 * Returns the translated input method of object (defined if $this->methode_commande_id > 0).
+	 * This function make a sql request to get translation. No cache yet, try to not use it inside a loop.
+	 *
+	 * @return string
+	 */
+	public function getInputMethod()
+	{
+		global $db, $langs;
 
-			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
-			$pu_ht_devise = $tabprice[19];
+		if ($this->methode_commande_id > 0)
+		{
+			$sql = "SELECT rowid, code, libelle as label";
+			$sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method';
+			$sql.= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id);
 
-            $localtax1_type=$localtaxes_type[0];
-			$localtax2_type=$localtaxes_type[2];
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				if ($db->num_rows($query))
+				{
+					$obj = $db->fetch_object($query);
 
-            $subprice = price2num($pu_ht,'MU');
-
-            //Fetch current line from the database and then clone the object and set it in $oldline property
-            $this->line=new CommandeFournisseurLigne($this->db);
-            $this->line->fetch($rowid);
-            $oldline = clone $this->line;
-            $this->line->oldline = $oldline;
-
-            $this->line->context = $this->context;
-
-            $this->line->fk_commande=$this->id;
-            //$this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
-
-	        $this->line->vat_src_code   = $vat_src_code;
-            $this->line->tva_tx         = $txtva;
-            $this->line->localtax1_tx   = $txlocaltax1;
-            $this->line->localtax2_tx   = $txlocaltax2;
-            $this->line->localtax1_type = $localtaxes_type[0];
-            $this->line->localtax2_type = $localtaxes_type[2];
-            $this->line->remise_percent = $remise_percent;
-            $this->line->subprice       = $pu_ht;
-            $this->line->rang           = $this->rang;
-            $this->line->info_bits      = $info_bits;
-            $this->line->total_ht       = $total_ht;
-            $this->line->total_tva      = $total_tva;
-            $this->line->total_localtax1= $total_localtax1;
-            $this->line->total_localtax2= $total_localtax2;
-            $this->line->total_ttc      = $total_ttc;
-            $this->line->product_type   = $type;
-            $this->line->special_code   = $this->special_code;
-            $this->line->origin         = $this->origin;
-            $this->line->fk_unit        = $fk_unit;
-
-            $this->line->date_start     = $date_start;
-            $this->line->date_end       = $date_end;
-
-            // Multicurrency
-            $this->line->fk_multicurrency			= $this->fk_multicurrency;
-            $this->line->multicurrency_code			= $this->multicurrency_code;
-            $this->line->multicurrency_subprice		= $pu_ht_devise;
-            $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
-
-            $this->line->subprice=$pu_ht;
-            $this->line->price=$this->line->subprice;
-
-            $this->line->remise_percent=$remise_percent;
-
-            if (is_array($array_options) && count($array_options)>0) {
-                $this->line->array_options=$array_options;
-            }
-
-            $result=$this->line->update($notrigger);
-
-
-            // Mise a jour info denormalisees au niveau facture
-            if ($result >= 0)
-            {
-                $this->update_price('','auto');
-				$this->db->commit();
-				return $result;
-            }
-            else
-            {
-                $this->error=$this->db->lasterror();
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error="Order status makes operation forbidden";
-            dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
-            return -2;
-        }
-    }
-
-
-    /**
-     *  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()
-    {
-        global $user,$langs,$conf;
-
-        dol_syslog(get_class($this)."::initAsSpecimen");
-
-        $now=dol_now();
-
-        // Find first product
-        $prodid=0;
-        $product=new ProductFournisseur($this->db);
-        $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product').")";
-        $sql.=$this->db->order("rowid","ASC");
-        $sql.=$this->db->plimit(1);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            $prodid = $obj->rowid;
-        }
-
-        // Initialise parametres
-        $this->id=0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen=1;
-        $this->socid = 1;
-        $this->date = $now;
-        $this->date_commande = $now;
-        $this->date_lim_reglement=$this->date+3600*24*30;
-        $this->cond_reglement_code = 'RECEP';
-        $this->mode_reglement_code = 'CHQ';
-        $this->note_public='This is a comment (public)';
-        $this->note_private='This is a comment (private)';
-        $this->statut=0;
-
-        // Lines
-        $nbp = 5;
-        $xnbp = 0;
-        while ($xnbp < $nbp)
-        {
-            $line=new CommandeFournisseurLigne($this->db);
-            $line->desc=$langs->trans("Description")." ".$xnbp;
-            $line->qty=1;
-            $line->subprice=100;
-            $line->price=100;
-            $line->tva_tx=19.6;
-            $line->localtax1_tx=0;
-            $line->localtax2_tx=0;
-            if ($xnbp == 2)
-            {
-                $line->total_ht=50;
-                $line->total_ttc=59.8;
-                $line->total_tva=9.8;
-                $line->remise_percent=50;
-            }
-            else
-            {
-                $line->total_ht=100;
-                $line->total_ttc=119.6;
-                $line->total_tva=19.6;
-                $line->remise_percent=00;
-            }
-            $line->fk_product=$prodid;
-
-            $this->lines[$xnbp]=$line;
-
-            $this->total_ht       += $line->total_ht;
-            $this->total_tva      += $line->total_tva;
-            $this->total_ttc      += $line->total_ttc;
-
-            $xnbp++;
-        }
-    }
-
-    /**
-     *	Charge les informations d'ordre info dans l'objet facture
-     *
-     *	@param  int		$id       	Id de la facture a charger
-     *	@return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT c.rowid, date_creation as datec, tms as datem, date_valid as date_validation, date_approve as datea, date_approve2 as datea2,';
-        $sql.= ' fk_user_author, fk_user_modif, fk_user_valid, fk_user_approve, fk_user_approve2';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur as c';
-        $sql.= ' WHERE c.rowid = '.$id;
-
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->id = $obj->rowid;
-                if ($obj->fk_user_author)   $this->user_creation_id = $obj->fk_user_author;
-                if ($obj->fk_user_valid)    $this->user_validation_id = $obj->fk_user_valid;
-                if ($obj->fk_user_modif)    $this->user_modification_id =$obj->fk_user_modif;
-                if ($obj->fk_user_approve)  $this->user_approve_id = $obj->fk_user_approve;
-                if ($obj->fk_user_approve2) $this->user_approve_id2 = $obj->fk_user_approve2;
-
-                $this->date_creation     = $this->db->idate($obj->datec);
-                $this->date_modification = $this->db->idate($obj->datem);
-                $this->date_approve      = $this->db->idate($obj->datea);
-                $this->date_approve2     = $this->db->idate($obj->datea2);
-                $this->date_validation   = $this->db->idate($obj->date_validation);
-            }
-            $this->db->free($result);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
-
-    /**
-     *	Charge indicateurs this->nb de tableau de bord
-     *
-     *	@return     int         <0 si ko, >0 si ok
-     */
-    function load_state_board()
-    {
-        global $conf, $user;
-
-        $this->nb=array();
-        $clause = "WHERE";
-
-        $sql = "SELECT count(co.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
-        if (!$user->rights->societe->client->voir && !$user->societe_id)
-        {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
-            $clause = "AND";
-        }
-        $sql.= " ".$clause." co.entity = ".$conf->entity;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $this->nb["supplier_orders"]=$obj->nb;
-            }
-            $this->db->free($resql);
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *	@param          User	$user   Objet user
-     *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
-     */
-    function load_board($user)
-    {
-        global $conf, $langs;
-
-        $clause = " WHERE";
-
-        $sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
-        if (!$user->rights->societe->client->voir && !$user->societe_id)
-        {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
-            $clause = " AND";
-        }
-        $sql.= $clause." c.entity = ".$conf->entity;
-        $sql.= " AND (c.fk_statut BETWEEN 1 AND 2)";
-        if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $commandestatic = new CommandeFournisseur($this->db);
-
-	        $response = new WorkboardResponse();
-	        $response->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24;
-	        $response->label=$langs->trans("SuppliersOrdersToProcess");
-	        $response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2,3&mainmenu=commercial&leftmenu=orders_suppliers';
-	        $response->img=img_object('',"order");
-
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-
-                $commandestatic->date_livraison = $this->db->jdate($obj->delivery_date);
-                $commandestatic->date_commande = $this->db->jdate($obj->date_commande);
-                $commandestatic->statut = $obj->fk_statut;
-
-                if ($commandestatic->hasDelay()) {
-	                $response->nbtodolate++;
-                }
-            }
-
-            return $response;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     * Returns the translated input method of object (defined if $this->methode_commande_id > 0).
-     * This function make a sql request to get translation. No cache yet, try to not use it inside a loop.
-     *
-     * @return string
-     */
-    public function getInputMethod()
-    {
-        global $db, $langs;
-
-        if ($this->methode_commande_id > 0)
-        {
-            $sql = "SELECT rowid, code, libelle as label";
-            $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method';
-            $sql.= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id);
-
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                if ($db->num_rows($query))
-                {
-                    $obj = $db->fetch_object($query);
-
-                    $string = $langs->trans($obj->code);
-                    if ($string == $obj->code)
-                    {
-                        $string = $obj->label != '-' ? $obj->label : '';
-                    }
-                    return $string;
-                }
-            }
-            else dol_print_error($db);
-        }
-
-        return '';
-    }
+					$string = $langs->trans($obj->code);
+					if ($string == $obj->code)
+					{
+						$string = $obj->label != '-' ? $obj->label : '';
+					}
+					return $string;
+				}
+			}
+			else dol_print_error($db);
+		}
+
+		return '';
+	}
 
 	/**
 	 *  Create a document onto disk according to template model.
@@ -2738,12 +2738,12 @@ 
 	}
 
 	/**
-     * Return the max number delivery delay in day
-     *
-     * @param	Translate	$langs		Language object
-     * @return 							Translated string
-     */
-    public function getMaxDeliveryTimeDay($langs)
+	 * Return the max number delivery delay in day
+	 *
+	 * @param	Translate	$langs		Language object
+	 * @return 							Translated string
+	 */
+	public function getMaxDeliveryTimeDay($langs)
 	{
 		if (empty($this->lines)) return '';
 
@@ -2796,134 +2796,134 @@ 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
-    /**
-     * Is the supplier order delayed?
-     *
-     * @return bool
-     */
-    public function hasDelay()
-    {
-        global $conf;
-
-        if (empty($this->date_delivery) && ! empty($this->date_livraison)) $this->date_delivery = $this->date_livraison;    // For backward compatibility
-
-        $now = dol_now();
-        $date_to_test = empty($this->date_delivery) ? $this->date_commande : $this->date_delivery;
-
-        return ($this->statut > 0 && $this->statut < 4) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
-    }
-
-    /**
-     * Show the customer delayed info
-     *
-     * @return string       Show delayed information
-     */
-    public function showDelay()
-    {
-        global $conf, $langs;
-
-        if (empty($this->date_delivery) && ! empty($this->date_livraison)) $this->date_delivery = $this->date_livraison;    // For backward compatibility
-
-        if (empty($this->date_delivery)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
-        else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
-        $text.=' '.($conf->commande->fournisseur->warning_delay>0?'+':'-').' '.round(abs($conf->commande->fournisseur->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
-
-        return $text;
-    }
-
-
-    /**
-     * Calc status regarding to dispatched stock
-     *
-     * @param 		User 	$user                   User action
-     * @param       int     $closeopenorder         Close if received
-     * @param		string	$comment				Comment
-     * @return		int		                        <0 if KO, 0 if not applicable, >0 if OK
-     */
-    public function calcAndSetStatusDispatch(User $user, $closeopenorder=1, $comment='')
-    {
-    	global $conf, $langs;
-
-    	if (! empty($conf->fournisseur->enabled))
-    	{
-    		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
-
-    		$qtydelivered=array();
-    		$qtywished=array();
-
-    		$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
-    		$filter=array('t.fk_commande'=>$this->id);
-    		if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
-    			$filter['t.status']=1;	// Restrict to lines with status validated
-    		}
-
-    		$ret=$supplierorderdispatch->fetchAll('','',0,0,$filter);
-    		if ($ret<0)
-    		{
-    			$this->error=$supplierorderdispatch->error; $this->errors=$supplierorderdispatch->errors;
-    			return $ret;
-    		}
-    		else
-    		{
-    			if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines)>0)
-    			{
-    				$date_liv = dol_now();
-
-    				// Build array with quantity deliverd by product
-    				foreach($supplierorderdispatch->lines as $line) {
-    					$qtydelivered[$line->fk_product]+=$line->qty;
-    				}
-    				foreach($this->lines as $line) {
-    					$qtywished[$line->fk_product]+=$line->qty;
-    				}
-    				//Compare array
-    				$diff_array=array_diff_assoc($qtydelivered,$qtywished);		// Warning: $diff_array is done only on common keys.
-    				$keysinwishednotindelivered=array_diff(array_keys($qtywished),array_keys($qtydelivered));		// To check we also have same number of keys
-    				$keysindeliverednotinwished=array_diff(array_keys($qtydelivered),array_keys($qtywished));		// To check we also have same number of keys
-    				/*var_dump(array_keys($qtydelivered));
+	/**
+	 * Is the supplier order delayed?
+	 *
+	 * @return bool
+	 */
+	public function hasDelay()
+	{
+		global $conf;
+
+		if (empty($this->date_delivery) && ! empty($this->date_livraison)) $this->date_delivery = $this->date_livraison;    // For backward compatibility
+
+		$now = dol_now();
+		$date_to_test = empty($this->date_delivery) ? $this->date_commande : $this->date_delivery;
+
+		return ($this->statut > 0 && $this->statut < 4) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
+	}
+
+	/**
+	 * Show the customer delayed info
+	 *
+	 * @return string       Show delayed information
+	 */
+	public function showDelay()
+	{
+		global $conf, $langs;
+
+		if (empty($this->date_delivery) && ! empty($this->date_livraison)) $this->date_delivery = $this->date_livraison;    // For backward compatibility
+
+		if (empty($this->date_delivery)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+		else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
+		$text.=' '.($conf->commande->fournisseur->warning_delay>0?'+':'-').' '.round(abs($conf->commande->fournisseur->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
+
+		return $text;
+	}
+
+
+	/**
+	 * Calc status regarding to dispatched stock
+	 *
+	 * @param 		User 	$user                   User action
+	 * @param       int     $closeopenorder         Close if received
+	 * @param		string	$comment				Comment
+	 * @return		int		                        <0 if KO, 0 if not applicable, >0 if OK
+	 */
+	public function calcAndSetStatusDispatch(User $user, $closeopenorder=1, $comment='')
+	{
+		global $conf, $langs;
+
+		if (! empty($conf->fournisseur->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
+
+			$qtydelivered=array();
+			$qtywished=array();
+
+			$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
+			$filter=array('t.fk_commande'=>$this->id);
+			if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+				$filter['t.status']=1;	// Restrict to lines with status validated
+			}
+
+			$ret=$supplierorderdispatch->fetchAll('','',0,0,$filter);
+			if ($ret<0)
+			{
+				$this->error=$supplierorderdispatch->error; $this->errors=$supplierorderdispatch->errors;
+				return $ret;
+			}
+			else
+			{
+				if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines)>0)
+				{
+					$date_liv = dol_now();
+
+					// Build array with quantity deliverd by product
+					foreach($supplierorderdispatch->lines as $line) {
+						$qtydelivered[$line->fk_product]+=$line->qty;
+					}
+					foreach($this->lines as $line) {
+						$qtywished[$line->fk_product]+=$line->qty;
+					}
+					//Compare array
+					$diff_array=array_diff_assoc($qtydelivered,$qtywished);		// Warning: $diff_array is done only on common keys.
+					$keysinwishednotindelivered=array_diff(array_keys($qtywished),array_keys($qtydelivered));		// To check we also have same number of keys
+					$keysindeliverednotinwished=array_diff(array_keys($qtydelivered),array_keys($qtywished));		// To check we also have same number of keys
+					/*var_dump(array_keys($qtydelivered));
     				var_dump(array_keys($qtywished));
     				var_dump($diff_array);
     				var_dump($keysinwishednotindelivered);
     				var_dump($keysindeliverednotinwished);
     				exit;*/
 
-    				if (count($diff_array)==0 && count($keysinwishednotindelivered)==0 && count($keysindeliverednotinwished)==0) //No diff => mean everythings is received
-    				{
-    					if ($closeopenorder)
-    					{
-        					//$ret=$this->setStatus($user,5);
-    						$ret = $this->Livraison($user, $date_liv, 'tot', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-        					if ($ret<0) {
-        						return -1;
-        					}
-    					    return 5;
-    					}
-    					else
-    					{
-    					    //Diff => received partially
-    					    //$ret=$this->setStatus($user,4);
-    						$ret = $this->Livraison($user, $date_liv, 'par', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-    					    if ($ret<0) {
-    					        return -1;
-    					    }
-    					    return 4;
-    					}
-    				}
-    				else
-    				{
-    					//Diff => received partially
-    					$ret = $this->Livraison($user, $date_liv, 'par', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-    					if ($ret<0) {
-    						return -1;
-    					}
-    					return 4;
-    				}
-    			}
-    			return 1;
-    		}
-    	}
-    	return 0;
-    }
+					if (count($diff_array)==0 && count($keysinwishednotindelivered)==0 && count($keysindeliverednotinwished)==0) //No diff => mean everythings is received
+					{
+						if ($closeopenorder)
+						{
+							//$ret=$this->setStatus($user,5);
+							$ret = $this->Livraison($user, $date_liv, 'tot', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+							if ($ret<0) {
+								return -1;
+							}
+							return 5;
+						}
+						else
+						{
+							//Diff => received partially
+							//$ret=$this->setStatus($user,4);
+							$ret = $this->Livraison($user, $date_liv, 'par', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+							if ($ret<0) {
+								return -1;
+							}
+							return 4;
+						}
+					}
+					else
+					{
+						//Diff => received partially
+						$ret = $this->Livraison($user, $date_liv, 'par', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+						if ($ret<0) {
+							return -1;
+						}
+						return 4;
+					}
+				}
+				return 1;
+			}
+		}
+		return 0;
+	}
 }
 
 
@@ -2933,22 +2933,22 @@ 
  */
 class CommandeFournisseurLigne extends CommonOrderLine
 {
-    public $element='commande_fournisseurdet';
+	public $element='commande_fournisseurdet';
 	public $table_element='commande_fournisseurdet';
 
-    public $oldline;
+	public $oldline;
 
-    /**
-     * Id of parent order
-     * @var int
-     */
-    public $fk_commande;
+	/**
+	 * Id of parent order
+	 * @var int
+	 */
+	public $fk_commande;
 
-    // From llx_commande_fournisseurdet
-    public $fk_parent_line;
-    public $fk_facture;
-    public $label;
-    public $rang = 0;
+	// From llx_commande_fournisseurdet
+	public $fk_parent_line;
+	public $fk_facture;
+	public $label;
+	public $rang = 0;
 
 	/**
 	 * Unit price without taxes
@@ -2956,401 +2956,401 @@ 
 	 */
 	public $pu_ht;
 
-    public $date_start;
-    public $date_end;
+	public $date_start;
+	public $date_end;
 
-    // From llx_product_fournisseur_price
+	// From llx_product_fournisseur_price
 
 	/**
 	 * Supplier reference of price when we added the line. May have been changed after line was added.
 	 * @var string
 	 */
-    public $ref_supplier;
-    public $remise;
-    public $product_libelle;
-
-
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db= $db;
-    }
-
-    /**
-     *  Load line order
-     *
-     *  @param  int		$rowid      Id line order
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function fetch($rowid)
-    {
-        $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.product_type, cd.description, cd.qty, cd.tva_tx,';
-        $sql.= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref,';
-        $sql.= ' cd.remise, cd.remise_percent, cd.subprice,';
-        $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
-        $sql.= ' cd.total_localtax1, cd.total_localtax2,';
-        $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
-        $sql.= ' cd.date_start, cd.date_end, cd.fk_unit,';
+	public $ref_supplier;
+	public $remise;
+	public $product_libelle;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db= $db;
+	}
+
+	/**
+	 *  Load line order
+	 *
+	 *  @param  int		$rowid      Id line order
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function fetch($rowid)
+	{
+		$sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.product_type, cd.description, cd.qty, cd.tva_tx,';
+		$sql.= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref,';
+		$sql.= ' cd.remise, cd.remise_percent, cd.subprice,';
+		$sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
+		$sql.= ' cd.total_localtax1, cd.total_localtax2,';
+		$sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
+		$sql.= ' cd.date_start, cd.date_end, cd.fk_unit,';
 		$sql.= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
-        $sql.= ' WHERE cd.rowid = '.$rowid;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $objp = $this->db->fetch_object($result);
-
-            $this->rowid            = $objp->rowid;
-            $this->id               = $objp->rowid;
-            $this->fk_commande      = $objp->fk_commande;
-            $this->desc             = $objp->description;
-            $this->qty              = $objp->qty;
-            $this->ref_fourn        = $objp->ref;
-            $this->ref_supplier     = $objp->ref;
-            $this->subprice         = $objp->subprice;
-            $this->tva_tx           = $objp->tva_tx;
-            $this->localtax1_tx		= $objp->localtax1_tx;
-            $this->localtax2_tx		= $objp->localtax2_tx;
-            $this->localtax1_type	= $objp->localtax1_type;
-            $this->localtax2_type	= $objp->localtax2_type;
-            $this->remise           = $objp->remise;
-            $this->remise_percent   = $objp->remise_percent;
-            $this->fk_product       = $objp->fk_product;
-            $this->info_bits        = $objp->info_bits;
-            $this->total_ht         = $objp->total_ht;
-            $this->total_tva        = $objp->total_tva;
-            $this->total_localtax1	= $objp->total_localtax1;
-            $this->total_localtax2	= $objp->total_localtax2;
-            $this->total_ttc        = $objp->total_ttc;
-            $this->product_type     = $objp->product_type;
-
-            $this->ref	            = $objp->product_ref;
-            $this->product_ref      = $objp->product_ref;
-            $this->product_libelle  = $objp->product_libelle;
-            $this->product_desc     = $objp->product_desc;
-
-            $this->date_start       		= $this->db->jdate($objp->date_start);
-            $this->date_end         		= $this->db->jdate($objp->date_end);
-	        $this->fk_unit          		= $objp->fk_unit;
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
+		$sql.= ' WHERE cd.rowid = '.$rowid;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$objp = $this->db->fetch_object($result);
+
+			$this->rowid            = $objp->rowid;
+			$this->id               = $objp->rowid;
+			$this->fk_commande      = $objp->fk_commande;
+			$this->desc             = $objp->description;
+			$this->qty              = $objp->qty;
+			$this->ref_fourn        = $objp->ref;
+			$this->ref_supplier     = $objp->ref;
+			$this->subprice         = $objp->subprice;
+			$this->tva_tx           = $objp->tva_tx;
+			$this->localtax1_tx		= $objp->localtax1_tx;
+			$this->localtax2_tx		= $objp->localtax2_tx;
+			$this->localtax1_type	= $objp->localtax1_type;
+			$this->localtax2_type	= $objp->localtax2_type;
+			$this->remise           = $objp->remise;
+			$this->remise_percent   = $objp->remise_percent;
+			$this->fk_product       = $objp->fk_product;
+			$this->info_bits        = $objp->info_bits;
+			$this->total_ht         = $objp->total_ht;
+			$this->total_tva        = $objp->total_tva;
+			$this->total_localtax1	= $objp->total_localtax1;
+			$this->total_localtax2	= $objp->total_localtax2;
+			$this->total_ttc        = $objp->total_ttc;
+			$this->product_type     = $objp->product_type;
+
+			$this->ref	            = $objp->product_ref;
+			$this->product_ref      = $objp->product_ref;
+			$this->product_libelle  = $objp->product_libelle;
+			$this->product_desc     = $objp->product_desc;
+
+			$this->date_start       		= $this->db->jdate($objp->date_start);
+			$this->date_end         		= $this->db->jdate($objp->date_end);
+			$this->fk_unit          		= $objp->fk_unit;
 
 			$this->multicurrency_subprice	= $objp->multicurrency_subprice;
 			$this->multicurrency_total_ht	= $objp->multicurrency_total_ht;
 			$this->multicurrency_total_tva	= $objp->multicurrency_total_tva;
 			$this->multicurrency_total_ttc	= $objp->multicurrency_total_ttc;
 
-            $this->db->free($result);
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
-
-    /**
-     *  Mise a jour de l'objet ligne de commande en base
-     *
-     *  @return		int		<0 si ko, >0 si ok
-     */
-    public function updateTotal()
-    {
-        $this->db->begin();
-
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseurdet SET";
-        $sql.= " total_ht='".price2num($this->total_ht)."'";
-        $sql.= ",total_tva='".price2num($this->total_tva)."'";
-        $sql.= ",total_localtax1='".price2num($this->total_localtax1)."'";
-        $sql.= ",total_localtax2='".price2num($this->total_localtax2)."'";
-        $sql.= ",total_ttc='".price2num($this->total_ttc)."'";
-        $sql.= " WHERE rowid = ".$this->rowid;
-
-        dol_syslog(get_class($this)."::updateTotal", LOG_DEBUG);
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
-    /**
-     *	Insert line into database
-     *
-     *	@param      int		$notrigger		1 = disable triggers
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function insert($notrigger=0)
-    {
-        global $conf, $user;
-
-        $error=0;
-
-        dol_syslog(get_class($this)."::insert rang=".$this->rang);
-
-        // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type='0';
-        if (empty($this->localtax2_type)) $this->localtax2_type='0';
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise)) $this->remise=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->pa_ht)) $this->pa_ht=0;
-
-        // Multicurrency
-        if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
-        if (empty($this->fk_multicurrency))
-        {
-            $this->multicurrency_code = $conf->currency;
-            $this->fk_multicurrency = 0;
-            $this->multicurrency_tx = 1;
-        }
-
-        // Check parameters
-        if ($this->product_type < 0) return -1;
-
-        $this->db->begin();
-
-        // Insertion dans base de la ligne
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " (fk_commande, label, description, date_start, date_end,";
-        $sql.= " fk_product, product_type,";
-        $sql.= " qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,";
-        $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit,";
-        $sql.= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc";
-        $sql.= ")";
-        $sql.= " VALUES (".$this->fk_commande.", '" . $this->db->escape($this->label) . "','" . $this->db->escape($this->desc) . "',";
-        $sql.= " ".($this->date_start?"'".$this->db->idate($this->date_start)."'":"null").",";
-        $sql.= " ".($this->date_end?"'".$this->db->idate($this->date_end)."'":"null").",";
-        if ($this->fk_product) { $sql.= $this->fk_product.","; }
-        else { $sql.= "null,"; }
-        $sql.= "'".$this->db->escape($this->product_type)."',";
-        $sql.= "'".$this->db->escape($this->qty)."', ";
-
-        $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
-        $sql.= " ".$this->tva_tx.", ";
-        $sql.= " ".$this->localtax1_tx.",";
-        $sql.= " ".$this->localtax2_tx.",";
-        $sql.= " '".$this->db->escape($this->localtax1_type)."',";
-        $sql.= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql.= " ".$this->remise_percent.", ".price2num($this->subprice,'MU').", '".$this->db->escape($this->ref_supplier)."',";
-        $sql.= " ".price2num($this->total_ht).",";
-        $sql.= " ".price2num($this->total_tva).",";
-        $sql.= " ".price2num($this->total_localtax1).",";
-        $sql.= " ".price2num($this->total_localtax2).",";
-        $sql.= " ".price2num($this->total_ttc).",";
-        $sql.= ($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'":"null");
-        $sql.= ", ".($this->fk_multicurrency ? $this->fk_multicurrency : "null");
-        $sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql.= ", ".price2num($this->multicurrency_subprice);
-        $sql.= ", ".price2num($this->multicurrency_total_ht);
-        $sql.= ", ".price2num($this->multicurrency_total_tva);
-        $sql.= ", ".price2num($this->multicurrency_total_ttc);
-        $sql.= ")";
-
-        dol_syslog(get_class($this)."::insert", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-            $this->rowid =$this->id;
-
-            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-            {
-
-                $result=$this->insertExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-
-            if (! $error && ! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('LINEORDER_SUPPLIER_CREATE',$user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-
-            if (!$error) {
-                $this->db->commit();
-                return 1;
-            }
-
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->errors[]=($this->errors?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->errors[]=$this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
-    /**
-     *	Update the line object into db
-     *
-     *	@param      int		$notrigger		1 = disable triggers
-     *	@return		int		<0 si ko, >0 si ok
-     */
-    public function update($notrigger=0)
-    {
-        global $conf,$user;
-
-        $error=0;
-
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= "  description='".$this->db->escape($this->desc)."'";
-        $sql.= ", subprice='".price2num($this->subprice)."'";
-        //$sql.= ",remise='".price2num($remise)."'";
-        $sql.= ", remise_percent='".price2num($this->remise_percent)."'";
+			$this->db->free($result);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *  Mise a jour de l'objet ligne de commande en base
+	 *
+	 *  @return		int		<0 si ko, >0 si ok
+	 */
+	public function updateTotal()
+	{
+		$this->db->begin();
+
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseurdet SET";
+		$sql.= " total_ht='".price2num($this->total_ht)."'";
+		$sql.= ",total_tva='".price2num($this->total_tva)."'";
+		$sql.= ",total_localtax1='".price2num($this->total_localtax1)."'";
+		$sql.= ",total_localtax2='".price2num($this->total_localtax2)."'";
+		$sql.= ",total_ttc='".price2num($this->total_ttc)."'";
+		$sql.= " WHERE rowid = ".$this->rowid;
+
+		dol_syslog(get_class($this)."::updateTotal", LOG_DEBUG);
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
+	/**
+	 *	Insert line into database
+	 *
+	 *	@param      int		$notrigger		1 = disable triggers
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function insert($notrigger=0)
+	{
+		global $conf, $user;
+
+		$error=0;
+
+		dol_syslog(get_class($this)."::insert rang=".$this->rang);
+
+		// Clean parameters
+		if (empty($this->tva_tx)) $this->tva_tx=0;
+		if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
+		if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
+		if (empty($this->localtax1_type)) $this->localtax1_type='0';
+		if (empty($this->localtax2_type)) $this->localtax2_type='0';
+		if (empty($this->total_localtax1)) $this->total_localtax1=0;
+		if (empty($this->total_localtax2)) $this->total_localtax2=0;
+		if (empty($this->rang)) $this->rang=0;
+		if (empty($this->remise)) $this->remise=0;
+		if (empty($this->remise_percent)) $this->remise_percent=0;
+		if (empty($this->info_bits)) $this->info_bits=0;
+		if (empty($this->special_code)) $this->special_code=0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
+		if (empty($this->pa_ht)) $this->pa_ht=0;
+
+		// Multicurrency
+		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = $conf->currency;
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
+
+		// Check parameters
+		if ($this->product_type < 0) return -1;
+
+		$this->db->begin();
+
+		// Insertion dans base de la ligne
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " (fk_commande, label, description, date_start, date_end,";
+		$sql.= " fk_product, product_type,";
+		$sql.= " qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,";
+		$sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit,";
+		$sql.= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc";
+		$sql.= ")";
+		$sql.= " VALUES (".$this->fk_commande.", '" . $this->db->escape($this->label) . "','" . $this->db->escape($this->desc) . "',";
+		$sql.= " ".($this->date_start?"'".$this->db->idate($this->date_start)."'":"null").",";
+		$sql.= " ".($this->date_end?"'".$this->db->idate($this->date_end)."'":"null").",";
+		if ($this->fk_product) { $sql.= $this->fk_product.","; }
+		else { $sql.= "null,"; }
+		$sql.= "'".$this->db->escape($this->product_type)."',";
+		$sql.= "'".$this->db->escape($this->qty)."', ";
+
+		$sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
+		$sql.= " ".$this->tva_tx.", ";
+		$sql.= " ".$this->localtax1_tx.",";
+		$sql.= " ".$this->localtax2_tx.",";
+		$sql.= " '".$this->db->escape($this->localtax1_type)."',";
+		$sql.= " '".$this->db->escape($this->localtax2_type)."',";
+		$sql.= " ".$this->remise_percent.", ".price2num($this->subprice,'MU').", '".$this->db->escape($this->ref_supplier)."',";
+		$sql.= " ".price2num($this->total_ht).",";
+		$sql.= " ".price2num($this->total_tva).",";
+		$sql.= " ".price2num($this->total_localtax1).",";
+		$sql.= " ".price2num($this->total_localtax2).",";
+		$sql.= " ".price2num($this->total_ttc).",";
+		$sql.= ($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'":"null");
+		$sql.= ", ".($this->fk_multicurrency ? $this->fk_multicurrency : "null");
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".price2num($this->multicurrency_subprice);
+		$sql.= ", ".price2num($this->multicurrency_total_ht);
+		$sql.= ", ".price2num($this->multicurrency_total_tva);
+		$sql.= ", ".price2num($this->multicurrency_total_ttc);
+		$sql.= ")";
+
+		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->rowid =$this->id;
+
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+
+			if (! $error && ! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('LINEORDER_SUPPLIER_CREATE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (!$error) {
+				$this->db->commit();
+				return 1;
+			}
+
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->errors[]=($this->errors?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->errors[]=$this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
+	/**
+	 *	Update the line object into db
+	 *
+	 *	@param      int		$notrigger		1 = disable triggers
+	 *	@return		int		<0 si ko, >0 si ok
+	 */
+	public function update($notrigger=0)
+	{
+		global $conf,$user;
+
+		$error=0;
+
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= "  description='".$this->db->escape($this->desc)."'";
+		$sql.= ", subprice='".price2num($this->subprice)."'";
+		//$sql.= ",remise='".price2num($remise)."'";
+		$sql.= ", remise_percent='".price2num($this->remise_percent)."'";
 
 		$sql.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->vat_src_code)."'";
-        $sql.= ", tva_tx='".price2num($this->tva_tx)."'";
-        $sql.= ", localtax1_tx='".price2num($this->total_localtax1)."'";
-        $sql.= ", localtax2_tx='".price2num($this->total_localtax2)."'";
-        $sql.= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
-        $sql.= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-        $sql.= ", qty='".price2num($this->qty)."'";
-        $sql.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
-        $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-        $sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
-        $sql.= ", total_ht='".price2num($this->total_ht)."'";
-        $sql.= ", total_tva='".price2num($this->total_tva)."'";
-        $sql.= ", total_localtax1='".price2num($this->total_localtax1)."'";
-        $sql.= ", total_localtax2='".price2num($this->total_localtax2)."'";
-        $sql.= ", total_ttc='".price2num($this->total_ttc)."'";
-        $sql.= ", product_type=".$this->product_type;
-        $sql.= ($this->fk_unit ? ", fk_unit='".$this->db->escape($this->fk_unit)."'":", fk_unit=null");
-
-        // Multicurrency
-        $sql.= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql.= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql.= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql.= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
-
-        $sql.= " WHERE rowid = ".$this->id;
-
-        dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result > 0)
-        {
-            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-            {
-
-                $result=$this->insertExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-
-            if (! $error && ! $notrigger)
-            {
-                global $user;
-                // Call trigger
-                $result=$this->call_trigger('LINEORDER_SUPPLIER_UPDATE',$user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-                // End call triggers
-            }
-
-            if (! $error)
-            {
-                $this->db->commit();
-                return $result;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     * 	Delete line in database
-     *
-     *	@param      int     $notrigger  1=Disable call to triggers
-     *	@return     int                 <0 if KO, >0 if OK
-     */
-    function delete($notrigger)
-    {
-        global $user;
-
-        $error=0;
-
-        $this->db->begin();
-
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid=".$this->rowid;
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('LINEORDER_SUPPLIER_DELETE',$user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-
-            if (!$error)
-            {
-                $this->db->commit();
-                return 1;
-            }
-
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
-    }
+		$sql.= ", tva_tx='".price2num($this->tva_tx)."'";
+		$sql.= ", localtax1_tx='".price2num($this->total_localtax1)."'";
+		$sql.= ", localtax2_tx='".price2num($this->total_localtax2)."'";
+		$sql.= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql.= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
+		$sql.= ", qty='".price2num($this->qty)."'";
+		$sql.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
+		$sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
+		$sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
+		$sql.= ", total_ht='".price2num($this->total_ht)."'";
+		$sql.= ", total_tva='".price2num($this->total_tva)."'";
+		$sql.= ", total_localtax1='".price2num($this->total_localtax1)."'";
+		$sql.= ", total_localtax2='".price2num($this->total_localtax2)."'";
+		$sql.= ", total_ttc='".price2num($this->total_ttc)."'";
+		$sql.= ", product_type=".$this->product_type;
+		$sql.= ($this->fk_unit ? ", fk_unit='".$this->db->escape($this->fk_unit)."'":", fk_unit=null");
+
+		// Multicurrency
+		$sql.= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+		$sql.= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+		$sql.= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+		$sql.= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+
+		$sql.= " WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result > 0)
+		{
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+
+			if (! $error && ! $notrigger)
+			{
+				global $user;
+				// Call trigger
+				$result=$this->call_trigger('LINEORDER_SUPPLIER_UPDATE',$user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return $result;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * 	Delete line in database
+	 *
+	 *	@param      int     $notrigger  1=Disable call to triggers
+	 *	@return     int                 <0 if KO, >0 if OK
+	 */
+	function delete($notrigger)
+	{
+		global $user;
+
+		$error=0;
+
+		$this->db->begin();
+
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid=".$this->rowid;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('LINEORDER_SUPPLIER_DELETE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+	}
 }
 

Spacing +778 added lines, -778 removed lines

@@ -31,7 +31,7 @@ 
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
@@ -39,12 +39,12 @@ 
  */
 class CommandeFournisseur extends CommonOrder
 {
-    public $element='order_supplier';
-    public $table_element='commande_fournisseur';
+    public $element = 'order_supplier';
+    public $table_element = 'commande_fournisseur';
     public $table_element_line = 'commande_fournisseurdet';
     public $fk_element = 'fk_commande';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto='order';
+    protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+    public $picto = 'order';
 
     /**
      * {@inheritdoc}
@@ -60,19 +60,19 @@ 
     public $ref;
     public $ref_supplier;
     public $brouillon;
-    public $statut;			// 0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
+    public $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
     //                                                              -> 7=Canceled/Never received -> (reopen) 3=Process runing
     //									              -> 6=Canceled -> (reopen) 2=Approved
     //  		                                      -> 9=Refused  -> (reopen) 1=Validated
     //  Note: billed or not is on another field "billed"
-    public $statuts;           // List of status
+    public $statuts; // List of status
 
     public $socid;
     public $fourn_id;
     public $date;
     public $date_valid;
     public $date_approve;
-    public $date_approve2;		// Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
+    public $date_approve2; // Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
     public $date_commande;
 
     /**
@@ -81,8 +81,8 @@ 
     public $date_livraison;
     public $total_ht;
     public $total_tva;
-    public $total_localtax1;   // Total Local tax 1
-    public $total_localtax2;   // Total Local tax 2
+    public $total_localtax1; // Total Local tax 1
+    public $total_localtax2; // Total Local tax 2
     public $total_ttc;
     public $source;
 	/**
@@ -102,14 +102,14 @@ 
     public $user_author_id;
     public $user_valid_id;
     public $user_approve_id;
-    public $user_approve_id2;	// Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
+    public $user_approve_id2; // Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
 
 	//Incoterms
     public $fk_incoterms;
     public $location_incoterms;
-    public $libelle_incoterms;  //Used into tooltip
+    public $libelle_incoterms; //Used into tooltip
 
-    public $extraparams=array();
+    public $extraparams = array();
 
 	/**
 	 * @var CommandeFournisseurLigne[]
@@ -118,7 +118,7 @@ 
 	//Add for supplier_proposal
     public $origin;
     public $origin_id;
-    public $linked_objects=array();
+    public $linked_objects = array();
 
 	// Multicurrency
     public $fk_multicurrency;
@@ -155,8 +155,8 @@ 
         else $this->statuts[3] = 'StatusOrderOnProcessWithValidation';
         $this->statuts[4] = 'StatusOrderReceivedPartially';
         $this->statuts[5] = 'StatusOrderReceivedAll';
-        $this->statuts[6] = 'StatusOrderCanceled';	// Approved->Canceled
-        $this->statuts[7] = 'StatusOrderCanceled';	// Process running->canceled
+        $this->statuts[6] = 'StatusOrderCanceled'; // Approved->Canceled
+        $this->statuts[7] = 'StatusOrderCanceled'; // Process running->canceled
         //$this->statuts[8] = 'StatusOrderBilled';	// Everything is finished, order received totally and bill received
         $this->statuts[9] = 'StatusOrderRefused';
     }
@@ -169,7 +169,7 @@ 
      * 	@param	string	$ref		Ref of object
      *	@return int 		        >0 if OK, <0 if KO, 0 if not found
      */
-    public function fetch($id,$ref='')
+    public function fetch($id, $ref = '')
     {
         global $conf;
 
@@ -177,79 +177,79 @@ 
         if (empty($id) && empty($ref)) return -1;
 
         $sql = "SELECT c.rowid, c.ref, ref_supplier, c.fk_soc, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_vat,";
-        $sql.= " c.localtax1, c.localtax2, ";
-        $sql.= " c.date_creation, c.date_valid, c.date_approve, c.date_approve2,";
-        $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve, c.fk_user_approve2,";
-        $sql.= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
-        $sql.= " c.fk_account,";
-        $sql.= " c.note_private, c.note_public, c.model_pdf, c.extraparams, c.billed,";
-		$sql.= " c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc,";
-        $sql.= " cm.libelle as methode_commande,";
-        $sql.= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
-        $sql.= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle";
-        $sql.= ', c.fk_incoterms, c.location_incoterms';
-        $sql.= ', i.libelle as libelle_incoterms';
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (c.fk_cond_reglement = cr.rowid AND cr.entity = " . getEntity('c_payment_term') . ")";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON (c.fk_mode_reglement = p.id AND p.entity = " . getEntity('c_paiement') . ")";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_input_method as cm ON cm.rowid = c.fk_input_method";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
-        $sql.= " WHERE c.entity = ".$conf->entity;
-        if ($ref) $sql.= " AND c.ref='".$this->db->escape($ref)."'";
-        else $sql.= " AND c.rowid=".$id;
+        $sql .= " c.localtax1, c.localtax2, ";
+        $sql .= " c.date_creation, c.date_valid, c.date_approve, c.date_approve2,";
+        $sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve, c.fk_user_approve2,";
+        $sql .= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
+        $sql .= " c.fk_account,";
+        $sql .= " c.note_private, c.note_public, c.model_pdf, c.extraparams, c.billed,";
+		$sql .= " c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc,";
+        $sql .= " cm.libelle as methode_commande,";
+        $sql .= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
+        $sql .= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle";
+        $sql .= ', c.fk_incoterms, c.location_incoterms';
+        $sql .= ', i.libelle as libelle_incoterms';
+        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (c.fk_cond_reglement = cr.rowid AND cr.entity = ".getEntity('c_payment_term').")";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON (c.fk_mode_reglement = p.id AND p.entity = ".getEntity('c_paiement').")";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_input_method as cm ON cm.rowid = c.fk_input_method";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
+        $sql .= " WHERE c.entity = ".$conf->entity;
+        if ($ref) $sql .= " AND c.ref='".$this->db->escape($ref)."'";
+        else $sql .= " AND c.rowid=".$id;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            if (! $obj)
+            if (!$obj)
             {
-                $this->error='Bill with id '.$id.' not found';
+                $this->error = 'Bill with id '.$id.' not found';
                 dol_syslog(get_class($this).'::fetch '.$this->error);
                 return 0;
             }
 
-            $this->id					= $obj->rowid;
-            $this->ref					= $obj->ref;
-            $this->ref_supplier			= $obj->ref_supplier;
-            $this->socid				= $obj->fk_soc;
-            $this->fourn_id				= $obj->fk_soc;
+            $this->id = $obj->rowid;
+            $this->ref = $obj->ref;
+            $this->ref_supplier = $obj->ref_supplier;
+            $this->socid = $obj->fk_soc;
+            $this->fourn_id = $obj->fk_soc;
             $this->statut				= $obj->fk_statut;
             $this->billed				= $obj->billed;
-            $this->user_author_id		= $obj->fk_user_author;
-            $this->user_valid_id		= $obj->fk_user_valid;
-            $this->user_approve_id		= $obj->fk_user_approve;
-            $this->user_approve_id2		= $obj->fk_user_approve2;
+            $this->user_author_id = $obj->fk_user_author;
+            $this->user_valid_id = $obj->fk_user_valid;
+            $this->user_approve_id = $obj->fk_user_approve;
+            $this->user_approve_id2 = $obj->fk_user_approve2;
             $this->total_ht				= $obj->total_ht;
             $this->total_tva			= $obj->total_vat;
             $this->total_localtax1		= $obj->localtax1;
             $this->total_localtax2		= $obj->localtax2;
             $this->total_ttc			= $obj->total_ttc;
-            $this->date					= $this->db->jdate($obj->date_creation);
-            $this->date_valid			= $this->db->jdate($obj->date_valid);
+            $this->date = $this->db->jdate($obj->date_creation);
+            $this->date_valid = $this->db->jdate($obj->date_valid);
             $this->date_approve			= $this->db->jdate($obj->date_approve);
             $this->date_approve2		= $this->db->jdate($obj->date_approve2);
             $this->date_commande		= $this->db->jdate($obj->date_commande); // date we make the order to supplier
-			$this->date_livraison       = $this->db->jdate($obj->date_livraison);
-            $this->remise_percent		= $obj->remise_percent;
-            $this->methode_commande_id	= $obj->fk_input_method;
-            $this->methode_commande		= $obj->methode_commande;
-
-            $this->source				= $obj->source;
-            $this->fk_project			= $obj->fk_project;
-            $this->cond_reglement_id	= $obj->fk_cond_reglement;
-            $this->cond_reglement_code	= $obj->cond_reglement_code;
-            $this->cond_reglement		= $obj->cond_reglement_libelle;
-            $this->cond_reglement_doc	= $obj->cond_reglement_libelle;
-            $this->fk_account           = $obj->fk_account;
-            $this->mode_reglement_id	= $obj->fk_mode_reglement;
-            $this->mode_reglement_code	= $obj->mode_reglement_code;
-            $this->mode_reglement		= $obj->mode_reglement_libelle;
-            $this->note					= $obj->note_private;    // deprecated
-            $this->note_private			= $obj->note_private;
-            $this->note_public			= $obj->note_public;
-            $this->modelpdf				= $obj->model_pdf;
+			$this->date_livraison = $this->db->jdate($obj->date_livraison);
+            $this->remise_percent = $obj->remise_percent;
+            $this->methode_commande_id = $obj->fk_input_method;
+            $this->methode_commande = $obj->methode_commande;
+
+            $this->source = $obj->source;
+            $this->fk_project = $obj->fk_project;
+            $this->cond_reglement_id = $obj->fk_cond_reglement;
+            $this->cond_reglement_code = $obj->cond_reglement_code;
+            $this->cond_reglement = $obj->cond_reglement_libelle;
+            $this->cond_reglement_doc = $obj->cond_reglement_libelle;
+            $this->fk_account = $obj->fk_account;
+            $this->mode_reglement_id = $obj->fk_mode_reglement;
+            $this->mode_reglement_code = $obj->mode_reglement_code;
+            $this->mode_reglement = $obj->mode_reglement_libelle;
+            $this->note = $obj->note_private; // deprecated
+            $this->note_private = $obj->note_private;
+            $this->note_public = $obj->note_public;
+            $this->modelpdf = $obj->model_pdf;
 
 			//Incoterms
 			$this->fk_incoterms = $obj->fk_incoterms;
@@ -258,42 +258,42 @@ 
 
 			// Multicurrency
 			$this->fk_multicurrency 		= $obj->fk_multicurrency;
-			$this->multicurrency_code 		= $obj->multicurrency_code;
+			$this->multicurrency_code = $obj->multicurrency_code;
 			$this->multicurrency_tx 		= $obj->multicurrency_tx;
-			$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+			$this->multicurrency_total_ht = $obj->multicurrency_total_ht;
 			$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 			$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-            $this->extraparams			= (array) json_decode($obj->extraparams, true);
+            $this->extraparams = (array) json_decode($obj->extraparams, true);
 
             $this->db->free($resql);
 
             // Retrieve all extrafields
             // fetch optionals attributes and labels
             require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-            $extrafields=new ExtraFields($this->db);
-            $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-            $this->fetch_optionals($this->id,$extralabels);
+            $extrafields = new ExtraFields($this->db);
+            $extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+            $this->fetch_optionals($this->id, $extralabels);
 
             if ($this->statut == 0) $this->brouillon = 1;
 
 			$this->fetchObjectLinked();
 
 			//$result=$this->fetch_lines();
-            $this->lines=array();
+            $this->lines = array();
 
             $sql = "SELECT l.rowid, l.ref as ref_supplier, l.fk_product, l.product_type, l.label, l.description, l.qty,";
-            $sql.= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
-            $sql.= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
-            $sql.= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
-            $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
-	        $sql.= " l.fk_unit,";
-            $sql.= " l.date_start, l.date_end,";
-			$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
-            $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
-            $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-            $sql.= " WHERE l.fk_commande = ".$this->id;
-            $sql.= " ORDER BY l.rang, l.rowid";
+            $sql .= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
+            $sql .= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
+            $sql .= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
+            $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
+	        $sql .= " l.fk_unit,";
+            $sql .= " l.date_start, l.date_end,";
+			$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
+            $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
+            $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+            $sql .= " WHERE l.fk_commande = ".$this->id;
+            $sql .= " ORDER BY l.rang, l.rowid";
             //print $sql;
 
             dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
@@ -305,9 +305,9 @@ 
 
                 while ($i < $num)
                 {
-                    $objp                  = $this->db->fetch_object($result);
+                    $objp = $this->db->fetch_object($result);
 
-                    $line                 = new CommandeFournisseurLigne($this->db);
+                    $line = new CommandeFournisseurLigne($this->db);
 
                     $line->id                  = $objp->rowid;
                     $line->desc                = $objp->description;
@@ -319,7 +319,7 @@ 
                     $line->localtax1_type	   = $objp->localtax1_type;
                     $line->localtax2_type	   = $objp->localtax2_type;
                     $line->subprice            = $objp->subprice;
-                    $line->pu_ht	           = $objp->subprice;
+                    $line->pu_ht = $objp->subprice;
                     $line->remise_percent      = $objp->remise_percent;
 
                     $line->vat_src_code        = $objp->vat_src_code;
@@ -336,18 +336,18 @@ 
                     $line->product_label       = $objp->product_label;
                     $line->product_desc        = $objp->product_desc;
 
-                    $line->ref                 = $objp->product_ref;    // Ref of product
-                    $line->product_ref         = $objp->product_ref;    // Ref of product
-                    $line->ref_fourn           = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
-                    $line->ref_supplier        = $objp->ref_supplier;   // The supplier ref of price when product was added. May have change since
+                    $line->ref                 = $objp->product_ref; // Ref of product
+                    $line->product_ref         = $objp->product_ref; // Ref of product
+                    $line->ref_fourn           = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
+                    $line->ref_supplier        = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
 
                     $line->date_start          = $this->db->jdate($objp->date_start);
                     $line->date_end            = $this->db->jdate($objp->date_end);
-	                $line->fk_unit             = $objp->fk_unit;
+	                $line->fk_unit = $objp->fk_unit;
 
 					// Multicurrency
-					$line->fk_multicurrency 		= $objp->fk_multicurrency;
-					$line->multicurrency_code 		= $objp->multicurrency_code;
+					$line->fk_multicurrency = $objp->fk_multicurrency;
+					$line->multicurrency_code = $objp->multicurrency_code;
 					$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
 					$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
 					$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
@@ -356,9 +356,9 @@ 
 	                $line->special_code        = $objp->special_code;
 	                $line->fk_parent_line      = $objp->fk_parent_line;
 
-                    $line->rang                = $objp->rang;
+                    $line->rang = $objp->rang;
 
-                    $this->lines[$i]      = $line;
+                    $this->lines[$i] = $line;
 
                     $i++;
                 }
@@ -368,13 +368,13 @@ 
             }
             else
             {
-                $this->error=$this->db->error()." sql=".$sql;
+                $this->error = $this->db->error()." sql=".$sql;
                 return -1;
             }
         }
         else
         {
-            $this->error=$this->db->error()." sql=".$sql;
+            $this->error = $this->db->error()." sql=".$sql;
             return -1;
         }
     }
@@ -387,17 +387,17 @@ 
      *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
      *	@return	int						<0 if KO, >0 if OK
      */
-    public function valid($user,$idwarehouse=0,$notrigger=0)
+    public function valid($user, $idwarehouse = 0, $notrigger = 0)
     {
-        global $langs,$conf;
+        global $langs, $conf;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error=0;
+        $error = 0;
 
         dol_syslog(get_class($this)."::valid");
         $result = 0;
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->commande->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->supplier_order_advance->validate)))
+        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate)))
         {
             $this->db->begin();
 
@@ -417,29 +417,29 @@ 
             $this->newref = $num;
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur";
-            $sql.= " SET ref='".$this->db->escape($num)."',";
-            $sql.= " fk_statut = 1,";
-            $sql.= " date_valid='".$this->db->idate(dol_now())."',";
-            $sql.= " fk_user_valid = ".$user->id;
-            $sql.= " WHERE rowid = ".$this->id;
-            $sql.= " AND fk_statut = 0";
+            $sql .= " SET ref='".$this->db->escape($num)."',";
+            $sql .= " fk_statut = 1,";
+            $sql .= " date_valid='".$this->db->idate(dol_now())."',";
+            $sql .= " fk_user_valid = ".$user->id;
+            $sql .= " WHERE rowid = ".$this->id;
+            $sql .= " AND fk_statut = 0";
 
-            $resql=$this->db->query($sql);
-            if (! $resql)
+            $resql = $this->db->query($sql);
+            if (!$resql)
             {
                 dol_print_error($this->db);
                 $error++;
             }
 
-            if (! $error && ! $notrigger)
+            if (!$error && !$notrigger)
             {
 				// Call trigger
-				$result=$this->call_trigger('ORDER_SUPPLIER_VALIDATE',$user);
+				$result = $this->call_trigger('ORDER_SUPPLIER_VALIDATE', $user);
 				if ($result < 0) $error++;
 				// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
 	            $this->oldref = $this->ref;
 
@@ -460,13 +460,13 @@ 
                         {
                             dol_syslog("Rename ok");
                             // Rename docs starting with $oldref with $newref
-	                        $listoffiles=dol_dir_list($conf->fournisseur->dir_output.'/commande/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-	                        foreach($listoffiles as $fileentry)
+	                        $listoffiles = dol_dir_list($conf->fournisseur->dir_output.'/commande/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+	                        foreach ($listoffiles as $fileentry)
 	                        {
-	                        	$dirsource=$fileentry['name'];
-	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+	                        	$dirsource = $fileentry['name'];
+	                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+	                        	$dirsource = $fileentry['path'].'/'.$dirsource;
+	                        	$dirdest = $fileentry['path'].'/'.$dirdest;
 	                        	@rename($dirsource, $dirdest);
 	                        }
                         }
@@ -474,14 +474,14 @@ 
                 }
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $result = 1;
                 $this->statut = 1;
                 $this->ref = $num;
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->db->commit();
                 return 1;
@@ -494,7 +494,7 @@ 
         }
         else
         {
-            $this->error='NotAuthorized';
+            $this->error = 'NotAuthorized';
             dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
             return -1;
         }
@@ -506,9 +506,9 @@ 
 	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
      *  @return 	string        			Label
      */
-    public function getLibStatut($mode=0)
+    public function getLibStatut($mode = 0)
     {
-        return $this->LibStatut($this->statut,$mode,$this->billed);
+        return $this->LibStatut($this->statut, $mode, $this->billed);
     }
 
     /**
@@ -519,14 +519,14 @@ 
      *  @param  int     $billed     1=Billed
      *  @return string				Label of status
      */
-    function LibStatut($statut,$mode=0,$billed=0)
+    function LibStatut($statut, $mode = 0, $billed = 0)
     {
         global $langs;
         $langs->load('orders');
 
-        $billedtext='';
+        $billedtext = '';
 		//if ($statut==5 && $this->billed == 1) $statut = 8;
-        if ($billed == 1) $billedtext=$langs->trans("Billed");
+        if ($billed == 1) $billedtext = $langs->trans("Billed");
 
         // List of language codes for status
         $statutshort[0] = 'StatusOrderDraftShort';
@@ -554,39 +554,39 @@ 
         }
         if ($mode == 3)
         {
-            if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-            if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
-            if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
-			if ($statut==8) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
+            if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+            if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1');
+            if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3');
+            if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]), 'statut3');
+            if ($statut == 4) return img_picto($langs->trans($this->statuts[$statut]), 'statut3');
+            if ($statut == 5) return img_picto($langs->trans($this->statuts[$statut]), 'statut6');
+            if ($statut == 6 || $statut == 7) return img_picto($langs->trans($this->statuts[$statut]), 'statut5');
+			if ($statut == 8) return img_picto($langs->trans($this->statuts[$statut]), 'statut6');
+            if ($statut == 9) return img_picto($langs->trans($this->statuts[$statut]), 'statut5');
         }
         if ($mode == 4)
         {
-            if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-			if ($statut==8) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]).($billedtext ? ' - '.$billedtext : '');
+            if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1').' '.$langs->trans($this->statuts[$statut]).($billedtext ? ' - '.$billedtext : '');
+            if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext ? ' - '.$billedtext : '');
+            if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext ? ' - '.$billedtext : '');
+            if ($statut == 4) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext ? ' - '.$billedtext : '');
+            if ($statut == 5) return img_picto($langs->trans($this->statuts[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext ? ' - '.$billedtext : '');
+            if ($statut == 6 || $statut == 7) return img_picto($langs->trans($this->statuts[$statut]), 'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext ? ' - '.$billedtext : '');
+			if ($statut == 8) return img_picto($langs->trans($this->statuts[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext ? ' - '.$billedtext : '');
+            if ($statut == 9) return img_picto($langs->trans($this->statuts[$statut]), 'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext ? ' - '.$billedtext : '');
         }
         if ($mode == 5)
         {
-            if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-            if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut1');
-            if ($statut==2) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==3) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==4) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==5) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==6 || $statut==7) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
-            if ($statut==8) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==9) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
+            if ($statut == 0) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+            if ($statut == 1) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut1');
+            if ($statut == 2) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut3');
+            if ($statut == 3) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut3');
+            if ($statut == 4) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut3');
+            if ($statut == 5) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut6');
+            if ($statut == 6 || $statut == 7) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut5');
+            if ($statut == 8) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut6');
+            if ($statut == 9) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut5');
         }
     }
 
@@ -600,53 +600,53 @@ 
      *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
      *	@return		string								Chain with URL
      */
-    public function getNomUrl($withpicto=0, $option='', $notooltip=0, $save_lastsearch_value=-1)
+    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $save_lastsearch_value = -1)
     {
         global $langs, $conf;
 
-        $result='';
-        $label = '<u>' . $langs->trans("ShowOrder") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->ref_supplier))
-            $label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-
-        $picto='order';
+        $result = '';
+        $label = '<u>'.$langs->trans("ShowOrder").'</u>';
+        if (!empty($this->ref))
+            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+        if (!empty($this->ref_supplier))
+            $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+        if (!empty($this->total_ht))
+            $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_tva))
+            $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_ttc))
+            $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+
+        $picto = 'order';
         $url = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$this->id;
 
         if ($option !== 'nolink')
         {
         	// 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';
+        	$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';
         }
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowOrder");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowOrder");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip"';
         }
 
         $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        $result.=$linkstart.$this->ref.$linkend;
+        if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+        if ($withpicto && $withpicto != 2) $result .= ' ';
+        $result .= $linkstart.$this->ref.$linkend;
         return $result;
     }
 
@@ -663,12 +663,12 @@ 
         global $db, $langs, $conf;
         $langs->load("orders");
 
-        if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER))
+        if (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER))
         {
             $mybool = false;
 
             $file = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER.'.php';
-            $classname=$conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
+            $classname = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
 
             // Include file with class
             $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -678,19 +678,19 @@ 
                 $dir = dol_buildpath($reldir."core/modules/supplier_order/");
 
                 // Load file with numbering class (if found)
-                $mybool|=@include_once $dir.$file;
+                $mybool |= @include_once $dir.$file;
             }
 
-            if (! $mybool)
+            if (!$mybool)
             {
-                dol_print_error('',"Failed to include file ".$file);
+                dol_print_error('', "Failed to include file ".$file);
                 return '';
             }
 
             $obj = new $classname();
-            $numref = $obj->getNextValue($soc,$this);
+            $numref = $obj->getNextValue($soc, $this);
 
-            if ( $numref != "")
+            if ($numref != "")
             {
                 return $numref;
             }
@@ -714,24 +714,24 @@ 
      */
     public function classifyBilled(User $user)
     {
-        $error=0;
+        $error = 0;
         $this->db->begin();
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur SET billed = 1';
         $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ';
         if ($this->db->query($sql))
         {
-        	if (! $error)
+        	if (!$error)
         	{
         	    // Call trigger
-        	    $result=$this->call_trigger('ORDER_SUPPLIER_CLASSIFY_BILLED',$user);
+        	    $result = $this->call_trigger('ORDER_SUPPLIER_CLASSIFY_BILLED', $user);
         	    if ($result < 0) $error++;
         	    // End call triggers
         	}
 
-        	if (! $error)
+        	if (!$error)
         	{
-        	    $this->billed=1;
+        	    $this->billed = 1;
 
         	    $this->db->commit();
         	    return 1;
@@ -759,12 +759,12 @@ 
      *  @param	int		$secondlevel	0=Standard approval, 1=Second level approval (used when option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
      *	@return	int						<0 if KO, >0 if OK
      */
-    public function approve($user, $idwarehouse=0, $secondlevel=0)
+    public function approve($user, $idwarehouse = 0, $secondlevel = 0)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error=0;
+        $error = 0;
 
         dol_syslog(get_class($this)."::approve");
 
@@ -790,42 +790,42 @@ 
             $this->newref = $num;
 
             // Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated)
-			$movetoapprovestatus=true;
-			$comment='';
+			$movetoapprovestatus = true;
+			$comment = '';
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-			$sql.= " SET ref='".$this->db->escape($num)."',";
+			$sql .= " SET ref='".$this->db->escape($num)."',";
 			if (empty($secondlevel))	// standard or first level approval
 			{
-	            $sql.= " date_approve='".$this->db->idate($now)."',";
-    	        $sql.= " fk_user_approve = ".$user->id;
-    	        if (! empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
+	            $sql .= " date_approve='".$this->db->idate($now)."',";
+    	        $sql .= " fk_user_approve = ".$user->id;
+    	        if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
     	        {
     	        	if (empty($this->user_approve_id2))
     	        	{
-    	        	    $movetoapprovestatus=false;		// second level approval not done
-    	        	    $comment=' (first level)';
+    	        	    $movetoapprovestatus = false; // second level approval not done
+    	        	    $comment = ' (first level)';
     	        	}
     	        }
 			}
 			else	// request a second level approval
 			{
-            	$sql.= " date_approve2='".$this->db->idate($now)."',";
-            	$sql.= " fk_user_approve2 = ".$user->id;
-    	        if (empty($this->user_approve_id)) $movetoapprovestatus=false;		// first level approval not done
-    	        $comment=' (second level)';
+            	$sql .= " date_approve2='".$this->db->idate($now)."',";
+            	$sql .= " fk_user_approve2 = ".$user->id;
+    	        if (empty($this->user_approve_id)) $movetoapprovestatus = false; // first level approval not done
+    	        $comment = ' (second level)';
 			}
 			// If double approval is required and first approval, we keep status to 1 = validated
-			if ($movetoapprovestatus) $sql.= ", fk_statut = 2";
-			else $sql.= ", fk_statut = 1";
-            $sql.= " WHERE rowid = ".$this->id;
-            $sql.= " AND fk_statut = 1";
+			if ($movetoapprovestatus) $sql .= ", fk_statut = 2";
+			else $sql .= ", fk_statut = 1";
+            $sql .= " WHERE rowid = ".$this->id;
+            $sql .= " AND fk_statut = 1";
 
             if ($this->db->query($sql))
             {
-            	if (! empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT))
+            	if (!empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT))
 	            {
-					$result=$this->add_contact($user->id, 'SALESREPFOLL', 'internal', 1);
+					$result = $this->add_contact($user->id, 'SALESREPFOLL', 'internal', 1);
 					if ($result < 0 && $result != -2)	// -2 means already exists
 					{
 						$error++;
@@ -833,12 +833,12 @@ 
 	            }
 
                 // If stock is incremented on validate order, we must increment it
-                if (! $error && $movetoapprovestatus && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER))
+                if (!$error && $movetoapprovestatus && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER))
                 {
                     require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
                     $langs->load("agenda");
 
-                    $cpt=count($this->lines);
+                    $cpt = count($this->lines);
                     for ($i = 0; $i < $cpt; $i++)
                     {
                         // Product with reference
@@ -848,24 +848,24 @@ 
                             $mouvP = new MouvementStock($this->db);
                             $mouvP->origin = &$this;
                             // We decrement stock of product (and sub-products)
-	                        $up_ht_disc=$this->lines[$i]->subprice;
-    	                    if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
-                            $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr",$this->ref));
+	                        $up_ht_disc = $this->lines[$i]->subprice;
+    	                    if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+                            $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr", $this->ref));
                             if ($result < 0) { $error++; }
                             unset($this->line);
                         }
                     }
                 }
 
-                if (! $error)
+                if (!$error)
                 {
 					// Call trigger
-					$result=$this->call_trigger('ORDER_SUPPLIER_APPROVE',$user);
+					$result = $this->call_trigger('ORDER_SUPPLIER_APPROVE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
                 }
 
-                if (! $error)
+                if (!$error)
                 {
                 	$this->ref = $this->newref;
 
@@ -894,7 +894,7 @@ 
             else
             {
                 $this->db->rollback();
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 return -1;
             }
         }
@@ -915,7 +915,7 @@ 
     {
         global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
         dol_syslog(get_class($this)."::refuse");
         $result = 0;
@@ -933,7 +933,7 @@ 
                 if ($error == 0)
                 {
 					// Call trigger
-					$result=$this->call_trigger('ORDER_SUPPLIER_REFUSE',$user);
+					$result = $this->call_trigger('ORDER_SUPPLIER_REFUSE', $user);
 					if ($result < 0)
                     {
                         $error++;
@@ -947,7 +947,7 @@ 
             else
             {
                 $this->db->rollback();
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::refuse Error -1");
                 $result = -1;
             }
@@ -956,7 +956,7 @@ 
         {
             dol_syslog(get_class($this)."::refuse Not Authorized");
         }
-        return $result ;
+        return $result;
     }
 
     /**
@@ -967,11 +967,11 @@ 
      *	@param	int		$idwarehouse	Id warehouse to use for stock change (not used for supplier orders).
      * 	@return	int						>0 if Ok, <0 if Ko
      */
-    function Cancel($user, $idwarehouse=-1)
+    function Cancel($user, $idwarehouse = -1)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
         //dol_syslog("CommandeFournisseur::Cancel");
         $result = 0;
@@ -989,7 +989,7 @@ 
                 $result = 0;
 
 				// Call trigger
-				$result=$this->call_trigger('ORDER_SUPPLIER_CANCEL',$user);
+				$result = $this->call_trigger('ORDER_SUPPLIER_CANCEL', $user);
 				if ($result < 0) $error++;
 				// End call triggers
 
@@ -1007,7 +1007,7 @@ 
             else
             {
                 $this->db->rollback();
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::cancel ".$this->error);
                 return -1;
             }
@@ -1029,7 +1029,7 @@ 
      * 	@param		string	$comment	Comment
      * 	@return		int			        <0 if KO, >0 if OK
      */
-    public function commande($user, $date, $methode, $comment='')
+    public function commande($user, $date, $methode, $comment = '')
     {
         global $langs;
         dol_syslog(get_class($this)."::commande");
@@ -1049,7 +1049,7 @@ 
                 $this->date_commande = $date;
 
                 // Call trigger
-                $result=$this->call_trigger('ORDER_SUPPLIER_SUBMIT',$user);
+                $result = $this->call_trigger('ORDER_SUPPLIER_SUBMIT', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
@@ -1060,7 +1060,7 @@ 
                 $this->errors[] = $this->db->lasterror();
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->db->commit();
             }
@@ -1087,20 +1087,20 @@ 
      *	@param		int		$notrigger	Disable all triggers
      *  @return     int         		<0 if KO, Id of supplier order if OK
      */
-    public function create($user, $notrigger=0)
+    public function create($user, $notrigger = 0)
     {
-        global $langs,$conf,$hookmanager;
+        global $langs, $conf, $hookmanager;
 
         $this->db->begin();
 
-		$error=0;
-        $now=dol_now();
+		$error = 0;
+        $now = dol_now();
 
         // Clean parameters
         if (empty($this->source)) $this->source = 0;
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
 		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
 		if (empty($this->fk_multicurrency))
 		{
@@ -1113,50 +1113,50 @@ 
         $this->brouillon = 1;
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur (";
-        $sql.= "ref";
-        $sql.= ", ref_supplier";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", entity";
-        $sql.= ", fk_soc";
-        $sql.= ", fk_projet";
-        $sql.= ", date_creation";
-		$sql.= ", date_livraison";
-        $sql.= ", fk_user_author";
-        $sql.= ", fk_statut";
-        $sql.= ", source";
-        $sql.= ", model_pdf";
-        $sql.= ", fk_mode_reglement";
-		$sql.= ", fk_cond_reglement";
-        $sql.= ", fk_account";
-		$sql.= ", fk_incoterms, location_incoterms";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ") ";
-        $sql.= " VALUES (";
-        $sql.= "''";
-        $sql.= ", '".$this->db->escape($this->ref_supplier)."'";
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", ".$conf->entity;
-        $sql.= ", ".$this->socid;
-        $sql.= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
-        $sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
-        $sql.= ", ".$user->id;
-        $sql.= ", 0";
-        $sql.= ", ".$this->db->escape($this->source);
-        $sql.= ", '".$conf->global->COMMANDE_SUPPLIER_ADDON_PDF."'";
-        $sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
-        $sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ", ".(int) $this->fk_multicurrency;
-		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ")";
+        $sql .= "ref";
+        $sql .= ", ref_supplier";
+        $sql .= ", note_private";
+        $sql .= ", note_public";
+        $sql .= ", entity";
+        $sql .= ", fk_soc";
+        $sql .= ", fk_projet";
+        $sql .= ", date_creation";
+		$sql .= ", date_livraison";
+        $sql .= ", fk_user_author";
+        $sql .= ", fk_statut";
+        $sql .= ", source";
+        $sql .= ", model_pdf";
+        $sql .= ", fk_mode_reglement";
+		$sql .= ", fk_cond_reglement";
+        $sql .= ", fk_account";
+		$sql .= ", fk_incoterms, location_incoterms";
+        $sql .= ", fk_multicurrency";
+        $sql .= ", multicurrency_code";
+        $sql .= ", multicurrency_tx";
+        $sql .= ") ";
+        $sql .= " VALUES (";
+        $sql .= "''";
+        $sql .= ", '".$this->db->escape($this->ref_supplier)."'";
+        $sql .= ", '".$this->db->escape($this->note_private)."'";
+        $sql .= ", '".$this->db->escape($this->note_public)."'";
+        $sql .= ", ".$conf->entity;
+        $sql .= ", ".$this->socid;
+        $sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+        $sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".($this->date_livraison ? "'".$this->db->idate($this->date_livraison)."'" : "null");
+        $sql .= ", ".$user->id;
+        $sql .= ", 0";
+        $sql .= ", ".$this->db->escape($this->source);
+        $sql .= ", '".$conf->global->COMMANDE_SUPPLIER_ADDON_PDF."'";
+        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
+        $sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
+        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+        $sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", ".(int) $this->fk_multicurrency;
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".(double) $this->multicurrency_tx;
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
         if ($this->db->query($sql))
@@ -1164,10 +1164,10 @@ 
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."commande_fournisseur");
 
 			if ($this->id) {
-				$num=count($this->lines);
+				$num = count($this->lines);
 
 	            // insert products details into database
-	            for ($i=0;$i<$num;$i++)
+	            for ($i = 0; $i < $num; $i++)
 	            {
 	                $result = $this->addline(              // This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
 	                    $this->lines[$i]->desc,
@@ -1178,7 +1178,7 @@ 
 	                    $this->lines[$i]->localtax2_tx,
 	                    $this->lines[$i]->fk_product,
 	                    0,
-	                    $this->lines[$i]->ref_fourn,   // $this->lines[$i]->ref_fourn comes from field ref into table of lines. Value may ba a ref that does not exists anymore, so we first try with value of product
+	                    $this->lines[$i]->ref_fourn, // $this->lines[$i]->ref_fourn comes from field ref into table of lines. Value may ba a ref that does not exists anymore, so we first try with value of product
 	                    $this->lines[$i]->remise_percent,
 	                    'HT',
 	                    0,
@@ -1192,30 +1192,30 @@ 
 	                );
 	                if ($result < 0)
 	                {
-	                    dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);	// do not use dol_print_error here as it may be a functionnal error
+	                    dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functionnal error
 	                    $this->db->rollback();
 	                    return -1;
 	                }
 	            }
 
 	            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-	            $sql.= " SET ref='(PROV".$this->id.")'";
-	            $sql.= " WHERE rowid=".$this->id;
+	            $sql .= " SET ref='(PROV".$this->id.")'";
+	            $sql .= " WHERE rowid=".$this->id;
 	            dol_syslog(get_class($this)."::create", LOG_DEBUG);
 	            if ($this->db->query($sql))
 	            {
 					// Add link with price request and supplier order
 					if ($this->id)
                     {
-                        $this->ref="(PROV".$this->id.")";
+                        $this->ref = "(PROV".$this->id.")";
 
                         // Add object linked
-                        if (is_array($this->linked_objects) && ! empty($this->linked_objects))
+                        if (is_array($this->linked_objects) && !empty($this->linked_objects))
                         {
-                        	foreach($this->linked_objects as $origin => $origin_id)
+                        	foreach ($this->linked_objects as $origin => $origin_id)
                         	{
                         		$ret = $this->add_object_linked($origin, $origin_id);
-                        		if (! $ret)
+                        		if (!$ret)
                         		{
                         			dol_print_error($this->db);
                         			$error++;
@@ -1224,16 +1224,16 @@ 
                         }
                     }
 
-	                if (! $error)
+	                if (!$error)
                     {
-                    	$result=$this->insertExtraFields();
+                    	$result = $this->insertExtraFields();
 	                    if ($result < 0) $error++;
                     }
 
-					if (! $error && ! $notrigger)
+					if (!$error && !$notrigger)
 	                {
 						// Call trigger
-						$result=$this->call_trigger('ORDER_SUPPLIER_CREATE',$user);
+						$result = $this->call_trigger('ORDER_SUPPLIER_CREATE', $user);
 						if ($result < 0)
 	                    {
 	                        $this->db->rollback();
@@ -1247,7 +1247,7 @@ 
 	            }
 	            else
 	            {
-	                $this->error=$this->db->lasterror();
+	                $this->error = $this->db->lasterror();
 	                $this->db->rollback();
 	                return -2;
 	            }
@@ -1255,7 +1255,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -1268,9 +1268,9 @@ 
      */
     public function createFromClone()
     {
-        global $conf,$user,$langs,$hookmanager;
+        global $conf, $user, $langs, $hookmanager;
 
-        $error=0;
+        $error = 0;
 
 		$this->context['createfromclone'] = 'createfromclone';
 
@@ -1279,8 +1279,8 @@ 
 		// Load source object
 		$objFrom = clone $this;
 
-        $this->id=0;
-        $this->statut=0;
+        $this->id = 0;
+        $this->statut = 0;
 
         // Clear fields
         $this->user_author_id     = $user->id;
@@ -1294,22 +1294,22 @@ 
         $this->date_approve2      = '';
 
         // Create clone
-        $result=$this->create($user);
+        $result = $this->create($user);
         if ($result < 0) $error++;
 
-        if (! $error)
+        if (!$error)
         {
             // Hook of thirdparty module
             if (is_object($hookmanager))
             {
-                $parameters=array('objFrom'=>$objFrom);
-                $action='';
-                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                $parameters = array('objFrom'=>$objFrom);
+                $action = '';
+                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
 
 			// Call trigger
-			$result=$this->call_trigger('ORDER_SUPPLIER_CLONE',$user);
+			$result = $this->call_trigger('ORDER_SUPPLIER_CLONE', $user);
 			if ($result < 0) $error++;
 			// End call triggers
         }
@@ -1317,7 +1317,7 @@ 
 		unset($this->context['createfromclone']);
 
 		// End
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return $this->id;
@@ -1356,9 +1356,9 @@ 
 	 *  @param		int		$origin_id				Id of origin object
      *	@return     int             				<=0 if KO, >0 if OK
      */
-	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $fk_prod_fourn_price=0, $fourn_ref='', $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $type=0, $info_bits=0, $notrigger=false, $date_start=null, $date_end=null, $array_options=0, $fk_unit=null, $pu_ht_devise=0, $origin='', $origin_id=0)
+	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $fk_prod_fourn_price = 0, $fourn_ref = '', $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $type = 0, $info_bits = 0, $notrigger = false, $date_start = null, $date_end = null, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $origin = '', $origin_id = 0)
     {
-        global $langs,$mysoc,$conf;
+        global $langs, $mysoc, $conf;
 
         $error = 0;
 
@@ -1366,35 +1366,35 @@ 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
-        if (! $qty) $qty=1;
-        if (! $info_bits) $info_bits=0;
-        if (empty($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
-		if (empty($remise_percent)) $remise_percent=0;
-
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu_ht=price2num($pu_ht);
-        $pu_ttc=price2num($pu_ttc);
+        if (!$qty) $qty = 1;
+        if (!$info_bits) $info_bits = 0;
+        if (empty($txtva)) $txtva = 0;
+        if (empty($txlocaltax1)) $txlocaltax1 = 0;
+        if (empty($txlocaltax2)) $txlocaltax2 = 0;
+		if (empty($remise_percent)) $remise_percent = 0;
+
+        $remise_percent = price2num($remise_percent);
+        $qty = price2num($qty);
+        $pu_ht = price2num($pu_ht);
+        $pu_ttc = price2num($pu_ttc);
         $txtva = price2num($txtva);
         $txlocaltax1 = price2num($txlocaltax1);
         $txlocaltax2 = price2num($txlocaltax2);
-        if ($price_base_type=='HT')
+        if ($price_base_type == 'HT')
         {
-            $pu=$pu_ht;
+            $pu = $pu_ht;
         }
         else
         {
-            $pu=$pu_ttc;
+            $pu = $pu_ttc;
         }
-        $desc=trim($desc);
-        $ref_supplier=''; // Ref of supplier price when we add line
+        $desc = trim($desc);
+        $ref_supplier = ''; // Ref of supplier price when we add line
 
         // Check parameters
-        if ($qty < 1 && ! $fk_product)
+        if ($qty < 1 && !$fk_product)
         {
-            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Product"));
+            $this->error = $langs->trans("ErrorFieldRequired", $langs->trans("Product"));
             return -1;
         }
         if ($type < 0) return -1;
@@ -1417,21 +1417,21 @@ 
 
                         // We use 'none' instead of $fourn_ref, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
                         // If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
-                        $result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', $this->fk_soc);   // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$fourn_ref/$this->fk_soc
+                        $result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', $this->fk_soc); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$fourn_ref/$this->fk_soc
                         if ($result > 0)
                         {
-                            $pu           = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
-                            $ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
+                            $pu           = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+                            $ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
 			    // is remise percent not keyed but present for the product we add it
-                            if ($remise_percent == 0 && $prod->remise_percent !=0)
-                            	$remise_percent =$prod->remise_percent;
+                            if ($remise_percent == 0 && $prod->remise_percent != 0)
+                            	$remise_percent = $prod->remise_percent;
 
 
                         }
                         if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
                         {
                             $langs->load("errors");
-                            $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+                            $this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
                             $this->db->rollback();
                             dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
                             //$pu    = $prod->fourn_pu;     // We do not overwrite unit price
@@ -1441,14 +1441,14 @@ 
                         if ($result == -1)
                         {
                             $langs->load("errors");
-                            $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+                            $this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
                             $this->db->rollback();
                             dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
                             return -1;
                         }
                         if ($result < -1)
                         {
-                            $this->error=$prod->error;
+                            $this->error = $prod->error;
                             $this->db->rollback();
                             dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
                             return -1;
@@ -1456,7 +1456,7 @@ 
                     }
                     else
     				{
-                        $this->error=$prod->error;
+                        $this->error = $prod->error;
                         return -1;
                     }
                 }
@@ -1471,17 +1471,17 @@ 
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc,$this->thirdparty);
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
             // Clean vat code
-            $vat_src_code='';
+            $vat_src_code = '';
             if (preg_match('/\((.*)\)/', $txtva, $reg))
             {
                 $vat_src_code = $reg[1];
-                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
             }
 
-            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx,$pu_ht_devise);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
@@ -1490,82 +1490,82 @@ 
 			$pu_ht = $tabprice[3];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-            $localtax1_type=$localtaxes_type[0];
-			$localtax2_type=$localtaxes_type[2];
+            $localtax1_type = $localtaxes_type[0];
+			$localtax2_type = $localtaxes_type[2];
 
-            $subprice = price2num($pu,'MU');
+            $subprice = price2num($pu, 'MU');
 
             $rangmax = $this->line_max();
             $rang = $rangmax + 1;
 
             // Insert line
-            $this->line=new CommandeFournisseurLigne($this->db);
+            $this->line = new CommandeFournisseurLigne($this->db);
 
             $this->line->context = $this->context;
 
-            $this->line->fk_commande=$this->id;
-            $this->line->label=$label;
+            $this->line->fk_commande = $this->id;
+            $this->line->label = $label;
             $this->line->ref_fourn = $ref_supplier;
             $this->line->ref_supplier = $ref_supplier;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
-            $this->line->tva_tx=$txtva;
-            $this->line->localtax1_tx=$txlocaltax1;
-            $this->line->localtax2_tx=$txlocaltax2;
+            $this->line->desc = $desc;
+            $this->line->qty = $qty;
+            $this->line->tva_tx = $txtva;
+            $this->line->localtax1_tx = $txlocaltax1;
+            $this->line->localtax2_tx = $txlocaltax2;
             $this->line->localtax1_type = $localtaxes_type[0];
             $this->line->localtax2_type = $localtaxes_type[2];
-            $this->line->fk_product=$fk_product;
-            $this->line->product_type=$product_type;
-            $this->line->remise_percent=$remise_percent;
-            $this->line->subprice=$pu_ht;
-            $this->line->rang=$this->rang;
-            $this->line->info_bits=$info_bits;
-
-            $this->line->vat_src_code=$vat_src_code;
-            $this->line->total_ht=$total_ht;
-            $this->line->total_tva=$total_tva;
-            $this->line->total_localtax1=$total_localtax1;
-            $this->line->total_localtax2=$total_localtax2;
-            $this->line->total_ttc=$total_ttc;
-            $this->line->product_type=$type;
-            $this->line->special_code=$this->special_code;
-            $this->line->origin=$origin;
-            $this->line->origin_id=$origin_id;
-            $this->line->fk_unit=$fk_unit;
-
-            $this->line->date_start=$date_start;
-            $this->line->date_end=$date_end;
+            $this->line->fk_product = $fk_product;
+            $this->line->product_type = $product_type;
+            $this->line->remise_percent = $remise_percent;
+            $this->line->subprice = $pu_ht;
+            $this->line->rang = $this->rang;
+            $this->line->info_bits = $info_bits;
+
+            $this->line->vat_src_code = $vat_src_code;
+            $this->line->total_ht = $total_ht;
+            $this->line->total_tva = $total_tva;
+            $this->line->total_localtax1 = $total_localtax1;
+            $this->line->total_localtax2 = $total_localtax2;
+            $this->line->total_ttc = $total_ttc;
+            $this->line->product_type = $type;
+            $this->line->special_code = $this->special_code;
+            $this->line->origin = $origin;
+            $this->line->origin_id = $origin_id;
+            $this->line->fk_unit = $fk_unit;
+
+            $this->line->date_start = $date_start;
+            $this->line->date_end = $date_end;
 
             // Multicurrency
-            $this->line->fk_multicurrency			= $this->fk_multicurrency;
-            $this->line->multicurrency_code			= $this->multicurrency_code;
+            $this->line->fk_multicurrency = $this->fk_multicurrency;
+            $this->line->multicurrency_code = $this->multicurrency_code;
             $this->line->multicurrency_subprice		= $pu_ht_devise;
             $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-            $this->line->subprice=$pu_ht;
-            $this->line->price=$this->line->subprice;
+            $this->line->subprice = $pu_ht;
+            $this->line->price = $this->line->subprice;
 
-            $this->line->remise_percent=$remise_percent;
+            $this->line->remise_percent = $remise_percent;
 
-            if (is_array($array_options) && count($array_options)>0) {
-                $this->line->array_options=$array_options;
+            if (is_array($array_options) && count($array_options) > 0) {
+                $this->line->array_options = $array_options;
             }
 
-            $result=$this->line->insert($notrigger);
+            $result = $this->line->insert($notrigger);
             if ($result > 0)
             {
                 // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+                if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
                 // Mise a jour informations denormalisees au niveau de la commande meme
-                $result=$this->update_price(1,'auto',0,$this->thirdparty);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+                $result = $this->update_price(1, 'auto', 0, $this->thirdparty); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
                 if ($result > 0)
                 {
                     $this->db->commit();
@@ -1579,8 +1579,8 @@ 
             }
             else
             {
-                $this->error=$this->line->error;
-                $this->errors=$this->line->errors;
+                $this->error = $this->line->error;
+                $this->errors = $this->line->errors;
                 dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -1;
@@ -1605,49 +1605,49 @@ 
      * @param	int			$notrigger          	1 = notrigger
      * @return 	int						<0 if KO, >0 if OK
      */
-    public function dispatchProduct($user, $product, $qty, $entrepot, $price=0, $comment='', $eatby='', $sellby='', $batch='', $fk_commandefourndet=0, $notrigger=0)
+    public function dispatchProduct($user, $product, $qty, $entrepot, $price = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $fk_commandefourndet = 0, $notrigger = 0)
     {
         global $conf, $langs;
 
         $error = 0;
-        require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
         // Check parameters (if test are wrong here, there is bug into caller)
         if ($entrepot <= 0)
         {
-            $this->error='ErrorBadValueForParameterWarehouse';
+            $this->error = 'ErrorBadValueForParameterWarehouse';
             return -1;
         }
         if ($qty <= 0)
         {
-            $this->error='ErrorBadValueForParameterQty';
+            $this->error = 'ErrorBadValueForParameterQty';
             return -1;
         }
 
         $dispatchstatus = 1;
-        if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0;	// Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
+        if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0; // Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
 
-        $now=dol_now();
+        $now = dol_now();
 
         if (($this->statut == 3 || $this->statut == 4 || $this->statut == 5))
         {
             $this->db->begin();
 
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
-            $sql.= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch) VALUES";
-            $sql.= " ('".$this->id."','".$product."','".$qty."',".($entrepot>0?"'".$entrepot."'":"null").",'".$user->id."','".$this->db->idate($now)."','".$fk_commandefourndet."', ".$dispatchstatus.", '".$this->db->escape($comment)."', ";
-            $sql.= ($eatby?"'".$this->db->idate($eatby)."'":"null").", ".($sellby?"'".$this->db->idate($sellby)."'":"null").", ".($batch?"'".$batch."'":"null");
-            $sql.= ")";
+            $sql .= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch) VALUES";
+            $sql .= " ('".$this->id."','".$product."','".$qty."',".($entrepot > 0 ? "'".$entrepot."'" : "null").",'".$user->id."','".$this->db->idate($now)."','".$fk_commandefourndet."', ".$dispatchstatus.", '".$this->db->escape($comment)."', ";
+            $sql .= ($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ".($batch ? "'".$batch."'" : "null");
+            $sql .= ")";
 
             dol_syslog(get_class($this)."::dispatchProduct", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql)
             {
-                if (! $notrigger)
+                if (!$notrigger)
                 {
                     global $conf, $langs, $user;
 					// Call trigger
-					$result=$this->call_trigger('LINEORDER_SUPPLIER_DISPATCH',$user);
+					$result = $this->call_trigger('LINEORDER_SUPPLIER_DISPATCH', $user);
 					if ($result < 0)
                     {
                         $error++;
@@ -1658,12 +1658,12 @@ 
             }
             else
 			{
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $error++;
             }
 
             // Si module stock gere et que incrementation faite depuis un dispatching en stock
-            if (! $error && $entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+            if (!$error && $entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
             {
 
                 $mouv = new MouvementStock($this->db);
@@ -1671,12 +1671,12 @@ 
                 {
                 	// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
                 	$mouv->origin = &$this;
-					$result=$mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch);
+					$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch);
                     if ($result < 0)
                     {
-                        $this->error=$mouv->error;
-                        $this->errors=$mouv->errors;
-                        dol_syslog(get_class($this)."::dispatchProduct ".$this->error." ".join(',',$this->errors), LOG_ERR);
+                        $this->error = $mouv->error;
+                        $this->errors = $mouv->errors;
+                        dol_syslog(get_class($this)."::dispatchProduct ".$this->error." ".join(',', $this->errors), LOG_ERR);
                         $error++;
                     }
                 }
@@ -1695,7 +1695,7 @@ 
         }
         else
 		{
-            $this->error='BadStatusForObject';
+            $this->error = 'BadStatusForObject';
             return -2;
         }
     }
@@ -1707,7 +1707,7 @@ 
      *	@param	int		$notrigger	1=Disable call to triggers
      *	@return	int					<0 if KO, >0 if OK
      */
-    public function deleteline($idline, $notrigger=0)
+    public function deleteline($idline, $notrigger = 0)
     {
         if ($this->statut == 0)
         {
@@ -1743,9 +1743,9 @@ 
      *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return	int					<0 if KO, >0 if OK
      */
-    public function delete(User $user, $notrigger=0)
+    public function delete(User $user, $notrigger = 0)
     {
-        global $langs,$conf;
+        global $langs, $conf;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         $error = 0;
@@ -1755,51 +1755,51 @@ 
         if (empty($notrigger))
         {
             // Call trigger
-            $result=$this->call_trigger('ORDER_SUPPLIER_DELETE',$user);
+            $result = $this->call_trigger('ORDER_SUPPLIER_DELETE', $user);
             if ($result < 0)
             {
-            	$this->errors[]='ErrorWhenRunningTrigger';
+            	$this->errors[] = 'ErrorWhenRunningTrigger';
             	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
             	return -1;
             }
             // End call triggers
         }
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =". $this->id ;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =".$this->id;
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        if (! $this->db->query($sql) )
+        if (!$this->db->query($sql))
         {
-            $this->error=$this->db->lasterror();
-            $this->errors[]=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
             $error++;
         }
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id;
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        if ($resql = $this->db->query($sql) )
+        if ($resql = $this->db->query($sql))
         {
             if ($this->db->affected_rows($resql) < 1)
             {
-                $this->error=$this->db->lasterror();
-                $this->errors[]=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
+                $this->errors[] = $this->db->lasterror();
                 $error++;
             }
         }
         else
         {
-            $this->error=$this->db->lasterror();
-            $this->errors[]=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
             $error++;
         }
 
         // Remove extrafields
-        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
         {
-        	$result=$this->deleteExtraFields();
+        	$result = $this->deleteExtraFields();
         	if ($result < 0)
         	{
-        		$this->error='FailToDeleteExtraFields';
-        		$this->errors[]='FailToDeleteExtraFields';
+        		$this->error = 'FailToDeleteExtraFields';
+        		$this->errors[] = 'FailToDeleteExtraFields';
         		$error++;
         		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
         	}
@@ -1808,42 +1808,42 @@ 
 		// Delete linked object
     	$res = $this->deleteObjectLinked();
     	if ($res < 0) {
-    		$this->error='FailToDeleteObjectLinked';
-    		$this->errors[]='FailToDeleteObjectLinked';
+    		$this->error = 'FailToDeleteObjectLinked';
+    		$this->errors[] = 'FailToDeleteObjectLinked';
     		$error++;
     	}
 
-        if (! $error)
+        if (!$error)
         {
         	// We remove directory
         	$ref = dol_sanitizeFileName($this->ref);
         	if ($conf->fournisseur->commande->dir_output)
         	{
-        		$dir = $conf->fournisseur->commande->dir_output . "/" . $ref ;
-        		$file = $dir . "/" . $ref . ".pdf";
+        		$dir = $conf->fournisseur->commande->dir_output."/".$ref;
+        		$file = $dir."/".$ref.".pdf";
         		if (file_exists($file))
         		{
-        			if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+        			if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
         			{
-        				$this->error='ErrorFailToDeleteFile';
-        				$this->errors[]='ErrorFailToDeleteFile';
+        				$this->error = 'ErrorFailToDeleteFile';
+        				$this->errors[] = 'ErrorFailToDeleteFile';
         				$error++;
         			}
         		}
         		if (file_exists($dir))
         		{
-        			$res=@dol_delete_dir_recursive($dir);
-        			if (! $res)
+        			$res = @dol_delete_dir_recursive($dir);
+        			if (!$res)
         			{
-        				$this->error='ErrorFailToDeleteDir';
-        				$this->errors[]='ErrorFailToDeleteDir';
+        				$this->error = 'ErrorFailToDeleteDir';
+        				$this->errors[] = 'ErrorFailToDeleteDir';
         				$error++;
         			}
         		}
         	}
         }
 
-		if (! $error)
+		if (!$error)
 		{
 			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
 			$this->db->commit();
@@ -1865,10 +1865,10 @@ 
     function get_methodes_commande()
     {
         $sql = "SELECT rowid, libelle";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
-        $sql.= " WHERE active = 1";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_input_method";
+        $sql .= " WHERE active = 1";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $i = 0;
@@ -1896,21 +1896,21 @@ 
 	 * @param	int		$status		Filter on stats (-1 = no filter, 0 = lines draft to be approved, 1 = approved lines)
 	 * @return	array				Array of lines
      */
-    public function getDispachedLines($status=-1)
+    public function getDispachedLines($status = -1)
     {
     	$ret = array();
 
     	// List of already dispatched lines
 		$sql = "SELECT p.ref, p.label,";
-		$sql.= " e.rowid as warehouse_id, e.label as entrepot,";
-		$sql.= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product as p,";
-		$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
-		$sql.= " WHERE cfd.fk_commande = ".$this->id;
-		$sql.= " AND cfd.fk_product = p.rowid";
-		if ($status >= 0) $sql.=" AND cfd.status = ".$status;
-		$sql.= " ORDER BY cfd.rowid ASC";
+		$sql .= " e.rowid as warehouse_id, e.label as entrepot,";
+		$sql .= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
+		$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
+		$sql .= " WHERE cfd.fk_commande = ".$this->id;
+		$sql .= " AND cfd.fk_product = p.rowid";
+		if ($status >= 0) $sql .= " AND cfd.status = ".$status;
+		$sql .= " ORDER BY cfd.rowid ASC";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -1921,7 +1921,7 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if ($objp) $ret[]=array('id'=>$objp->dispatchedlineid, 'productid'=>$objp->fk_product, 'warehouseid'=>$objp->warehouse_id);
+				if ($objp) $ret[] = array('id'=>$objp->dispatchedlineid, 'productid'=>$objp->fk_product, 'warehouseid'=>$objp->warehouse_id);
 
 				$i++;
 			}
@@ -1958,29 +1958,29 @@ 
             if ($type == 'can') $statut = 7;
 
             // Some checks to accept the record
-            if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
+            if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
             {
 				// If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done"
-	        	if (! $error && ($type == 'tot'))
+	        	if (!$error && ($type == 'tot'))
 		    	{
-		    		$dispatchedlinearray=$this->getDispachedLines(0);
+		    		$dispatchedlinearray = $this->getDispachedLines(0);
 		    		if (count($dispatchedlinearray) > 0)
 		    		{
-		    			$result=-1;
+		    			$result = -1;
 		    			$error++;
-		    			$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
+		    			$this->errors[] = 'ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
 		    			dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
 		    		}
 
 		    	}
-	    		if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot'))	// Accept to move to reception done, only if status of all line are ok (refuse denied)
+	    		if (!$error && !empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot'))	// Accept to move to reception done, only if status of all line are ok (refuse denied)
 	    		{
-	    			$dispatcheddenied=$this->getDispachedLines(2);
+	    			$dispatcheddenied = $this->getDispachedLines(2);
 	    			if (count($dispatchedlinearray) > 0)
 	    			{
-		    			$result=-1;
+		    			$result = -1;
 		    			$error++;
-		    			$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionDenied';
+		    			$this->errors[] = 'ErrorCantSetReceptionToTotalDoneWithReceptionDenied';
 		    			dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionDenied', LOG_DEBUG);
 	    			}
 	    		}
@@ -1989,24 +1989,24 @@ 
             // TODO LDR01 Add a control test to accept only if ALL predefined products are received (same qty).
 
 
-            if (! $error && ! ($statut == 4 or $statut == 5 or $statut == 7))
+            if (!$error && !($statut == 4 or $statut == 5 or $statut == 7))
             {
             	$error++;
                 dol_syslog(get_class($this)."::Livraison Error -2", LOG_ERR);
                 $result = -2;
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->db->begin();
 
                 $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-                $sql.= " SET fk_statut = ".$statut;
-                $sql.= " WHERE rowid = ".$this->id;
-                $sql.= " AND fk_statut IN (3,4)";	// Process running or Partially received
+                $sql .= " SET fk_statut = ".$statut;
+                $sql .= " WHERE rowid = ".$this->id;
+                $sql .= " AND fk_statut IN (3,4)"; // Process running or Partially received
 
                 dol_syslog(get_class($this)."::Livraison", LOG_DEBUG);
-                $resql=$this->db->query($sql);
+                $resql = $this->db->query($sql);
                 if ($resql)
                 {
                     $result = 0;
@@ -2015,11 +2015,11 @@ 
 					$this->actionmsg2 = $comment;
 
                     // Call trigger
-                    $result=$this->call_trigger('ORDER_SUPPLIER_RECEIVE',$user);
+                    $result = $this->call_trigger('ORDER_SUPPLIER_RECEIVE', $user);
                     if ($result < 0) $error++;
                     // End call triggers
 
-                    if (! $error)
+                    if (!$error)
                     {
                         $this->db->commit();
                     }
@@ -2027,14 +2027,14 @@ 
                     {
                         $this->statut = $old_statut;
                         $this->db->rollback();
-                        $this->error=$this->db->lasterror();
+                        $this->error = $this->db->lasterror();
                         $result = -1;
                     }
                 }
                 else
                 {
                     $this->db->rollback();
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     $result = -1;
                 }
             }
@@ -2046,7 +2046,7 @@ 
             dol_syslog(get_class($this)."::Livraison Not Authorized");
             $result = -3;
         }
-        return $result ;
+        return $result;
     }
 
 	/**
@@ -2057,54 +2057,54 @@ 
      *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
      *	@return     int         						<0 if KO, >0 if OK
      */
-    function set_date_livraison($user, $date_livraison, $notrigger=0)
+    function set_date_livraison($user, $date_livraison, $notrigger = 0)
     {
         if ($user->rights->fournisseur->commande->creer)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
         	$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+            $sql .= " WHERE rowid = ".$this->id;
 
         	dol_syslog(__METHOD__, LOG_DEBUG);
-        	$resql=$this->db->query($sql);
+        	$resql = $this->db->query($sql);
         	if (!$resql)
         	{
-        		$this->errors[]=$this->db->error();
+        		$this->errors[] = $this->db->error();
         		$error++;
         	}
 
-        	if (! $error)
+        	if (!$error)
         	{
-        		$this->oldcopy= clone $this;
+        		$this->oldcopy = clone $this;
         		$this->date_livraison = $date_livraison;
         	}
 
-        	if (! $notrigger && empty($error))
+        	if (!$notrigger && empty($error))
         	{
         		// Call trigger
-        		$result=$this->call_trigger('ORDER_SUPPLIER_MODIFY',$user);
+        		$result = $this->call_trigger('ORDER_SUPPLIER_MODIFY', $user);
         		if ($result < 0) $error++;
         		// End call triggers
         	}
 
-        	if (! $error)
+        	if (!$error)
         	{
         		$this->db->commit();
         		return 1;
         	}
         	else
         	{
-        		foreach($this->errors as $errmsg)
+        		foreach ($this->errors as $errmsg)
         		{
         			dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-        			$this->error.=($this->error?', '.$errmsg:$errmsg);
+        			$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
         		}
         		$this->db->rollback();
-        		return -1*$error;
+        		return -1 * $error;
         	}
         }
         else
@@ -2121,54 +2121,54 @@ 
      *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
      *	@return     int         						<0 si ko, >0 si ok
      */
-    function set_id_projet($user, $id_projet, $notrigger=0)
+    function set_id_projet($user, $id_projet, $notrigger = 0)
     {
         if ($user->rights->fournisseur->commande->creer)
         {
-        	$error=0;
+        	$error = 0;
 
         	$this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql.= " SET fk_projet = ".($id_projet > 0 ? (int) $id_projet : 'null');
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " SET fk_projet = ".($id_projet > 0 ? (int) $id_projet : 'null');
+            $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if (!$resql)
             {
-            	$this->errors[]=$this->db->error();
+            	$this->errors[] = $this->db->error();
             	$error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-            	$this->oldcopy= clone $this;
+            	$this->oldcopy = clone $this;
             	$this->fk_projet = $id_projet;
             }
 
-            if (! $notrigger && empty($error))
+            if (!$notrigger && empty($error))
             {
             	// Call trigger
-            	$result=$this->call_trigger('ORDER_SUPPLIER_MODIFY',$user);
+            	$result = $this->call_trigger('ORDER_SUPPLIER_MODIFY', $user);
             	if ($result < 0) $error++;
             	// End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
             	$this->db->commit();
             	return 1;
             }
             else
             {
-            	foreach($this->errors as $errmsg)
+            	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error.=($this->error?', '.$errmsg:$errmsg);
+            		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             	}
             	$this->db->rollback();
-            	return -1*$error;
+            	return -1 * $error;
             }
         }
         else
@@ -2194,7 +2194,7 @@ 
 
         $this->lines = array();
 
-        $num=count($comclient->lines);
+        $num = count($comclient->lines);
         for ($i = 0; $i < $num; $i++)
         {
             $prod = new Product($this->db);
@@ -2206,7 +2206,7 @@ 
 
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseurdet";
             $sql .= " (fk_commande,label,description,fk_product, price, qty, tva_tx, localtax1_tx, localtax2_tx, remise_percent, subprice, remise, ref)";
-            $sql .= " VALUES (".$idc.", '" . $this->db->escape($libelle) . "','" . $this->db->escape($comclient->lines[$i]->desc) . "'";
+            $sql .= " VALUES (".$idc.", '".$this->db->escape($libelle)."','".$this->db->escape($comclient->lines[$i]->desc)."'";
             $sql .= ",".$comclient->lines[$i]->fk_product.",'".price2num($comclient->lines[$i]->price)."'";
             $sql .= ", '".$comclient->lines[$i]->qty."', ".$comclient->lines[$i]->tva_tx.", ".$comclient->lines[$i]->localtax1_tx.", ".$comclient->lines[$i]->localtax2_tx.", ".$comclient->lines[$i]->remise_percent;
             $sql .= ", '".price2num($comclient->lines[$i]->subprice)."','0','".$ref."');";
@@ -2226,16 +2226,16 @@ 
      *  @param      int		$status		New status
      *  @return     int         		<0 if KO, >0 if OK
      */
-    public function setStatus($user,$status)
+    public function setStatus($user, $status)
     {
-        global $conf,$langs;
-        $error=0;
+        global $conf, $langs;
+        $error = 0;
 
         $this->db->begin();
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
-        $sql.= ' SET fk_statut='.$status;
-        $sql.= ' WHERE rowid = '.$this->id;
+        $sql .= ' SET fk_statut='.$status;
+        $sql .= ' WHERE rowid = '.$this->id;
 
         dol_syslog(get_class($this)."::setStatus", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -2254,18 +2254,18 @@ 
             $trigger_name[9] = 'REFUSED';
 
             // Call trigger
-            $result=$this->call_trigger("ORDER_SUPPLIER_STATUS_".$trigger_name[$status],$user);
+            $result = $this->call_trigger("ORDER_SUPPLIER_STATUS_".$trigger_name[$status], $user);
             if ($result < 0) { $error++; }
             // End call triggers
         }
         else
         {
             $error++;
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::setStatus ".$this->error);
         }
 
-        if (! $error)
+        if (!$error)
         {
             $this->statut = $status;
             $this->db->commit();
@@ -2300,7 +2300,7 @@ 
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
      *	@return    	int         	    			< 0 if error, > 0 if ok
      */
-    public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit=null, $pu_ht_devise = 0)
+    public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $notrigger = false, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0)
     {
     	global $mysoc, $conf;
         dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit");
@@ -2313,21 +2313,21 @@ 
             $this->db->begin();
 
             // Clean parameters
-            if (empty($qty)) $qty=0;
-            if (empty($info_bits)) $info_bits=0;
-            if (empty($txtva)) $txtva=0;
-            if (empty($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2)) $txlocaltax2=0;
-            if (empty($remise)) $remise=0;
-            if (empty($remise_percent)) $remise_percent=0;
-
-            $remise_percent=price2num($remise_percent);
-            $qty=price2num($qty);
-            if (! $qty) $qty=1;
+            if (empty($qty)) $qty = 0;
+            if (empty($info_bits)) $info_bits = 0;
+            if (empty($txtva)) $txtva = 0;
+            if (empty($txlocaltax1)) $txlocaltax1 = 0;
+            if (empty($txlocaltax2)) $txlocaltax2 = 0;
+            if (empty($remise)) $remise = 0;
+            if (empty($remise_percent)) $remise_percent = 0;
+
+            $remise_percent = price2num($remise_percent);
+            $qty = price2num($qty);
+            if (!$qty) $qty = 1;
             $pu = price2num($pu);
-            $txtva=price2num($txtva);
-            $txlocaltax1=price2num($txlocaltax1);
-            $txlocaltax2=price2num($txlocaltax2);
+            $txtva = price2num($txtva);
+            $txlocaltax1 = price2num($txlocaltax1);
+            $txlocaltax2 = price2num($txlocaltax2);
 
             // Check parameters
             if ($type < 0) return -1;
@@ -2337,17 +2337,17 @@ 
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc, $this->thirdparty);
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
             // Clean vat code
-            $vat_src_code='';
+            $vat_src_code = '';
             if (preg_match('/\((.*)\)/', $txtva, $reg))
             {
                 $vat_src_code = $reg[1];
-                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
             }
 
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
@@ -2358,30 +2358,30 @@ 
 			$pu_ttc = $tabprice[5];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
             $multicurrency_total_tva = $tabprice[17];
             $multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-            $localtax1_type=$localtaxes_type[0];
-			$localtax2_type=$localtaxes_type[2];
+            $localtax1_type = $localtaxes_type[0];
+			$localtax2_type = $localtaxes_type[2];
 
-            $subprice = price2num($pu_ht,'MU');
+            $subprice = price2num($pu_ht, 'MU');
 
             //Fetch current line from the database and then clone the object and set it in $oldline property
-            $this->line=new CommandeFournisseurLigne($this->db);
+            $this->line = new CommandeFournisseurLigne($this->db);
             $this->line->fetch($rowid);
             $oldline = clone $this->line;
             $this->line->oldline = $oldline;
 
             $this->line->context = $this->context;
 
-            $this->line->fk_commande=$this->id;
+            $this->line->fk_commande = $this->id;
             //$this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
+            $this->line->desc = $desc;
+            $this->line->qty = $qty;
 
-	        $this->line->vat_src_code   = $vat_src_code;
+	        $this->line->vat_src_code = $vat_src_code;
             $this->line->tva_tx         = $txtva;
             $this->line->localtax1_tx   = $txlocaltax1;
             $this->line->localtax2_tx   = $txlocaltax2;
@@ -2393,8 +2393,8 @@ 
             $this->line->info_bits      = $info_bits;
             $this->line->total_ht       = $total_ht;
             $this->line->total_tva      = $total_tva;
-            $this->line->total_localtax1= $total_localtax1;
-            $this->line->total_localtax2= $total_localtax2;
+            $this->line->total_localtax1 = $total_localtax1;
+            $this->line->total_localtax2 = $total_localtax2;
             $this->line->total_ttc      = $total_ttc;
             $this->line->product_type   = $type;
             $this->line->special_code   = $this->special_code;
@@ -2405,42 +2405,42 @@ 
             $this->line->date_end       = $date_end;
 
             // Multicurrency
-            $this->line->fk_multicurrency			= $this->fk_multicurrency;
-            $this->line->multicurrency_code			= $this->multicurrency_code;
+            $this->line->fk_multicurrency = $this->fk_multicurrency;
+            $this->line->multicurrency_code = $this->multicurrency_code;
             $this->line->multicurrency_subprice		= $pu_ht_devise;
             $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-            $this->line->subprice=$pu_ht;
-            $this->line->price=$this->line->subprice;
+            $this->line->subprice = $pu_ht;
+            $this->line->price = $this->line->subprice;
 
-            $this->line->remise_percent=$remise_percent;
+            $this->line->remise_percent = $remise_percent;
 
-            if (is_array($array_options) && count($array_options)>0) {
-                $this->line->array_options=$array_options;
+            if (is_array($array_options) && count($array_options) > 0) {
+                $this->line->array_options = $array_options;
             }
 
-            $result=$this->line->update($notrigger);
+            $result = $this->line->update($notrigger);
 
 
             // Mise a jour info denormalisees au niveau facture
             if ($result >= 0)
             {
-                $this->update_price('','auto');
+                $this->update_price('', 'auto');
 				$this->db->commit();
 				return $result;
             }
             else
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -1;
             }
         }
         else
         {
-            $this->error="Order status makes operation forbidden";
+            $this->error = "Order status makes operation forbidden";
             dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
             return -2;
         }
@@ -2456,20 +2456,20 @@ 
      */
     public function initAsSpecimen()
     {
-        global $user,$langs,$conf;
+        global $user, $langs, $conf;
 
         dol_syslog(get_class($this)."::initAsSpecimen");
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Find first product
-        $prodid=0;
-        $product=new ProductFournisseur($this->db);
+        $prodid = 0;
+        $product = new ProductFournisseur($this->db);
         $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product').")";
-        $sql.=$this->db->order("rowid","ASC");
-        $sql.=$this->db->plimit(1);
+        $sql .= " FROM ".MAIN_DB_PREFIX."product";
+        $sql .= " WHERE entity IN (".getEntity('product').")";
+        $sql .= $this->db->order("rowid", "ASC");
+        $sql .= $this->db->plimit(1);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2478,49 +2478,49 @@ 
         }
 
         // Initialise parametres
-        $this->id=0;
+        $this->id = 0;
         $this->ref = 'SPECIMEN';
-        $this->specimen=1;
+        $this->specimen = 1;
         $this->socid = 1;
         $this->date = $now;
         $this->date_commande = $now;
-        $this->date_lim_reglement=$this->date+3600*24*30;
+        $this->date_lim_reglement = $this->date + 3600 * 24 * 30;
         $this->cond_reglement_code = 'RECEP';
         $this->mode_reglement_code = 'CHQ';
-        $this->note_public='This is a comment (public)';
-        $this->note_private='This is a comment (private)';
-        $this->statut=0;
+        $this->note_public = 'This is a comment (public)';
+        $this->note_private = 'This is a comment (private)';
+        $this->statut = 0;
 
         // Lines
         $nbp = 5;
         $xnbp = 0;
         while ($xnbp < $nbp)
         {
-            $line=new CommandeFournisseurLigne($this->db);
-            $line->desc=$langs->trans("Description")." ".$xnbp;
-            $line->qty=1;
-            $line->subprice=100;
-            $line->price=100;
-            $line->tva_tx=19.6;
-            $line->localtax1_tx=0;
-            $line->localtax2_tx=0;
+            $line = new CommandeFournisseurLigne($this->db);
+            $line->desc = $langs->trans("Description")." ".$xnbp;
+            $line->qty = 1;
+            $line->subprice = 100;
+            $line->price = 100;
+            $line->tva_tx = 19.6;
+            $line->localtax1_tx = 0;
+            $line->localtax2_tx = 0;
             if ($xnbp == 2)
             {
-                $line->total_ht=50;
-                $line->total_ttc=59.8;
-                $line->total_tva=9.8;
-                $line->remise_percent=50;
+                $line->total_ht = 50;
+                $line->total_ttc = 59.8;
+                $line->total_tva = 9.8;
+                $line->remise_percent = 50;
             }
             else
             {
-                $line->total_ht=100;
-                $line->total_ttc=119.6;
-                $line->total_tva=19.6;
-                $line->remise_percent=00;
+                $line->total_ht = 100;
+                $line->total_ttc = 119.6;
+                $line->total_tva = 19.6;
+                $line->remise_percent = 00;
             }
-            $line->fk_product=$prodid;
+            $line->fk_product = $prodid;
 
-            $this->lines[$xnbp]=$line;
+            $this->lines[$xnbp] = $line;
 
             $this->total_ht       += $line->total_ht;
             $this->total_tva      += $line->total_tva;
@@ -2539,11 +2539,11 @@ 
     public function info($id)
     {
         $sql = 'SELECT c.rowid, date_creation as datec, tms as datem, date_valid as date_validation, date_approve as datea, date_approve2 as datea2,';
-        $sql.= ' fk_user_author, fk_user_modif, fk_user_valid, fk_user_approve, fk_user_approve2';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur as c';
-        $sql.= ' WHERE c.rowid = '.$id;
+        $sql .= ' fk_user_author, fk_user_modif, fk_user_valid, fk_user_approve, fk_user_approve2';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur as c';
+        $sql .= ' WHERE c.rowid = '.$id;
 
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             if ($this->db->num_rows($result))
@@ -2552,7 +2552,7 @@ 
                 $this->id = $obj->rowid;
                 if ($obj->fk_user_author)   $this->user_creation_id = $obj->fk_user_author;
                 if ($obj->fk_user_valid)    $this->user_validation_id = $obj->fk_user_valid;
-                if ($obj->fk_user_modif)    $this->user_modification_id =$obj->fk_user_modif;
+                if ($obj->fk_user_modif)    $this->user_modification_id = $obj->fk_user_modif;
                 if ($obj->fk_user_approve)  $this->user_approve_id = $obj->fk_user_approve;
                 if ($obj->fk_user_approve2) $this->user_approve_id2 = $obj->fk_user_approve2;
 
@@ -2579,26 +2579,26 @@ 
     {
         global $conf, $user;
 
-        $this->nb=array();
+        $this->nb = array();
         $clause = "WHERE";
 
         $sql = "SELECT count(co.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+            $sql .= " WHERE sc.fk_user = ".$user->id;
             $clause = "AND";
         }
-        $sql.= " ".$clause." co.entity = ".$conf->entity;
+        $sql .= " ".$clause." co.entity = ".$conf->entity;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
-                $this->nb["supplier_orders"]=$obj->nb;
+                $this->nb["supplier_orders"] = $obj->nb;
             }
             $this->db->free($resql);
             return 1;
@@ -2606,7 +2606,7 @@ 
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -2624,29 +2624,29 @@ 
         $clause = " WHERE";
 
         $sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date";
-        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
+        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
+            $sql .= " WHERE sc.fk_user = ".$user->id;
             $clause = " AND";
         }
-        $sql.= $clause." c.entity = ".$conf->entity;
-        $sql.= " AND (c.fk_statut BETWEEN 1 AND 2)";
-        if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
+        $sql .= $clause." c.entity = ".$conf->entity;
+        $sql .= " AND (c.fk_statut BETWEEN 1 AND 2)";
+        if ($user->societe_id) $sql .= " AND c.fk_soc = ".$user->societe_id;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $commandestatic = new CommandeFournisseur($this->db);
 
 	        $response = new WorkboardResponse();
-	        $response->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24;
-	        $response->label=$langs->trans("SuppliersOrdersToProcess");
-	        $response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2,3&mainmenu=commercial&leftmenu=orders_suppliers';
-	        $response->img=img_object('',"order");
+	        $response->warning_delay = $conf->commande->fournisseur->warning_delay / 60 / 60 / 24;
+	        $response->label = $langs->trans("SuppliersOrdersToProcess");
+	        $response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2,3&mainmenu=commercial&leftmenu=orders_suppliers';
+	        $response->img = img_object('', "order");
 
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
                 $response->nbtodo++;
 
@@ -2663,7 +2663,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -2681,8 +2681,8 @@ 
         if ($this->methode_commande_id > 0)
         {
             $sql = "SELECT rowid, code, libelle as label";
-            $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method';
-            $sql.= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id);
+            $sql .= " FROM ".MAIN_DB_PREFIX.'c_input_method';
+            $sql .= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id);
 
             $resql = $db->query($sql);
             if ($resql)
@@ -2715,19 +2715,19 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 *  @return     int          				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
 		global $conf, $langs;
 
 		$langs->load("suppliers");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'muscadet';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
+			} elseif (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
 				$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
 			}
 		}
@@ -2805,7 +2805,7 @@ 
     {
         global $conf;
 
-        if (empty($this->date_delivery) && ! empty($this->date_livraison)) $this->date_delivery = $this->date_livraison;    // For backward compatibility
+        if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility
 
         $now = dol_now();
         $date_to_test = empty($this->date_delivery) ? $this->date_commande : $this->date_delivery;
@@ -2822,11 +2822,11 @@ 
     {
         global $conf, $langs;
 
-        if (empty($this->date_delivery) && ! empty($this->date_livraison)) $this->date_delivery = $this->date_livraison;    // For backward compatibility
+        if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility
 
-        if (empty($this->date_delivery)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
-        else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
-        $text.=' '.($conf->commande->fournisseur->warning_delay>0?'+':'-').' '.round(abs($conf->commande->fournisseur->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
+        if (empty($this->date_delivery)) $text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+        else $text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
+        $text .= ' '.($conf->commande->fournisseur->warning_delay > 0 ? '+' : '-').' '.round(abs($conf->commande->fournisseur->warning_delay) / 3600 / 24, 1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 
         return $text;
     }
@@ -2840,46 +2840,46 @@ 
      * @param		string	$comment				Comment
      * @return		int		                        <0 if KO, 0 if not applicable, >0 if OK
      */
-    public function calcAndSetStatusDispatch(User $user, $closeopenorder=1, $comment='')
+    public function calcAndSetStatusDispatch(User $user, $closeopenorder = 1, $comment = '')
     {
     	global $conf, $langs;
 
-    	if (! empty($conf->fournisseur->enabled))
+    	if (!empty($conf->fournisseur->enabled))
     	{
     		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 
-    		$qtydelivered=array();
-    		$qtywished=array();
+    		$qtydelivered = array();
+    		$qtywished = array();
 
     		$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
-    		$filter=array('t.fk_commande'=>$this->id);
-    		if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
-    			$filter['t.status']=1;	// Restrict to lines with status validated
+    		$filter = array('t.fk_commande'=>$this->id);
+    		if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+    			$filter['t.status'] = 1; // Restrict to lines with status validated
     		}
 
-    		$ret=$supplierorderdispatch->fetchAll('','',0,0,$filter);
-    		if ($ret<0)
+    		$ret = $supplierorderdispatch->fetchAll('', '', 0, 0, $filter);
+    		if ($ret < 0)
     		{
-    			$this->error=$supplierorderdispatch->error; $this->errors=$supplierorderdispatch->errors;
+    			$this->error = $supplierorderdispatch->error; $this->errors = $supplierorderdispatch->errors;
     			return $ret;
     		}
     		else
     		{
-    			if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines)>0)
+    			if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0)
     			{
     				$date_liv = dol_now();
 
     				// Build array with quantity deliverd by product
-    				foreach($supplierorderdispatch->lines as $line) {
-    					$qtydelivered[$line->fk_product]+=$line->qty;
+    				foreach ($supplierorderdispatch->lines as $line) {
+    					$qtydelivered[$line->fk_product] += $line->qty;
     				}
-    				foreach($this->lines as $line) {
-    					$qtywished[$line->fk_product]+=$line->qty;
+    				foreach ($this->lines as $line) {
+    					$qtywished[$line->fk_product] += $line->qty;
     				}
     				//Compare array
-    				$diff_array=array_diff_assoc($qtydelivered,$qtywished);		// Warning: $diff_array is done only on common keys.
-    				$keysinwishednotindelivered=array_diff(array_keys($qtywished),array_keys($qtydelivered));		// To check we also have same number of keys
-    				$keysindeliverednotinwished=array_diff(array_keys($qtydelivered),array_keys($qtywished));		// To check we also have same number of keys
+    				$diff_array = array_diff_assoc($qtydelivered, $qtywished); // Warning: $diff_array is done only on common keys.
+    				$keysinwishednotindelivered = array_diff(array_keys($qtywished), array_keys($qtydelivered)); // To check we also have same number of keys
+    				$keysindeliverednotinwished = array_diff(array_keys($qtydelivered), array_keys($qtywished)); // To check we also have same number of keys
     				/*var_dump(array_keys($qtydelivered));
     				var_dump(array_keys($qtywished));
     				var_dump($diff_array);
@@ -2887,13 +2887,13 @@ 
     				var_dump($keysindeliverednotinwished);
     				exit;*/
 
-    				if (count($diff_array)==0 && count($keysinwishednotindelivered)==0 && count($keysindeliverednotinwished)==0) //No diff => mean everythings is received
+    				if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) //No diff => mean everythings is received
     				{
     					if ($closeopenorder)
     					{
         					//$ret=$this->setStatus($user,5);
-    						$ret = $this->Livraison($user, $date_liv, 'tot', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-        					if ($ret<0) {
+    						$ret = $this->Livraison($user, $date_liv, 'tot', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+        					if ($ret < 0) {
         						return -1;
         					}
     					    return 5;
@@ -2902,8 +2902,8 @@ 
     					{
     					    //Diff => received partially
     					    //$ret=$this->setStatus($user,4);
-    						$ret = $this->Livraison($user, $date_liv, 'par', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-    					    if ($ret<0) {
+    						$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+    					    if ($ret < 0) {
     					        return -1;
     					    }
     					    return 4;
@@ -2912,8 +2912,8 @@ 
     				else
     				{
     					//Diff => received partially
-    					$ret = $this->Livraison($user, $date_liv, 'par', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-    					if ($ret<0) {
+    					$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+    					if ($ret < 0) {
     						return -1;
     					}
     					return 4;
@@ -2933,8 +2933,8 @@ 
  */
 class CommandeFournisseurLigne extends CommonOrderLine
 {
-    public $element='commande_fournisseurdet';
-	public $table_element='commande_fournisseurdet';
+    public $element = 'commande_fournisseurdet';
+	public $table_element = 'commande_fournisseurdet';
 
     public $oldline;
 
@@ -2977,7 +2977,7 @@ 
      */
     public function __construct($db)
     {
-        $this->db= $db;
+        $this->db = $db;
     }
 
     /**
@@ -2989,16 +2989,16 @@ 
     public function fetch($rowid)
     {
         $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.product_type, cd.description, cd.qty, cd.tva_tx,';
-        $sql.= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref,';
-        $sql.= ' cd.remise, cd.remise_percent, cd.subprice,';
-        $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
-        $sql.= ' cd.total_localtax1, cd.total_localtax2,';
-        $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
-        $sql.= ' cd.date_start, cd.date_end, cd.fk_unit,';
-		$sql.= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
-        $sql.= ' WHERE cd.rowid = '.$rowid;
+        $sql .= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref,';
+        $sql .= ' cd.remise, cd.remise_percent, cd.subprice,';
+        $sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
+        $sql .= ' cd.total_localtax1, cd.total_localtax2,';
+        $sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
+        $sql .= ' cd.date_start, cd.date_end, cd.fk_unit,';
+		$sql .= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
+        $sql .= ' WHERE cd.rowid = '.$rowid;
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -3028,14 +3028,14 @@ 
             $this->total_ttc        = $objp->total_ttc;
             $this->product_type     = $objp->product_type;
 
-            $this->ref	            = $objp->product_ref;
+            $this->ref = $objp->product_ref;
             $this->product_ref      = $objp->product_ref;
             $this->product_libelle  = $objp->product_libelle;
             $this->product_desc     = $objp->product_desc;
 
             $this->date_start       		= $this->db->jdate($objp->date_start);
             $this->date_end         		= $this->db->jdate($objp->date_end);
-	        $this->fk_unit          		= $objp->fk_unit;
+	        $this->fk_unit = $objp->fk_unit;
 
 			$this->multicurrency_subprice	= $objp->multicurrency_subprice;
 			$this->multicurrency_total_ht	= $objp->multicurrency_total_ht;
@@ -3063,16 +3063,16 @@ 
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseurdet SET";
-        $sql.= " total_ht='".price2num($this->total_ht)."'";
-        $sql.= ",total_tva='".price2num($this->total_tva)."'";
-        $sql.= ",total_localtax1='".price2num($this->total_localtax1)."'";
-        $sql.= ",total_localtax2='".price2num($this->total_localtax2)."'";
-        $sql.= ",total_ttc='".price2num($this->total_ttc)."'";
-        $sql.= " WHERE rowid = ".$this->rowid;
+        $sql .= " total_ht='".price2num($this->total_ht)."'";
+        $sql .= ",total_tva='".price2num($this->total_tva)."'";
+        $sql .= ",total_localtax1='".price2num($this->total_localtax1)."'";
+        $sql .= ",total_localtax2='".price2num($this->total_localtax2)."'";
+        $sql .= ",total_ttc='".price2num($this->total_ttc)."'";
+        $sql .= " WHERE rowid = ".$this->rowid;
 
         dol_syslog(get_class($this)."::updateTotal", LOG_DEBUG);
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->db->commit();
@@ -3080,7 +3080,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }
@@ -3092,32 +3092,32 @@ 
      *	@param      int		$notrigger		1 = disable triggers
      *	@return		int						<0 if KO, >0 if OK
      */
-    public function insert($notrigger=0)
+    public function insert($notrigger = 0)
     {
         global $conf, $user;
 
-        $error=0;
+        $error = 0;
 
         dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
         // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type='0';
-        if (empty($this->localtax2_type)) $this->localtax2_type='0';
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise)) $this->remise=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->pa_ht)) $this->pa_ht=0;
+        if (empty($this->tva_tx)) $this->tva_tx = 0;
+        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+        if (empty($this->localtax1_type)) $this->localtax1_type = '0';
+        if (empty($this->localtax2_type)) $this->localtax2_type = '0';
+        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+        if (empty($this->rang)) $this->rang = 0;
+        if (empty($this->remise)) $this->remise = 0;
+        if (empty($this->remise_percent)) $this->remise_percent = 0;
+        if (empty($this->info_bits)) $this->info_bits = 0;
+        if (empty($this->special_code)) $this->special_code = 0;
+        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+        if (empty($this->pa_ht)) $this->pa_ht = 0;
 
         // Multicurrency
-        if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+        if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
         if (empty($this->fk_multicurrency))
         {
             $this->multicurrency_code = $conf->currency;
@@ -3132,62 +3132,62 @@ 
 
         // Insertion dans base de la ligne
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " (fk_commande, label, description, date_start, date_end,";
-        $sql.= " fk_product, product_type,";
-        $sql.= " qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,";
-        $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit,";
-        $sql.= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc";
-        $sql.= ")";
-        $sql.= " VALUES (".$this->fk_commande.", '" . $this->db->escape($this->label) . "','" . $this->db->escape($this->desc) . "',";
-        $sql.= " ".($this->date_start?"'".$this->db->idate($this->date_start)."'":"null").",";
-        $sql.= " ".($this->date_end?"'".$this->db->idate($this->date_end)."'":"null").",";
-        if ($this->fk_product) { $sql.= $this->fk_product.","; }
-        else { $sql.= "null,"; }
-        $sql.= "'".$this->db->escape($this->product_type)."',";
-        $sql.= "'".$this->db->escape($this->qty)."', ";
-
-        $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
-        $sql.= " ".$this->tva_tx.", ";
-        $sql.= " ".$this->localtax1_tx.",";
-        $sql.= " ".$this->localtax2_tx.",";
-        $sql.= " '".$this->db->escape($this->localtax1_type)."',";
-        $sql.= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql.= " ".$this->remise_percent.", ".price2num($this->subprice,'MU').", '".$this->db->escape($this->ref_supplier)."',";
-        $sql.= " ".price2num($this->total_ht).",";
-        $sql.= " ".price2num($this->total_tva).",";
-        $sql.= " ".price2num($this->total_localtax1).",";
-        $sql.= " ".price2num($this->total_localtax2).",";
-        $sql.= " ".price2num($this->total_ttc).",";
-        $sql.= ($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'":"null");
-        $sql.= ", ".($this->fk_multicurrency ? $this->fk_multicurrency : "null");
-        $sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql.= ", ".price2num($this->multicurrency_subprice);
-        $sql.= ", ".price2num($this->multicurrency_total_ht);
-        $sql.= ", ".price2num($this->multicurrency_total_tva);
-        $sql.= ", ".price2num($this->multicurrency_total_ttc);
-        $sql.= ")";
+        $sql .= " (fk_commande, label, description, date_start, date_end,";
+        $sql .= " fk_product, product_type,";
+        $sql .= " qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,";
+        $sql .= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit,";
+        $sql .= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc";
+        $sql .= ")";
+        $sql .= " VALUES (".$this->fk_commande.", '".$this->db->escape($this->label)."','".$this->db->escape($this->desc)."',";
+        $sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
+        $sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
+        if ($this->fk_product) { $sql .= $this->fk_product.","; }
+        else { $sql .= "null,"; }
+        $sql .= "'".$this->db->escape($this->product_type)."',";
+        $sql .= "'".$this->db->escape($this->qty)."', ";
+
+        $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+        $sql .= " ".$this->tva_tx.", ";
+        $sql .= " ".$this->localtax1_tx.",";
+        $sql .= " ".$this->localtax2_tx.",";
+        $sql .= " '".$this->db->escape($this->localtax1_type)."',";
+        $sql .= " '".$this->db->escape($this->localtax2_type)."',";
+        $sql .= " ".$this->remise_percent.", ".price2num($this->subprice, 'MU').", '".$this->db->escape($this->ref_supplier)."',";
+        $sql .= " ".price2num($this->total_ht).",";
+        $sql .= " ".price2num($this->total_tva).",";
+        $sql .= " ".price2num($this->total_localtax1).",";
+        $sql .= " ".price2num($this->total_localtax2).",";
+        $sql .= " ".price2num($this->total_ttc).",";
+        $sql .= ($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : "null");
+        $sql .= ", ".($this->fk_multicurrency ? $this->fk_multicurrency : "null");
+        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+        $sql .= ", ".price2num($this->multicurrency_subprice);
+        $sql .= ", ".price2num($this->multicurrency_total_ht);
+        $sql .= ", ".price2num($this->multicurrency_total_tva);
+        $sql .= ", ".price2num($this->multicurrency_total_ttc);
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::insert", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-            $this->rowid =$this->id;
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+            $this->rowid = $this->id;
 
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
 
-                $result=$this->insertExtraFields();
+                $result = $this->insertExtraFields();
                 if ($result < 0)
                 {
                     $error++;
                 }
             }
 
-            if (! $error && ! $notrigger)
+            if (!$error && !$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('LINEORDER_SUPPLIER_CREATE',$user);
+                $result = $this->call_trigger('LINEORDER_SUPPLIER_CREATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
@@ -3197,17 +3197,17 @@ 
                 return 1;
             }
 
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->errors[]=($this->errors?', '.$errmsg:$errmsg);
+                $this->errors[] = ($this->errors ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
-            $this->errors[]=$this->db->error();
+            $this->errors[] = $this->db->error();
             $this->db->rollback();
             return -2;
         }
@@ -3218,44 +3218,44 @@ 
      *	@param      int		$notrigger		1 = disable triggers
      *	@return		int		<0 si ko, >0 si ok
      */
-    public function update($notrigger=0)
+    public function update($notrigger = 0)
     {
-        global $conf,$user;
+        global $conf, $user;
 
-        $error=0;
+        $error = 0;
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= "  description='".$this->db->escape($this->desc)."'";
-        $sql.= ", subprice='".price2num($this->subprice)."'";
+        $sql .= "  description='".$this->db->escape($this->desc)."'";
+        $sql .= ", subprice='".price2num($this->subprice)."'";
         //$sql.= ",remise='".price2num($remise)."'";
-        $sql.= ", remise_percent='".price2num($this->remise_percent)."'";
-
-		$sql.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->vat_src_code)."'";
-        $sql.= ", tva_tx='".price2num($this->tva_tx)."'";
-        $sql.= ", localtax1_tx='".price2num($this->total_localtax1)."'";
-        $sql.= ", localtax2_tx='".price2num($this->total_localtax2)."'";
-        $sql.= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
-        $sql.= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-        $sql.= ", qty='".price2num($this->qty)."'";
-        $sql.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
-        $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-        $sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
-        $sql.= ", total_ht='".price2num($this->total_ht)."'";
-        $sql.= ", total_tva='".price2num($this->total_tva)."'";
-        $sql.= ", total_localtax1='".price2num($this->total_localtax1)."'";
-        $sql.= ", total_localtax2='".price2num($this->total_localtax2)."'";
-        $sql.= ", total_ttc='".price2num($this->total_ttc)."'";
-        $sql.= ", product_type=".$this->product_type;
-        $sql.= ($this->fk_unit ? ", fk_unit='".$this->db->escape($this->fk_unit)."'":", fk_unit=null");
+        $sql .= ", remise_percent='".price2num($this->remise_percent)."'";
+
+		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
+        $sql .= ", tva_tx='".price2num($this->tva_tx)."'";
+        $sql .= ", localtax1_tx='".price2num($this->total_localtax1)."'";
+        $sql .= ", localtax2_tx='".price2num($this->total_localtax2)."'";
+        $sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+        $sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
+        $sql .= ", qty='".price2num($this->qty)."'";
+        $sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
+        $sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+        $sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
+        $sql .= ", total_ht='".price2num($this->total_ht)."'";
+        $sql .= ", total_tva='".price2num($this->total_tva)."'";
+        $sql .= ", total_localtax1='".price2num($this->total_localtax1)."'";
+        $sql .= ", total_localtax2='".price2num($this->total_localtax2)."'";
+        $sql .= ", total_ttc='".price2num($this->total_ttc)."'";
+        $sql .= ", product_type=".$this->product_type;
+        $sql .= ($this->fk_unit ? ", fk_unit='".$this->db->escape($this->fk_unit)."'" : ", fk_unit=null");
 
         // Multicurrency
-        $sql.= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql.= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql.= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql.= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+        $sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
         $result = $this->db->query($sql);
@@ -3264,18 +3264,18 @@ 
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
 
-                $result=$this->insertExtraFields();
+                $result = $this->insertExtraFields();
                 if ($result < 0)
                 {
                     $error++;
                 }
             }
 
-            if (! $error && ! $notrigger)
+            if (!$error && !$notrigger)
             {
                 global $user;
                 // Call trigger
-                $result=$this->call_trigger('LINEORDER_SUPPLIER_UPDATE',$user);
+                $result = $this->call_trigger('LINEORDER_SUPPLIER_UPDATE', $user);
                 if ($result < 0)
                 {
                     $this->db->rollback();
@@ -3284,7 +3284,7 @@ 
                 // End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->db->commit();
                 return $result;
@@ -3297,7 +3297,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -3313,21 +3313,21 @@ 
     {
         global $user;
 
-        $error=0;
+        $error = 0;
 
         $this->db->begin();
 
         $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid=".$this->rowid;
 
         dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
 
             if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('LINEORDER_SUPPLIER_DELETE',$user);
+                $result = $this->call_trigger('LINEORDER_SUPPLIER_DELETE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
@@ -3338,17 +3338,17 @@ 
                 return 1;
             }
 
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }

Braces +469 added lines, -271 removed lines

@@ -31,7 +31,9 @@ 
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (! empty($conf->productbatch->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+}
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
@@ -151,8 +153,11 @@ 
         $this->statuts[0] = 'StatusOrderDraft';
         $this->statuts[1] = 'StatusOrderValidated';
         $this->statuts[2] = 'StatusOrderApproved';
-        if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusOrderOnProcess';
-        else $this->statuts[3] = 'StatusOrderOnProcessWithValidation';
+        if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+        	$this->statuts[3] = 'StatusOrderOnProcess';
+        } else {
+        	$this->statuts[3] = 'StatusOrderOnProcessWithValidation';
+        }
         $this->statuts[4] = 'StatusOrderReceivedPartially';
         $this->statuts[5] = 'StatusOrderReceivedAll';
         $this->statuts[6] = 'StatusOrderCanceled';	// Approved->Canceled
@@ -174,7 +179,9 @@ 
         global $conf;
 
         // Check parameters
-        if (empty($id) && empty($ref)) return -1;
+        if (empty($id) && empty($ref)) {
+        	return -1;
+        }
 
         $sql = "SELECT c.rowid, c.ref, ref_supplier, c.fk_soc, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_vat,";
         $sql.= " c.localtax1, c.localtax2, ";
@@ -195,8 +202,11 @@ 
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_input_method as cm ON cm.rowid = c.fk_input_method";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
         $sql.= " WHERE c.entity = ".$conf->entity;
-        if ($ref) $sql.= " AND c.ref='".$this->db->escape($ref)."'";
-        else $sql.= " AND c.rowid=".$id;
+        if ($ref) {
+        	$sql.= " AND c.ref='".$this->db->escape($ref)."'";
+        } else {
+        	$sql.= " AND c.rowid=".$id;
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -275,7 +285,9 @@ 
             $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
             $this->fetch_optionals($this->id,$extralabels);
 
-            if ($this->statut == 0) $this->brouillon = 1;
+            if ($this->statut == 0) {
+            	$this->brouillon = 1;
+            }
 
 			$this->fetchObjectLinked();
 
@@ -365,14 +377,12 @@ 
                 $this->db->free($result);
 
                 return 1;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->error()." sql=".$sql;
                 return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error()." sql=".$sql;
             return -1;
@@ -406,11 +416,12 @@ 
             $soc->fetch($this->fourn_id);
 
             // Check if object has a temporary ref
-            if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+            if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) {
+            	// empty should not happened, but when it occurs, the test save life
             {
                 $num = $this->getNextNumRef($soc);
             }
-            else
+            } else
 			{
                 $num = $this->ref;
             }
@@ -435,7 +446,9 @@ 
             {
 				// Call trigger
 				$result=$this->call_trigger('ORDER_SUPPLIER_VALIDATE',$user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
             }
 
@@ -485,14 +498,12 @@ 
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             $this->error='NotAuthorized';
             dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -526,7 +537,9 @@ 
 
         $billedtext='';
 		//if ($statut==5 && $this->billed == 1) $statut = 8;
-        if ($billed == 1) $billedtext=$langs->trans("Billed");
+        if ($billed == 1) {
+        	$billedtext=$langs->trans("Billed");
+        }
 
         // List of language codes for status
         $statutshort[0] = 'StatusOrderDraftShort';
@@ -554,39 +567,93 @@ 
         }
         if ($mode == 3)
         {
-            if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-            if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
-            if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
-			if ($statut==8) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
+            if ($statut==0) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+            }
+            if ($statut==1) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut1');
+            }
+            if ($statut==2) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+            }
+            if ($statut==3) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+            }
+            if ($statut==4) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+            }
+            if ($statut==5) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut6');
+            }
+            if ($statut==6 || $statut==7) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut5');
+            }
+			if ($statut==8) {
+				return img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			}
+            if ($statut==9) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut5');
+            }
         }
         if ($mode == 4)
         {
-            if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==4) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==5) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-			if ($statut==8) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
-            if ($statut==9) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            if ($statut==0) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            }
+            if ($statut==1) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            }
+            if ($statut==2) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            }
+            if ($statut==3) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            }
+            if ($statut==4) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            }
+            if ($statut==5) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            }
+            if ($statut==6 || $statut==7) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            }
+			if ($statut==8) {
+				return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+			}
+            if ($statut==9) {
+            	return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
+            }
         }
         if ($mode == 5)
         {
-            if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-            if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut1');
-            if ($statut==2) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==3) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==4) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-            if ($statut==5) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==6 || $statut==7) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
-            if ($statut==8) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
-            if ($statut==9) return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
+            if ($statut==0) {
+            	return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+            }
+            if ($statut==1) {
+            	return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut1');
+            }
+            if ($statut==2) {
+            	return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+            }
+            if ($statut==3) {
+            	return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+            }
+            if ($statut==4) {
+            	return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+            }
+            if ($statut==5) {
+            	return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+            }
+            if ($statut==6 || $statut==7) {
+            	return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
+            }
+            if ($statut==8) {
+            	return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+            }
+            if ($statut==9) {
+            	return '<span class="hideonsmartphone">'.$langs->trans($statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
+            }
         }
     }
 
@@ -606,16 +673,21 @@ 
 
         $result='';
         $label = '<u>' . $langs->trans("ShowOrder") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->ref_supplier))
-            $label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        if (! empty($this->ref)) {
+                    $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        }
+        if (! empty($this->ref_supplier)) {
+                    $label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
+        }
+        if (! empty($this->total_ht)) {
+                    $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+        }
+        if (! empty($this->total_tva)) {
+                    $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+        }
+        if (! empty($this->total_ttc)) {
+                    $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        }
 
         $picto='order';
         $url = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$this->id;
@@ -624,8 +696,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='';
@@ -644,8 +720,12 @@ 
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
+        if ($withpicto) {
+        	$result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+        	$result.=' ';
+        }
         $result.=$linkstart.$this->ref.$linkend;
         return $result;
     }
@@ -693,14 +773,12 @@ 
             if ( $numref != "")
             {
                 return $numref;
-            }
-            else
+            } else
 			{
                 $this->error = $obj->error;
                 return -1;
             }
-        }
-        else
+        } else
 		{
             $this->error = "Error_COMMANDE_SUPPLIER_ADDON_NotDefined";
             return -2;
@@ -725,7 +803,9 @@ 
         	{
         	    // Call trigger
         	    $result=$this->call_trigger('ORDER_SUPPLIER_CLASSIFY_BILLED',$user);
-        	    if ($result < 0) $error++;
+        	    if ($result < 0) {
+        	    	$error++;
+        	    }
         	    // End call triggers
         	}
 
@@ -735,14 +815,12 @@ 
 
         	    $this->db->commit();
         	    return 1;
-        	}
-        	else
+        	} else
         	{
         	    $this->db->rollback();
                 return -1;
         	}
-        }
-        else
+        } else
         {
         	dol_print_error($this->db);
 
@@ -779,11 +857,12 @@ 
             $soc->fetch($this->fourn_id);
 
             // Check if object has a temporary ref
-            if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+            if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) {
+            	// empty should not happened, but when it occurs, the test save life
             {
                 $num = $this->getNextNumRef($soc);
             }
-            else
+            } else
 			{
                 $num = $this->ref;
             }
@@ -795,9 +874,11 @@ 
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
 			$sql.= " SET ref='".$this->db->escape($num)."',";
-			if (empty($secondlevel))	// standard or first level approval
+			if (empty($secondlevel)) {
+				// standard or first level approval
 			{
 	            $sql.= " date_approve='".$this->db->idate($now)."',";
+			}
     	        $sql.= " fk_user_approve = ".$user->id;
     	        if (! empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
     	        {
@@ -807,17 +888,22 @@ 
     	        	    $comment=' (first level)';
     	        	}
     	        }
-			}
-			else	// request a second level approval
+			} else	// request a second level approval
 			{
             	$sql.= " date_approve2='".$this->db->idate($now)."',";
             	$sql.= " fk_user_approve2 = ".$user->id;
-    	        if (empty($this->user_approve_id)) $movetoapprovestatus=false;		// first level approval not done
+    	        if (empty($this->user_approve_id)) {
+    	        	$movetoapprovestatus=false;
+    	        }
+    	        // first level approval not done
     	        $comment=' (second level)';
 			}
 			// If double approval is required and first approval, we keep status to 1 = validated
-			if ($movetoapprovestatus) $sql.= ", fk_statut = 2";
-			else $sql.= ", fk_statut = 1";
+			if ($movetoapprovestatus) {
+				$sql.= ", fk_statut = 2";
+			} else {
+				$sql.= ", fk_statut = 1";
+			}
             $sql.= " WHERE rowid = ".$this->id;
             $sql.= " AND fk_statut = 1";
 
@@ -826,10 +912,12 @@ 
             	if (! empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT))
 	            {
 					$result=$this->add_contact($user->id, 'SALESREPFOLL', 'internal', 1);
-					if ($result < 0 && $result != -2)	// -2 means already exists
+					if ($result < 0 && $result != -2) {
+						// -2 means already exists
 					{
 						$error++;
 					}
+					}
 	            }
 
                 // If stock is incremented on validate order, we must increment it
@@ -849,7 +937,9 @@ 
                             $mouvP->origin = &$this;
                             // We decrement stock of product (and sub-products)
 	                        $up_ht_disc=$this->lines[$i]->subprice;
-    	                    if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+    	                    if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
+    	                    	$up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+    	                    }
                             $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr",$this->ref));
                             if ($result < 0) { $error++; }
                             unset($this->line);
@@ -861,7 +951,9 @@ 
                 {
 					// Call trigger
 					$result=$this->call_trigger('ORDER_SUPPLIER_APPROVE',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
                 }
 
@@ -869,14 +961,18 @@ 
                 {
                 	$this->ref = $this->newref;
 
-                	if ($movetoapprovestatus) $this->statut = 2;
-					else $this->statut = 1;
-           			if (empty($secondlevel))	// standard or first level approval
+                	if ($movetoapprovestatus) {
+                		$this->statut = 2;
+                	} else {
+						$this->statut = 1;
+					}
+           			if (empty($secondlevel)) {
+           				// standard or first level approval
 					{
 			            $this->date_approve = $now;
+           			}
 		    	        $this->user_approve_id = $user->id;
-					}
-					else	// request a second level approval
+					} else	// request a second level approval
 					{
 			            $this->date_approve2 = $now;
 		    	        $this->user_approve_id2 = $user->id;
@@ -884,21 +980,18 @@ 
 
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 $this->error=$this->db->lasterror();
                 return -1;
             }
-        }
-        else
+        } else
         {
             dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
         }
@@ -938,21 +1031,19 @@ 
                     {
                         $error++;
                         $this->db->rollback();
+                    } else {
+                                        	$this->db->commit();
                     }
-                    else
-                    	$this->db->commit();
 					// End call triggers
                 }
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 $this->error=$this->db->lasterror();
                 dol_syslog(get_class($this)."::refuse Error -1");
                 $result = -1;
             }
-        }
-        else
+        } else
         {
             dol_syslog(get_class($this)."::refuse Not Authorized");
         }
@@ -990,29 +1081,28 @@ 
 
 				// Call trigger
 				$result=$this->call_trigger('ORDER_SUPPLIER_CANCEL',$user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 
                 if ($error == 0)
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 $this->error=$this->db->lasterror();
                 dol_syslog(get_class($this)."::cancel ".$this->error);
                 return -1;
             }
-        }
-        else
+        } else
         {
             dol_syslog(get_class($this)."::cancel Not Authorized");
             return -1;
@@ -1050,10 +1140,11 @@ 
 
                 // Call trigger
                 $result=$this->call_trigger('ORDER_SUPPLIER_SUBMIT',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                	$error++;
+                }
                 // End call triggers
-            }
-            else
+            } else
             {
                 $error++;
                 $this->error = $this->db->lasterror();
@@ -1063,13 +1154,11 @@ 
             if (! $error)
             {
                 $this->db->commit();
-            }
-            else
+            } else
             {
                 $this->db->rollback();
             }
-        }
-        else
+        } else
         {
             $error++;
             $this->error = $langs->trans('NotAuthorized');
@@ -1097,11 +1186,16 @@ 
         $now=dol_now();
 
         // Clean parameters
-        if (empty($this->source)) $this->source = 0;
+        if (empty($this->source)) {
+        	$this->source = 0;
+        }
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
@@ -1227,7 +1321,9 @@ 
 	                if (! $error)
                     {
                     	$result=$this->insertExtraFields();
-	                    if ($result < 0) $error++;
+	                    if ($result < 0) {
+	                    	$error++;
+	                    }
                     }
 
 					if (! $error && ! $notrigger)
@@ -1244,16 +1340,14 @@ 
 
 	                $this->db->commit();
 	                return $this->id;
-	            }
-	            else
+	            } else
 	            {
 	                $this->error=$this->db->lasterror();
 	                $this->db->rollback();
 	                return -2;
 	            }
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->db->rollback();
@@ -1295,7 +1389,9 @@ 
 
         // Create clone
         $result=$this->create($user);
-        if ($result < 0) $error++;
+        if ($result < 0) {
+        	$error++;
+        }
 
         if (! $error)
         {
@@ -1305,12 +1401,16 @@ 
                 $parameters=array('objFrom'=>$objFrom);
                 $action='';
                 $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
+                if ($reshook < 0) {
+                	$error++;
+                }
             }
 
 			// Call trigger
 			$result=$this->call_trigger('ORDER_SUPPLIER_CLONE',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
         }
 
@@ -1321,8 +1421,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -1366,12 +1465,24 @@ 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
-        if (! $qty) $qty=1;
-        if (! $info_bits) $info_bits=0;
-        if (empty($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
-		if (empty($remise_percent)) $remise_percent=0;
+        if (! $qty) {
+        	$qty=1;
+        }
+        if (! $info_bits) {
+        	$info_bits=0;
+        }
+        if (empty($txtva)) {
+        	$txtva=0;
+        }
+        if (empty($txlocaltax1)) {
+        	$txlocaltax1=0;
+        }
+        if (empty($txlocaltax2)) {
+        	$txlocaltax2=0;
+        }
+		if (empty($remise_percent)) {
+			$remise_percent=0;
+		}
 
         $remise_percent=price2num($remise_percent);
         $qty=price2num($qty);
@@ -1383,8 +1494,7 @@ 
         if ($price_base_type=='HT')
         {
             $pu=$pu_ht;
-        }
-        else
+        } else
         {
             $pu=$pu_ttc;
         }
@@ -1397,7 +1507,9 @@ 
             $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Product"));
             return -1;
         }
-        if ($type < 0) return -1;
+        if ($type < 0) {
+        	return -1;
+        }
 
         if ($this->statut == 0)
         {
@@ -1423,14 +1535,17 @@ 
                             $pu           = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
                             $ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
 			    // is remise percent not keyed but present for the product we add it
-                            if ($remise_percent == 0 && $prod->remise_percent !=0)
-                            	$remise_percent =$prod->remise_percent;
+                            if ($remise_percent == 0 && $prod->remise_percent !=0) {
+                                                        	$remise_percent =$prod->remise_percent;
+                            }
 
 
                         }
-                        if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
+                        if ($result == 0) {
+                        	// If result == 0, we failed to found the supplier reference price
                         {
                             $langs->load("errors");
+                        }
                             $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
                             $this->db->rollback();
                             dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
@@ -1453,15 +1568,13 @@ 
                             dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
                             return -1;
                         }
-                    }
-                    else
+                    } else
     				{
                         $this->error=$prod->error;
                         return -1;
                     }
                 }
-            }
-            else
+            } else
             {
                 $product_type = $type;
             }
@@ -1562,7 +1675,9 @@ 
             if ($result > 0)
             {
                 // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+                if (! empty($fk_parent_line)) {
+                	$this->line_order(true,'DESC');
+                }
 
                 // Mise a jour informations denormalisees au niveau de la commande meme
                 $result=$this->update_price(1,'auto',0,$this->thirdparty);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
@@ -1570,14 +1685,12 @@ 
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$this->line->error;
                 $this->errors=$this->line->errors;
@@ -1625,7 +1738,10 @@ 
         }
 
         $dispatchstatus = 1;
-        if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0;	// Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
+        if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+        	$dispatchstatus = 0;
+        }
+        // Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
 
         $now=dol_now();
 
@@ -1655,8 +1771,7 @@ 
                     }
 					// End call triggers
                 }
-            }
-            else
+            } else
 			{
                 $this->error=$this->db->lasterror();
                 $error++;
@@ -1686,14 +1801,12 @@ 
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
 		{
             $this->error='BadStatusForObject';
             return -2;
@@ -1722,15 +1835,13 @@ 
             {
                 $this->update_price();
                 return 1;
-            }
-            else
+            } else
             {
                 $this->error = $line->error;
                 $this->errors = $line->errors;
                 return -1;
             }
-        }
-        else
+        } else
         {
             return -2;
         }
@@ -1784,8 +1895,7 @@ 
                 $this->errors[]=$this->db->lasterror();
                 $error++;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->errors[]=$this->db->lasterror();
@@ -1793,9 +1903,11 @@ 
         }
 
         // Remove extrafields
-        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
+        	// For avoid conflicts if trigger used
         {
         	$result=$this->deleteExtraFields();
+        }
         	if ($result < 0)
         	{
         		$this->error='FailToDeleteExtraFields';
@@ -1823,9 +1935,11 @@ 
         		$file = $dir . "/" . $ref . ".pdf";
         		if (file_exists($file))
         		{
-        			if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+        			if (! dol_delete_file($file,0,0,0,$this)) {
+        				// For triggers
         			{
         				$this->error='ErrorFailToDeleteFile';
+        			}
         				$this->errors[]='ErrorFailToDeleteFile';
         				$error++;
         			}
@@ -1848,8 +1962,7 @@ 
 			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
@@ -1883,8 +1996,7 @@ 
                 $i++;
             }
             return 0;
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -1909,7 +2021,9 @@ 
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
 		$sql.= " WHERE cfd.fk_commande = ".$this->id;
 		$sql.= " AND cfd.fk_product = p.rowid";
-		if ($status >= 0) $sql.=" AND cfd.status = ".$status;
+		if ($status >= 0) {
+			$sql.=" AND cfd.status = ".$status;
+		}
 		$sql.= " ORDER BY cfd.rowid ASC";
 
 		$resql = $this->db->query($sql);
@@ -1921,12 +2035,15 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if ($objp) $ret[]=array('id'=>$objp->dispatchedlineid, 'productid'=>$objp->fk_product, 'warehouseid'=>$objp->warehouse_id);
+				if ($objp) {
+					$ret[]=array('id'=>$objp->dispatchedlineid, 'productid'=>$objp->fk_product, 'warehouseid'=>$objp->warehouse_id);
+				}
 
 				$i++;
 			}
+		} else {
+			dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
 		}
-		else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
 
 		return $ret;
     }
@@ -1952,10 +2069,18 @@ 
 
         if ($user->rights->fournisseur->commande->receptionner)
         {
-            if ($type == 'par') $statut = 4;
-            if ($type == 'tot')	$statut = 5;
-            if ($type == 'nev') $statut = 7;
-            if ($type == 'can') $statut = 7;
+            if ($type == 'par') {
+            	$statut = 4;
+            }
+            if ($type == 'tot') {
+            	$statut = 5;
+            }
+            if ($type == 'nev') {
+            	$statut = 7;
+            }
+            if ($type == 'can') {
+            	$statut = 7;
+            }
 
             // Some checks to accept the record
             if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
@@ -1973,9 +2098,11 @@ 
 		    		}
 
 		    	}
-	    		if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot'))	// Accept to move to reception done, only if status of all line are ok (refuse denied)
+	    		if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot')) {
+	    			// Accept to move to reception done, only if status of all line are ok (refuse denied)
 	    		{
 	    			$dispatcheddenied=$this->getDispachedLines(2);
+	    		}
 	    			if (count($dispatchedlinearray) > 0)
 	    			{
 		    			$result=-1;
@@ -2016,30 +2143,29 @@ 
 
                     // Call trigger
                     $result=$this->call_trigger('ORDER_SUPPLIER_RECEIVE',$user);
-                    if ($result < 0) $error++;
+                    if ($result < 0) {
+                    	$error++;
+                    }
                     // End call triggers
 
                     if (! $error)
                     {
                         $this->db->commit();
-                    }
-                    else
+                    } else
                     {
                         $this->statut = $old_statut;
                         $this->db->rollback();
                         $this->error=$this->db->lasterror();
                         $result = -1;
                     }
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     $this->error=$this->db->lasterror();
                     $result = -1;
                 }
             }
-        }
-        else
+        } else
         {
             $this->error = $langs->trans('NotAuthorized');
             $this->errors[] = $langs->trans('NotAuthorized');
@@ -2087,7 +2213,9 @@ 
         	{
         		// Call trigger
         		$result=$this->call_trigger('ORDER_SUPPLIER_MODIFY',$user);
-        		if ($result < 0) $error++;
+        		if ($result < 0) {
+        			$error++;
+        		}
         		// End call triggers
         	}
 
@@ -2095,8 +2223,7 @@ 
         	{
         		$this->db->commit();
         		return 1;
-        	}
-        	else
+        	} else
         	{
         		foreach($this->errors as $errmsg)
         		{
@@ -2106,8 +2233,7 @@ 
         		$this->db->rollback();
         		return -1*$error;
         	}
-        }
-        else
+        } else
         {
             return -2;
         }
@@ -2151,7 +2277,9 @@ 
             {
             	// Call trigger
             	$result=$this->call_trigger('ORDER_SUPPLIER_MODIFY',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            		$error++;
+            	}
             	// End call triggers
             }
 
@@ -2159,8 +2287,7 @@ 
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
+            } else
             {
             	foreach($this->errors as $errmsg)
             	{
@@ -2170,8 +2297,7 @@ 
             	$this->db->rollback();
             	return -1*$error;
             }
-        }
-        else
+        } else
         {
             return -2;
         }
@@ -2257,8 +2383,7 @@ 
             $result=$this->call_trigger("ORDER_SUPPLIER_STATUS_".$trigger_name[$status],$user);
             if ($result < 0) { $error++; }
             // End call triggers
-        }
-        else
+        } else
         {
             $error++;
             $this->error=$this->db->lasterror();
@@ -2270,8 +2395,7 @@ 
             $this->statut = $status;
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -2313,24 +2437,42 @@ 
             $this->db->begin();
 
             // Clean parameters
-            if (empty($qty)) $qty=0;
-            if (empty($info_bits)) $info_bits=0;
-            if (empty($txtva)) $txtva=0;
-            if (empty($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2)) $txlocaltax2=0;
-            if (empty($remise)) $remise=0;
-            if (empty($remise_percent)) $remise_percent=0;
+            if (empty($qty)) {
+            	$qty=0;
+            }
+            if (empty($info_bits)) {
+            	$info_bits=0;
+            }
+            if (empty($txtva)) {
+            	$txtva=0;
+            }
+            if (empty($txlocaltax1)) {
+            	$txlocaltax1=0;
+            }
+            if (empty($txlocaltax2)) {
+            	$txlocaltax2=0;
+            }
+            if (empty($remise)) {
+            	$remise=0;
+            }
+            if (empty($remise_percent)) {
+            	$remise_percent=0;
+            }
 
             $remise_percent=price2num($remise_percent);
             $qty=price2num($qty);
-            if (! $qty) $qty=1;
+            if (! $qty) {
+            	$qty=1;
+            }
             $pu = price2num($pu);
             $txtva=price2num($txtva);
             $txlocaltax1=price2num($txlocaltax1);
             $txlocaltax2=price2num($txlocaltax2);
 
             // Check parameters
-            if ($type < 0) return -1;
+            if ($type < 0) {
+            	return -1;
+            }
 
             // Calcul du total TTC et de la TVA pour la ligne a partir de
             // qty, pu, remise_percent et txtva
@@ -2430,15 +2572,13 @@ 
                 $this->update_price('','auto');
 				$this->db->commit();
 				return $result;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->lasterror();
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             $this->error="Order status makes operation forbidden";
             dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
@@ -2510,8 +2650,7 @@ 
                 $line->total_ttc=59.8;
                 $line->total_tva=9.8;
                 $line->remise_percent=50;
-            }
-            else
+            } else
             {
                 $line->total_ht=100;
                 $line->total_ttc=119.6;
@@ -2550,11 +2689,21 @@ 
             {
                 $obj = $this->db->fetch_object($result);
                 $this->id = $obj->rowid;
-                if ($obj->fk_user_author)   $this->user_creation_id = $obj->fk_user_author;
-                if ($obj->fk_user_valid)    $this->user_validation_id = $obj->fk_user_valid;
-                if ($obj->fk_user_modif)    $this->user_modification_id =$obj->fk_user_modif;
-                if ($obj->fk_user_approve)  $this->user_approve_id = $obj->fk_user_approve;
-                if ($obj->fk_user_approve2) $this->user_approve_id2 = $obj->fk_user_approve2;
+                if ($obj->fk_user_author) {
+                	$this->user_creation_id = $obj->fk_user_author;
+                }
+                if ($obj->fk_user_valid) {
+                	$this->user_validation_id = $obj->fk_user_valid;
+                }
+                if ($obj->fk_user_modif) {
+                	$this->user_modification_id =$obj->fk_user_modif;
+                }
+                if ($obj->fk_user_approve) {
+                	$this->user_approve_id = $obj->fk_user_approve;
+                }
+                if ($obj->fk_user_approve2) {
+                	$this->user_approve_id2 = $obj->fk_user_approve2;
+                }
 
                 $this->date_creation     = $this->db->idate($obj->datec);
                 $this->date_modification = $this->db->idate($obj->datem);
@@ -2563,8 +2712,7 @@ 
                 $this->date_validation   = $this->db->idate($obj->date_validation);
             }
             $this->db->free($result);
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -2602,8 +2750,7 @@ 
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             $this->error=$this->db->error();
@@ -2633,7 +2780,9 @@ 
         }
         $sql.= $clause." c.entity = ".$conf->entity;
         $sql.= " AND (c.fk_statut BETWEEN 1 AND 2)";
-        if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
+        if ($user->societe_id) {
+        	$sql.=" AND c.fk_soc = ".$user->societe_id;
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -2660,8 +2809,7 @@ 
             }
 
             return $response;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -2698,8 +2846,9 @@ 
                     }
                     return $string;
                 }
+            } else {
+            	dol_print_error($db);
             }
-            else dol_print_error($db);
         }
 
         return '';
@@ -2745,7 +2894,9 @@ 
      */
     public function getMaxDeliveryTimeDay($langs)
 	{
-		if (empty($this->lines)) return '';
+		if (empty($this->lines)) {
+			return '';
+		}
 
 		$obj = new ProductFournisseur($this->db);
 
@@ -2758,13 +2909,18 @@ 
 				if ($idp)
 				{
 					$obj->fetch($idp);
-					if ($obj->delivery_time_days > $nb) $nb = $obj->delivery_time_days;
+					if ($obj->delivery_time_days > $nb) {
+						$nb = $obj->delivery_time_days;
+					}
 				}
 			}
 		}
 
-		if ($nb === 0) return '';
-		else return $nb.' '.$langs->trans('Days');
+		if ($nb === 0) {
+			return '';
+		} else {
+			return $nb.' '.$langs->trans('Days');
+		}
 	}
 
 	/**
@@ -2805,7 +2961,10 @@ 
     {
         global $conf;
 
-        if (empty($this->date_delivery) && ! empty($this->date_livraison)) $this->date_delivery = $this->date_livraison;    // For backward compatibility
+        if (empty($this->date_delivery) && ! empty($this->date_livraison)) {
+        	$this->date_delivery = $this->date_livraison;
+        }
+        // For backward compatibility
 
         $now = dol_now();
         $date_to_test = empty($this->date_delivery) ? $this->date_commande : $this->date_delivery;
@@ -2822,10 +2981,16 @@ 
     {
         global $conf, $langs;
 
-        if (empty($this->date_delivery) && ! empty($this->date_livraison)) $this->date_delivery = $this->date_livraison;    // For backward compatibility
+        if (empty($this->date_delivery) && ! empty($this->date_livraison)) {
+        	$this->date_delivery = $this->date_livraison;
+        }
+        // For backward compatibility
 
-        if (empty($this->date_delivery)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
-        else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
+        if (empty($this->date_delivery)) {
+        	$text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+        } else {
+        	$text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
+        }
         $text.=' '.($conf->commande->fournisseur->warning_delay>0?'+':'-').' '.round(abs($conf->commande->fournisseur->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 
         return $text;
@@ -2862,8 +3027,7 @@ 
     		{
     			$this->error=$supplierorderdispatch->error; $this->errors=$supplierorderdispatch->errors;
     			return $ret;
-    		}
-    		else
+    		} else
     		{
     			if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines)>0)
     			{
@@ -2887,18 +3051,20 @@ 
     				var_dump($keysindeliverednotinwished);
     				exit;*/
 
-    				if (count($diff_array)==0 && count($keysinwishednotindelivered)==0 && count($keysindeliverednotinwished)==0) //No diff => mean everythings is received
+    				if (count($diff_array)==0 && count($keysinwishednotindelivered)==0 && count($keysindeliverednotinwished)==0) {
+    					//No diff => mean everythings is received
     				{
     					if ($closeopenorder)
     					{
         					//$ret=$this->setStatus($user,5);
-    						$ret = $this->Livraison($user, $date_liv, 'tot', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+    						$ret = $this->Livraison($user, $date_liv, 'tot', $comment);
+    				}
+    				// GETPOST("type") is 'tot', 'par', 'nev', 'can'
         					if ($ret<0) {
         						return -1;
         					}
     					    return 5;
-    					}
-    					else
+    					} else
     					{
     					    //Diff => received partially
     					    //$ret=$this->setStatus($user,4);
@@ -2908,8 +3074,7 @@ 
     					    }
     					    return 4;
     					}
-    				}
-    				else
+    				} else
     				{
     					//Diff => received partially
     					$ret = $this->Livraison($user, $date_liv, 'par', $comment);   // GETPOST("type") is 'tot', 'par', 'nev', 'can'
@@ -3044,8 +3209,7 @@ 
 
             $this->db->free($result);
             return 1;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             return -1;
@@ -3077,8 +3241,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -3101,23 +3264,53 @@ 
         dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
         // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type='0';
-        if (empty($this->localtax2_type)) $this->localtax2_type='0';
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise)) $this->remise=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->pa_ht)) $this->pa_ht=0;
+        if (empty($this->tva_tx)) {
+        	$this->tva_tx=0;
+        }
+        if (empty($this->localtax1_tx)) {
+        	$this->localtax1_tx=0;
+        }
+        if (empty($this->localtax2_tx)) {
+        	$this->localtax2_tx=0;
+        }
+        if (empty($this->localtax1_type)) {
+        	$this->localtax1_type='0';
+        }
+        if (empty($this->localtax2_type)) {
+        	$this->localtax2_type='0';
+        }
+        if (empty($this->total_localtax1)) {
+        	$this->total_localtax1=0;
+        }
+        if (empty($this->total_localtax2)) {
+        	$this->total_localtax2=0;
+        }
+        if (empty($this->rang)) {
+        	$this->rang=0;
+        }
+        if (empty($this->remise)) {
+        	$this->remise=0;
+        }
+        if (empty($this->remise_percent)) {
+        	$this->remise_percent=0;
+        }
+        if (empty($this->info_bits)) {
+        	$this->info_bits=0;
+        }
+        if (empty($this->special_code)) {
+        	$this->special_code=0;
+        }
+        if (empty($this->fk_parent_line)) {
+        	$this->fk_parent_line=0;
+        }
+        if (empty($this->pa_ht)) {
+        	$this->pa_ht=0;
+        }
 
         // Multicurrency
-        if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+        if (!empty($this->multicurrency_code)) {
+        	list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+        }
         if (empty($this->fk_multicurrency))
         {
             $this->multicurrency_code = $conf->currency;
@@ -3126,7 +3319,9 @@ 
         }
 
         // Check parameters
-        if ($this->product_type < 0) return -1;
+        if ($this->product_type < 0) {
+        	return -1;
+        }
 
         $this->db->begin();
 
@@ -3141,8 +3336,7 @@ 
         $sql.= " VALUES (".$this->fk_commande.", '" . $this->db->escape($this->label) . "','" . $this->db->escape($this->desc) . "',";
         $sql.= " ".($this->date_start?"'".$this->db->idate($this->date_start)."'":"null").",";
         $sql.= " ".($this->date_end?"'".$this->db->idate($this->date_end)."'":"null").",";
-        if ($this->fk_product) { $sql.= $this->fk_product.","; }
-        else { $sql.= "null,"; }
+        if ($this->fk_product) { $sql.= $this->fk_product.","; } else { $sql.= "null,"; }
         $sql.= "'".$this->db->escape($this->product_type)."',";
         $sql.= "'".$this->db->escape($this->qty)."', ";
 
@@ -3174,10 +3368,12 @@ 
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
             $this->rowid =$this->id;
 
-            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            	// For avoid conflicts if trigger used
             {
 
                 $result=$this->insertExtraFields();
+            }
                 if ($result < 0)
                 {
                     $error++;
@@ -3188,7 +3384,9 @@ 
             {
                 // Call trigger
                 $result=$this->call_trigger('LINEORDER_SUPPLIER_CREATE',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                	$error++;
+                }
                 // End call triggers
             }
 
@@ -3204,8 +3402,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->errors[]=$this->db->error();
             $this->db->rollback();
@@ -3261,10 +3458,12 @@ 
         $result = $this->db->query($sql);
         if ($result > 0)
         {
-            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            	// For avoid conflicts if trigger used
             {
 
                 $result=$this->insertExtraFields();
+            }
                 if ($result < 0)
                 {
                     $error++;
@@ -3288,14 +3487,12 @@ 
             {
                 $this->db->commit();
                 return $result;
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->db->rollback();
@@ -3328,7 +3525,9 @@ 
             {
                 // Call trigger
                 $result=$this->call_trigger('LINEORDER_SUPPLIER_DELETE',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                	$error++;
+                }
                 // End call triggers
             }
 
@@ -3345,8 +3544,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             return -1;

htdocs/fourn/class/fournisseur.facture.class.php

Doc Comments +11 added lines, -11 removed lines

@@ -1302,19 +1302,19 @@ 
      *	@param		double	$txlocaltax2		LocalTax2 Rate
      *	@param    	double	$qty             	Quantite
      *	@param    	int		$fk_product      	Id du produit/service predefini
-     *	@param    	double	$remise_percent  	Pourcentage de remise de la ligne
+     *	@param    	integer	$remise_percent  	Pourcentage de remise de la ligne
      *	@param    	date	$date_start      	Date de debut de validite du service
      * 	@param    	date	$date_end        	Date de fin de validite du service
-     * 	@param    	string	$ventil          	Code de ventilation comptable
+     * 	@param    	integer	$ventil          	Code de ventilation comptable
      *	@param    	int		$info_bits			Bits de type de lines
      *	@param    	string	$price_base_type 	HT ou TTC
      *	@param		int		$type				Type of line (0=product, 1=service)
      *  @param      int		$rang            	Position of line
      *  @param		int		$notrigger			Disable triggers
-	 *  @param		array	$array_options		extrafields array
+	 *  @param		integer	$array_options		extrafields array
      * 	@param 		string	$fk_unit 			Code of the unit to use. Null to use the default one
      *  @param      int     $origin_id          id origin document
-	 *  @param		double	$pu_ht_devise		Amount in currency
+	 *  @param		integer	$pu_ht_devise		Amount in currency
      *	@return    	int             			>0 if OK, <0 if KO
      *
      *  FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order.
@@ -1452,20 +1452,20 @@ 
      * @param     	string		$desc         		Description of line
      * @param     	double		$pu          		Prix unitaire (HT ou TTC selon price_base_type)
      * @param     	double		$vatrate       		VAT Rate
-     * @param		double		$txlocaltax1		LocalTax1 Rate
-     * @param		double		$txlocaltax2		LocalTax2 Rate
-     * @param     	double		$qty           		Quantity
+     * @param		integer		$txlocaltax1		LocalTax1 Rate
+     * @param		integer		$txlocaltax2		LocalTax2 Rate
+     * @param     	integer		$qty           		Quantity
      * @param     	int			$idproduct			Id produit
      * @param	  	double		$price_base_type	HT or TTC
      * @param	  	int			$info_bits			Miscellaneous informations of line
      * @param		int			$type				Type of line (0=product, 1=service)
-     * @param     	double		$remise_percent  	Pourcentage de remise de la ligne
+     * @param     	integer		$remise_percent  	Pourcentage de remise de la ligne
      * @param		int			$notrigger			Disable triggers
      * @param      	timestamp	$date_start     	Date start of service
      * @param      	timestamp   $date_end       	Date end of service
-	 * @param		array		$array_options		extrafields array
+	 * @param		integer		$array_options		extrafields array
      * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * @param		double		$pu_ht_devise		Amount in currency
+	 * @param		integer		$pu_ht_devise		Amount in currency
      * @return    	int           					<0 if KO, >0 if OK
      */
     public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null, $pu_ht_devise=0)
@@ -2456,7 +2456,7 @@ 
 	/**
 	 * Deletes a line
 	 *
-	 * @param     bool|int   $notrigger     1=Does not execute triggers, 0= execute triggers
+	 * @param     integer   $notrigger     1=Does not execute triggers, 0= execute triggers
 	 * @return    int                       0 if KO, 1 if OK
 	 */
 	public function delete($notrigger = 0)

Indentation +2043 added lines, -2043 removed lines

@@ -40,194 +40,194 @@ 
  */
 class FactureFournisseur extends CommonInvoice
 {
-    public $element='invoice_supplier';
-    public $table_element='facture_fourn';
-    public $table_element_line='facture_fourn_det';
-    public $fk_element='fk_facture_fourn';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto='bill';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
-
-    public $rowid;
-    public $ref;
-    public $product_ref;
-    public $ref_supplier;
-    public $socid;
-    //Check constants for types
-    public $type = self::TYPE_STANDARD;
+	public $element='invoice_supplier';
+	public $table_element='facture_fourn';
+	public $table_element_line='facture_fourn_det';
+	public $fk_element='fk_facture_fourn';
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $picto='bill';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
+
+	public $rowid;
+	public $ref;
+	public $product_ref;
+	public $ref_supplier;
+	public $socid;
+	//Check constants for types
+	public $type = self::TYPE_STANDARD;
 
 	/**
 	 * Supplier invoice status
 	 * @var int
 	 * @see FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_PAID, FactureFournisseur::STATUS_ABANDONED
 	 */
-    public $statut;
-
-    /**
-     * Set to 1 if the invoice is completely paid, otherwise is 0
-     * @var int
-     * @deprecated Use statuses stored in self::statut
-     */
-    public $paye;
-
-    public $author;
-    public $libelle;
-    public $datec;            // Creation date
-    public $tms;              // Last update date
-    public $date;             // Invoice date
-    public $date_echeance;    // Max payment date
-    public $amount;
-    public $remise;
-    public $tva;
-    public $localtax1;
-    public $localtax2;
-    public $total_ht;
-    public $total_tva;
-    public $total_localtax1;
-    public $total_localtax2;
-    public $total_ttc;
+	public $statut;
+
+	/**
+	 * Set to 1 if the invoice is completely paid, otherwise is 0
+	 * @var int
+	 * @deprecated Use statuses stored in self::statut
+	 */
+	public $paye;
+
+	public $author;
+	public $libelle;
+	public $datec;            // Creation date
+	public $tms;              // Last update date
+	public $date;             // Invoice date
+	public $date_echeance;    // Max payment date
+	public $amount;
+	public $remise;
+	public $tva;
+	public $localtax1;
+	public $localtax2;
+	public $total_ht;
+	public $total_tva;
+	public $total_localtax1;
+	public $total_localtax2;
+	public $total_ttc;
 	/**
 	 * @deprecated
 	 * @see note_private, note_public
 	 */
-    public $note;
-    public $note_private;
-    public $note_public;
-    public $propalid;
-    public $cond_reglement_id;
-    public $cond_reglement_code;
-    public $fk_account;
-    public $mode_reglement_id;
-    public $mode_reglement_code;
+	public $note;
+	public $note_private;
+	public $note_public;
+	public $propalid;
+	public $cond_reglement_id;
+	public $cond_reglement_code;
+	public $fk_account;
+	public $mode_reglement_id;
+	public $mode_reglement_code;
 
 	/**
 	 * Invoice lines
 	 * @var SupplierInvoiceLine[]
 	 */
-    public $lines = array();
+	public $lines = array();
 	/**
 	 * @deprecated
 	 */
-    public $fournisseur;
+	public $fournisseur;
 
 	//Incorterms
-    public $fk_incoterms;
-    public $location_incoterms;
-    public $libelle_incoterms;  //Used into tooltip
+	public $fk_incoterms;
+	public $location_incoterms;
+	public $libelle_incoterms;  //Used into tooltip
 
-    public $extraparams=array();
+	public $extraparams=array();
 
 	// Multicurrency
-    public $fk_multicurrency;
-    public $multicurrency_code;
-    public $multicurrency_tx;
-    public $multicurrency_total_ht;
-    public $multicurrency_total_tva;
-    public $multicurrency_total_ttc;
-    //! id of source invoice if replacement invoice or credit note
-    public $fk_facture_source;
-
-    /**
-     * Standard invoice
-     */
-    const TYPE_STANDARD = 0;
-
-    /**
-     * Replacement invoice
-     */
-    const TYPE_REPLACEMENT = 1;
-
-    /**
-     * Credit note invoice
-     */
-    const TYPE_CREDIT_NOTE = 2;
-
-    /**
-     * Deposit invoice
-     */
-    const TYPE_DEPOSIT = 3;
-
-    /**
-     * Draft
-     */
-    const STATUS_DRAFT = 0;
-
-    /**
-     * Validated (need to be paid)
-     */
-    const STATUS_VALIDATED = 1;
-
-    /**
-     * Classified paid.
-     * If paid partially, $this->close_code can be:
-     * - CLOSECODE_DISCOUNTVAT
-     * - CLOSECODE_BADDEBT
-     * If paid completelly, this->close_code will be null
-     */
-    const STATUS_CLOSED = 2;
-
-    /**
-     * Classified abandoned and no payment done.
-     * $this->close_code can be:
-     * - CLOSECODE_BADDEBT
-     * - CLOSECODE_ABANDONED
-     * - CLOSECODE_REPLACED
-     */
-    const STATUS_ABANDONED = 3;
+	public $fk_multicurrency;
+	public $multicurrency_code;
+	public $multicurrency_tx;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
+	//! id of source invoice if replacement invoice or credit note
+	public $fk_facture_source;
+
+	/**
+	 * Standard invoice
+	 */
+	const TYPE_STANDARD = 0;
+
+	/**
+	 * Replacement invoice
+	 */
+	const TYPE_REPLACEMENT = 1;
+
+	/**
+	 * Credit note invoice
+	 */
+	const TYPE_CREDIT_NOTE = 2;
+
+	/**
+	 * Deposit invoice
+	 */
+	const TYPE_DEPOSIT = 3;
+
+	/**
+	 * Draft
+	 */
+	const STATUS_DRAFT = 0;
+
+	/**
+	 * Validated (need to be paid)
+	 */
+	const STATUS_VALIDATED = 1;
+
+	/**
+	 * Classified paid.
+	 * If paid partially, $this->close_code can be:
+	 * - CLOSECODE_DISCOUNTVAT
+	 * - CLOSECODE_BADDEBT
+	 * If paid completelly, this->close_code will be null
+	 */
+	const STATUS_CLOSED = 2;
+
+	/**
+	 * Classified abandoned and no payment done.
+	 * $this->close_code can be:
+	 * - CLOSECODE_BADDEBT
+	 * - CLOSECODE_ABANDONED
+	 * - CLOSECODE_REPLACED
+	 */
+	const STATUS_ABANDONED = 3;
 
 	const CLOSECODE_DISCOUNTVAT = 'discount_vat';
 	const CLOSECODE_BADCREDIT = 'badsupplier';
 	const CLOSECODE_ABANDONED = 'abandon';
 	const CLOSECODE_REPLACED = 'replaced';
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->amount = 0;
-        $this->remise = 0;
-        $this->tva = 0;
-        $this->total_localtax1 = 0;
-        $this->total_localtax2 = 0;
-        $this->total_ht = 0;
-        $this->total_tva = 0;
-        $this->total_ttc = 0;
-        $this->propalid = 0;
-
-        $this->products = array();
-    }
-
-    /**
-     *    Create supplier invoice into database
-     *
-     *    @param      User		$user       object utilisateur qui cree
-     *    @return     int    	     		Id invoice created if OK, < 0 if KO
-     */
-    public function create($user)
-    {
-        global $langs,$conf,$hookmanager;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+		$this->amount = 0;
+		$this->remise = 0;
+		$this->tva = 0;
+		$this->total_localtax1 = 0;
+		$this->total_localtax2 = 0;
+		$this->total_ht = 0;
+		$this->total_tva = 0;
+		$this->total_ttc = 0;
+		$this->propalid = 0;
+
+		$this->products = array();
+	}
+
+	/**
+	 *    Create supplier invoice into database
+	 *
+	 *    @param      User		$user       object utilisateur qui cree
+	 *    @return     int    	     		Id invoice created if OK, < 0 if KO
+	 */
+	public function create($user)
+	{
+		global $langs,$conf,$hookmanager;
 
 		$error=0;
-        $now=dol_now();
+		$now=dol_now();
 
-        // Clean parameters
-        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-        if (empty($this->type)) $this->type = self::TYPE_STANDARD;
-        if (empty($this->date)) $this->date=$now;
+		// Clean parameters
+		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
+		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
+		if (empty($this->date)) $this->date=$now;
 
-        $socid = $this->socid;
-        $ref_supplier = $this->ref_supplier;
-        $amount = $this->amount;
-        $remise = $this->remise;
+		$socid = $this->socid;
+		$ref_supplier = $this->ref_supplier;
+		$amount = $this->amount;
+		$remise = $this->remise;
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
 		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
@@ -239,166 +239,166 @@ 
 			$this->multicurrency_tx = 1;
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        if (! $remise) $remise = 0 ;
-        $totalht = ($amount - $remise);
+		if (! $remise) $remise = 0 ;
+		$totalht = ($amount - $remise);
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (";
 		$sql.= "ref";
-        $sql.= ", ref_supplier";
-        $sql.= ", entity";
-        $sql.= ", type";
-        $sql.= ", libelle";
-        $sql.= ", fk_soc";
-        $sql.= ", datec";
-        $sql.= ", datef";
+		$sql.= ", ref_supplier";
+		$sql.= ", entity";
+		$sql.= ", type";
+		$sql.= ", libelle";
+		$sql.= ", fk_soc";
+		$sql.= ", datec";
+		$sql.= ", datef";
 		$sql.= ", fk_projet";
 		$sql.= ", fk_cond_reglement";
 		$sql.= ", fk_mode_reglement";
-        $sql.= ", fk_account";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", fk_user_author";
-        $sql.= ", date_lim_reglement";
+		$sql.= ", fk_account";
+		$sql.= ", note_private";
+		$sql.= ", note_public";
+		$sql.= ", fk_user_author";
+		$sql.= ", date_lim_reglement";
 		$sql.= ", fk_incoterms, location_incoterms";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ", fk_facture_source";
-        $sql.= ")";
-        $sql.= " VALUES (";
+		$sql.= ", fk_multicurrency";
+		$sql.= ", multicurrency_code";
+		$sql.= ", multicurrency_tx";
+		$sql.= ", fk_facture_source";
+		$sql.= ")";
+		$sql.= " VALUES (";
 		$sql.= "'(PROV)'";
-        $sql.= ", '".$this->db->escape($this->ref_supplier)."'";
-        $sql.= ", ".$conf->entity;
-        $sql.= ", '".$this->db->escape($this->type)."'";
-        $sql.= ", '".$this->db->escape($this->libelle)."'";
-        $sql.= ", ".$this->socid;
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ", '".$this->db->idate($this->date)."'";
+		$sql.= ", '".$this->db->escape($this->ref_supplier)."'";
+		$sql.= ", ".$conf->entity;
+		$sql.= ", '".$this->db->escape($this->type)."'";
+		$sql.= ", '".$this->db->escape($this->libelle)."'";
+		$sql.= ", ".$this->socid;
+		$sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ", '".$this->db->idate($this->date)."'";
 		$sql.= ", ".(isset($this->fk_project)?$this->fk_project:"null");
 		$sql.= ", ".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null");
 		$sql.= ", ".(isset($this->mode_reglement_id)?$this->mode_reglement_id:"null");
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", ".$user->id.",";
-        $sql.= $this->date_echeance!=''?"'".$this->db->idate($this->date_echeance)."'":"null";
+		$sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
+		$sql.= ", '".$this->db->escape($this->note_private)."'";
+		$sql.= ", '".$this->db->escape($this->note_public)."'";
+		$sql.= ", ".$user->id.",";
+		$sql.= $this->date_echeance!=''?"'".$this->db->idate($this->date_echeance)."'":"null";
 		$sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ", ".(isset($this->fk_facture_source)?$this->fk_facture_source:"NULL");
-        $sql.= ")";
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn');
-
-            // Update ref with new one
-            $this->ref='(PROV'.$this->id.')';
-            $sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
-
-            dol_syslog(get_class($this)."::create", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (! $resql) $error++;
-
-            // Add object linked
-            if (! $error && $this->id && ! empty($this->origin) && ! empty($this->origin_id))
-            {
-                $ret = $this->add_object_linked();
-                if (! $ret)
-                {
-                    dol_print_error($this->db);
-                    $error++;
-                }
-            }
+		$sql.= ", ".(isset($this->fk_facture_source)?$this->fk_facture_source:"NULL");
+		$sql.= ")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn');
+
+			// Update ref with new one
+			$this->ref='(PROV'.$this->id.')';
+			$sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
+
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (! $resql) $error++;
+
+			// Add object linked
+			if (! $error && $this->id && ! empty($this->origin) && ! empty($this->origin_id))
+			{
+				$ret = $this->add_object_linked();
+				if (! $ret)
+				{
+					dol_print_error($this->db);
+					$error++;
+				}
+			}
 
 			if (count($this->lines) && is_object($this->lines[0]))	// If this->lines is array of InvoiceLines (preferred mode)
 			{
-                dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
-                foreach ($this->lines as $i => $val)
-                {
-                    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
-                    $sql .= ' VALUES ('.$this->id.')';
-
-                    $resql_insert=$this->db->query($sql);
-                    if ($resql_insert)
-                    {
-                        $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
-
-                        $this->updateline(
-                            $idligne,
-                            $this->lines[$i]->description,
-                            $this->lines[$i]->pu_ht,
-                            $this->lines[$i]->tva_tx,
-                            $this->lines[$i]->localtax1_tx,
-                            $this->lines[$i]->localtax2_tx,
-                            $this->lines[$i]->qty,
-                            $this->lines[$i]->fk_product,
-                            'HT',
-                            (! empty($this->lines[$i]->info_bits)?$this->lines[$i]->info_bits:''),
-                            $this->lines[$i]->product_type
-                        );
-                    }
-                    else
-                    {
-                        $this->error=$this->db->lasterror();
-                        $this->db->rollback();
-                        return -5;
-                    }
-                }
+				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
+				foreach ($this->lines as $i => $val)
+				{
+					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
+					$sql .= ' VALUES ('.$this->id.')';
+
+					$resql_insert=$this->db->query($sql);
+					if ($resql_insert)
+					{
+						$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
+
+						$this->updateline(
+							$idligne,
+							$this->lines[$i]->description,
+							$this->lines[$i]->pu_ht,
+							$this->lines[$i]->tva_tx,
+							$this->lines[$i]->localtax1_tx,
+							$this->lines[$i]->localtax2_tx,
+							$this->lines[$i]->qty,
+							$this->lines[$i]->fk_product,
+							'HT',
+							(! empty($this->lines[$i]->info_bits)?$this->lines[$i]->info_bits:''),
+							$this->lines[$i]->product_type
+						);
+					}
+					else
+					{
+						$this->error=$this->db->lasterror();
+						$this->db->rollback();
+						return -5;
+					}
+				}
 			}
 			else	// If this->lines is an array of invoice line arrays
 			{
-			    dol_syslog("There is ".count($this->lines)." lines that are array lines");
-			    foreach ($this->lines as $i => $val)
-			    {
-                	$line = $this->lines[$i];
-
-                	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
-                	if (! is_object($line)) $line = (object) $line;
-
-                	$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
-			        $sql .= ' VALUES ('.$this->id.')';
-
-			        $resql_insert=$this->db->query($sql);
-			        if ($resql_insert)
-			        {
-			            $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
-
-			            $this->updateline(
-			                $idligne,
-			                $line->description,
-			                $line->pu_ht,
-			                $line->tva_tx,
-			                $line->localtax1_tx,
-			                $line->localtax2_tx,
-			                $line->qty,
-			                $line->fk_product,
-			                'HT',
-			                (! empty($line->info_bits)?$line->info_bits:''),
-			                $line->product_type
-			                );
-			        }
-			        else
-			        {
-			            $this->error=$this->db->lasterror();
-			            $this->db->rollback();
-			            return -5;
-			        }
-			    }
+				dol_syslog("There is ".count($this->lines)." lines that are array lines");
+				foreach ($this->lines as $i => $val)
+				{
+					$line = $this->lines[$i];
+
+					// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+					//if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
+					if (! is_object($line)) $line = (object) $line;
+
+					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
+					$sql .= ' VALUES ('.$this->id.')';
+
+					$resql_insert=$this->db->query($sql);
+					if ($resql_insert)
+					{
+						$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
+
+						$this->updateline(
+							$idligne,
+							$line->description,
+							$line->pu_ht,
+							$line->tva_tx,
+							$line->localtax1_tx,
+							$line->localtax2_tx,
+							$line->qty,
+							$line->fk_product,
+							'HT',
+							(! empty($line->info_bits)?$line->info_bits:''),
+							$line->product_type
+							);
+					}
+					else
+					{
+						$this->error=$this->db->lasterror();
+						$this->db->rollback();
+						return -5;
+					}
+				}
 			}
 
-            // Update total price
-            $result=$this->update_price();
-            if ($result > 0)
-            {
-            	$action='create';
+			// Update total price
+			$result=$this->update_price();
+			if ($result > 0)
+			{
+				$action='create';
 
 				// Actions on extra fields (by external module or standard code)
 				// TODO le hook fait double emploi avec le trigger !!
@@ -407,7 +407,7 @@ 
 				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
-	            	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 					{
 						$result=$this->insertExtraFields();               // This also set $this->error or $this->errors if errors are found
 						if ($result < 0)
@@ -420,164 +420,164 @@ 
 
 				if (! $error)
 				{
-                    // Call trigger
-                    $result=$this->call_trigger('BILL_SUPPLIER_CREATE',$user);
-                    if ($result < 0) $error++;
-                    // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('BILL_SUPPLIER_CREATE',$user);
+					if ($result < 0) $error++;
+					// End call triggers
+				}
+
+				if (! $error)
+				{
+					$this->db->commit();
+					return $this->id;
+				}
+				else
+				{
+					$this->db->rollback();
+					return -4;
 				}
+			}
+			else
+			{
+				$this->error=$langs->trans('FailedToUpdatePrice');
+				$this->db->rollback();
+				return -3;
+			}
+		}
+		else
+		{
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$this->error=$langs->trans('ErrorRefAlreadyExists');
+				$this->db->rollback();
+				return -1;
+			}
+			else
+			{
+				$this->error=$this->db->lasterror();
+				$this->db->rollback();
+				return -2;
+			}
+		}
+	}
 
-                if (! $error)
-                {
-                    $this->db->commit();
-                    return $this->id;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -4;
-                }
-            }
-            else
-            {
-                $this->error=$langs->trans('FailedToUpdatePrice');
-                $this->db->rollback();
-                return -3;
-            }
-        }
-        else
-        {
-            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-            {
-                $this->error=$langs->trans('ErrorRefAlreadyExists');
-                $this->db->rollback();
-                return -1;
-            }
-            else
-            {
-                $this->error=$this->db->lasterror();
-                $this->db->rollback();
-                return -2;
-            }
-        }
-    }
-
-    /**
-     *    Load object in memory from database
-     *
-     *    @param	int		$id         Id supplier invoice
-     *    @param	string	$ref		Ref supplier invoice
-     *    @return   int        			<0 if KO, >0 if OK, 0 if not found
-     */
-    public function fetch($id='',$ref='')
-    {
-        global $langs;
-
-        $sql = "SELECT";
-        $sql.= " t.rowid,";
+	/**
+	 *    Load object in memory from database
+	 *
+	 *    @param	int		$id         Id supplier invoice
+	 *    @param	string	$ref		Ref supplier invoice
+	 *    @return   int        			<0 if KO, >0 if OK, 0 if not found
+	 */
+	public function fetch($id='',$ref='')
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
 		$sql.= " t.ref,";
-        $sql.= " t.ref_supplier,";
-        $sql.= " t.entity,";
-        $sql.= " t.type,";
-        $sql.= " t.fk_soc,";
-        $sql.= " t.datec,";
-        $sql.= " t.datef,";
-        $sql.= " t.tms,";
-        $sql.= " t.libelle,";
-        $sql.= " t.paye,";
-        $sql.= " t.amount,";
-        $sql.= " t.remise,";
-        $sql.= " t.close_code,";
-        $sql.= " t.close_note,";
-        $sql.= " t.tva,";
-        $sql.= " t.localtax1,";
-        $sql.= " t.localtax2,";
-        //$sql.= " t.total,";
-        $sql.= " t.total_ht,";
-        $sql.= " t.total_tva,";
-        $sql.= " t.total_ttc,";
-        $sql.= " t.fk_statut,";
-        $sql.= " t.fk_user_author,";
-        $sql.= " t.fk_user_valid,";
-        $sql.= " t.fk_facture_source,";
-        $sql.= " t.fk_projet,";
-        $sql.= " t.fk_cond_reglement,";
-        $sql.= " t.fk_account,";
-        $sql.= " t.fk_mode_reglement,";
-        $sql.= " t.date_lim_reglement,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
-        $sql.= " t.model_pdf,";
-        $sql.= " t.import_key,";
-        $sql.= " t.extraparams,";
-        $sql.= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
-        $sql.= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle,";
-        $sql.= ' s.nom as socnom, s.rowid as socid,';
-        $sql.= ' t.fk_incoterms, t.location_incoterms,';
-        $sql.= " i.libelle as libelle_incoterms,";
-        $sql.= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (t.fk_cond_reglement = cr.rowid AND cr.entity = " . getEntity('c_payment_term') . ")";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON (t.fk_mode_reglement = p.id AND p.entity = " . getEntity('c_paiement') . ")";
+		$sql.= " t.ref_supplier,";
+		$sql.= " t.entity,";
+		$sql.= " t.type,";
+		$sql.= " t.fk_soc,";
+		$sql.= " t.datec,";
+		$sql.= " t.datef,";
+		$sql.= " t.tms,";
+		$sql.= " t.libelle,";
+		$sql.= " t.paye,";
+		$sql.= " t.amount,";
+		$sql.= " t.remise,";
+		$sql.= " t.close_code,";
+		$sql.= " t.close_note,";
+		$sql.= " t.tva,";
+		$sql.= " t.localtax1,";
+		$sql.= " t.localtax2,";
+		//$sql.= " t.total,";
+		$sql.= " t.total_ht,";
+		$sql.= " t.total_tva,";
+		$sql.= " t.total_ttc,";
+		$sql.= " t.fk_statut,";
+		$sql.= " t.fk_user_author,";
+		$sql.= " t.fk_user_valid,";
+		$sql.= " t.fk_facture_source,";
+		$sql.= " t.fk_projet,";
+		$sql.= " t.fk_cond_reglement,";
+		$sql.= " t.fk_account,";
+		$sql.= " t.fk_mode_reglement,";
+		$sql.= " t.date_lim_reglement,";
+		$sql.= " t.note_private,";
+		$sql.= " t.note_public,";
+		$sql.= " t.model_pdf,";
+		$sql.= " t.import_key,";
+		$sql.= " t.extraparams,";
+		$sql.= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
+		$sql.= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle,";
+		$sql.= ' s.nom as socnom, s.rowid as socid,';
+		$sql.= ' t.fk_incoterms, t.location_incoterms,';
+		$sql.= " i.libelle as libelle_incoterms,";
+		$sql.= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (t.fk_cond_reglement = cr.rowid AND cr.entity = " . getEntity('c_payment_term') . ")";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON (t.fk_mode_reglement = p.id AND p.entity = " . getEntity('c_paiement') . ")";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
-        if ($id)  $sql.= " WHERE t.rowid=".$id;
-        if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id					= $obj->rowid;
-                $this->ref					= $obj->ref?$obj->ref:$obj->rowid;	// We take rowid if ref is empty for backward compatibility
-
-                $this->ref_supplier			= $obj->ref_supplier;
-                $this->entity				= $obj->entity;
-                $this->type					= empty($obj->type)? self::TYPE_STANDARD:$obj->type;
-                $this->fk_soc				= $obj->fk_soc;
-                $this->datec				= $this->db->jdate($obj->datec);
-                $this->date					= $this->db->jdate($obj->datef);
-                $this->datep				= $this->db->jdate($obj->datef);
-                $this->tms					= $this->db->jdate($obj->tms);
-                $this->libelle				= $obj->libelle;
-                $this->label				= $obj->libelle;
-                $this->paye					= $obj->paye;
-                $this->amount				= $obj->amount;
-                $this->remise				= $obj->remise;
-                $this->close_code			= $obj->close_code;
-                $this->close_note			= $obj->close_note;
-                $this->tva					= $obj->tva;
-                $this->total_localtax1		= $obj->localtax1;
-                $this->total_localtax2		= $obj->localtax2;
-                //$this->total				= $obj->total;
-                $this->total_ht				= $obj->total_ht;
-                $this->total_tva			= $obj->total_tva;
-                $this->total_ttc			= $obj->total_ttc;
-                $this->fk_statut			= $obj->fk_statut;
-                $this->statut				= $obj->fk_statut;
-                $this->fk_user_author		= $obj->fk_user_author;
-                $this->author				= $obj->fk_user_author;
-                $this->fk_user_valid		= $obj->fk_user_valid;
-                $this->fk_facture_source	= $obj->fk_facture_source;
-                $this->fk_project			= $obj->fk_projet;
-	            $this->cond_reglement_id	= $obj->fk_cond_reglement;
-	            $this->cond_reglement_code	= $obj->cond_reglement_code;
-	            $this->cond_reglement		= $obj->cond_reglement_libelle;
-	            $this->cond_reglement_doc	= $obj->cond_reglement_libelle;
-                $this->fk_account           = $obj->fk_account;
-	            $this->mode_reglement_id	= $obj->fk_mode_reglement;
-	            $this->mode_reglement_code	= $obj->mode_reglement_code;
-	            $this->mode_reglement		= $obj->mode_reglement_libelle;
-                $this->date_echeance		= $this->db->jdate($obj->date_lim_reglement);
-                $this->note					= $obj->note_private;	// deprecated
-                $this->note_private			= $obj->note_private;
-                $this->note_public			= $obj->note_public;
-                $this->model_pdf			= $obj->model_pdf;
-                $this->modelpdf			    = $obj->model_pdf;
-                $this->import_key			= $obj->import_key;
+		if ($id)  $sql.= " WHERE t.rowid=".$id;
+		if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id					= $obj->rowid;
+				$this->ref					= $obj->ref?$obj->ref:$obj->rowid;	// We take rowid if ref is empty for backward compatibility
+
+				$this->ref_supplier			= $obj->ref_supplier;
+				$this->entity				= $obj->entity;
+				$this->type					= empty($obj->type)? self::TYPE_STANDARD:$obj->type;
+				$this->fk_soc				= $obj->fk_soc;
+				$this->datec				= $this->db->jdate($obj->datec);
+				$this->date					= $this->db->jdate($obj->datef);
+				$this->datep				= $this->db->jdate($obj->datef);
+				$this->tms					= $this->db->jdate($obj->tms);
+				$this->libelle				= $obj->libelle;
+				$this->label				= $obj->libelle;
+				$this->paye					= $obj->paye;
+				$this->amount				= $obj->amount;
+				$this->remise				= $obj->remise;
+				$this->close_code			= $obj->close_code;
+				$this->close_note			= $obj->close_note;
+				$this->tva					= $obj->tva;
+				$this->total_localtax1		= $obj->localtax1;
+				$this->total_localtax2		= $obj->localtax2;
+				//$this->total				= $obj->total;
+				$this->total_ht				= $obj->total_ht;
+				$this->total_tva			= $obj->total_tva;
+				$this->total_ttc			= $obj->total_ttc;
+				$this->fk_statut			= $obj->fk_statut;
+				$this->statut				= $obj->fk_statut;
+				$this->fk_user_author		= $obj->fk_user_author;
+				$this->author				= $obj->fk_user_author;
+				$this->fk_user_valid		= $obj->fk_user_valid;
+				$this->fk_facture_source	= $obj->fk_facture_source;
+				$this->fk_project			= $obj->fk_projet;
+				$this->cond_reglement_id	= $obj->fk_cond_reglement;
+				$this->cond_reglement_code	= $obj->cond_reglement_code;
+				$this->cond_reglement		= $obj->cond_reglement_libelle;
+				$this->cond_reglement_doc	= $obj->cond_reglement_libelle;
+				$this->fk_account           = $obj->fk_account;
+				$this->mode_reglement_id	= $obj->fk_mode_reglement;
+				$this->mode_reglement_code	= $obj->mode_reglement_code;
+				$this->mode_reglement		= $obj->mode_reglement_libelle;
+				$this->date_echeance		= $this->db->jdate($obj->date_lim_reglement);
+				$this->note					= $obj->note_private;	// deprecated
+				$this->note_private			= $obj->note_private;
+				$this->note_public			= $obj->note_public;
+				$this->model_pdf			= $obj->model_pdf;
+				$this->modelpdf			    = $obj->model_pdf;
+				$this->import_key			= $obj->import_key;
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -592,114 +592,114 @@ 
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-                $this->extraparams			= (array) json_decode($obj->extraparams, true);
-
-                $this->socid  = $obj->socid;
-                $this->socnom = $obj->socnom;
-
-                // Retreive all extrafield
-                // fetch optionals attributes and labels
-                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
-
-                if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
-
-                $result=$this->fetch_lines();
-                if ($result < 0)
-                {
-                    $this->error=$this->db->lasterror();
-                    return -3;
-                }
-
-            }
-            else
-            {
-                $this->error='Bill with id '.$id.' not found';
-                dol_syslog(get_class($this).'::fetch '.$this->error);
-                return 0;
-            }
-
-            $this->db->free($resql);
-            return 1;
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Load this->lines
-     *
-     *	@return     int         1 si ok, < 0 si erreur
-     */
-    function fetch_lines()
-    {
-        $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
-        $sql.= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
-        $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
-        $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
+				$this->extraparams			= (array) json_decode($obj->extraparams, true);
+
+				$this->socid  = $obj->socid;
+				$this->socnom = $obj->socnom;
+
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+				$extrafields=new ExtraFields($this->db);
+				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+				$this->fetch_optionals($this->id,$extralabels);
+
+				if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+
+				$result=$this->fetch_lines();
+				if ($result < 0)
+				{
+					$this->error=$this->db->lasterror();
+					return -3;
+				}
+
+			}
+			else
+			{
+				$this->error='Bill with id '.$id.' not found';
+				dol_syslog(get_class($this).'::fetch '.$this->error);
+				return 0;
+			}
+
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Load this->lines
+	 *
+	 *	@return     int         1 si ok, < 0 si erreur
+	 */
+	function fetch_lines()
+	{
+		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
+		$sql.= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
+		$sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
+		$sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
 		$sql.= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
-        $sql.= ' WHERE fk_facture_fourn='.$this->id;
-        $sql.= ' ORDER BY f.rang, f.rowid';
-
-
-        dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
-        $resql_rows = $this->db->query($sql);
-        if ($resql_rows)
-        {
-            $num_rows = $this->db->num_rows($resql_rows);
-            if ($num_rows)
-            {
-                $i = 0;
-                while ($i < $num_rows)
-                {
-                    $obj = $this->db->fetch_object($resql_rows);
-
-	                $line = new SupplierInvoiceLine($this->db);
-
-                    $line->id				= $obj->rowid;
-                    $line->rowid			= $obj->rowid;
-                    $line->description		= $obj->description;
-                    $line->product_ref		= $obj->product_ref;
-                    $line->ref				= $obj->product_ref;
-                    $line->ref_supplier		= $obj->ref_supplier;
-                    $line->libelle			= $obj->label;
-                    $line->label  			= $obj->label;
-                    $line->product_desc		= $obj->product_desc;
-                    $line->subprice			= $obj->pu_ht;
-                    $line->pu_ht			= $obj->pu_ht;
-                    $line->pu_ttc			= $obj->pu_ttc;
-
-                    $line->vat_src_code     = $obj->vat_src_code;
-                    $line->tva_tx			= $obj->tva_tx;
-                    $line->localtax1_tx		= $obj->localtax1_tx;
-                    $line->localtax2_tx		= $obj->localtax2_tx;
-                    $line->localtax1_type	= $obj->localtax1_type;
-                    $line->localtax2_type	= $obj->localtax2_type;
-                    $line->qty				= $obj->qty;
-                    $line->remise_percent   = $obj->remise_percent;
-                    $line->tva				= $obj->total_tva;
-                    $line->total_ht			= $obj->total_ht;
-                    $line->total_tva		= $obj->total_tva;
-                    $line->total_localtax1	= $obj->total_localtax1;
-                    $line->total_localtax2	= $obj->total_localtax2;
-                    $line->fk_facture_fourn     = $obj->fk_facture_fourn;
-                    $line->total_ttc		= $obj->total_ttc;
-                    $line->fk_product		= $obj->fk_product;
-                    $line->product_type		= $obj->product_type;
-                    $line->product_label	= $obj->label;
-                    $line->info_bits		= $obj->info_bits;
-                    $line->fk_parent_line   = $obj->fk_parent_line;
-                    $line->special_code		= $obj->special_code;
-                    $line->rang       		= $obj->rang;
-                    $line->fk_unit          = $obj->fk_unit;
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
+		$sql.= ' WHERE fk_facture_fourn='.$this->id;
+		$sql.= ' ORDER BY f.rang, f.rowid';
+
+
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+		$resql_rows = $this->db->query($sql);
+		if ($resql_rows)
+		{
+			$num_rows = $this->db->num_rows($resql_rows);
+			if ($num_rows)
+			{
+				$i = 0;
+				while ($i < $num_rows)
+				{
+					$obj = $this->db->fetch_object($resql_rows);
+
+					$line = new SupplierInvoiceLine($this->db);
+
+					$line->id				= $obj->rowid;
+					$line->rowid			= $obj->rowid;
+					$line->description		= $obj->description;
+					$line->product_ref		= $obj->product_ref;
+					$line->ref				= $obj->product_ref;
+					$line->ref_supplier		= $obj->ref_supplier;
+					$line->libelle			= $obj->label;
+					$line->label  			= $obj->label;
+					$line->product_desc		= $obj->product_desc;
+					$line->subprice			= $obj->pu_ht;
+					$line->pu_ht			= $obj->pu_ht;
+					$line->pu_ttc			= $obj->pu_ttc;
+
+					$line->vat_src_code     = $obj->vat_src_code;
+					$line->tva_tx			= $obj->tva_tx;
+					$line->localtax1_tx		= $obj->localtax1_tx;
+					$line->localtax2_tx		= $obj->localtax2_tx;
+					$line->localtax1_type	= $obj->localtax1_type;
+					$line->localtax2_type	= $obj->localtax2_type;
+					$line->qty				= $obj->qty;
+					$line->remise_percent   = $obj->remise_percent;
+					$line->tva				= $obj->total_tva;
+					$line->total_ht			= $obj->total_ht;
+					$line->total_tva		= $obj->total_tva;
+					$line->total_localtax1	= $obj->total_localtax1;
+					$line->total_localtax2	= $obj->total_localtax2;
+					$line->fk_facture_fourn     = $obj->fk_facture_fourn;
+					$line->total_ttc		= $obj->total_ttc;
+					$line->fk_product		= $obj->fk_product;
+					$line->product_type		= $obj->product_type;
+					$line->product_label	= $obj->label;
+					$line->info_bits		= $obj->info_bits;
+					$line->fk_parent_line   = $obj->fk_parent_line;
+					$line->special_code		= $obj->special_code;
+					$line->rang       		= $obj->rang;
+					$line->fk_unit          = $obj->fk_unit;
 
 					// Multicurrency
 					$line->fk_multicurrency 		= $obj->fk_multicurrency;
@@ -709,201 +709,201 @@ 
 					$line->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 					$line->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-	                $this->lines[$i] = $line;
-
-                    $i++;
-                }
-            }
-            $this->db->free($resql_rows);
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -3;
-        }
-    }
-
-
-    /**
-     *  Update database
-     *
-     *  @param	User	$user            User that modify
-     *  @param  int		$notrigger       0=launch triggers after, 1=disable triggers
-     *  @return int 			         <0 if KO, >0 if OK
-     */
-    public function update($user=null, $notrigger=0)
-    {
-        global $conf, $langs;
-        $error=0;
-
-        // Clean parameters
-        if (empty($this->type)) $this->type= self::TYPE_STANDARD;
+					$this->lines[$i] = $line;
+
+					$i++;
+				}
+			}
+			$this->db->free($resql_rows);
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -3;
+		}
+	}
+
+
+	/**
+	 *  Update database
+	 *
+	 *  @param	User	$user            User that modify
+	 *  @param  int		$notrigger       0=launch triggers after, 1=disable triggers
+	 *  @return int 			         <0 if KO, >0 if OK
+	 */
+	public function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (empty($this->type)) $this->type= self::TYPE_STANDARD;
 		if (isset($this->ref)) $this->ref=trim($this->ref);
-        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-        if (isset($this->entity)) $this->entity=trim($this->entity);
-        if (isset($this->type)) $this->type=trim($this->type);
-        if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
-        if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-        if (isset($this->paye)) $this->paye=trim($this->paye);
-        if (isset($this->amount)) $this->amount=trim($this->amount);
-        if (isset($this->remise)) $this->remise=trim($this->remise);
-        if (isset($this->close_code)) $this->close_code=trim($this->close_code);
-        if (isset($this->close_note)) $this->close_note=trim($this->close_note);
-        if (isset($this->tva)) $this->tva=trim($this->tva);
-        if (isset($this->localtax1)) $this->localtax1=trim($this->localtax1);
-        if (isset($this->localtax2)) $this->localtax2=trim($this->localtax2);
-        if (empty($this->total_ht)) $this->total_ht=0;
-        if (empty($this->total_tva)) $this->total_tva=0;
-        //	if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1);
-        //	if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2);
-        if (isset($this->total_ttc)) $this->total_ttc=trim($this->total_ttc);
-        if (isset($this->statut)) $this->statut=(int) $this->statut;
-        if (isset($this->author)) $this->author=trim($this->author);
-        if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-        if (isset($this->fk_facture_source)) $this->fk_facture_source=trim($this->fk_facture_source);
-        if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
-        if (isset($this->cond_reglement_id)) $this->cond_reglement_id=trim($this->cond_reglement_id);
-        if (isset($this->note_private)) $this->note=trim($this->note_private);
-        if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-        if (isset($this->model_pdf)) $this->model_pdf=trim($this->model_pdf);
-        if (isset($this->import_key)) $this->import_key=trim($this->import_key);
-
-
-        // Check parameters
-        // Put here code to add control on parameters values
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn SET";
+		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
+		if (isset($this->entity)) $this->entity=trim($this->entity);
+		if (isset($this->type)) $this->type=trim($this->type);
+		if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
+		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
+		if (isset($this->paye)) $this->paye=trim($this->paye);
+		if (isset($this->amount)) $this->amount=trim($this->amount);
+		if (isset($this->remise)) $this->remise=trim($this->remise);
+		if (isset($this->close_code)) $this->close_code=trim($this->close_code);
+		if (isset($this->close_note)) $this->close_note=trim($this->close_note);
+		if (isset($this->tva)) $this->tva=trim($this->tva);
+		if (isset($this->localtax1)) $this->localtax1=trim($this->localtax1);
+		if (isset($this->localtax2)) $this->localtax2=trim($this->localtax2);
+		if (empty($this->total_ht)) $this->total_ht=0;
+		if (empty($this->total_tva)) $this->total_tva=0;
+		//	if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1);
+		//	if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2);
+		if (isset($this->total_ttc)) $this->total_ttc=trim($this->total_ttc);
+		if (isset($this->statut)) $this->statut=(int) $this->statut;
+		if (isset($this->author)) $this->author=trim($this->author);
+		if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
+		if (isset($this->fk_facture_source)) $this->fk_facture_source=trim($this->fk_facture_source);
+		if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
+		if (isset($this->cond_reglement_id)) $this->cond_reglement_id=trim($this->cond_reglement_id);
+		if (isset($this->note_private)) $this->note=trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
+		if (isset($this->model_pdf)) $this->model_pdf=trim($this->model_pdf);
+		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn SET";
 		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-        $sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
-        $sql.= " entity=".(isset($this->entity)?$this->entity:"null").",";
-        $sql.= " type=".(isset($this->type)?$this->type:"null").",";
-        $sql.= " fk_soc=".(isset($this->fk_soc)?$this->fk_soc:"null").",";
-        $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
-        $sql.= " datef=".(dol_strlen($this->date)!=0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
-        if (dol_strlen($this->tms) != 0) $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-        $sql.= " libelle=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " paye=".(isset($this->paye)?$this->paye:"null").",";
-        $sql.= " amount=".(isset($this->amount)?$this->amount:"null").",";
-        $sql.= " remise=".(isset($this->remise)?$this->remise:"null").",";
-        $sql.= " close_code=".(isset($this->close_code)?"'".$this->db->escape($this->close_code)."'":"null").",";
-        $sql.= " close_note=".(isset($this->close_note)?"'".$this->db->escape($this->close_note)."'":"null").",";
-        $sql.= " tva=".(isset($this->tva)?$this->tva:"null").",";
-        $sql.= " localtax1=".(isset($this->localtax1)?$this->localtax1:"null").",";
-        $sql.= " localtax2=".(isset($this->localtax2)?$this->localtax2:"null").",";
-        //$sql.= " total=".(isset($this->total)?$this->total:"null").",";
-        $sql.= " total_ht=".(isset($this->total_ht)?$this->total_ht:"null").",";
-        $sql.= " total_tva=".(isset($this->total_tva)?$this->total_tva:"null").",";
-        $sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").",";
-        $sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-        $sql.= " fk_user_author=".(isset($this->author)?$this->author:"null").",";
-        $sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
-        $sql.= " fk_facture_source=".(isset($this->fk_facture_source)?$this->fk_facture_source:"null").",";
-        $sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
-        $sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").",";
-        $sql.= " date_lim_reglement=".(dol_strlen($this->date_echeance)!=0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";
-        $sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-        $sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-        $sql.= " model_pdf=".(isset($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null").",";
-        $sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
-        $sql.= " WHERE rowid=".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-
-        if (!$resql) {
-            $error++;
-
-            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                $this->errors[] = $langs->trans('ErrorRefAlreadyExists');
-            } else {
-                $this->errors[] = "Error ".$this->db->lasterror();
-            }
-        }
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('BILL_SUPPLIER_UPDATE',$user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-
-    /**
-     *	Delete invoice from database
-     *
-     *  @param      User	$user		    User object
-     *	@param	    int		$notrigger	    1=Does not execute triggers, 0= execute triggers
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function delete(User $user, $notrigger=0)
-    {
-        global $langs,$conf;
-
-        $rowid=$this->id;
-
-        dol_syslog("FactureFournisseur::delete rowid=".$rowid, LOG_DEBUG);
-
-        // TODO Test if there is at least on payment. If yes, refuse to delete.
-
-        $error=0;
-        $this->db->begin();
-
-        if (! $error && ! $notrigger)
-        {
-            // Call trigger
-            $result=$this->call_trigger('BILL_SUPPLIER_DELETE',$user);
-            if ($result < 0)
-            {
-                $this->db->rollback();
-                return -1;
-            }
-            // Fin appel triggers
-        }
-
-        if (! $error)
-        {
-            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
-                dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-                $resql2 = $this->db->query($sql);
-                if (! $resql2) {
-                	$error++;
-                }
-            }
-            else {
-            	$error++;
-            }
-        }
+		$sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
+		$sql.= " entity=".(isset($this->entity)?$this->entity:"null").",";
+		$sql.= " type=".(isset($this->type)?$this->type:"null").",";
+		$sql.= " fk_soc=".(isset($this->fk_soc)?$this->fk_soc:"null").",";
+		$sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql.= " datef=".(dol_strlen($this->date)!=0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
+		if (dol_strlen($this->tms) != 0) $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql.= " libelle=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
+		$sql.= " paye=".(isset($this->paye)?$this->paye:"null").",";
+		$sql.= " amount=".(isset($this->amount)?$this->amount:"null").",";
+		$sql.= " remise=".(isset($this->remise)?$this->remise:"null").",";
+		$sql.= " close_code=".(isset($this->close_code)?"'".$this->db->escape($this->close_code)."'":"null").",";
+		$sql.= " close_note=".(isset($this->close_note)?"'".$this->db->escape($this->close_note)."'":"null").",";
+		$sql.= " tva=".(isset($this->tva)?$this->tva:"null").",";
+		$sql.= " localtax1=".(isset($this->localtax1)?$this->localtax1:"null").",";
+		$sql.= " localtax2=".(isset($this->localtax2)?$this->localtax2:"null").",";
+		//$sql.= " total=".(isset($this->total)?$this->total:"null").",";
+		$sql.= " total_ht=".(isset($this->total_ht)?$this->total_ht:"null").",";
+		$sql.= " total_tva=".(isset($this->total_tva)?$this->total_tva:"null").",";
+		$sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").",";
+		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
+		$sql.= " fk_user_author=".(isset($this->author)?$this->author:"null").",";
+		$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
+		$sql.= " fk_facture_source=".(isset($this->fk_facture_source)?$this->fk_facture_source:"null").",";
+		$sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
+		$sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").",";
+		$sql.= " date_lim_reglement=".(dol_strlen($this->date_echeance)!=0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";
+		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
+		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
+		$sql.= " model_pdf=".(isset($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null").",";
+		$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$error++;
+
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$this->errors[] = $langs->trans('ErrorRefAlreadyExists');
+			} else {
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
+		}
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('BILL_SUPPLIER_UPDATE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 *	Delete invoice from database
+	 *
+	 *  @param      User	$user		    User object
+	 *	@param	    int		$notrigger	    1=Does not execute triggers, 0= execute triggers
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger=0)
+	{
+		global $langs,$conf;
+
+		$rowid=$this->id;
+
+		dol_syslog("FactureFournisseur::delete rowid=".$rowid, LOG_DEBUG);
+
+		// TODO Test if there is at least on payment. If yes, refuse to delete.
+
+		$error=0;
+		$this->db->begin();
+
+		if (! $error && ! $notrigger)
+		{
+			// Call trigger
+			$result=$this->call_trigger('BILL_SUPPLIER_DELETE',$user);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				return -1;
+			}
+			// Fin appel triggers
+		}
+
+		if (! $error)
+		{
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
+				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+				$resql2 = $this->db->query($sql);
+				if (! $resql2) {
+					$error++;
+				}
+			}
+			else {
+				$error++;
+			}
+		}
 
 		if (! $error)
 		{
@@ -912,780 +912,780 @@ 
 			if ($res < 0) $error++;
 		}
 
-        if (! $error)
-        {
-        	// Delete linked object
-        	$res = $this->deleteObjectLinked();
-        	if ($res < 0) $error++;
-        }
-
-        if (! $error)
-        {
-        	// We remove directory
-        	if ($conf->fournisseur->facture->dir_output)
-        	{
-        		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        		$ref = dol_sanitizeFileName($this->ref);
-        		$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoive_supplier').$ref;
-        		$file = $dir . "/" . $ref . ".pdf";
-        		if (file_exists($file))
-        		{
-        			if (! dol_delete_file($file,0,0,0,$this)) // For triggers
-        			{
-        				$this->error='ErrorFailToDeleteFile';
-        				$error++;
-        			}
-        		}
-        		if (file_exists($dir))
-        		{
-        			$res=@dol_delete_dir_recursive($dir);
-
-        			if (! $res)
-        			{
-        				$this->error='ErrorFailToDeleteDir';
-        				$error++;
-        			}
-        		}
-        	}
-        }
-
-        // Remove extrafields
-        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
-        {
-        	$result=$this->deleteExtraFields();
-        	if ($result < 0)
-        	{
-        		$error++;
-        		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-        	}
-        }
-
-        if (! $error)
-        {
-        	dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
-        	$this->db->commit();
-        	return 1;
-        }
-        else
-        {
-        	$this->error=$this->db->lasterror();
-        	$this->db->rollback();
-        	return -$error;
-        }
-    }
-
-
-    /**
-     *	Tag invoice as a payed invoice
-     *
-     *	@param  User	$user       Object user
-	 *	@param  string	$close_code	Code renseigne si on classe a payee completement alors que paiement incomplet. Not implementd yet.
-	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet. Not implementd yet.
-     *	@return int         		<0 si ko, >0 si ok
-     */
-    function set_paid($user, $close_code='', $close_note='')
-    {
-        global $conf,$langs;
-        $error=0;
-
-        $this->db->begin();
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
-        $sql.= ' SET paye = 1, fk_statut=2';
-        $sql.= ' WHERE rowid = '.$this->id;
-
-        dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Call trigger
-            $result=$this->call_trigger('BILL_SUPPLIER_PAYED',$user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-        else
-        {
-            $error++;
-            $this->error=$this->db->error();
-            dol_print_error($this->db);
-        }
-
-        if (! $error)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
-     *	Fonction utilisee quand un paiement prelevement est refuse,
-     *	ou quand une facture annulee et reouverte.
-     *
-     *	@param      User	$user       Object user that change status
-     *	@return     int         		<0 si ok, >0 si ok
-     */
-    function set_unpaid($user)
-    {
-        global $conf,$langs;
-        $error=0;
-
-        $this->db->begin();
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
-        $sql.= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
-        $sql.= ' WHERE rowid = '.$this->id;
-
-        dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Call trigger
-            $result=$this->call_trigger('BILL_SUPPLIER_UNPAYED',$user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-        else
-        {
-            $error++;
-            $this->error=$this->db->lasterror();
-            dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
-        }
-
-        if (! $error)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Tag invoice as validated + call trigger BILL_VALIDATE
-     *
-     *	@param	User	$user           Object user that validate
-     *	@param  string	$force_number   Reference to force on invoice
-     *	@param	int		$idwarehouse	Id of warehouse for stock change
-     *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *	@return int 			        <0 if KO, =0 if nothing to do, >0 if OK
-     */
-    public function validate($user, $force_number='', $idwarehouse=0, $notrigger=0)
-    {
-        global $conf,$langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $now=dol_now();
-
-        $error=0;
-        dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse);
-
-        // Force to have object complete for checks
-        $this->fetch_thirdparty();
-        $this->fetch_lines();
-
-        // Check parameters
-        if ($this->statut > self::STATUS_DRAFT)	// This is to avoid to validate twice (avoid errors on logs and stock management)
-        {
-            dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
-            return 0;
-        }
-        if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->ref_supplier))
-        {
-        	$langs->load("errors");
-        	$this->error=$langs->trans("ErrorFieldFormat",$langs->transnoentities("RefSupplier")).'. '.$langs->trans('RemoveString',$langs->transnoentitiesnoconv("CopyOf"));
-            return -1;
-        }
-        if (count($this->lines) <= 0)
-        {
-        	$langs->load("errors");
-            $this->error=$langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
-            return -1;
-        }
-
-        $this->db->begin();
-
-        // Define new ref
-        if ($force_number)
-        {
-            $num = $force_number;
-        }
-        else if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-        {
-            $num = $this->getNextNumRef($this->thirdparty);
-        }
-        else
-		{
-            $num = $this->ref;
-        }
-        $this->newref = $num;
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-        $sql.= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
-        $sql.= " WHERE rowid = ".$this->id;
-
-        dol_syslog(get_class($this)."::validate", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Si on incrémente le produit principal et ses composants à la validation de facture fournisseur
-            if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
-            {
-                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-                $langs->load("agenda");
-
-                $cpt=count($this->lines);
-                for ($i = 0; $i < $cpt; $i++)
-                {
-                    if ($this->lines[$i]->fk_product > 0)
-                    {
-                        $this->line = $this->lines[$i];
-                        $mouvP = new MouvementStock($this->db);
-						$mouvP->origin = &$this;
-                        // We increase stock for product
-                        $up_ht_disc=$this->lines[$i]->pu_ht;
-                        if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
-                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr",$num));
-                        if ($result < 0) { $error++; }
-                        unset($this->line);
-                    }
-                }
-            }
-
-            // Triggers call
-            if (! $error && empty($notrigger))
-            {
-                // Call trigger
-                $result=$this->call_trigger('BILL_SUPPLIER_VALIDATE',$user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-
-            if (! $error)
-            {
-	            $this->oldref = $this->ref;
-
-            	// Rename directory if dir was a temporary ref
-            	if (preg_match('/^[\(]?PROV/i', $this->ref))
-            	{
-            		// On renomme repertoire facture ($this->ref = ancienne ref, $num = nouvelle ref)
-            		// in order not to lose the attached files
-            		$oldref = dol_sanitizeFileName($this->ref);
-            		$newref = dol_sanitizeFileName($num);
-
-            		$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$oldref;
-            		$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$newref;
-            		if (file_exists($dirsource))
-            		{
-            			dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
-
-            			if (@rename($dirsource, $dirdest))
-            			{
-            				dol_syslog("Rename ok");
-                            // Rename docs starting with $oldref with $newref
-	                        $listoffiles=dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-	                        foreach($listoffiles as $fileentry)
-	                        {
-	                        	$dirsource=$fileentry['name'];
-	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
-	                        	@rename($dirsource, $dirdest);
-	                        }
-            			}
-            		}
-            	}
-            }
-
-            // Set new ref and define current statut
-            if (! $error)
-            {
-            	$this->ref = $num;
-            	$this->statut=self::STATUS_VALIDATED;
-            	//$this->date_validation=$now; this is stored into log table
-            }
-
-            if (! $error)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Set draft status
-     *
-     *	@param	User	$user			Object user that modify
-     *	@param	int		$idwarehouse	Id warehouse to use for stock change.
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    function set_draft($user, $idwarehouse=-1)
-    {
-        global $conf,$langs;
-
-        $error=0;
-
-        if ($this->statut == self::STATUS_DRAFT)
-        {
-            dol_syslog(get_class($this)."::set_draft already draft status", LOG_WARNING);
-            return 0;
-        }
-
-        $this->db->begin();
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-        $sql.= " SET fk_statut = 0";
-        $sql.= " WHERE rowid = ".$this->id;
-
-        dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            // Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
-            if ($result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
-            {
-                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-                $langs->load("agenda");
-
-                $cpt=count($this->lines);
-                for ($i = 0; $i < $cpt; $i++)
-                {
-                    if ($this->lines[$i]->fk_product > 0)
-                    {
-                        $mouvP = new MouvementStock($this->db);
-                        // We increase stock for product
-                        $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));
-                    }
-                }
-            }
-            // Triggers call
-            if (! $error && empty($notrigger))
-            {
-                // Call trigger
-                $result=$this->call_trigger('BILL_SUPPLIER_UNVALIDATE',$user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-            if ($error == 0)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Ajoute une ligne de facture (associe a aucun produit/service predefini)
-     *	Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
-     *	de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
-     *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,idprod)
-     *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue).
-     *
-     *	@param    	string	$desc            	Description de la ligne
-     *	@param    	double	$pu              	Prix unitaire (HT ou TTC selon price_base_type, > 0 even for credit note)
-     *	@param    	double	$txtva           	Force Vat rate to use, -1 for auto.
-     *	@param		double	$txlocaltax1		LocalTax1 Rate
-     *	@param		double	$txlocaltax2		LocalTax2 Rate
-     *	@param    	double	$qty             	Quantite
-     *	@param    	int		$fk_product      	Id du produit/service predefini
-     *	@param    	double	$remise_percent  	Pourcentage de remise de la ligne
-     *	@param    	date	$date_start      	Date de debut de validite du service
-     * 	@param    	date	$date_end        	Date de fin de validite du service
-     * 	@param    	string	$ventil          	Code de ventilation comptable
-     *	@param    	int		$info_bits			Bits de type de lines
-     *	@param    	string	$price_base_type 	HT ou TTC
-     *	@param		int		$type				Type of line (0=product, 1=service)
-     *  @param      int		$rang            	Position of line
-     *  @param		int		$notrigger			Disable triggers
-	 *  @param		array	$array_options		extrafields array
-     * 	@param 		string	$fk_unit 			Code of the unit to use. Null to use the default one
-     *  @param      int     $origin_id          id origin document
-	 *  @param		double	$pu_ht_devise		Amount in currency
-     *	@return    	int             			>0 if OK, <0 if KO
-     *
-     *  FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order.
-     */
-    public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null, $origin_id=0, $pu_ht_devise=0)
-    {
-        dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-        global $mysoc;
-
-        // Clean parameters
-        if (empty($remise_percent)) $remise_percent=0;
-        if (empty($qty)) $qty=0;
-        if (empty($info_bits)) $info_bits=0;
-        if (empty($rang)) $rang=0;
-        if (empty($ventil)) $ventil=0;
-        if (empty($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
-
-        $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
-
-        // Clean vat code
-        $vat_src_code='';
-        if (preg_match('/\((.*)\)/', $txtva, $reg))
-        {
-            $vat_src_code = $reg[1];
-            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-        }
-
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu=price2num($pu);
-        $txtva=price2num($txtva);
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-
-        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
-        $total_ht  = $tabprice[0];
-        $total_tva = $tabprice[1];
-        $total_ttc = $tabprice[2];
-        $total_localtax1 = $tabprice[9];
-        $total_localtax2 = $tabprice[10];
-		$pu_ht = $tabprice[3];
+		if (! $error)
+		{
+			// Delete linked object
+			$res = $this->deleteObjectLinked();
+			if ($res < 0) $error++;
+		}
 
-        // MultiCurrency
-        $multicurrency_total_ht  = $tabprice[16];
-        $multicurrency_total_tva = $tabprice[17];
-        $multicurrency_total_ttc = $tabprice[18];
-		$pu_ht_devise = $tabprice[19];
+		if (! $error)
+		{
+			// We remove directory
+			if ($conf->fournisseur->facture->dir_output)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        // Check parameters
-        if ($type < 0) return -1;
-
-        // Insert line
-        $this->line=new SupplierInvoiceLine($this->db);
-
-        $this->line->context = $this->context;
-
-        $this->line->fk_facture_fourn=$this->id;
-        //$this->line->label=$label;	// deprecated
-        $this->line->desc=$desc;
-        $this->line->qty=            ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
-
-        $this->line->vat_src_code=$vat_src_code;
-        $this->line->tva_tx=$txtva;
-        $this->line->localtax1_tx=$txlocaltax1;
-        $this->line->localtax2_tx=$txlocaltax2;
-        $this->line->fk_product=$fk_product;
-        $this->line->product_type=$type;
-        $this->line->remise_percent=$remise_percent;
-        $this->line->subprice=       ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
-        $this->line->date_start=$date_start;
-        $this->line->date_end=$date_end;
-        $this->line->ventil=$ventil;
-        $this->line->rang=$rang;
-        $this->line->info_bits=$info_bits;
-        $this->line->total_ht=       (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
-        $this->line->total_tva=      $total_tva;
-        $this->line->total_localtax1=$total_localtax1;
-        $this->line->total_localtax2=$total_localtax2;
-        $this->line->localtax1_type = $localtaxes_type[0];
-        $this->line->localtax2_type = $localtaxes_type[2];
-        $this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
-        $this->line->special_code=$this->special_code;
-        $this->line->fk_parent_line=$this->fk_parent_line;
-        $this->line->origin=$this->origin;
-        $this->line->origin_id=$origin_id;
-        $this->line->fk_unit=$fk_unit;
-
-        // Multicurrency
-        $this->line->fk_multicurrency			= $this->fk_multicurrency;
-        $this->line->multicurrency_code			= $this->multicurrency_code;
-        $this->line->multicurrency_subprice		= $pu_ht_devise;
-        $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-        $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-        $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
-
-        if (is_array($array_options) && count($array_options)>0) {
-            $this->line->array_options=$array_options;
-        }
-
-        $result=$this->line->insert($notrigger);
-        if ($result > 0)
-        {
-            // Reorder if child line
-            if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
-
-            // Mise a jour informations denormalisees au niveau de la facture meme
-            $result=$this->update_price(1,'auto',0,$this->thirdparty);	// The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
-            if ($result > 0)
-            {
-                $this->db->commit();
-                return $this->line->id;
-            }
-            else
-            {
-                $this->error=$this->db->error();
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error=$this->line->error;
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
-    /**
-     * Update a line detail into database
-     *
-     * @param     	int			$id            		Id of line invoice
-     * @param     	string		$desc         		Description of line
-     * @param     	double		$pu          		Prix unitaire (HT ou TTC selon price_base_type)
-     * @param     	double		$vatrate       		VAT Rate
-     * @param		double		$txlocaltax1		LocalTax1 Rate
-     * @param		double		$txlocaltax2		LocalTax2 Rate
-     * @param     	double		$qty           		Quantity
-     * @param     	int			$idproduct			Id produit
-     * @param	  	double		$price_base_type	HT or TTC
-     * @param	  	int			$info_bits			Miscellaneous informations of line
-     * @param		int			$type				Type of line (0=product, 1=service)
-     * @param     	double		$remise_percent  	Pourcentage de remise de la ligne
-     * @param		int			$notrigger			Disable triggers
-     * @param      	timestamp	$date_start     	Date start of service
-     * @param      	timestamp   $date_end       	Date end of service
-	 * @param		array		$array_options		extrafields array
-     * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+				$ref = dol_sanitizeFileName($this->ref);
+				$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoive_supplier').$ref;
+				$file = $dir . "/" . $ref . ".pdf";
+				if (file_exists($file))
+				{
+					if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+					{
+						$this->error='ErrorFailToDeleteFile';
+						$error++;
+					}
+				}
+				if (file_exists($dir))
+				{
+					$res=@dol_delete_dir_recursive($dir);
+
+					if (! $res)
+					{
+						$this->error='ErrorFailToDeleteDir';
+						$error++;
+					}
+				}
+			}
+		}
+
+		// Remove extrafields
+		if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+		{
+			$result=$this->deleteExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+			}
+		}
+
+		if (! $error)
+		{
+			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			return -$error;
+		}
+	}
+
+
+	/**
+	 *	Tag invoice as a payed invoice
+	 *
+	 *	@param  User	$user       Object user
+	 *	@param  string	$close_code	Code renseigne si on classe a payee completement alors que paiement incomplet. Not implementd yet.
+	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet. Not implementd yet.
+	 *	@return int         		<0 si ko, >0 si ok
+	 */
+	function set_paid($user, $close_code='', $close_note='')
+	{
+		global $conf,$langs;
+		$error=0;
+
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
+		$sql.= ' SET paye = 1, fk_statut=2';
+		$sql.= ' WHERE rowid = '.$this->id;
+
+		dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Call trigger
+			$result=$this->call_trigger('BILL_SUPPLIER_PAYED',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+		else
+		{
+			$error++;
+			$this->error=$this->db->error();
+			dol_print_error($this->db);
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
+	 *	Fonction utilisee quand un paiement prelevement est refuse,
+	 *	ou quand une facture annulee et reouverte.
+	 *
+	 *	@param      User	$user       Object user that change status
+	 *	@return     int         		<0 si ok, >0 si ok
+	 */
+	function set_unpaid($user)
+	{
+		global $conf,$langs;
+		$error=0;
+
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
+		$sql.= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
+		$sql.= ' WHERE rowid = '.$this->id;
+
+		dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Call trigger
+			$result=$this->call_trigger('BILL_SUPPLIER_UNPAYED',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+		else
+		{
+			$error++;
+			$this->error=$this->db->lasterror();
+			dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Tag invoice as validated + call trigger BILL_VALIDATE
+	 *
+	 *	@param	User	$user           Object user that validate
+	 *	@param  string	$force_number   Reference to force on invoice
+	 *	@param	int		$idwarehouse	Id of warehouse for stock change
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return int 			        <0 if KO, =0 if nothing to do, >0 if OK
+	 */
+	public function validate($user, $force_number='', $idwarehouse=0, $notrigger=0)
+	{
+		global $conf,$langs;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$now=dol_now();
+
+		$error=0;
+		dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse);
+
+		// Force to have object complete for checks
+		$this->fetch_thirdparty();
+		$this->fetch_lines();
+
+		// Check parameters
+		if ($this->statut > self::STATUS_DRAFT)	// This is to avoid to validate twice (avoid errors on logs and stock management)
+		{
+			dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
+			return 0;
+		}
+		if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->ref_supplier))
+		{
+			$langs->load("errors");
+			$this->error=$langs->trans("ErrorFieldFormat",$langs->transnoentities("RefSupplier")).'. '.$langs->trans('RemoveString',$langs->transnoentitiesnoconv("CopyOf"));
+			return -1;
+		}
+		if (count($this->lines) <= 0)
+		{
+			$langs->load("errors");
+			$this->error=$langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
+			return -1;
+		}
+
+		$this->db->begin();
+
+		// Define new ref
+		if ($force_number)
+		{
+			$num = $force_number;
+		}
+		else if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+		{
+			$num = $this->getNextNumRef($this->thirdparty);
+		}
+		else
+		{
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
+		$sql.= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
+		$sql.= " WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Si on incrémente le produit principal et ses composants à la validation de facture fournisseur
+			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+				$langs->load("agenda");
+
+				$cpt=count($this->lines);
+				for ($i = 0; $i < $cpt; $i++)
+				{
+					if ($this->lines[$i]->fk_product > 0)
+					{
+						$this->line = $this->lines[$i];
+						$mouvP = new MouvementStock($this->db);
+						$mouvP->origin = &$this;
+						// We increase stock for product
+						$up_ht_disc=$this->lines[$i]->pu_ht;
+						if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr",$num));
+						if ($result < 0) { $error++; }
+						unset($this->line);
+					}
+				}
+			}
+
+			// Triggers call
+			if (! $error && empty($notrigger))
+			{
+				// Call trigger
+				$result=$this->call_trigger('BILL_SUPPLIER_VALIDATE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (! $error)
+			{
+				$this->oldref = $this->ref;
+
+				// Rename directory if dir was a temporary ref
+				if (preg_match('/^[\(]?PROV/i', $this->ref))
+				{
+					// On renomme repertoire facture ($this->ref = ancienne ref, $num = nouvelle ref)
+					// in order not to lose the attached files
+					$oldref = dol_sanitizeFileName($this->ref);
+					$newref = dol_sanitizeFileName($num);
+
+					$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$oldref;
+					$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$newref;
+					if (file_exists($dirsource))
+					{
+						dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
+
+						if (@rename($dirsource, $dirdest))
+						{
+							dol_syslog("Rename ok");
+							// Rename docs starting with $oldref with $newref
+							$listoffiles=dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+							foreach($listoffiles as $fileentry)
+							{
+								$dirsource=$fileentry['name'];
+								$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+								$dirsource=$fileentry['path'].'/'.$dirsource;
+								$dirdest=$fileentry['path'].'/'.$dirdest;
+								@rename($dirsource, $dirdest);
+							}
+						}
+					}
+				}
+			}
+
+			// Set new ref and define current statut
+			if (! $error)
+			{
+				$this->ref = $num;
+				$this->statut=self::STATUS_VALIDATED;
+				//$this->date_validation=$now; this is stored into log table
+			}
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *	@param	int		$idwarehouse	Id warehouse to use for stock change.
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	function set_draft($user, $idwarehouse=-1)
+	{
+		global $conf,$langs;
+
+		$error=0;
+
+		if ($this->statut == self::STATUS_DRAFT)
+		{
+			dol_syslog(get_class($this)."::set_draft already draft status", LOG_WARNING);
+			return 0;
+		}
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
+		$sql.= " SET fk_statut = 0";
+		$sql.= " WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			// Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
+			if ($result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+				$langs->load("agenda");
+
+				$cpt=count($this->lines);
+				for ($i = 0; $i < $cpt; $i++)
+				{
+					if ($this->lines[$i]->fk_product > 0)
+					{
+						$mouvP = new MouvementStock($this->db);
+						// We increase stock for product
+						$result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));
+					}
+				}
+			}
+			// Triggers call
+			if (! $error && empty($notrigger))
+			{
+				// Call trigger
+				$result=$this->call_trigger('BILL_SUPPLIER_UNVALIDATE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+			if ($error == 0)
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Ajoute une ligne de facture (associe a aucun produit/service predefini)
+	 *	Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
+	 *	de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
+	 *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,idprod)
+	 *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue).
+	 *
+	 *	@param    	string	$desc            	Description de la ligne
+	 *	@param    	double	$pu              	Prix unitaire (HT ou TTC selon price_base_type, > 0 even for credit note)
+	 *	@param    	double	$txtva           	Force Vat rate to use, -1 for auto.
+	 *	@param		double	$txlocaltax1		LocalTax1 Rate
+	 *	@param		double	$txlocaltax2		LocalTax2 Rate
+	 *	@param    	double	$qty             	Quantite
+	 *	@param    	int		$fk_product      	Id du produit/service predefini
+	 *	@param    	double	$remise_percent  	Pourcentage de remise de la ligne
+	 *	@param    	date	$date_start      	Date de debut de validite du service
+	 * 	@param    	date	$date_end        	Date de fin de validite du service
+	 * 	@param    	string	$ventil          	Code de ventilation comptable
+	 *	@param    	int		$info_bits			Bits de type de lines
+	 *	@param    	string	$price_base_type 	HT ou TTC
+	 *	@param		int		$type				Type of line (0=product, 1=service)
+	 *  @param      int		$rang            	Position of line
+	 *  @param		int		$notrigger			Disable triggers
+	 *  @param		array	$array_options		extrafields array
+	 * 	@param 		string	$fk_unit 			Code of the unit to use. Null to use the default one
+	 *  @param      int     $origin_id          id origin document
+	 *  @param		double	$pu_ht_devise		Amount in currency
+	 *	@return    	int             			>0 if OK, <0 if KO
+	 *
+	 *  FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order.
+	 */
+	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null, $origin_id=0, $pu_ht_devise=0)
+	{
+		dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		global $mysoc;
+
+		// Clean parameters
+		if (empty($remise_percent)) $remise_percent=0;
+		if (empty($qty)) $qty=0;
+		if (empty($info_bits)) $info_bits=0;
+		if (empty($rang)) $rang=0;
+		if (empty($ventil)) $ventil=0;
+		if (empty($txtva)) $txtva=0;
+		if (empty($txlocaltax1)) $txlocaltax1=0;
+		if (empty($txlocaltax2)) $txlocaltax2=0;
+
+		$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
+
+		// Clean vat code
+		$vat_src_code='';
+		if (preg_match('/\((.*)\)/', $txtva, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+		}
+
+		$remise_percent=price2num($remise_percent);
+		$qty=price2num($qty);
+		$pu=price2num($pu);
+		$txtva=price2num($txtva);
+		$txlocaltax1=price2num($txlocaltax1);
+		$txlocaltax2=price2num($txlocaltax2);
+
+		$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+		$total_ht  = $tabprice[0];
+		$total_tva = $tabprice[1];
+		$total_ttc = $tabprice[2];
+		$total_localtax1 = $tabprice[9];
+		$total_localtax2 = $tabprice[10];
+		$pu_ht = $tabprice[3];
+
+		// MultiCurrency
+		$multicurrency_total_ht  = $tabprice[16];
+		$multicurrency_total_tva = $tabprice[17];
+		$multicurrency_total_ttc = $tabprice[18];
+		$pu_ht_devise = $tabprice[19];
+
+		// Check parameters
+		if ($type < 0) return -1;
+
+		// Insert line
+		$this->line=new SupplierInvoiceLine($this->db);
+
+		$this->line->context = $this->context;
+
+		$this->line->fk_facture_fourn=$this->id;
+		//$this->line->label=$label;	// deprecated
+		$this->line->desc=$desc;
+		$this->line->qty=            ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
+
+		$this->line->vat_src_code=$vat_src_code;
+		$this->line->tva_tx=$txtva;
+		$this->line->localtax1_tx=$txlocaltax1;
+		$this->line->localtax2_tx=$txlocaltax2;
+		$this->line->fk_product=$fk_product;
+		$this->line->product_type=$type;
+		$this->line->remise_percent=$remise_percent;
+		$this->line->subprice=       ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
+		$this->line->date_start=$date_start;
+		$this->line->date_end=$date_end;
+		$this->line->ventil=$ventil;
+		$this->line->rang=$rang;
+		$this->line->info_bits=$info_bits;
+		$this->line->total_ht=       (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
+		$this->line->total_tva=      $total_tva;
+		$this->line->total_localtax1=$total_localtax1;
+		$this->line->total_localtax2=$total_localtax2;
+		$this->line->localtax1_type = $localtaxes_type[0];
+		$this->line->localtax2_type = $localtaxes_type[2];
+		$this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
+		$this->line->special_code=$this->special_code;
+		$this->line->fk_parent_line=$this->fk_parent_line;
+		$this->line->origin=$this->origin;
+		$this->line->origin_id=$origin_id;
+		$this->line->fk_unit=$fk_unit;
+
+		// Multicurrency
+		$this->line->fk_multicurrency			= $this->fk_multicurrency;
+		$this->line->multicurrency_code			= $this->multicurrency_code;
+		$this->line->multicurrency_subprice		= $pu_ht_devise;
+		$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+		$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+		$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
+		if (is_array($array_options) && count($array_options)>0) {
+			$this->line->array_options=$array_options;
+		}
+
+		$result=$this->line->insert($notrigger);
+		if ($result > 0)
+		{
+			// Reorder if child line
+			if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+
+			// Mise a jour informations denormalisees au niveau de la facture meme
+			$result=$this->update_price(1,'auto',0,$this->thirdparty);	// The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
+			if ($result > 0)
+			{
+				$this->db->commit();
+				return $this->line->id;
+			}
+			else
+			{
+				$this->error=$this->db->error();
+				$this->db->rollback();
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error=$this->line->error;
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
+	/**
+	 * Update a line detail into database
+	 *
+	 * @param     	int			$id            		Id of line invoice
+	 * @param     	string		$desc         		Description of line
+	 * @param     	double		$pu          		Prix unitaire (HT ou TTC selon price_base_type)
+	 * @param     	double		$vatrate       		VAT Rate
+	 * @param		double		$txlocaltax1		LocalTax1 Rate
+	 * @param		double		$txlocaltax2		LocalTax2 Rate
+	 * @param     	double		$qty           		Quantity
+	 * @param     	int			$idproduct			Id produit
+	 * @param	  	double		$price_base_type	HT or TTC
+	 * @param	  	int			$info_bits			Miscellaneous informations of line
+	 * @param		int			$type				Type of line (0=product, 1=service)
+	 * @param     	double		$remise_percent  	Pourcentage de remise de la ligne
+	 * @param		int			$notrigger			Disable triggers
+	 * @param      	timestamp	$date_start     	Date start of service
+	 * @param      	timestamp   $date_end       	Date end of service
+	 * @param		array		$array_options		extrafields array
+	 * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * @param		double		$pu_ht_devise		Amount in currency
-     * @return    	int           					<0 if KO, >0 if OK
-     */
-    public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null, $pu_ht_devise=0)
-    {
-    	global $mysoc;
-        dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$fk_unit", LOG_DEBUG);
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-        $pu = price2num($pu);
-        $qty  = price2num($qty);
+	 * @return    	int           					<0 if KO, >0 if OK
+	 */
+	public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null, $pu_ht_devise=0)
+	{
+		global $mysoc;
+		dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$fk_unit", LOG_DEBUG);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		$pu = price2num($pu);
+		$qty  = price2num($qty);
 		$remise_percent=price2num($remise_percent);
 		$pu_ht_devise = price2num($pu_ht_devise);
 
-        // Check parameters
-        //if (! is_numeric($pu) || ! is_numeric($qty)) return -1;
-        if ($type < 0) return -1;
+		// Check parameters
+		//if (! is_numeric($pu) || ! is_numeric($qty)) return -1;
+		if ($type < 0) return -1;
 
-        // Clean parameters
+		// Clean parameters
 		if (empty($vatrate)) $vatrate=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
-
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-
-        $localtaxes_type = array($txlocaltax1,$txlocaltax2);
-
-        // Calcul du total TTC et de la TVA pour la ligne a partir de
-        // qty, pu, remise_percent et txtva
-        // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-        // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-
-        $localtaxes_type=getLocalTaxesFromRate($vatrate,0,$mysoc, $this->thirdparty);
-
-        // Clean vat code
-        $vat_src_code='';
-        if (preg_match('/\((.*)\)/', $vatrate, $reg))
-        {
-            $vat_src_code = $reg[1];
-            $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate);    // Remove code into vatrate.
-        }
-
-        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
-        $total_ht  = $tabprice[0];
-        $total_tva = $tabprice[1];
-        $total_ttc = $tabprice[2];
-        $pu_ht  = $tabprice[3];
-        $pu_tva = $tabprice[4];
-        $pu_ttc = $tabprice[5];
-        $total_localtax1 = $tabprice[9];
-        $total_localtax2 = $tabprice[10];
+		if (empty($txlocaltax1)) $txlocaltax1=0;
+		if (empty($txlocaltax2)) $txlocaltax2=0;
+
+		$txlocaltax1=price2num($txlocaltax1);
+		$txlocaltax2=price2num($txlocaltax2);
+
+		$localtaxes_type = array($txlocaltax1,$txlocaltax2);
+
+		// Calcul du total TTC et de la TVA pour la ligne a partir de
+		// qty, pu, remise_percent et txtva
+		// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+		// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+
+		$localtaxes_type=getLocalTaxesFromRate($vatrate,0,$mysoc, $this->thirdparty);
+
+		// Clean vat code
+		$vat_src_code='';
+		if (preg_match('/\((.*)\)/', $vatrate, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate);    // Remove code into vatrate.
+		}
+
+		$tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+		$total_ht  = $tabprice[0];
+		$total_tva = $tabprice[1];
+		$total_ttc = $tabprice[2];
+		$pu_ht  = $tabprice[3];
+		$pu_tva = $tabprice[4];
+		$pu_ttc = $tabprice[5];
+		$total_localtax1 = $tabprice[9];
+		$total_localtax2 = $tabprice[10];
 
 		// MultiCurrency
 		$multicurrency_total_ht  = $tabprice[16];
-        $multicurrency_total_tva = $tabprice[17];
-        $multicurrency_total_ttc = $tabprice[18];
+		$multicurrency_total_tva = $tabprice[17];
+		$multicurrency_total_ttc = $tabprice[18];
 		$pu_ht_devise = $tabprice[19];
 
-        if (empty($info_bits)) $info_bits=0;
-
-        if ($idproduct)
-        {
-            $product=new Product($this->db);
-            $result=$product->fetch($idproduct);
-            $product_type = $product->type;
-        }
-        else
-        {
-            $product_type = $type;
-        }
-
-	    $line = new SupplierInvoiceLine($this->db);
-
-	    if ($line->fetch($id) < 1) {
-		    return -1;
-	    }
-
-	    $line->description = $desc;
-	    $line->subprice = $pu_ht;
-	    $line->pu_ht = $pu_ht;
-	    $line->pu_ttc = $pu_ttc;
-	    $line->qty = $qty;
-	    $line->remise_percent = $remise_percent;
-
-	    $line->vat_src_code=$vat_src_code;
-	    $line->tva_tx = $vatrate;
-	    $line->localtax1_tx = $txlocaltax1;
-	    $line->localtax2_tx = $txlocaltax2;
+		if (empty($info_bits)) $info_bits=0;
+
+		if ($idproduct)
+		{
+			$product=new Product($this->db);
+			$result=$product->fetch($idproduct);
+			$product_type = $product->type;
+		}
+		else
+		{
+			$product_type = $type;
+		}
+
+		$line = new SupplierInvoiceLine($this->db);
+
+		if ($line->fetch($id) < 1) {
+			return -1;
+		}
+
+		$line->description = $desc;
+		$line->subprice = $pu_ht;
+		$line->pu_ht = $pu_ht;
+		$line->pu_ttc = $pu_ttc;
+		$line->qty = $qty;
+		$line->remise_percent = $remise_percent;
+
+		$line->vat_src_code=$vat_src_code;
+		$line->tva_tx = $vatrate;
+		$line->localtax1_tx = $txlocaltax1;
+		$line->localtax2_tx = $txlocaltax2;
 		$line->localtax1_type = $localtaxes_type[0];
 		$line->localtax2_type = $localtaxes_type[2];
-	    $line->total_ht = $total_ht;
-	    $line->total_tva = $total_tva;
-	    $line->total_localtax1 = $total_localtax1;
-	    $line->total_localtax2 = $total_localtax2;
-	    $line->total_ttc = $total_ttc;
-	    $line->fk_product = $idproduct;
-	    $line->product_type = $product_type;
-	    $line->info_bits = $info_bits;
-	    $line->fk_unit = $fk_unit;
-	    $line->array_options = $array_options;
+		$line->total_ht = $total_ht;
+		$line->total_tva = $total_tva;
+		$line->total_localtax1 = $total_localtax1;
+		$line->total_localtax2 = $total_localtax2;
+		$line->total_ttc = $total_ttc;
+		$line->fk_product = $idproduct;
+		$line->product_type = $product_type;
+		$line->info_bits = $info_bits;
+		$line->fk_unit = $fk_unit;
+		$line->array_options = $array_options;
 
 		// Multicurrency
 		$line->multicurrency_subprice	= $pu_ht_devise;
 		$line->multicurrency_total_ht 	= $multicurrency_total_ht;
-        $line->multicurrency_total_tva 	= $multicurrency_total_tva;
-        $line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
-
-	    $res = $line->update($notrigger);
-
-	    if ($res < 1) {
-		    $this->errors[] = $line->error;
-	    } else {
-		    // Update total price into invoice record
-		    $res = $this->update_price('','auto');
-	    }
-
-	    return $res;
-    }
-
-    /**
-     * 	Delete a detail line from database
-     *
-     * 	@param  int		$rowid      	Id of line to delete
-     *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     * 	@return	int						<0 if KO, >0 if OK
-     */
-    public function deleteline($rowid, $notrigger=0)
-    {
-        if (!$rowid) {
-	        $rowid = $this->id;
-        }
-
-	    $line = new SupplierInvoiceLine($this->db);
-
-	    if ($line->fetch($rowid) < 1) {
-		    return -1;
-	    }
-
-	    $res = $line->delete($notrigger);
-
-	    if ($res < 1) {
-		    $this->errors[] = $line->error;
-	    } else {
-		    $res = $this->update_price();
-	    }
-
-    	return $res;
-    }
-
-
-    /**
-     *	Charge les informations d'ordre info dans l'objet facture
-     *
-     *	@param  int		$id       	Id de la facture a charger
-     *	@return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT c.rowid, datec, tms as datem, ';
-        $sql.= ' fk_user_author, fk_user_modif, fk_user_valid';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as c';
-        $sql.= ' WHERE c.rowid = '.$id;
-
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->id = $obj->rowid;
-                if ($obj->fk_user_author)
-                {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation     = $cuser;
-                }
-                if ($obj->fk_user_valid)
-                {
-                    $vuser = new User($this->db);
-                    $vuser->fetch($obj->fk_user_valid);
-                    $this->user_validation = $vuser;
-                }
-                if ($obj->fk_user_modif)
-                {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
-                $this->date_creation     = $this->db->idate($obj->datec);
-                $this->date_modification = $this->db->idate($obj->datem);
-                //$this->date_validation   = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders)
-            }
-            $this->db->free($result);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+		$line->multicurrency_total_tva 	= $multicurrency_total_tva;
+		$line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
+		$res = $line->update($notrigger);
+
+		if ($res < 1) {
+			$this->errors[] = $line->error;
+		} else {
+			// Update total price into invoice record
+			$res = $this->update_price('','auto');
+		}
+
+		return $res;
+	}
+
+	/**
+	 * 	Delete a detail line from database
+	 *
+	 * 	@param  int		$rowid      	Id of line to delete
+	 *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 * 	@return	int						<0 if KO, >0 if OK
+	 */
+	public function deleteline($rowid, $notrigger=0)
+	{
+		if (!$rowid) {
+			$rowid = $this->id;
+		}
+
+		$line = new SupplierInvoiceLine($this->db);
+
+		if ($line->fetch($rowid) < 1) {
+			return -1;
+		}
+
+		$res = $line->delete($notrigger);
+
+		if ($res < 1) {
+			$this->errors[] = $line->error;
+		} else {
+			$res = $this->update_price();
+		}
+
+		return $res;
+	}
+
+
+	/**
+	 *	Charge les informations d'ordre info dans l'objet facture
+	 *
+	 *	@param  int		$id       	Id de la facture a charger
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT c.rowid, datec, tms as datem, ';
+		$sql.= ' fk_user_author, fk_user_modif, fk_user_valid';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as c';
+		$sql.= ' WHERE c.rowid = '.$id;
+
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation     = $cuser;
+				}
+				if ($obj->fk_user_valid)
+				{
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+				if ($obj->fk_user_modif)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+				$this->date_creation     = $this->db->idate($obj->datec);
+				$this->date_modification = $this->db->idate($obj->datem);
+				//$this->date_validation   = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders)
+			}
+			$this->db->free($result);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
 
 	/**
 	 *	Renvoi liste des factures remplacables
@@ -1783,296 +1783,296 @@ 
 		}
 	}
 
-    /**
-     *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *	@param      User	$user       Object user
-     *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
-     */
-    function load_board($user)
-    {
-        global $conf, $langs;
-
-        $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= ' WHERE ff.paye=0';
-        $sql.= ' AND ff.fk_statut > 0';
-        $sql.= " AND ff.entity = ".$conf->entity;
-        if ($user->societe_id) $sql.=' AND ff.fk_soc = '.$user->societe_id;
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-	        $langs->load("bills");
-	        $now=dol_now();
-
-	        $response = new WorkboardResponse();
-	        $response->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
-	        $response->label=$langs->trans("SupplierBillsToPay");
-
-	        $response->url=DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&mainmenu=accountancy&leftmenu=suppliers_bills';
-	        $response->img=img_object($langs->trans("Bills"),"bill");
-
-            $facturestatic = new FactureFournisseur($this->db);
-
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-
-                $facturestatic->date_echeance = $this->db->jdate($obj->datefin);
-                $facturestatic->statut = $obj->fk_statut;
-
-                if ($facturestatic->hasDelay()) {
-	                $response->nbtodolate++;
-                }
-            }
-            $this->db->free($resql);
-            return $response;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Return clicable name (with picto eventually)
-     *
-     *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param		string	$option						Where point the link
-     *	@param		int		$max						Max length of shown ref
-     *	@param		int		$short						1=Return just URL
-     *	@param		string	$moretitle					Add more text to title tooltip
-     *  @param	    int   	$notooltip					1=Disable 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, $option='',$max=0, $short=0, $moretitle='', $notooltip=0, $save_lastsearch_value=-1)
-    {
-        global $langs, $conf;
-
-        $result='';
-
-        if ($option == 'document')	$url = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$this->id;
-        else $url = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id;
-
-        if ($short) return $url;
-
-        if ($option !== 'nolink')
-        {
-        	// 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';
-        }
-
-        $picto='bill';
-        if ($this->type == self::TYPE_REPLACEMENT) $picto.='r'; // Replacement invoice
-        if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a'; // Credit note
-        if ($this->type == self::TYPE_DEPOSIT)     $picto.='d'; // Deposit invoice
-
-        $label = '<u>' . $langs->trans("ShowSupplierInvoice") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->ref_supplier))
-            $label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-        if ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
-        if ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
-        if ($this->type == self::TYPE_DEPOSIT)     $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
-        if ($moretitle) $label.=' - '.$moretitle;
-
-        $ref=$this->ref;
-        if (empty($ref)) $ref=$this->id;
-
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowSupplierInvoice");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
-        }
-
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
-
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
-        $result.=$linkstart.($max?dol_trunc($ref,$max):$ref).$linkend;
-        return $result;
-    }
+	/**
+	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *	@param      User	$user       Object user
+	 *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 */
+	function load_board($user)
+	{
+		global $conf, $langs;
+
+		$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= ' WHERE ff.paye=0';
+		$sql.= ' AND ff.fk_statut > 0';
+		$sql.= " AND ff.entity = ".$conf->entity;
+		if ($user->societe_id) $sql.=' AND ff.fk_soc = '.$user->societe_id;
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$langs->load("bills");
+			$now=dol_now();
+
+			$response = new WorkboardResponse();
+			$response->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
+			$response->label=$langs->trans("SupplierBillsToPay");
+
+			$response->url=DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&mainmenu=accountancy&leftmenu=suppliers_bills';
+			$response->img=img_object($langs->trans("Bills"),"bill");
+
+			$facturestatic = new FactureFournisseur($this->db);
+
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
+
+				$facturestatic->date_echeance = $this->db->jdate($obj->datefin);
+				$facturestatic->statut = $obj->fk_statut;
+
+				if ($facturestatic->hasDelay()) {
+					$response->nbtodolate++;
+				}
+			}
+			$this->db->free($resql);
+			return $response;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Return clicable name (with picto eventually)
+	 *
+	 *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param		string	$option						Where point the link
+	 *	@param		int		$max						Max length of shown ref
+	 *	@param		int		$short						1=Return just URL
+	 *	@param		string	$moretitle					Add more text to title tooltip
+	 *  @param	    int   	$notooltip					1=Disable 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, $option='',$max=0, $short=0, $moretitle='', $notooltip=0, $save_lastsearch_value=-1)
+	{
+		global $langs, $conf;
+
+		$result='';
+
+		if ($option == 'document')	$url = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$this->id;
+		else $url = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id;
+
+		if ($short) return $url;
+
+		if ($option !== 'nolink')
+		{
+			// 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';
+		}
+
+		$picto='bill';
+		if ($this->type == self::TYPE_REPLACEMENT) $picto.='r'; // Replacement invoice
+		if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a'; // Credit note
+		if ($this->type == self::TYPE_DEPOSIT)     $picto.='d'; // Deposit invoice
+
+		$label = '<u>' . $langs->trans("ShowSupplierInvoice") . '</u>';
+		if (! empty($this->ref))
+			$label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		if (! empty($this->ref_supplier))
+			$label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
+		if (! empty($this->total_ht))
+			$label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+		if (! empty($this->total_tva))
+			$label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+		if (! empty($this->total_ttc))
+			$label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+		if ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
+		if ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
+		if ($this->type == self::TYPE_DEPOSIT)     $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
+		if ($moretitle) $label.=' - '.$moretitle;
+
+		$ref=$this->ref;
+		if (empty($ref)) $ref=$this->id;
+
+		$linkclose='';
+		if (empty($notooltip))
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowSupplierInvoice");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
+		}
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
+		$result.=$linkstart.($max?dol_trunc($ref,$max):$ref).$linkend;
+		return $result;
+	}
 
 	 /**
-      *      Return next reference of supplier invoice not already used (or last reference)
-      *      according to numbering module defined into constant INVOICE_SUPPLIER_ADDON_NUMBER
-      *
-      *      @param	   Societe		$soc		Thirdparty object
-      *      @param    string		$mode		'next' for next value or 'last' for last value
-      *      @return   string					free ref or last ref
-      */
-    public function getNextNumRef($soc,$mode='next')
-    {
-        global $db, $langs, $conf;
-        $langs->load("orders");
-
-        // Clean parameters (if not defined or using deprecated value)
-        if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER='mod_facture_fournisseur_cactus';
-
-        $mybool=false;
-
-        $file = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER.".php";
-        $classname = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER;
-
-        // Include file with class
-        $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
-        foreach ($dirmodels as $reldir) {
-
-            $dir = dol_buildpath($reldir."core/modules/supplier_invoice/");
-
-            // Load file with numbering class (if found)
-            $mybool|=@include_once $dir.$file;
-        }
-
-        if (! $mybool)
-        {
-        	dol_print_error('',"Failed to include file ".$file);
-        	return '';
-        }
-
-        $obj = new $classname();
-        $numref = "";
-        $numref = $obj->getNumRef($soc,$this,$mode);
-
-        if ($numref != "")
-        {
-        	return $numref;
-        }
-        else
-       {
-       		$this->error=$obj->error;
-        	//dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
-        	return false;
-        }
-    }
-
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
+	  *      Return next reference of supplier invoice not already used (or last reference)
+	  *      according to numbering module defined into constant INVOICE_SUPPLIER_ADDON_NUMBER
+	  *
+	  *      @param	   Societe		$soc		Thirdparty object
+	  *      @param    string		$mode		'next' for next value or 'last' for last value
+	  *      @return   string					free ref or last ref
+	  */
+	public function getNextNumRef($soc,$mode='next')
+	{
+		global $db, $langs, $conf;
+		$langs->load("orders");
+
+		// Clean parameters (if not defined or using deprecated value)
+		if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER='mod_facture_fournisseur_cactus';
+
+		$mybool=false;
+
+		$file = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER.".php";
+		$classname = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER;
+
+		// Include file with class
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+		foreach ($dirmodels as $reldir) {
+
+			$dir = dol_buildpath($reldir."core/modules/supplier_invoice/");
+
+			// Load file with numbering class (if found)
+			$mybool|=@include_once $dir.$file;
+		}
+
+		if (! $mybool)
+		{
+			dol_print_error('',"Failed to include file ".$file);
+			return '';
+		}
+
+		$obj = new $classname();
+		$numref = "";
+		$numref = $obj->getNumRef($soc,$this,$mode);
+
+		if ($numref != "")
+		{
+			return $numref;
+		}
+		else
+	   {
+	   		$this->error=$obj->error;
+			//dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
+			return false;
+		}
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
-     *  @return	void
-     */
-    public function initAsSpecimen($option='')
-    {
-        global $langs,$conf;
+	 *  @return	void
+	 */
+	public function initAsSpecimen($option='')
+	{
+		global $langs,$conf;
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-        $now = dol_now();
-
-        // Load array of products prodids
-        $num_prods = 0;
-        $prodids = array();
-
-        $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product').")";
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num_prods = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num_prods)
-            {
-                $i++;
-                $row = $this->db->fetch_row($resql);
-                $prodids[$i] = $row[0];
-            }
-        }
-
-        // Initialise parametres
-        $this->id=0;
-        $this->ref = 'SPECIMEN';
-        $this->ref_supplier = 'SUPPLIER_REF_SPECIMEN';
-        $this->specimen=1;
-        $this->socid = 1;
-        $this->date = $now;
-        $this->date_lim_reglement=$this->date+3600*24*30;
-        $this->cond_reglement_code = 'RECEP';
-        $this->mode_reglement_code = 'CHQ';
-        $this->note_public='This is a comment (public)';
-        $this->note_private='This is a comment (private)';
+		$now = dol_now();
+
+		// Load array of products prodids
+		$num_prods = 0;
+		$prodids = array();
+
+		$sql = "SELECT rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."product";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num_prods = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num_prods)
+			{
+				$i++;
+				$row = $this->db->fetch_row($resql);
+				$prodids[$i] = $row[0];
+			}
+		}
+
+		// Initialise parametres
+		$this->id=0;
+		$this->ref = 'SPECIMEN';
+		$this->ref_supplier = 'SUPPLIER_REF_SPECIMEN';
+		$this->specimen=1;
+		$this->socid = 1;
+		$this->date = $now;
+		$this->date_lim_reglement=$this->date+3600*24*30;
+		$this->cond_reglement_code = 'RECEP';
+		$this->mode_reglement_code = 'CHQ';
+		$this->note_public='This is a comment (public)';
+		$this->note_private='This is a comment (private)';
 
 		if (empty($option) || $option != 'nolines')
 		{
-	        // Lines
-	        $nbp = 5;
-	        $xnbp = 0;
-	        while ($xnbp < $nbp)
-	        {
-	            $line=new FactureLigne($this->db);
-	            $line->desc=$langs->trans("Description")." ".$xnbp;
-	            $line->qty=1;
-	            $line->subprice=100;
-	            $line->pu_ht=100;		// the canelle template use pu_ht and not subprice
-	            $line->price=100;
-	            $line->tva_tx=19.6;
-	            $line->localtax1_tx=0;
-	            $line->localtax2_tx=0;
+			// Lines
+			$nbp = 5;
+			$xnbp = 0;
+			while ($xnbp < $nbp)
+			{
+				$line=new FactureLigne($this->db);
+				$line->desc=$langs->trans("Description")." ".$xnbp;
+				$line->qty=1;
+				$line->subprice=100;
+				$line->pu_ht=100;		// the canelle template use pu_ht and not subprice
+				$line->price=100;
+				$line->tva_tx=19.6;
+				$line->localtax1_tx=0;
+				$line->localtax2_tx=0;
 				if ($xnbp == 2)
 				{
-				    $line->total_ht=50;
-				    $line->total_ttc=59.8;
-				    $line->total_tva=9.8;
-	    			$line->remise_percent=50;
+					$line->total_ht=50;
+					$line->total_ttc=59.8;
+					$line->total_tva=9.8;
+					$line->remise_percent=50;
 				}
 				else
 				{
-				    $line->total_ht=100;
-				    $line->total_ttc=119.6;
-				    $line->total_tva=19.6;
-	    			$line->remise_percent=0;
+					$line->total_ht=100;
+					$line->total_ttc=119.6;
+					$line->total_tva=19.6;
+					$line->remise_percent=0;
 				}
 
-	            if ($num_prods > 0)
-	            {
+				if ($num_prods > 0)
+				{
 					$prodid = mt_rand(1, $num_prods);
-	            	$line->fk_product=$prodids[$prodid];
-	            }
-	            $line->product_type=0;
+					$line->fk_product=$prodids[$prodid];
+				}
+				$line->product_type=0;
 
-	            $this->lines[$xnbp]=$line;
+				$this->lines[$xnbp]=$line;
 
-	    		$this->total_ht       += $line->total_ht;
-	    		$this->total_tva      += $line->total_tva;
-	    		$this->total_ttc      += $line->total_ttc;
+				$this->total_ht       += $line->total_ht;
+				$this->total_tva      += $line->total_tva;
+				$this->total_ttc      += $line->total_ttc;
 
-	    		$xnbp++;
-	        }
+				$xnbp++;
+			}
 		}
 
-        $this->amount_ht      = $xnbp*100;
-        $this->total_ht       = $xnbp*100;
-        $this->total_tva      = $xnbp*19.6;
-        $this->total_ttc      = $xnbp*119.6;
-    }
+		$this->amount_ht      = $xnbp*100;
+		$this->total_ht       = $xnbp*100;
+		$this->total_tva      = $xnbp*19.6;
+		$this->total_ttc      = $xnbp*119.6;
+	}
 
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
@@ -2105,7 +2105,7 @@ 
 			{
 				$this->nb["supplier_invoices"]=$obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
 		}
 		else
@@ -2116,83 +2116,83 @@ 
 		}
 	}
 
-    /**
-     *	Load an object from its id and create a new one in database
-     *
-     *	@param      int		$fromid     	Id of object to clone
-     *	@param		int		$invertdetail	Reverse sign of amounts for lines
-     * 	@return		int						New id of clone
-     */
-    public function createFromClone($fromid,$invertdetail=0)
-    {
-        global $user,$langs;
+	/**
+	 *	Load an object from its id and create a new one in database
+	 *
+	 *	@param      int		$fromid     	Id of object to clone
+	 *	@param		int		$invertdetail	Reverse sign of amounts for lines
+	 * 	@return		int						New id of clone
+	 */
+	public function createFromClone($fromid,$invertdetail=0)
+	{
+		global $user,$langs;
 
-        $error=0;
+		$error=0;
 
-        $object=new FactureFournisseur($this->db);
+		$object=new FactureFournisseur($this->db);
 
 		$object->context['createfromclone'] = 'createfromclone';
 
 		$this->db->begin();
 
-        // Load source object
-        $object->fetch($fromid);
-        $object->id=0;
-        $object->statut=self::STATUS_DRAFT;
-
-        // Clear fields
-        $object->ref_supplier=$langs->trans("CopyOf").' '.$object->ref_supplier;
-        $object->author             = $user->id;
-        $object->user_valid         = '';
-        $object->fk_facture_source  = 0;
-        $object->date_creation      = '';
-        $object->date_validation    = '';
-        $object->date               = '';
-        $object->date_echeance      = '';
-        $object->ref_client         = '';
-        $object->close_code         = '';
-        $object->close_note         = '';
-
-        // Loop on each line of new invoice
-        foreach($object->lines as $i => $line)
-        {
-            if (isset($object->lines[$i]->info_bits) && ($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
-            {
-                unset($object->lines[$i]);
-            }
-        }
-
-        // Create clone
-        $result=$object->create($user);
-
-        // Other options
-        if ($result < 0)
-        {
-            $this->error=$object->error;
-            $error++;
-        }
-
-        if (! $error)
-        {
-
-
-
-        }
-
-        unset($object->context['createfromclone']);
-
-        // End
-        if (! $error)
-        {
-            $this->db->commit();
-            return $object->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		// Load source object
+		$object->fetch($fromid);
+		$object->id=0;
+		$object->statut=self::STATUS_DRAFT;
+
+		// Clear fields
+		$object->ref_supplier=$langs->trans("CopyOf").' '.$object->ref_supplier;
+		$object->author             = $user->id;
+		$object->user_valid         = '';
+		$object->fk_facture_source  = 0;
+		$object->date_creation      = '';
+		$object->date_validation    = '';
+		$object->date               = '';
+		$object->date_echeance      = '';
+		$object->ref_client         = '';
+		$object->close_code         = '';
+		$object->close_note         = '';
+
+		// Loop on each line of new invoice
+		foreach($object->lines as $i => $line)
+		{
+			if (isset($object->lines[$i]->info_bits) && ($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
+			{
+				unset($object->lines[$i]);
+			}
+		}
+
+		// Create clone
+		$result=$object->create($user);
+
+		// Other options
+		if ($result < 0)
+		{
+			$this->error=$object->error;
+			$error++;
+		}
+
+		if (! $error)
+		{
+
+
+
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (! $error)
+		{
+			$this->db->commit();
+			return $object->id;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 	/**
 	 *	Create a document onto disk according to template model.
@@ -2225,13 +2225,13 @@ 
 
 		if (empty($modele))
 		{
-		    return 0;
+			return 0;
 		}
 		else
 		{
-            $modelpath = "core/modules/supplier_invoice/pdf/";
+			$modelpath = "core/modules/supplier_invoice/pdf/";
 
-            return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	}
 
@@ -2263,23 +2263,23 @@ 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
-    /**
-     * Is the payment of the supplier invoice having a delay?
-     *
-     * @return bool
-     */
-    public function hasDelay()
-    {
-        global $conf;
+	/**
+	 * Is the payment of the supplier invoice having a delay?
+	 *
+	 * @return bool
+	 */
+	public function hasDelay()
+	{
+		global $conf;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        if (!$this->date_echeance) {
-            return false;
-        }
+		if (!$this->date_echeance) {
+			return false;
+		}
 
-        return ($this->statut == self::STATUS_VALIDATED) && ($this->date_echeance < ($now - $conf->facture->fournisseur->warning_delay));
-    }
+		return ($this->statut == self::STATUS_VALIDATED) && ($this->date_echeance < ($now - $conf->facture->fournisseur->warning_delay));
+	}
 }
 
 
@@ -2406,14 +2406,14 @@ 
 	public $multicurrency_total_ttc;
 
 	/**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db= $db;
-    }
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db= $db;
+	}
 
 	/**
 	 * Retrieves a supplier invoice line
@@ -2571,7 +2571,7 @@ 
 		if (empty($this->fk_unit)) {
 			$fk_unit = "null";
 		} else {
-		    $fk_unit = "'".$this->db->escape($this->fk_unit)."'";
+			$fk_unit = "'".$this->db->escape($this->fk_unit)."'";
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
@@ -2598,9 +2598,9 @@ 
 
 		// Multicurrency
 		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		$sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+		$sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+		$sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
 		$sql.= " WHERE rowid = ".$this->id;
 
@@ -2644,179 +2644,179 @@ 
 		return 1;
 	}
 
-    /**
-     *	Insert line into database
-     *
-     *	@param      int		$notrigger		1 no triggers
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function insert($notrigger=0)
-    {
-        global $user,$conf;
-
-        $error=0;
-
-        dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
-
-        // Clean parameters
-        $this->desc=trim($this->desc);
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type='0';
-        if (empty($this->localtax2_type)) $this->localtax2_type='0';
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->subprice)) $this->subprice=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
-
-        if (empty($this->pa_ht)) $this->pa_ht=0;
-        if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
-        if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
-        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
-
-
-        // Check parameters
-        if ($this->product_type < 0)
-        {
-            $this->error='ErrorProductTypeMustBe0orMore';
-            return -1;
-        }
-        if (! empty($this->fk_product))
-        {
-            // Check product exists
-            $result=Product::isExistingObject('product', $this->fk_product);
-            if ($result <= 0)
-            {
-                $this->error='ErrorProductIdDoesNotExists';
-                return -1;
-            }
-        }
-
-        $this->db->begin();
-
-        // Insertion dans base de la ligne
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-        $sql.= ' (fk_facture_fourn, fk_parent_line, label, description, qty,';
-        $sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-        $sql.= ' fk_product, product_type, remise_percent, pu_ht, pu_ttc,';
-        $sql.= ' date_start, date_end, fk_code_ventilation, rang, special_code,';
-        $sql.= ' info_bits, total_ht, tva, total_ttc, total_localtax1, total_localtax2, fk_unit';
-        $sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-        $sql.= ')';
-        $sql.= " VALUES (".$this->fk_facture_fourn.",";
-        $sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
-        $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->desc)."',";
-        $sql.= " ".price2num($this->qty).",";
-
-        $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
-        $sql.= " ".price2num($this->tva_tx).",";
-        $sql.= " ".price2num($this->localtax1_tx).",";
-        $sql.= " ".price2num($this->localtax2_tx).",";
-        $sql.= " '".$this->db->escape($this->localtax1_type)."',";
-        $sql.= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql.= ' '.(! empty($this->fk_product)?$this->fk_product:"null").',';
-        $sql.= " ".$this->product_type.",";
-        $sql.= " ".price2num($this->remise_percent).",";
-        $sql.= " ".price2num($this->subprice).",";
-        $sql.= " ".price2num($this->total_ttc/$this->qty).",";
-        $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").",";
-        $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").",";
-        $sql.= ' '.(!empty($this->fk_code_ventilation)?$this->fk_code_ventilation:0).',';
-        $sql.= ' '.$this->rang.',';
-        $sql.= ' '.$this->special_code.',';
-        $sql.= " '".$this->db->escape($this->info_bits)."',";
-        $sql.= " ".price2num($this->total_ht).",";
-        $sql.= " ".price2num($this->total_tva).",";
-        $sql.= " ".price2num($this->total_ttc).",";
-        $sql.= " ".price2num($this->total_localtax1).",";
-        $sql.= " ".price2num($this->total_localtax2);
-        $sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-        $sql.= ", ".(int) $this->fk_multicurrency;
-        $sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql.= ", ".price2num($this->multicurrency_subprice);
-        $sql.= ", ".price2num($this->multicurrency_total_ht);
-        $sql.= ", ".price2num($this->multicurrency_total_tva);
-        $sql.= ", ".price2num($this->multicurrency_total_ttc);
-        $sql.= ')';
-
-        dol_syslog(get_class($this)."::insert", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-            $this->rowid=$this->id;
-
-            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-            {
-                $result=$this->insertExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('LINEBILL_SUPPLIER_CREATE',$user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    return -2;
-                }
-                // End call triggers
-            }
-
-            $this->db->commit();
-            return $this->id;
-
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
-            /**
-     *  Mise a jour de l'objet ligne de commande en base
-     *
-     *  @return		int		<0 si ko, >0 si ok
-     */
-    function update_total()
-    {
-        $this->db->begin();
-
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
-        $sql.= "  total_ht='".price2num($this->total_ht)."'";
-        $sql.= ", tva='".price2num($this->total_tva)."'";
-        $sql.= ", total_localtax1='".price2num($this->total_localtax1)."'";
-        $sql.= ", total_localtax2='".price2num($this->total_localtax2)."'";
-        $sql.= ", total_ttc='".price2num($this->total_ttc)."'";
-        $sql.= " WHERE rowid = ".$this->rowid;
-
-        dol_syslog("FactureFournisseurLigne.class.php::update_total", LOG_DEBUG);
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
+	/**
+	 *	Insert line into database
+	 *
+	 *	@param      int		$notrigger		1 no triggers
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function insert($notrigger=0)
+	{
+		global $user,$conf;
+
+		$error=0;
+
+		dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
+
+		// Clean parameters
+		$this->desc=trim($this->desc);
+		if (empty($this->tva_tx)) $this->tva_tx=0;
+		if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
+		if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
+		if (empty($this->localtax1_type)) $this->localtax1_type='0';
+		if (empty($this->localtax2_type)) $this->localtax2_type='0';
+		if (empty($this->total_localtax1)) $this->total_localtax1=0;
+		if (empty($this->total_localtax2)) $this->total_localtax2=0;
+		if (empty($this->rang)) $this->rang=0;
+		if (empty($this->remise_percent)) $this->remise_percent=0;
+		if (empty($this->info_bits)) $this->info_bits=0;
+		if (empty($this->subprice)) $this->subprice=0;
+		if (empty($this->special_code)) $this->special_code=0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
+		if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
+
+		if (empty($this->pa_ht)) $this->pa_ht=0;
+		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
+		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
+		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
+		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+
+
+		// Check parameters
+		if ($this->product_type < 0)
+		{
+			$this->error='ErrorProductTypeMustBe0orMore';
+			return -1;
+		}
+		if (! empty($this->fk_product))
+		{
+			// Check product exists
+			$result=Product::isExistingObject('product', $this->fk_product);
+			if ($result <= 0)
+			{
+				$this->error='ErrorProductIdDoesNotExists';
+				return -1;
+			}
+		}
+
+		$this->db->begin();
+
+		// Insertion dans base de la ligne
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
+		$sql.= ' (fk_facture_fourn, fk_parent_line, label, description, qty,';
+		$sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+		$sql.= ' fk_product, product_type, remise_percent, pu_ht, pu_ttc,';
+		$sql.= ' date_start, date_end, fk_code_ventilation, rang, special_code,';
+		$sql.= ' info_bits, total_ht, tva, total_ttc, total_localtax1, total_localtax2, fk_unit';
+		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql.= ')';
+		$sql.= " VALUES (".$this->fk_facture_fourn.",";
+		$sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
+		$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
+		$sql.= " '".$this->db->escape($this->desc)."',";
+		$sql.= " ".price2num($this->qty).",";
+
+		$sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
+		$sql.= " ".price2num($this->tva_tx).",";
+		$sql.= " ".price2num($this->localtax1_tx).",";
+		$sql.= " ".price2num($this->localtax2_tx).",";
+		$sql.= " '".$this->db->escape($this->localtax1_type)."',";
+		$sql.= " '".$this->db->escape($this->localtax2_type)."',";
+		$sql.= ' '.(! empty($this->fk_product)?$this->fk_product:"null").',';
+		$sql.= " ".$this->product_type.",";
+		$sql.= " ".price2num($this->remise_percent).",";
+		$sql.= " ".price2num($this->subprice).",";
+		$sql.= " ".price2num($this->total_ttc/$this->qty).",";
+		$sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").",";
+		$sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").",";
+		$sql.= ' '.(!empty($this->fk_code_ventilation)?$this->fk_code_ventilation:0).',';
+		$sql.= ' '.$this->rang.',';
+		$sql.= ' '.$this->special_code.',';
+		$sql.= " '".$this->db->escape($this->info_bits)."',";
+		$sql.= " ".price2num($this->total_ht).",";
+		$sql.= " ".price2num($this->total_tva).",";
+		$sql.= " ".price2num($this->total_ttc).",";
+		$sql.= " ".price2num($this->total_localtax1).",";
+		$sql.= " ".price2num($this->total_localtax2);
+		$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql.= ", ".(int) $this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".price2num($this->multicurrency_subprice);
+		$sql.= ", ".price2num($this->multicurrency_total_ht);
+		$sql.= ", ".price2num($this->multicurrency_total_tva);
+		$sql.= ", ".price2num($this->multicurrency_total_ttc);
+		$sql.= ')';
+
+		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->rowid=$this->id;
+
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('LINEBILL_SUPPLIER_CREATE',$user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -2;
+				}
+				// End call triggers
+			}
+
+			$this->db->commit();
+			return $this->id;
+
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
+			/**
+			 *  Mise a jour de l'objet ligne de commande en base
+			 *
+			 *  @return		int		<0 si ko, >0 si ok
+			 */
+	function update_total()
+	{
+		$this->db->begin();
+
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
+		$sql.= "  total_ht='".price2num($this->total_ht)."'";
+		$sql.= ", tva='".price2num($this->total_tva)."'";
+		$sql.= ", total_localtax1='".price2num($this->total_localtax1)."'";
+		$sql.= ", total_localtax2='".price2num($this->total_localtax2)."'";
+		$sql.= ", total_ttc='".price2num($this->total_ttc)."'";
+		$sql.= " WHERE rowid = ".$this->rowid;
+
+		dol_syslog("FactureFournisseurLigne.class.php::update_total", LOG_DEBUG);
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
  }

Spacing +709 added lines, -709 removed lines

@@ -40,12 +40,12 @@ 
  */
 class FactureFournisseur extends CommonInvoice
 {
-    public $element='invoice_supplier';
-    public $table_element='facture_fourn';
-    public $table_element_line='facture_fourn_det';
-    public $fk_element='fk_facture_fourn';
-    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto='bill';
+    public $element = 'invoice_supplier';
+    public $table_element = 'facture_fourn';
+    public $table_element_line = 'facture_fourn_det';
+    public $fk_element = 'fk_facture_fourn';
+    protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+    public $picto = 'bill';
 
     /**
      * {@inheritdoc}
@@ -76,10 +76,10 @@ 
 
     public $author;
     public $libelle;
-    public $datec;            // Creation date
-    public $tms;              // Last update date
-    public $date;             // Invoice date
-    public $date_echeance;    // Max payment date
+    public $datec; // Creation date
+    public $tms; // Last update date
+    public $date; // Invoice date
+    public $date_echeance; // Max payment date
     public $amount;
     public $remise;
     public $tva;
@@ -117,9 +117,9 @@ 
 	//Incorterms
     public $fk_incoterms;
     public $location_incoterms;
-    public $libelle_incoterms;  //Used into tooltip
+    public $libelle_incoterms; //Used into tooltip
 
-    public $extraparams=array();
+    public $extraparams = array();
 
 	// Multicurrency
     public $fk_multicurrency;
@@ -214,15 +214,15 @@ 
      */
     public function create($user)
     {
-        global $langs,$conf,$hookmanager;
+        global $langs, $conf, $hookmanager;
 
-		$error=0;
-        $now=dol_now();
+		$error = 0;
+        $now = dol_now();
 
         // Clean parameters
-        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
+        if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
         if (empty($this->type)) $this->type = self::TYPE_STANDARD;
-        if (empty($this->date)) $this->date=$now;
+        if (empty($this->date)) $this->date = $now;
 
         $socid = $this->socid;
         $ref_supplier = $this->ref_supplier;
@@ -230,7 +230,7 @@ 
         $remise = $this->remise;
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
 		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
 		if (empty($this->fk_multicurrency))
 		{
@@ -241,76 +241,76 @@ 
 
         $this->db->begin();
 
-        if (! $remise) $remise = 0 ;
+        if (!$remise) $remise = 0;
         $totalht = ($amount - $remise);
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (";
-		$sql.= "ref";
-        $sql.= ", ref_supplier";
-        $sql.= ", entity";
-        $sql.= ", type";
-        $sql.= ", libelle";
-        $sql.= ", fk_soc";
-        $sql.= ", datec";
-        $sql.= ", datef";
-		$sql.= ", fk_projet";
-		$sql.= ", fk_cond_reglement";
-		$sql.= ", fk_mode_reglement";
-        $sql.= ", fk_account";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", fk_user_author";
-        $sql.= ", date_lim_reglement";
-		$sql.= ", fk_incoterms, location_incoterms";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ", fk_facture_source";
-        $sql.= ")";
-        $sql.= " VALUES (";
-		$sql.= "'(PROV)'";
-        $sql.= ", '".$this->db->escape($this->ref_supplier)."'";
-        $sql.= ", ".$conf->entity;
-        $sql.= ", '".$this->db->escape($this->type)."'";
-        $sql.= ", '".$this->db->escape($this->libelle)."'";
-        $sql.= ", ".$this->socid;
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ", '".$this->db->idate($this->date)."'";
-		$sql.= ", ".(isset($this->fk_project)?$this->fk_project:"null");
-		$sql.= ", ".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null");
-		$sql.= ", ".(isset($this->mode_reglement_id)?$this->mode_reglement_id:"null");
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", ".$user->id.",";
-        $sql.= $this->date_echeance!=''?"'".$this->db->idate($this->date_echeance)."'":"null";
-		$sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ", ".(int) $this->fk_multicurrency;
-		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ", ".(isset($this->fk_facture_source)?$this->fk_facture_source:"NULL");
-        $sql.= ")";
+		$sql .= "ref";
+        $sql .= ", ref_supplier";
+        $sql .= ", entity";
+        $sql .= ", type";
+        $sql .= ", libelle";
+        $sql .= ", fk_soc";
+        $sql .= ", datec";
+        $sql .= ", datef";
+		$sql .= ", fk_projet";
+		$sql .= ", fk_cond_reglement";
+		$sql .= ", fk_mode_reglement";
+        $sql .= ", fk_account";
+        $sql .= ", note_private";
+        $sql .= ", note_public";
+        $sql .= ", fk_user_author";
+        $sql .= ", date_lim_reglement";
+		$sql .= ", fk_incoterms, location_incoterms";
+        $sql .= ", fk_multicurrency";
+        $sql .= ", multicurrency_code";
+        $sql .= ", multicurrency_tx";
+        $sql .= ", fk_facture_source";
+        $sql .= ")";
+        $sql .= " VALUES (";
+		$sql .= "'(PROV)'";
+        $sql .= ", '".$this->db->escape($this->ref_supplier)."'";
+        $sql .= ", ".$conf->entity;
+        $sql .= ", '".$this->db->escape($this->type)."'";
+        $sql .= ", '".$this->db->escape($this->libelle)."'";
+        $sql .= ", ".$this->socid;
+        $sql .= ", '".$this->db->idate($now)."'";
+        $sql .= ", '".$this->db->idate($this->date)."'";
+		$sql .= ", ".(isset($this->fk_project) ? $this->fk_project : "null");
+		$sql .= ", ".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null");
+		$sql .= ", ".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null");
+        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+        $sql .= ", '".$this->db->escape($this->note_private)."'";
+        $sql .= ", '".$this->db->escape($this->note_public)."'";
+        $sql .= ", ".$user->id.",";
+        $sql .= $this->date_echeance != '' ? "'".$this->db->idate($this->date_echeance)."'" : "null";
+		$sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", ".(int) $this->fk_multicurrency;
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".(double) $this->multicurrency_tx;
+        $sql .= ", ".(isset($this->fk_facture_source) ? $this->fk_facture_source : "NULL");
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn');
 
             // Update ref with new one
-            $this->ref='(PROV'.$this->id.')';
+            $this->ref = '(PROV'.$this->id.')';
             $sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
             dol_syslog(get_class($this)."::create", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (! $resql) $error++;
+            $resql = $this->db->query($sql);
+            if (!$resql) $error++;
 
             // Add object linked
-            if (! $error && $this->id && ! empty($this->origin) && ! empty($this->origin_id))
+            if (!$error && $this->id && !empty($this->origin) && !empty($this->origin_id))
             {
                 $ret = $this->add_object_linked();
-                if (! $ret)
+                if (!$ret)
                 {
                     dol_print_error($this->db);
                     $error++;
@@ -325,7 +325,7 @@ 
                     $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
                     $sql .= ' VALUES ('.$this->id.')';
 
-                    $resql_insert=$this->db->query($sql);
+                    $resql_insert = $this->db->query($sql);
                     if ($resql_insert)
                     {
                         $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
@@ -340,13 +340,13 @@ 
                             $this->lines[$i]->qty,
                             $this->lines[$i]->fk_product,
                             'HT',
-                            (! empty($this->lines[$i]->info_bits)?$this->lines[$i]->info_bits:''),
+                            (!empty($this->lines[$i]->info_bits) ? $this->lines[$i]->info_bits : ''),
                             $this->lines[$i]->product_type
                         );
                     }
                     else
                     {
-                        $this->error=$this->db->lasterror();
+                        $this->error = $this->db->lasterror();
                         $this->db->rollback();
                         return -5;
                     }
@@ -361,12 +361,12 @@ 
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
-                	if (! is_object($line)) $line = (object) $line;
+                	if (!is_object($line)) $line = (object) $line;
 
                 	$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
 			        $sql .= ' VALUES ('.$this->id.')';
 
-			        $resql_insert=$this->db->query($sql);
+			        $resql_insert = $this->db->query($sql);
 			        if ($resql_insert)
 			        {
 			            $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
@@ -381,13 +381,13 @@ 
 			                $line->qty,
 			                $line->fk_product,
 			                'HT',
-			                (! empty($line->info_bits)?$line->info_bits:''),
+			                (!empty($line->info_bits) ? $line->info_bits : ''),
 			                $line->product_type
 			                );
 			        }
 			        else
 			        {
-			            $this->error=$this->db->lasterror();
+			            $this->error = $this->db->lasterror();
 			            $this->db->rollback();
 			            return -5;
 			        }
@@ -395,21 +395,21 @@ 
 			}
 
             // Update total price
-            $result=$this->update_price();
+            $result = $this->update_price();
             if ($result > 0)
             {
-            	$action='create';
+            	$action = 'create';
 
 				// Actions on extra fields (by external module or standard code)
 				// TODO le hook fait double emploi avec le trigger !!
 				$hookmanager->initHooks(array('supplierinvoicedao'));
-				$parameters=array('socid'=>$this->id);
-				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('socid'=>$this->id);
+				$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
 	            	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 					{
-						$result=$this->insertExtraFields();               // This also set $this->error or $this->errors if errors are found
+						$result = $this->insertExtraFields(); // This also set $this->error or $this->errors if errors are found
 						if ($result < 0)
 						{
 							$error++;
@@ -418,15 +418,15 @@ 
 				}
 				else if ($reshook < 0) $error++;
 
-				if (! $error)
+				if (!$error)
 				{
                     // Call trigger
-                    $result=$this->call_trigger('BILL_SUPPLIER_CREATE',$user);
+                    $result = $this->call_trigger('BILL_SUPPLIER_CREATE', $user);
                     if ($result < 0) $error++;
                     // End call triggers
 				}
 
-                if (! $error)
+                if (!$error)
                 {
                     $this->db->commit();
                     return $this->id;
@@ -439,7 +439,7 @@ 
             }
             else
             {
-                $this->error=$langs->trans('FailedToUpdatePrice');
+                $this->error = $langs->trans('FailedToUpdatePrice');
                 $this->db->rollback();
                 return -3;
             }
@@ -448,13 +448,13 @@ 
         {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
-                $this->error=$langs->trans('ErrorRefAlreadyExists');
+                $this->error = $langs->trans('ErrorRefAlreadyExists');
                 $this->db->rollback();
                 return -1;
             }
             else
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
@@ -468,88 +468,88 @@ 
      *    @param	string	$ref		Ref supplier invoice
      *    @return   int        			<0 if KO, >0 if OK, 0 if not found
      */
-    public function fetch($id='',$ref='')
+    public function fetch($id = '', $ref = '')
     {
         global $langs;
 
         $sql = "SELECT";
-        $sql.= " t.rowid,";
-		$sql.= " t.ref,";
-        $sql.= " t.ref_supplier,";
-        $sql.= " t.entity,";
-        $sql.= " t.type,";
-        $sql.= " t.fk_soc,";
-        $sql.= " t.datec,";
-        $sql.= " t.datef,";
-        $sql.= " t.tms,";
-        $sql.= " t.libelle,";
-        $sql.= " t.paye,";
-        $sql.= " t.amount,";
-        $sql.= " t.remise,";
-        $sql.= " t.close_code,";
-        $sql.= " t.close_note,";
-        $sql.= " t.tva,";
-        $sql.= " t.localtax1,";
-        $sql.= " t.localtax2,";
+        $sql .= " t.rowid,";
+		$sql .= " t.ref,";
+        $sql .= " t.ref_supplier,";
+        $sql .= " t.entity,";
+        $sql .= " t.type,";
+        $sql .= " t.fk_soc,";
+        $sql .= " t.datec,";
+        $sql .= " t.datef,";
+        $sql .= " t.tms,";
+        $sql .= " t.libelle,";
+        $sql .= " t.paye,";
+        $sql .= " t.amount,";
+        $sql .= " t.remise,";
+        $sql .= " t.close_code,";
+        $sql .= " t.close_note,";
+        $sql .= " t.tva,";
+        $sql .= " t.localtax1,";
+        $sql .= " t.localtax2,";
         //$sql.= " t.total,";
-        $sql.= " t.total_ht,";
-        $sql.= " t.total_tva,";
-        $sql.= " t.total_ttc,";
-        $sql.= " t.fk_statut,";
-        $sql.= " t.fk_user_author,";
-        $sql.= " t.fk_user_valid,";
-        $sql.= " t.fk_facture_source,";
-        $sql.= " t.fk_projet,";
-        $sql.= " t.fk_cond_reglement,";
-        $sql.= " t.fk_account,";
-        $sql.= " t.fk_mode_reglement,";
-        $sql.= " t.date_lim_reglement,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
-        $sql.= " t.model_pdf,";
-        $sql.= " t.import_key,";
-        $sql.= " t.extraparams,";
-        $sql.= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
-        $sql.= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle,";
-        $sql.= ' s.nom as socnom, s.rowid as socid,';
-        $sql.= ' t.fk_incoterms, t.location_incoterms,';
-        $sql.= " i.libelle as libelle_incoterms,";
-        $sql.= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (t.fk_cond_reglement = cr.rowid AND cr.entity = " . getEntity('c_payment_term') . ")";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON (t.fk_mode_reglement = p.id AND p.entity = " . getEntity('c_paiement') . ")";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
-        if ($id)  $sql.= " WHERE t.rowid=".$id;
-        if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
+        $sql .= " t.total_ht,";
+        $sql .= " t.total_tva,";
+        $sql .= " t.total_ttc,";
+        $sql .= " t.fk_statut,";
+        $sql .= " t.fk_user_author,";
+        $sql .= " t.fk_user_valid,";
+        $sql .= " t.fk_facture_source,";
+        $sql .= " t.fk_projet,";
+        $sql .= " t.fk_cond_reglement,";
+        $sql .= " t.fk_account,";
+        $sql .= " t.fk_mode_reglement,";
+        $sql .= " t.date_lim_reglement,";
+        $sql .= " t.note_private,";
+        $sql .= " t.note_public,";
+        $sql .= " t.model_pdf,";
+        $sql .= " t.import_key,";
+        $sql .= " t.extraparams,";
+        $sql .= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
+        $sql .= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle,";
+        $sql .= ' s.nom as socnom, s.rowid as socid,';
+        $sql .= ' t.fk_incoterms, t.location_incoterms,';
+        $sql .= " i.libelle as libelle_incoterms,";
+        $sql .= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (t.fk_cond_reglement = cr.rowid AND cr.entity = ".getEntity('c_payment_term').")";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON (t.fk_mode_reglement = p.id AND p.entity = ".getEntity('c_paiement').")";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
+        if ($id)  $sql .= " WHERE t.rowid=".$id;
+        if ($ref) $sql .= " WHERE t.ref='".$this->db->escape($ref)."'";
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id					= $obj->rowid;
-                $this->ref					= $obj->ref?$obj->ref:$obj->rowid;	// We take rowid if ref is empty for backward compatibility
+                $this->id = $obj->rowid;
+                $this->ref = $obj->ref ? $obj->ref : $obj->rowid; // We take rowid if ref is empty for backward compatibility
 
-                $this->ref_supplier			= $obj->ref_supplier;
+                $this->ref_supplier = $obj->ref_supplier;
                 $this->entity				= $obj->entity;
-                $this->type					= empty($obj->type)? self::TYPE_STANDARD:$obj->type;
+                $this->type					= empty($obj->type) ? self::TYPE_STANDARD : $obj->type;
                 $this->fk_soc				= $obj->fk_soc;
                 $this->datec				= $this->db->jdate($obj->datec);
                 $this->date					= $this->db->jdate($obj->datef);
                 $this->datep				= $this->db->jdate($obj->datef);
-                $this->tms					= $this->db->jdate($obj->tms);
-                $this->libelle				= $obj->libelle;
+                $this->tms = $this->db->jdate($obj->tms);
+                $this->libelle = $obj->libelle;
                 $this->label				= $obj->libelle;
                 $this->paye					= $obj->paye;
                 $this->amount				= $obj->amount;
                 $this->remise				= $obj->remise;
                 $this->close_code			= $obj->close_code;
                 $this->close_note			= $obj->close_note;
-                $this->tva					= $obj->tva;
+                $this->tva = $obj->tva;
                 $this->total_localtax1		= $obj->localtax1;
                 $this->total_localtax2		= $obj->localtax2;
                 //$this->total				= $obj->total;
@@ -558,26 +558,26 @@ 
                 $this->total_ttc			= $obj->total_ttc;
                 $this->fk_statut			= $obj->fk_statut;
                 $this->statut				= $obj->fk_statut;
-                $this->fk_user_author		= $obj->fk_user_author;
+                $this->fk_user_author = $obj->fk_user_author;
                 $this->author				= $obj->fk_user_author;
                 $this->fk_user_valid		= $obj->fk_user_valid;
-                $this->fk_facture_source	= $obj->fk_facture_source;
+                $this->fk_facture_source = $obj->fk_facture_source;
                 $this->fk_project			= $obj->fk_projet;
 	            $this->cond_reglement_id	= $obj->fk_cond_reglement;
-	            $this->cond_reglement_code	= $obj->cond_reglement_code;
+	            $this->cond_reglement_code = $obj->cond_reglement_code;
 	            $this->cond_reglement		= $obj->cond_reglement_libelle;
-	            $this->cond_reglement_doc	= $obj->cond_reglement_libelle;
-                $this->fk_account           = $obj->fk_account;
+	            $this->cond_reglement_doc = $obj->cond_reglement_libelle;
+                $this->fk_account = $obj->fk_account;
 	            $this->mode_reglement_id	= $obj->fk_mode_reglement;
-	            $this->mode_reglement_code	= $obj->mode_reglement_code;
-	            $this->mode_reglement		= $obj->mode_reglement_libelle;
+	            $this->mode_reglement_code = $obj->mode_reglement_code;
+	            $this->mode_reglement = $obj->mode_reglement_libelle;
                 $this->date_echeance		= $this->db->jdate($obj->date_lim_reglement);
-                $this->note					= $obj->note_private;	// deprecated
+                $this->note = $obj->note_private; // deprecated
                 $this->note_private			= $obj->note_private;
-                $this->note_public			= $obj->note_public;
-                $this->model_pdf			= $obj->model_pdf;
+                $this->note_public = $obj->note_public;
+                $this->model_pdf = $obj->model_pdf;
                 $this->modelpdf			    = $obj->model_pdf;
-                $this->import_key			= $obj->import_key;
+                $this->import_key = $obj->import_key;
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -586,13 +586,13 @@ 
 
 				// Multicurrency
 				$this->fk_multicurrency 		= $obj->fk_multicurrency;
-				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->multicurrency_code = $obj->multicurrency_code;
 				$this->multicurrency_tx 		= $obj->multicurrency_tx;
-				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->multicurrency_total_ht = $obj->multicurrency_total_ht;
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-                $this->extraparams			= (array) json_decode($obj->extraparams, true);
+                $this->extraparams = (array) json_decode($obj->extraparams, true);
 
                 $this->socid  = $obj->socid;
                 $this->socnom = $obj->socnom;
@@ -600,23 +600,23 @@ 
                 // Retreive all extrafield
                 // fetch optionals attributes and labels
                 require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
+                $extrafields = new ExtraFields($this->db);
+                $extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+                $this->fetch_optionals($this->id, $extralabels);
 
                 if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
 
-                $result=$this->fetch_lines();
+                $result = $this->fetch_lines();
                 if ($result < 0)
                 {
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     return -3;
                 }
 
             }
             else
             {
-                $this->error='Bill with id '.$id.' not found';
+                $this->error = 'Bill with id '.$id.' not found';
                 dol_syslog(get_class($this).'::fetch '.$this->error);
                 return 0;
             }
@@ -626,7 +626,7 @@ 
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -640,14 +640,14 @@ 
     function fetch_lines()
     {
         $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
-        $sql.= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
-        $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
-        $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
-		$sql.= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
-        $sql.= ' WHERE fk_facture_fourn='.$this->id;
-        $sql.= ' ORDER BY f.rang, f.rowid';
+        $sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
+        $sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
+        $sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
+		$sql .= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
+        $sql .= ' WHERE fk_facture_fourn='.$this->id;
+        $sql .= ' ORDER BY f.rang, f.rowid';
 
 
         dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
@@ -664,46 +664,46 @@ 
 
 	                $line = new SupplierInvoiceLine($this->db);
 
-                    $line->id				= $obj->rowid;
-                    $line->rowid			= $obj->rowid;
+                    $line->id = $obj->rowid;
+                    $line->rowid = $obj->rowid;
                     $line->description		= $obj->description;
                     $line->product_ref		= $obj->product_ref;
-                    $line->ref				= $obj->product_ref;
+                    $line->ref = $obj->product_ref;
                     $line->ref_supplier		= $obj->ref_supplier;
                     $line->libelle			= $obj->label;
                     $line->label  			= $obj->label;
                     $line->product_desc		= $obj->product_desc;
-                    $line->subprice			= $obj->pu_ht;
-                    $line->pu_ht			= $obj->pu_ht;
+                    $line->subprice = $obj->pu_ht;
+                    $line->pu_ht = $obj->pu_ht;
                     $line->pu_ttc			= $obj->pu_ttc;
 
-                    $line->vat_src_code     = $obj->vat_src_code;
+                    $line->vat_src_code = $obj->vat_src_code;
                     $line->tva_tx			= $obj->tva_tx;
                     $line->localtax1_tx		= $obj->localtax1_tx;
                     $line->localtax2_tx		= $obj->localtax2_tx;
                     $line->localtax1_type	= $obj->localtax1_type;
                     $line->localtax2_type	= $obj->localtax2_type;
                     $line->qty				= $obj->qty;
-                    $line->remise_percent   = $obj->remise_percent;
+                    $line->remise_percent = $obj->remise_percent;
                     $line->tva				= $obj->total_tva;
                     $line->total_ht			= $obj->total_ht;
                     $line->total_tva		= $obj->total_tva;
                     $line->total_localtax1	= $obj->total_localtax1;
                     $line->total_localtax2	= $obj->total_localtax2;
-                    $line->fk_facture_fourn     = $obj->fk_facture_fourn;
-                    $line->total_ttc		= $obj->total_ttc;
-                    $line->fk_product		= $obj->fk_product;
+                    $line->fk_facture_fourn = $obj->fk_facture_fourn;
+                    $line->total_ttc = $obj->total_ttc;
+                    $line->fk_product = $obj->fk_product;
                     $line->product_type		= $obj->product_type;
                     $line->product_label	= $obj->label;
-                    $line->info_bits		= $obj->info_bits;
+                    $line->info_bits = $obj->info_bits;
                     $line->fk_parent_line   = $obj->fk_parent_line;
                     $line->special_code		= $obj->special_code;
-                    $line->rang       		= $obj->rang;
+                    $line->rang = $obj->rang;
                     $line->fk_unit          = $obj->fk_unit;
 
 					// Multicurrency
-					$line->fk_multicurrency 		= $obj->fk_multicurrency;
-					$line->multicurrency_code 		= $obj->multicurrency_code;
+					$line->fk_multicurrency = $obj->fk_multicurrency;
+					$line->multicurrency_code = $obj->multicurrency_code;
 					$line->multicurrency_subprice 	= $obj->multicurrency_subprice;
 					$line->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
 					$line->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
@@ -719,7 +719,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -3;
         }
     }
@@ -732,42 +732,42 @@ 
      *  @param  int		$notrigger       0=launch triggers after, 1=disable triggers
      *  @return int 			         <0 if KO, >0 if OK
      */
-    public function update($user=null, $notrigger=0)
+    public function update($user = null, $notrigger = 0)
     {
         global $conf, $langs;
-        $error=0;
+        $error = 0;
 
         // Clean parameters
-        if (empty($this->type)) $this->type= self::TYPE_STANDARD;
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-        if (isset($this->entity)) $this->entity=trim($this->entity);
-        if (isset($this->type)) $this->type=trim($this->type);
-        if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
-        if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-        if (isset($this->paye)) $this->paye=trim($this->paye);
-        if (isset($this->amount)) $this->amount=trim($this->amount);
-        if (isset($this->remise)) $this->remise=trim($this->remise);
-        if (isset($this->close_code)) $this->close_code=trim($this->close_code);
-        if (isset($this->close_note)) $this->close_note=trim($this->close_note);
-        if (isset($this->tva)) $this->tva=trim($this->tva);
-        if (isset($this->localtax1)) $this->localtax1=trim($this->localtax1);
-        if (isset($this->localtax2)) $this->localtax2=trim($this->localtax2);
-        if (empty($this->total_ht)) $this->total_ht=0;
-        if (empty($this->total_tva)) $this->total_tva=0;
+        if (empty($this->type)) $this->type = self::TYPE_STANDARD;
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+        if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
+        if (isset($this->entity)) $this->entity = trim($this->entity);
+        if (isset($this->type)) $this->type = trim($this->type);
+        if (isset($this->fk_soc)) $this->fk_soc = trim($this->fk_soc);
+        if (isset($this->libelle)) $this->libelle = trim($this->libelle);
+        if (isset($this->paye)) $this->paye = trim($this->paye);
+        if (isset($this->amount)) $this->amount = trim($this->amount);
+        if (isset($this->remise)) $this->remise = trim($this->remise);
+        if (isset($this->close_code)) $this->close_code = trim($this->close_code);
+        if (isset($this->close_note)) $this->close_note = trim($this->close_note);
+        if (isset($this->tva)) $this->tva = trim($this->tva);
+        if (isset($this->localtax1)) $this->localtax1 = trim($this->localtax1);
+        if (isset($this->localtax2)) $this->localtax2 = trim($this->localtax2);
+        if (empty($this->total_ht)) $this->total_ht = 0;
+        if (empty($this->total_tva)) $this->total_tva = 0;
         //	if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1);
         //	if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2);
-        if (isset($this->total_ttc)) $this->total_ttc=trim($this->total_ttc);
-        if (isset($this->statut)) $this->statut=(int) $this->statut;
-        if (isset($this->author)) $this->author=trim($this->author);
-        if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-        if (isset($this->fk_facture_source)) $this->fk_facture_source=trim($this->fk_facture_source);
-        if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
-        if (isset($this->cond_reglement_id)) $this->cond_reglement_id=trim($this->cond_reglement_id);
-        if (isset($this->note_private)) $this->note=trim($this->note_private);
-        if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-        if (isset($this->model_pdf)) $this->model_pdf=trim($this->model_pdf);
-        if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+        if (isset($this->total_ttc)) $this->total_ttc = trim($this->total_ttc);
+        if (isset($this->statut)) $this->statut = (int) $this->statut;
+        if (isset($this->author)) $this->author = trim($this->author);
+        if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
+        if (isset($this->fk_facture_source)) $this->fk_facture_source = trim($this->fk_facture_source);
+        if (isset($this->fk_project)) $this->fk_project = trim($this->fk_project);
+        if (isset($this->cond_reglement_id)) $this->cond_reglement_id = trim($this->cond_reglement_id);
+        if (isset($this->note_private)) $this->note = trim($this->note_private);
+        if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+        if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
+        if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 
 
         // Check parameters
@@ -775,39 +775,39 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn SET";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-        $sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
-        $sql.= " entity=".(isset($this->entity)?$this->entity:"null").",";
-        $sql.= " type=".(isset($this->type)?$this->type:"null").",";
-        $sql.= " fk_soc=".(isset($this->fk_soc)?$this->fk_soc:"null").",";
-        $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
-        $sql.= " datef=".(dol_strlen($this->date)!=0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
-        if (dol_strlen($this->tms) != 0) $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-        $sql.= " libelle=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " paye=".(isset($this->paye)?$this->paye:"null").",";
-        $sql.= " amount=".(isset($this->amount)?$this->amount:"null").",";
-        $sql.= " remise=".(isset($this->remise)?$this->remise:"null").",";
-        $sql.= " close_code=".(isset($this->close_code)?"'".$this->db->escape($this->close_code)."'":"null").",";
-        $sql.= " close_note=".(isset($this->close_note)?"'".$this->db->escape($this->close_note)."'":"null").",";
-        $sql.= " tva=".(isset($this->tva)?$this->tva:"null").",";
-        $sql.= " localtax1=".(isset($this->localtax1)?$this->localtax1:"null").",";
-        $sql.= " localtax2=".(isset($this->localtax2)?$this->localtax2:"null").",";
+		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+        $sql .= " ref_supplier=".(isset($this->ref_supplier) ? "'".$this->db->escape($this->ref_supplier)."'" : "null").",";
+        $sql .= " entity=".(isset($this->entity) ? $this->entity : "null").",";
+        $sql .= " type=".(isset($this->type) ? $this->type : "null").",";
+        $sql .= " fk_soc=".(isset($this->fk_soc) ? $this->fk_soc : "null").",";
+        $sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+        $sql .= " datef=".(dol_strlen($this->date) != 0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
+        if (dol_strlen($this->tms) != 0) $sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+        $sql .= " libelle=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+        $sql .= " paye=".(isset($this->paye) ? $this->paye : "null").",";
+        $sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
+        $sql .= " remise=".(isset($this->remise) ? $this->remise : "null").",";
+        $sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
+        $sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
+        $sql .= " tva=".(isset($this->tva) ? $this->tva : "null").",";
+        $sql .= " localtax1=".(isset($this->localtax1) ? $this->localtax1 : "null").",";
+        $sql .= " localtax2=".(isset($this->localtax2) ? $this->localtax2 : "null").",";
         //$sql.= " total=".(isset($this->total)?$this->total:"null").",";
-        $sql.= " total_ht=".(isset($this->total_ht)?$this->total_ht:"null").",";
-        $sql.= " total_tva=".(isset($this->total_tva)?$this->total_tva:"null").",";
-        $sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").",";
-        $sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-        $sql.= " fk_user_author=".(isset($this->author)?$this->author:"null").",";
-        $sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
-        $sql.= " fk_facture_source=".(isset($this->fk_facture_source)?$this->fk_facture_source:"null").",";
-        $sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
-        $sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").",";
-        $sql.= " date_lim_reglement=".(dol_strlen($this->date_echeance)!=0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";
-        $sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-        $sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-        $sql.= " model_pdf=".(isset($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null").",";
-        $sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
+        $sql .= " total_tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
+        $sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
+        $sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+        $sql .= " fk_user_author=".(isset($this->author) ? $this->author : "null").",";
+        $sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
+        $sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? $this->fk_facture_source : "null").",";
+        $sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
+        $sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
+        $sql .= " date_lim_reglement=".(dol_strlen($this->date_echeance) != 0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";
+        $sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+        $sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+        $sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
+        $sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
+        $sql .= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
@@ -824,12 +824,12 @@ 
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('BILL_SUPPLIER_UPDATE',$user);
+                $result = $this->call_trigger('BILL_SUPPLIER_UPDATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
@@ -838,13 +838,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -861,23 +861,23 @@ 
      *	@param	    int		$notrigger	    1=Does not execute triggers, 0= execute triggers
      *	@return		int						<0 if KO, >0 if OK
      */
-    public function delete(User $user, $notrigger=0)
+    public function delete(User $user, $notrigger = 0)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
-        $rowid=$this->id;
+        $rowid = $this->id;
 
         dol_syslog("FactureFournisseur::delete rowid=".$rowid, LOG_DEBUG);
 
         // TODO Test if there is at least on payment. If yes, refuse to delete.
 
-        $error=0;
+        $error = 0;
         $this->db->begin();
 
-        if (! $error && ! $notrigger)
+        if (!$error && !$notrigger)
         {
             // Call trigger
-            $result=$this->call_trigger('BILL_SUPPLIER_DELETE',$user);
+            $result = $this->call_trigger('BILL_SUPPLIER_DELETE', $user);
             if ($result < 0)
             {
                 $this->db->rollback();
@@ -886,7 +886,7 @@ 
             // Fin appel triggers
         }
 
-        if (! $error)
+        if (!$error)
         {
             $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -896,7 +896,7 @@ 
                 $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
                 dol_syslog(get_class($this)."::delete", LOG_DEBUG);
                 $resql2 = $this->db->query($sql);
-                if (! $resql2) {
+                if (!$resql2) {
                 	$error++;
                 }
             }
@@ -905,21 +905,21 @@ 
             }
         }
 
-		if (! $error)
+		if (!$error)
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
 			if ($res < 0) $error++;
 		}
 
-        if (! $error)
+        if (!$error)
         {
         	// Delete linked object
         	$res = $this->deleteObjectLinked();
         	if ($res < 0) $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
         	// We remove directory
         	if ($conf->fournisseur->facture->dir_output)
@@ -928,22 +928,22 @@ 
 
         		$ref = dol_sanitizeFileName($this->ref);
         		$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoive_supplier').$ref;
-        		$file = $dir . "/" . $ref . ".pdf";
+        		$file = $dir."/".$ref.".pdf";
         		if (file_exists($file))
         		{
-        			if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+        			if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
         			{
-        				$this->error='ErrorFailToDeleteFile';
+        				$this->error = 'ErrorFailToDeleteFile';
         				$error++;
         			}
         		}
         		if (file_exists($dir))
         		{
-        			$res=@dol_delete_dir_recursive($dir);
+        			$res = @dol_delete_dir_recursive($dir);
 
-        			if (! $res)
+        			if (!$res)
         			{
-        				$this->error='ErrorFailToDeleteDir';
+        				$this->error = 'ErrorFailToDeleteDir';
         				$error++;
         			}
         		}
@@ -951,9 +951,9 @@ 
         }
 
         // Remove extrafields
-        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
         {
-        	$result=$this->deleteExtraFields();
+        	$result = $this->deleteExtraFields();
         	if ($result < 0)
         	{
         		$error++;
@@ -961,7 +961,7 @@ 
         	}
         }
 
-        if (! $error)
+        if (!$error)
         {
         	dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
         	$this->db->commit();
@@ -969,7 +969,7 @@ 
         }
         else
         {
-        	$this->error=$this->db->lasterror();
+        	$this->error = $this->db->lasterror();
         	$this->db->rollback();
         	return -$error;
         }
@@ -984,34 +984,34 @@ 
 	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet. Not implementd yet.
      *	@return int         		<0 si ko, >0 si ok
      */
-    function set_paid($user, $close_code='', $close_note='')
+    function set_paid($user, $close_code = '', $close_note = '')
     {
-        global $conf,$langs;
-        $error=0;
+        global $conf, $langs;
+        $error = 0;
 
         $this->db->begin();
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
-        $sql.= ' SET paye = 1, fk_statut=2';
-        $sql.= ' WHERE rowid = '.$this->id;
+        $sql .= ' SET paye = 1, fk_statut=2';
+        $sql .= ' WHERE rowid = '.$this->id;
 
         dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
             // Call trigger
-            $result=$this->call_trigger('BILL_SUPPLIER_PAYED',$user);
+            $result = $this->call_trigger('BILL_SUPPLIER_PAYED', $user);
             if ($result < 0) $error++;
             // End call triggers
         }
         else
         {
             $error++;
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             dol_print_error($this->db);
         }
 
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return 1;
@@ -1034,32 +1034,32 @@ 
      */
     function set_unpaid($user)
     {
-        global $conf,$langs;
-        $error=0;
+        global $conf, $langs;
+        $error = 0;
 
         $this->db->begin();
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
-        $sql.= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
-        $sql.= ' WHERE rowid = '.$this->id;
+        $sql .= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
+        $sql .= ' WHERE rowid = '.$this->id;
 
         dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
             // Call trigger
-            $result=$this->call_trigger('BILL_SUPPLIER_UNPAYED',$user);
+            $result = $this->call_trigger('BILL_SUPPLIER_UNPAYED', $user);
             if ($result < 0) $error++;
             // End call triggers
         }
         else
         {
             $error++;
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
         }
 
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return 1;
@@ -1080,14 +1080,14 @@ 
      *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
      *	@return int 			        <0 if KO, =0 if nothing to do, >0 if OK
      */
-    public function validate($user, $force_number='', $idwarehouse=0, $notrigger=0)
+    public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $now=dol_now();
+        $now = dol_now();
 
-        $error=0;
+        $error = 0;
         dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse);
 
         // Force to have object complete for checks
@@ -1103,13 +1103,13 @@ 
         if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->ref_supplier))
         {
         	$langs->load("errors");
-        	$this->error=$langs->trans("ErrorFieldFormat",$langs->transnoentities("RefSupplier")).'. '.$langs->trans('RemoveString',$langs->transnoentitiesnoconv("CopyOf"));
+        	$this->error = $langs->trans("ErrorFieldFormat", $langs->transnoentities("RefSupplier")).'. '.$langs->trans('RemoveString', $langs->transnoentitiesnoconv("CopyOf"));
             return -1;
         }
         if (count($this->lines) <= 0)
         {
         	$langs->load("errors");
-            $this->error=$langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
+            $this->error = $langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
             return -1;
         }
 
@@ -1131,20 +1131,20 @@ 
         $this->newref = $num;
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-        $sql.= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::validate", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
             // Si on incrémente le produit principal et ses composants à la validation de facture fournisseur
-            if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
+            if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
             {
                 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
                 $langs->load("agenda");
 
-                $cpt=count($this->lines);
+                $cpt = count($this->lines);
                 for ($i = 0; $i < $cpt; $i++)
                 {
                     if ($this->lines[$i]->fk_product > 0)
@@ -1153,9 +1153,9 @@ 
                         $mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
                         // We increase stock for product
-                        $up_ht_disc=$this->lines[$i]->pu_ht;
-                        if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
-                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr",$num));
+                        $up_ht_disc = $this->lines[$i]->pu_ht;
+                        if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+                        $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
                         if ($result < 0) { $error++; }
                         unset($this->line);
                     }
@@ -1163,15 +1163,15 @@ 
             }
 
             // Triggers call
-            if (! $error && empty($notrigger))
+            if (!$error && empty($notrigger))
             {
                 // Call trigger
-                $result=$this->call_trigger('BILL_SUPPLIER_VALIDATE',$user);
+                $result = $this->call_trigger('BILL_SUPPLIER_VALIDATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
 	            $this->oldref = $this->ref;
 
@@ -1183,8 +1183,8 @@ 
             		$oldref = dol_sanitizeFileName($this->ref);
             		$newref = dol_sanitizeFileName($num);
 
-            		$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$oldref;
-            		$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$newref;
+            		$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$oldref;
+            		$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$newref;
             		if (file_exists($dirsource))
             		{
             			dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
@@ -1193,13 +1193,13 @@ 
             			{
             				dol_syslog("Rename ok");
                             // Rename docs starting with $oldref with $newref
-	                        $listoffiles=dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-	                        foreach($listoffiles as $fileentry)
+	                        $listoffiles = dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+	                        foreach ($listoffiles as $fileentry)
 	                        {
-	                        	$dirsource=$fileentry['name'];
-	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+	                        	$dirsource = $fileentry['name'];
+	                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+	                        	$dirsource = $fileentry['path'].'/'.$dirsource;
+	                        	$dirdest = $fileentry['path'].'/'.$dirdest;
 	                        	@rename($dirsource, $dirdest);
 	                        }
             			}
@@ -1208,14 +1208,14 @@ 
             }
 
             // Set new ref and define current statut
-            if (! $error)
+            if (!$error)
             {
             	$this->ref = $num;
-            	$this->statut=self::STATUS_VALIDATED;
+            	$this->statut = self::STATUS_VALIDATED;
             	//$this->date_validation=$now; this is stored into log table
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->db->commit();
                 return 1;
@@ -1228,7 +1228,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
         }
@@ -1242,11 +1242,11 @@ 
      *	@param	int		$idwarehouse	Id warehouse to use for stock change.
      *	@return	int						<0 if KO, >0 if OK
      */
-    function set_draft($user, $idwarehouse=-1)
+    function set_draft($user, $idwarehouse = -1)
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
-        $error=0;
+        $error = 0;
 
         if ($this->statut == self::STATUS_DRAFT)
         {
@@ -1257,35 +1257,35 @@ 
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-        $sql.= " SET fk_statut = 0";
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET fk_statut = 0";
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             // Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
-            if ($result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
+            if ($result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
             {
                 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
                 $langs->load("agenda");
 
-                $cpt=count($this->lines);
+                $cpt = count($this->lines);
                 for ($i = 0; $i < $cpt; $i++)
                 {
                     if ($this->lines[$i]->fk_product > 0)
                     {
                         $mouvP = new MouvementStock($this->db);
                         // We increase stock for product
-                        $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));
+                        $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
                     }
                 }
             }
             // Triggers call
-            if (! $error && empty($notrigger))
+            if (!$error && empty($notrigger))
             {
                 // Call trigger
-                $result=$this->call_trigger('BILL_SUPPLIER_UNVALIDATE',$user);
+                $result = $this->call_trigger('BILL_SUPPLIER_UNVALIDATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
@@ -1302,7 +1302,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
         }
@@ -1340,38 +1340,38 @@ 
      *
      *  FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order.
      */
-    public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null, $origin_id=0, $pu_ht_devise=0)
+    public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_ht_devise = 0)
     {
         dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
         global $mysoc;
 
         // Clean parameters
-        if (empty($remise_percent)) $remise_percent=0;
-        if (empty($qty)) $qty=0;
-        if (empty($info_bits)) $info_bits=0;
-        if (empty($rang)) $rang=0;
-        if (empty($ventil)) $ventil=0;
-        if (empty($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
+        if (empty($remise_percent)) $remise_percent = 0;
+        if (empty($qty)) $qty = 0;
+        if (empty($info_bits)) $info_bits = 0;
+        if (empty($rang)) $rang = 0;
+        if (empty($ventil)) $ventil = 0;
+        if (empty($txtva)) $txtva = 0;
+        if (empty($txlocaltax1)) $txlocaltax1 = 0;
+        if (empty($txlocaltax2)) $txlocaltax2 = 0;
 
-        $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
+        $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
         // Clean vat code
-        $vat_src_code='';
+        $vat_src_code = '';
         if (preg_match('/\((.*)\)/', $txtva, $reg))
         {
             $vat_src_code = $reg[1];
-            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
         }
 
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu=price2num($pu);
-        $txtva=price2num($txtva);
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
+        $remise_percent = price2num($remise_percent);
+        $qty = price2num($qty);
+        $pu = price2num($pu);
+        $txtva = price2num($txtva);
+        $txlocaltax1 = price2num($txlocaltax1);
+        $txlocaltax2 = price2num($txlocaltax2);
 
         $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
         $total_ht  = $tabprice[0];
@@ -1391,61 +1391,61 @@ 
         if ($type < 0) return -1;
 
         // Insert line
-        $this->line=new SupplierInvoiceLine($this->db);
+        $this->line = new SupplierInvoiceLine($this->db);
 
         $this->line->context = $this->context;
 
-        $this->line->fk_facture_fourn=$this->id;
+        $this->line->fk_facture_fourn = $this->id;
         //$this->line->label=$label;	// deprecated
-        $this->line->desc=$desc;
-        $this->line->qty=            ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
-
-        $this->line->vat_src_code=$vat_src_code;
-        $this->line->tva_tx=$txtva;
-        $this->line->localtax1_tx=$txlocaltax1;
-        $this->line->localtax2_tx=$txlocaltax2;
-        $this->line->fk_product=$fk_product;
-        $this->line->product_type=$type;
-        $this->line->remise_percent=$remise_percent;
-        $this->line->subprice=       ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
-        $this->line->date_start=$date_start;
-        $this->line->date_end=$date_end;
-        $this->line->ventil=$ventil;
-        $this->line->rang=$rang;
-        $this->line->info_bits=$info_bits;
-        $this->line->total_ht=       (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
-        $this->line->total_tva=      $total_tva;
-        $this->line->total_localtax1=$total_localtax1;
-        $this->line->total_localtax2=$total_localtax2;
+        $this->line->desc = $desc;
+        $this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ?abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
+
+        $this->line->vat_src_code = $vat_src_code;
+        $this->line->tva_tx = $txtva;
+        $this->line->localtax1_tx = $txlocaltax1;
+        $this->line->localtax2_tx = $txlocaltax2;
+        $this->line->fk_product = $fk_product;
+        $this->line->product_type = $type;
+        $this->line->remise_percent = $remise_percent;
+        $this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
+        $this->line->date_start = $date_start;
+        $this->line->date_end = $date_end;
+        $this->line->ventil = $ventil;
+        $this->line->rang = $rang;
+        $this->line->info_bits = $info_bits;
+        $this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
+        $this->line->total_tva = $total_tva;
+        $this->line->total_localtax1 = $total_localtax1;
+        $this->line->total_localtax2 = $total_localtax2;
         $this->line->localtax1_type = $localtaxes_type[0];
         $this->line->localtax2_type = $localtaxes_type[2];
-        $this->line->total_ttc=      (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
-        $this->line->special_code=$this->special_code;
-        $this->line->fk_parent_line=$this->fk_parent_line;
-        $this->line->origin=$this->origin;
-        $this->line->origin_id=$origin_id;
-        $this->line->fk_unit=$fk_unit;
+        $this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc);
+        $this->line->special_code = $this->special_code;
+        $this->line->fk_parent_line = $this->fk_parent_line;
+        $this->line->origin = $this->origin;
+        $this->line->origin_id = $origin_id;
+        $this->line->fk_unit = $fk_unit;
 
         // Multicurrency
-        $this->line->fk_multicurrency			= $this->fk_multicurrency;
-        $this->line->multicurrency_code			= $this->multicurrency_code;
+        $this->line->fk_multicurrency = $this->fk_multicurrency;
+        $this->line->multicurrency_code = $this->multicurrency_code;
         $this->line->multicurrency_subprice		= $pu_ht_devise;
         $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
         $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
         $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-        if (is_array($array_options) && count($array_options)>0) {
-            $this->line->array_options=$array_options;
+        if (is_array($array_options) && count($array_options) > 0) {
+            $this->line->array_options = $array_options;
         }
 
-        $result=$this->line->insert($notrigger);
+        $result = $this->line->insert($notrigger);
         if ($result > 0)
         {
             // Reorder if child line
-            if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+            if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
             // Mise a jour informations denormalisees au niveau de la facture meme
-            $result=$this->update_price(1,'auto',0,$this->thirdparty);	// The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
+            $result = $this->update_price(1, 'auto', 0, $this->thirdparty); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
             if ($result > 0)
             {
                 $this->db->commit();
@@ -1453,14 +1453,14 @@ 
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 $this->db->rollback();
                 return -1;
             }
         }
         else
         {
-            $this->error=$this->line->error;
+            $this->error = $this->line->error;
             $this->db->rollback();
             return -2;
         }
@@ -1489,15 +1489,15 @@ 
 	 * @param		double		$pu_ht_devise		Amount in currency
      * @return    	int           					<0 if KO, >0 if OK
      */
-    public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null, $pu_ht_devise=0)
+    public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1 = 0, $txlocaltax2 = 0, $qty = 1, $idproduct = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $remise_percent = 0, $notrigger = false, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0)
     {
     	global $mysoc;
         dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$fk_unit", LOG_DEBUG);
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         $pu = price2num($pu);
-        $qty  = price2num($qty);
-		$remise_percent=price2num($remise_percent);
+        $qty = price2num($qty);
+		$remise_percent = price2num($remise_percent);
 		$pu_ht_devise = price2num($pu_ht_devise);
 
         // Check parameters
@@ -1505,28 +1505,28 @@ 
         if ($type < 0) return -1;
 
         // Clean parameters
-		if (empty($vatrate)) $vatrate=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
+		if (empty($vatrate)) $vatrate = 0;
+        if (empty($txlocaltax1)) $txlocaltax1 = 0;
+        if (empty($txlocaltax2)) $txlocaltax2 = 0;
 
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
+        $txlocaltax1 = price2num($txlocaltax1);
+        $txlocaltax2 = price2num($txlocaltax2);
 
-        $localtaxes_type = array($txlocaltax1,$txlocaltax2);
+        $localtaxes_type = array($txlocaltax1, $txlocaltax2);
 
         // Calcul du total TTC et de la TVA pour la ligne a partir de
         // qty, pu, remise_percent et txtva
         // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
         // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-        $localtaxes_type=getLocalTaxesFromRate($vatrate,0,$mysoc, $this->thirdparty);
+        $localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $mysoc, $this->thirdparty);
 
         // Clean vat code
-        $vat_src_code='';
+        $vat_src_code = '';
         if (preg_match('/\((.*)\)/', $vatrate, $reg))
         {
             $vat_src_code = $reg[1];
-            $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate);    // Remove code into vatrate.
+            $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
         }
 
         $tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
@@ -1540,17 +1540,17 @@ 
         $total_localtax2 = $tabprice[10];
 
 		// MultiCurrency
-		$multicurrency_total_ht  = $tabprice[16];
+		$multicurrency_total_ht = $tabprice[16];
         $multicurrency_total_tva = $tabprice[17];
         $multicurrency_total_ttc = $tabprice[18];
 		$pu_ht_devise = $tabprice[19];
 
-        if (empty($info_bits)) $info_bits=0;
+        if (empty($info_bits)) $info_bits = 0;
 
         if ($idproduct)
         {
-            $product=new Product($this->db);
-            $result=$product->fetch($idproduct);
+            $product = new Product($this->db);
+            $result = $product->fetch($idproduct);
             $product_type = $product->type;
         }
         else
@@ -1571,7 +1571,7 @@ 
 	    $line->qty = $qty;
 	    $line->remise_percent = $remise_percent;
 
-	    $line->vat_src_code=$vat_src_code;
+	    $line->vat_src_code = $vat_src_code;
 	    $line->tva_tx = $vatrate;
 	    $line->localtax1_tx = $txlocaltax1;
 	    $line->localtax2_tx = $txlocaltax2;
@@ -1589,8 +1589,8 @@ 
 	    $line->array_options = $array_options;
 
 		// Multicurrency
-		$line->multicurrency_subprice	= $pu_ht_devise;
-		$line->multicurrency_total_ht 	= $multicurrency_total_ht;
+		$line->multicurrency_subprice = $pu_ht_devise;
+		$line->multicurrency_total_ht = $multicurrency_total_ht;
         $line->multicurrency_total_tva 	= $multicurrency_total_tva;
         $line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
@@ -1600,7 +1600,7 @@ 
 		    $this->errors[] = $line->error;
 	    } else {
 		    // Update total price into invoice record
-		    $res = $this->update_price('','auto');
+		    $res = $this->update_price('', 'auto');
 	    }
 
 	    return $res;
@@ -1613,7 +1613,7 @@ 
      *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
      * 	@return	int						<0 if KO, >0 if OK
      */
-    public function deleteline($rowid, $notrigger=0)
+    public function deleteline($rowid, $notrigger = 0)
     {
         if (!$rowid) {
 	        $rowid = $this->id;
@@ -1646,11 +1646,11 @@ 
     public function info($id)
     {
         $sql = 'SELECT c.rowid, datec, tms as datem, ';
-        $sql.= ' fk_user_author, fk_user_modif, fk_user_valid';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as c';
-        $sql.= ' WHERE c.rowid = '.$id;
+        $sql .= ' fk_user_author, fk_user_modif, fk_user_valid';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as c';
+        $sql .= ' WHERE c.rowid = '.$id;
 
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             if ($this->db->num_rows($result))
@@ -1661,7 +1661,7 @@ 
                 {
                     $cuser = new User($this->db);
                     $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation     = $cuser;
+                    $this->user_creation = $cuser;
                 }
                 if ($obj->fk_user_valid)
                 {
@@ -1694,32 +1694,32 @@ 
 	 *	@param		int		$socid		Id societe
 	 *	@return    	array				Tableau des factures ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
 	 */
-	function list_replacable_supplier_invoices($socid=0)
+	function list_replacable_supplier_invoices($socid = 0)
 	{
 		global $conf;
 
 		$return = array();
 
 		$sql = "SELECT f.rowid as rowid, f.ref, f.fk_statut,";
-		$sql.= " ff.rowid as rowidnext";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid = pf.fk_facturefourn";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as ff ON f.rowid = ff.fk_facture_source";
-		$sql.= " WHERE (f.fk_statut = ".self::STATUS_VALIDATED." OR (f.fk_statut = ".self::STATUS_ABANDONED." AND f.close_code = '".self::CLOSECODE_ABANDONED."'))";
-		$sql.= " AND f.entity = ".$conf->entity;
-		$sql.= " AND f.paye = 0";					// Pas classee payee completement
-		$sql.= " AND pf.fk_paiementfourn IS NULL";	// Aucun paiement deja fait
-		$sql.= " AND ff.fk_statut IS NULL";			// Renvoi vrai si pas facture de remplacement
-		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
-		$sql.= " ORDER BY f.ref";
+		$sql .= " ff.rowid as rowidnext";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid = pf.fk_facturefourn";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as ff ON f.rowid = ff.fk_facture_source";
+		$sql .= " WHERE (f.fk_statut = ".self::STATUS_VALIDATED." OR (f.fk_statut = ".self::STATUS_ABANDONED." AND f.close_code = '".self::CLOSECODE_ABANDONED."'))";
+		$sql .= " AND f.entity = ".$conf->entity;
+		$sql .= " AND f.paye = 0"; // Pas classee payee completement
+		$sql .= " AND pf.fk_paiementfourn IS NULL"; // Aucun paiement deja fait
+		$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de remplacement
+		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_replacable_supplier_invoices", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$return[$obj->rowid]=array(	'id' => $obj->rowid,
+				$return[$obj->rowid] = array('id' => $obj->rowid,
 				'ref' => $obj->ref,
 				'status' => $obj->fk_statut);
 			}
@@ -1728,7 +1728,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -1741,36 +1741,36 @@ 
 	 *	@param		int		$socid		Id societe
 	 *	@return    	array				Tableau des factures ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
 	 */
-	function list_qualified_avoir_supplier_invoices($socid=0)
+	function list_qualified_avoir_supplier_invoices($socid = 0)
 	{
 		global $conf;
 
 		$return = array();
 
 		$sql = "SELECT f.rowid as rowid, f.ref, f.fk_statut, f.type, f.paye, pf.fk_paiementfourn";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid = pf.fk_facturefourn";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as ff ON (f.rowid = ff.fk_facture_source AND ff.type=".self::TYPE_REPLACEMENT.")";
-		$sql.= " WHERE f.entity = ".$conf->entity;
-		$sql.= " AND f.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
-		$sql.= " AND ff.type IS NULL";									// Renvoi vrai si pas facture de remplacement
-		$sql.= " AND f.type != ".self::TYPE_CREDIT_NOTE;				// Type non 2 si facture non avoir
-		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
-		$sql.= " ORDER BY f.ref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid = pf.fk_facturefourn";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as ff ON (f.rowid = ff.fk_facture_source AND ff.type=".self::TYPE_REPLACEMENT.")";
+		$sql .= " WHERE f.entity = ".$conf->entity;
+		$sql .= " AND f.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
+		$sql .= " AND ff.type IS NULL"; // Renvoi vrai si pas facture de remplacement
+		$sql .= " AND f.type != ".self::TYPE_CREDIT_NOTE; // Type non 2 si facture non avoir
+		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_qualified_avoir_supplier_invoices", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$qualified=0;
-				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified=1;
-				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified=1;
+				$qualified = 0;
+				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified = 1;
+				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified = 1;
 				if ($qualified)
 				{
-					$paymentornot=($obj->fk_paiementfourn?1:0);
-					$return[$obj->rowid]=array('ref'=>$obj->ref,'status'=>$obj->fk_statut,'type'=>$obj->type,'paye'=>$obj->paye,'paymentornot'=>$paymentornot);
+					$paymentornot = ($obj->fk_paiementfourn ? 1 : 0);
+					$return[$obj->rowid] = array('ref'=>$obj->ref, 'status'=>$obj->fk_statut, 'type'=>$obj->type, 'paye'=>$obj->paye, 'paymentornot'=>$paymentornot);
 				}
 			}
 
@@ -1778,7 +1778,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -1794,30 +1794,30 @@ 
         global $conf, $langs;
 
         $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= ' WHERE ff.paye=0';
-        $sql.= ' AND ff.fk_statut > 0';
-        $sql.= " AND ff.entity = ".$conf->entity;
-        if ($user->societe_id) $sql.=' AND ff.fk_soc = '.$user->societe_id;
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-
-        $resql=$this->db->query($sql);
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql .= ' WHERE ff.paye=0';
+        $sql .= ' AND ff.fk_statut > 0';
+        $sql .= " AND ff.entity = ".$conf->entity;
+        if ($user->societe_id) $sql .= ' AND ff.fk_soc = '.$user->societe_id;
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+
+        $resql = $this->db->query($sql);
         if ($resql)
         {
 	        $langs->load("bills");
-	        $now=dol_now();
+	        $now = dol_now();
 
 	        $response = new WorkboardResponse();
-	        $response->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
-	        $response->label=$langs->trans("SupplierBillsToPay");
+	        $response->warning_delay = $conf->facture->fournisseur->warning_delay / 60 / 60 / 24;
+	        $response->label = $langs->trans("SupplierBillsToPay");
 
-	        $response->url=DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&mainmenu=accountancy&leftmenu=suppliers_bills';
-	        $response->img=img_object($langs->trans("Bills"),"bill");
+	        $response->url = DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&mainmenu=accountancy&leftmenu=suppliers_bills';
+	        $response->img = img_object($langs->trans("Bills"), "bill");
 
             $facturestatic = new FactureFournisseur($this->db);
 
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
                 $response->nbtodo++;
 
@@ -1834,7 +1834,7 @@ 
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -1852,11 +1852,11 @@ 
      *  @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, $option='',$max=0, $short=0, $moretitle='', $notooltip=0, $save_lastsearch_value=-1)
+    public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
     {
         global $langs, $conf;
 
-        $result='';
+        $result = '';
 
         if ($option == 'document')	$url = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$this->id;
         else $url = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id;
@@ -1866,53 +1866,53 @@ 
         if ($option !== 'nolink')
         {
         	// 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';
-        }
-
-        $picto='bill';
-        if ($this->type == self::TYPE_REPLACEMENT) $picto.='r'; // Replacement invoice
-        if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a'; // Credit note
-        if ($this->type == self::TYPE_DEPOSIT)     $picto.='d'; // Deposit invoice
-
-        $label = '<u>' . $langs->trans("ShowSupplierInvoice") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->ref_supplier))
-            $label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-        if ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
-        if ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
-        if ($this->type == self::TYPE_DEPOSIT)     $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
-        if ($moretitle) $label.=' - '.$moretitle;
-
-        $ref=$this->ref;
-        if (empty($ref)) $ref=$this->id;
-
-        $linkclose='';
+        	$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';
+        }
+
+        $picto = 'bill';
+        if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
+        if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
+        if ($this->type == self::TYPE_DEPOSIT)     $picto .= 'd'; // Deposit invoice
+
+        $label = '<u>'.$langs->trans("ShowSupplierInvoice").'</u>';
+        if (!empty($this->ref))
+            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+        if (!empty($this->ref_supplier))
+            $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+        if (!empty($this->total_ht))
+            $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_tva))
+            $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_ttc))
+            $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        if ($this->type == self::TYPE_REPLACEMENT) $label = $langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
+        if ($this->type == self::TYPE_CREDIT_NOTE) $label = $langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
+        if ($this->type == self::TYPE_DEPOSIT)     $label = $langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
+        if ($moretitle) $label .= ' - '.$moretitle;
+
+        $ref = $this->ref;
+        if (empty($ref)) $ref = $this->id;
+
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowSupplierInvoice");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowSupplierInvoice");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip"';
         }
 
         $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
-        $result.=$linkstart.($max?dol_trunc($ref,$max):$ref).$linkend;
+        if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend.' ');
+        $result .= $linkstart.($max ?dol_trunc($ref, $max) : $ref).$linkend;
         return $result;
     }
 
@@ -1924,15 +1924,15 @@ 
       *      @param    string		$mode		'next' for next value or 'last' for last value
       *      @return   string					free ref or last ref
       */
-    public function getNextNumRef($soc,$mode='next')
+    public function getNextNumRef($soc, $mode = 'next')
     {
         global $db, $langs, $conf;
         $langs->load("orders");
 
         // Clean parameters (if not defined or using deprecated value)
-        if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER='mod_facture_fournisseur_cactus';
+        if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER = 'mod_facture_fournisseur_cactus';
 
-        $mybool=false;
+        $mybool = false;
 
         $file = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER.".php";
         $classname = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER;
@@ -1945,18 +1945,18 @@ 
             $dir = dol_buildpath($reldir."core/modules/supplier_invoice/");
 
             // Load file with numbering class (if found)
-            $mybool|=@include_once $dir.$file;
+            $mybool |= @include_once $dir.$file;
         }
 
-        if (! $mybool)
+        if (!$mybool)
         {
-        	dol_print_error('',"Failed to include file ".$file);
+        	dol_print_error('', "Failed to include file ".$file);
         	return '';
         }
 
         $obj = new $classname();
         $numref = "";
-        $numref = $obj->getNumRef($soc,$this,$mode);
+        $numref = $obj->getNumRef($soc, $this, $mode);
 
         if ($numref != "")
         {
@@ -1964,7 +1964,7 @@ 
         }
         else
        {
-       		$this->error=$obj->error;
+       		$this->error = $obj->error;
         	//dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
         	return false;
         }
@@ -1979,9 +1979,9 @@ 
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
      *  @return	void
      */
-    public function initAsSpecimen($option='')
+    public function initAsSpecimen($option = '')
     {
-        global $langs,$conf;
+        global $langs, $conf;
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
         $now = dol_now();
@@ -1991,8 +1991,8 @@ 
         $prodids = array();
 
         $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product').")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."product";
+        $sql .= " WHERE entity IN (".getEntity('product').")";
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -2008,17 +2008,17 @@ 
         }
 
         // Initialise parametres
-        $this->id=0;
+        $this->id = 0;
         $this->ref = 'SPECIMEN';
         $this->ref_supplier = 'SUPPLIER_REF_SPECIMEN';
-        $this->specimen=1;
+        $this->specimen = 1;
         $this->socid = 1;
         $this->date = $now;
-        $this->date_lim_reglement=$this->date+3600*24*30;
+        $this->date_lim_reglement = $this->date + 3600 * 24 * 30;
         $this->cond_reglement_code = 'RECEP';
         $this->mode_reglement_code = 'CHQ';
-        $this->note_public='This is a comment (public)';
-        $this->note_private='This is a comment (private)';
+        $this->note_public = 'This is a comment (public)';
+        $this->note_private = 'This is a comment (private)';
 
 		if (empty($option) || $option != 'nolines')
 		{
@@ -2027,38 +2027,38 @@ 
 	        $xnbp = 0;
 	        while ($xnbp < $nbp)
 	        {
-	            $line=new FactureLigne($this->db);
-	            $line->desc=$langs->trans("Description")." ".$xnbp;
-	            $line->qty=1;
-	            $line->subprice=100;
-	            $line->pu_ht=100;		// the canelle template use pu_ht and not subprice
-	            $line->price=100;
-	            $line->tva_tx=19.6;
-	            $line->localtax1_tx=0;
-	            $line->localtax2_tx=0;
+	            $line = new FactureLigne($this->db);
+	            $line->desc = $langs->trans("Description")." ".$xnbp;
+	            $line->qty = 1;
+	            $line->subprice = 100;
+	            $line->pu_ht = 100; // the canelle template use pu_ht and not subprice
+	            $line->price = 100;
+	            $line->tva_tx = 19.6;
+	            $line->localtax1_tx = 0;
+	            $line->localtax2_tx = 0;
 				if ($xnbp == 2)
 				{
-				    $line->total_ht=50;
-				    $line->total_ttc=59.8;
-				    $line->total_tva=9.8;
-	    			$line->remise_percent=50;
+				    $line->total_ht = 50;
+				    $line->total_ttc = 59.8;
+				    $line->total_tva = 9.8;
+	    			$line->remise_percent = 50;
 				}
 				else
 				{
-				    $line->total_ht=100;
-				    $line->total_ttc=119.6;
-				    $line->total_tva=19.6;
-	    			$line->remise_percent=0;
+				    $line->total_ht = 100;
+				    $line->total_ttc = 119.6;
+				    $line->total_tva = 19.6;
+	    			$line->remise_percent = 0;
 				}
 
 	            if ($num_prods > 0)
 	            {
 					$prodid = mt_rand(1, $num_prods);
-	            	$line->fk_product=$prodids[$prodid];
+	            	$line->fk_product = $prodids[$prodid];
 	            }
-	            $line->product_type=0;
+	            $line->product_type = 0;
 
-	            $this->lines[$xnbp]=$line;
+	            $this->lines[$xnbp] = $line;
 
 	    		$this->total_ht       += $line->total_ht;
 	    		$this->total_tva      += $line->total_tva;
@@ -2068,10 +2068,10 @@ 
 	        }
 		}
 
-        $this->amount_ht      = $xnbp*100;
-        $this->total_ht       = $xnbp*100;
-        $this->total_tva      = $xnbp*19.6;
-        $this->total_ttc      = $xnbp*119.6;
+        $this->amount_ht      = $xnbp * 100;
+        $this->total_ht       = $xnbp * 100;
+        $this->total_tva      = $xnbp * 19.6;
+        $this->total_ttc      = $xnbp * 119.6;
     }
 
 	/**
@@ -2083,27 +2083,27 @@ 
 	{
 		global $conf, $user;
 
-		$this->nb=array();
+		$this->nb = array();
 
 		$clause = "WHERE";
 
 		$sql = "SELECT count(f.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
 		}
-		$sql.= " ".$clause." f.entity = ".$conf->entity;
+		$sql .= " ".$clause." f.entity = ".$conf->entity;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$this->nb["supplier_invoices"]=$obj->nb;
+				$this->nb["supplier_invoices"] = $obj->nb;
 			}
             $this->db->free($resql);
 			return 1;
@@ -2111,7 +2111,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2123,13 +2123,13 @@ 
      *	@param		int		$invertdetail	Reverse sign of amounts for lines
      * 	@return		int						New id of clone
      */
-    public function createFromClone($fromid,$invertdetail=0)
+    public function createFromClone($fromid, $invertdetail = 0)
     {
-        global $user,$langs;
+        global $user, $langs;
 
-        $error=0;
+        $error = 0;
 
-        $object=new FactureFournisseur($this->db);
+        $object = new FactureFournisseur($this->db);
 
 		$object->context['createfromclone'] = 'createfromclone';
 
@@ -2137,11 +2137,11 @@ 
 
         // Load source object
         $object->fetch($fromid);
-        $object->id=0;
-        $object->statut=self::STATUS_DRAFT;
+        $object->id = 0;
+        $object->statut = self::STATUS_DRAFT;
 
         // Clear fields
-        $object->ref_supplier=$langs->trans("CopyOf").' '.$object->ref_supplier;
+        $object->ref_supplier = $langs->trans("CopyOf").' '.$object->ref_supplier;
         $object->author             = $user->id;
         $object->user_valid         = '';
         $object->fk_facture_source  = 0;
@@ -2154,7 +2154,7 @@ 
         $object->close_note         = '';
 
         // Loop on each line of new invoice
-        foreach($object->lines as $i => $line)
+        foreach ($object->lines as $i => $line)
         {
             if (isset($object->lines[$i]->info_bits) && ($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
             {
@@ -2163,16 +2163,16 @@ 
         }
 
         // Create clone
-        $result=$object->create($user);
+        $result = $object->create($user);
 
         // Other options
         if ($result < 0)
         {
-            $this->error=$object->error;
+            $this->error = $object->error;
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
 
 
@@ -2182,7 +2182,7 @@ 
         unset($object->context['createfromclone']);
 
         // End
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return $object->id;
@@ -2204,7 +2204,7 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 *  @return     int         				<0 if KO, 0 if nothing done, >0 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
 		global $conf, $user, $langs;
 
@@ -2213,13 +2213,13 @@ 
 		// Set the model on the model name to use
 		if (empty($modele))
 		{
-			if (! empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
+			if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
 			{
 				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
 			}
 			else
 			{
-				$modele = '';       // No default value. For supplier invoice, we allow to disable all PDF generation
+				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
 
@@ -2289,8 +2289,8 @@ 
  */
 class SupplierInvoiceLine extends CommonObjectLine
 {
-	public $element='facture_fourn_det';
-	public $table_element='facture_fourn_det';
+	public $element = 'facture_fourn_det';
+	public $table_element = 'facture_fourn_det';
 
 	public $oldline;
 
@@ -2412,7 +2412,7 @@ 
      */
     public function __construct($db)
     {
-        $this->db= $db;
+        $this->db = $db;
     }
 
 	/**
@@ -2424,14 +2424,14 @@ 
 	public function fetch($rowid)
 	{
 		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx';
-		$sql.= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
-		$sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_facture_fourn, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
-		$sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
-		$sql.= ', f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, multicurrency_total_ttc';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
-		$sql.= ' WHERE f.rowid = '.$rowid;
-		$sql.= ' ORDER BY f.rang, f.rowid';
+		$sql .= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
+		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_facture_fourn, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
+		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
+		$sql .= ', f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, multicurrency_total_ttc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
+		$sql .= ' WHERE f.rowid = '.$rowid;
+		$sql .= ' ORDER BY f.rang, f.rowid';
 
 		$query = $this->db->query($sql);
 
@@ -2446,17 +2446,17 @@ 
 
 		$obj = $this->db->fetch_object($query);
 
-		$this->id				= $obj->rowid;
-		$this->rowid				= $obj->rowid;
-		$this->fk_facture_fourn			= $obj->fk_facture_fourn;
+		$this->id = $obj->rowid;
+		$this->rowid = $obj->rowid;
+		$this->fk_facture_fourn = $obj->fk_facture_fourn;
 		$this->description		= $obj->description;
 		$this->product_ref		= $obj->product_ref;
-		$this->ref				= $obj->product_ref;
+		$this->ref = $obj->product_ref;
 		$this->ref_supplier		= $obj->ref_supplier;
 		$this->libelle			= $obj->label;
 		$this->label  			= $obj->label;
 		$this->product_desc		= $obj->product_desc;
-		$this->subprice			= $obj->pu_ht;
+		$this->subprice = $obj->pu_ht;
 		$this->pu_ht				= $obj->pu_ht;
 		$this->pu_ttc			= $obj->pu_ttc;
 		$this->tva_tx			= $obj->tva_tx;
@@ -2465,20 +2465,20 @@ 
 		$this->localtax1_type		= $obj->localtax1_type;
 		$this->localtax2_type		= $obj->localtax2_type;
 		$this->qty				= $obj->qty;
-		$this->remise_percent    = $obj->remise_percent;
+		$this->remise_percent = $obj->remise_percent;
 		$this->tva				= $obj->total_tva;
-		$this->total_ht			= $obj->total_ht;
+		$this->total_ht = $obj->total_ht;
 		$this->total_tva			= $obj->total_tva;
 		$this->total_localtax1	= $obj->total_localtax1;
 		$this->total_localtax2	= $obj->total_localtax2;
 		$this->total_ttc			= $obj->total_ttc;
 		$this->fk_product		= $obj->fk_product;
-		$this->product_type		= $obj->product_type;
+		$this->product_type = $obj->product_type;
 		$this->product_label		= $obj->label;
 		$this->info_bits		    = $obj->info_bits;
 		$this->fk_parent_line    = $obj->fk_parent_line;
-		$this->special_code		= $obj->special_code;
-		$this->rang       		= $obj->rang;
+		$this->special_code = $obj->special_code;
+		$this->rang = $obj->rang;
 		$this->fk_unit           = $obj->fk_unit;
 
 		$this->multicurrency_subprice	= $obj->multicurrency_subprice;
@@ -2504,7 +2504,7 @@ 
 		$this->db->begin();
 
 		if (!$notrigger) {
-			if ($this->call_trigger('LINEBILL_SUPPLIER_DELETE',$user) < 0) {
+			if ($this->call_trigger('LINEBILL_SUPPLIER_DELETE', $user) < 0) {
 				$error++;
 			}
 		}
@@ -2521,7 +2521,7 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -2544,10 +2544,10 @@ 
 		global $conf;
 
 		$pu = price2num($this->pu_ht);
-		$qty  = price2num($this->qty);
+		$qty = price2num($this->qty);
 
 		// Check parameters
-		if (empty($this->qty)) $this->qty=0;
+		if (empty($this->qty)) $this->qty = 0;
 
 		if ($this->product_type < 0) {
 			return -1;
@@ -2575,34 +2575,34 @@ 
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
-		$sql.= " description ='".$this->db->escape($this->description)."'";
-		$sql.= ", pu_ht = ".price2num($this->pu_ht);
-		$sql.= ", pu_ttc = ".price2num($this->pu_ttc);
-		$sql.= ", qty = ".price2num($this->qty);
-		$sql.= ", remise_percent = ".price2num($this->remise_percent);
-		$sql.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->vat_src_code)."'";
-		$sql.= ", tva_tx = ".price2num($this->tva_tx);
-		$sql.= ", localtax1_tx = ".price2num($this->localtax1_tx);
-		$sql.= ", localtax2_tx = ".price2num($this->localtax2_tx);
-		$sql.= ", localtax1_type = '".$this->db->escape($this->localtax1_type)."'";
-		$sql.= ", localtax2_type = '".$this->db->escape($this->localtax2_type)."'";
-		$sql.= ", total_ht = ".price2num($this->total_ht);
-		$sql.= ", tva= ".price2num($this->total_tva);
-		$sql.= ", total_localtax1= ".price2num($this->total_localtax1);
-		$sql.= ", total_localtax2= ".price2num($this->total_localtax2);
-		$sql.= ", total_ttc = ".price2num($this->total_ttc);
-		$sql.= ", fk_product = ".$fk_product;
-		$sql.= ", product_type = ".$this->product_type;
-		$sql.= ", info_bits = ".$this->info_bits;
-		$sql.= ", fk_unit = ".$fk_unit;
+		$sql .= " description ='".$this->db->escape($this->description)."'";
+		$sql .= ", pu_ht = ".price2num($this->pu_ht);
+		$sql .= ", pu_ttc = ".price2num($this->pu_ttc);
+		$sql .= ", qty = ".price2num($this->qty);
+		$sql .= ", remise_percent = ".price2num($this->remise_percent);
+		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
+		$sql .= ", tva_tx = ".price2num($this->tva_tx);
+		$sql .= ", localtax1_tx = ".price2num($this->localtax1_tx);
+		$sql .= ", localtax2_tx = ".price2num($this->localtax2_tx);
+		$sql .= ", localtax1_type = '".$this->db->escape($this->localtax1_type)."'";
+		$sql .= ", localtax2_type = '".$this->db->escape($this->localtax2_type)."'";
+		$sql .= ", total_ht = ".price2num($this->total_ht);
+		$sql .= ", tva= ".price2num($this->total_tva);
+		$sql .= ", total_localtax1= ".price2num($this->total_localtax1);
+		$sql .= ", total_localtax2= ".price2num($this->total_localtax2);
+		$sql .= ", total_ttc = ".price2num($this->total_ttc);
+		$sql .= ", fk_product = ".$fk_product;
+		$sql .= ", product_type = ".$this->product_type;
+		$sql .= ", info_bits = ".$this->info_bits;
+		$sql .= ", fk_unit = ".$fk_unit;
 
 		// Multicurrency
-		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		$sql .= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql .= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql .= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql .= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2623,12 +2623,12 @@ 
 			}
 		}
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			global $langs, $user;
 
 			// Call trigger
-			if ($this->call_trigger('LINEBILL_SUPPLIER_UPDATE',$user) < 0) {
+			if ($this->call_trigger('LINEBILL_SUPPLIER_UPDATE', $user) < 0) {
 				$this->db->rollback();
 				return -1;
 			}
@@ -2650,51 +2650,51 @@ 
      *	@param      int		$notrigger		1 no triggers
      *	@return		int						<0 if KO, >0 if OK
      */
-    public function insert($notrigger=0)
+    public function insert($notrigger = 0)
     {
-        global $user,$conf;
+        global $user, $conf;
 
-        $error=0;
+        $error = 0;
 
         dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
 
         // Clean parameters
-        $this->desc=trim($this->desc);
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type='0';
-        if (empty($this->localtax2_type)) $this->localtax2_type='0';
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->subprice)) $this->subprice=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
-
-        if (empty($this->pa_ht)) $this->pa_ht=0;
-        if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
-        if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
-        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+        $this->desc = trim($this->desc);
+        if (empty($this->tva_tx)) $this->tva_tx = 0;
+        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+        if (empty($this->localtax1_type)) $this->localtax1_type = '0';
+        if (empty($this->localtax2_type)) $this->localtax2_type = '0';
+        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+        if (empty($this->rang)) $this->rang = 0;
+        if (empty($this->remise_percent)) $this->remise_percent = 0;
+        if (empty($this->info_bits)) $this->info_bits = 0;
+        if (empty($this->subprice)) $this->subprice = 0;
+        if (empty($this->special_code)) $this->special_code = 0;
+        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+        if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
+
+        if (empty($this->pa_ht)) $this->pa_ht = 0;
+        if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
+        if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
+        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
+        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
 
 
         // Check parameters
         if ($this->product_type < 0)
         {
-            $this->error='ErrorProductTypeMustBe0orMore';
+            $this->error = 'ErrorProductTypeMustBe0orMore';
             return -1;
         }
-        if (! empty($this->fk_product))
+        if (!empty($this->fk_product))
         {
             // Check product exists
-            $result=Product::isExistingObject('product', $this->fk_product);
+            $result = Product::isExistingObject('product', $this->fk_product);
             if ($result <= 0)
             {
-                $this->error='ErrorProductIdDoesNotExists';
+                $this->error = 'ErrorProductIdDoesNotExists';
                 return -1;
             }
         }
@@ -2703,70 +2703,70 @@ 
 
         // Insertion dans base de la ligne
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-        $sql.= ' (fk_facture_fourn, fk_parent_line, label, description, qty,';
-        $sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-        $sql.= ' fk_product, product_type, remise_percent, pu_ht, pu_ttc,';
-        $sql.= ' date_start, date_end, fk_code_ventilation, rang, special_code,';
-        $sql.= ' info_bits, total_ht, tva, total_ttc, total_localtax1, total_localtax2, fk_unit';
-        $sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-        $sql.= ')';
-        $sql.= " VALUES (".$this->fk_facture_fourn.",";
-        $sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
-        $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->desc)."',";
-        $sql.= " ".price2num($this->qty).",";
-
-        $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
-        $sql.= " ".price2num($this->tva_tx).",";
-        $sql.= " ".price2num($this->localtax1_tx).",";
-        $sql.= " ".price2num($this->localtax2_tx).",";
-        $sql.= " '".$this->db->escape($this->localtax1_type)."',";
-        $sql.= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql.= ' '.(! empty($this->fk_product)?$this->fk_product:"null").',';
-        $sql.= " ".$this->product_type.",";
-        $sql.= " ".price2num($this->remise_percent).",";
-        $sql.= " ".price2num($this->subprice).",";
-        $sql.= " ".price2num($this->total_ttc/$this->qty).",";
-        $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").",";
-        $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").",";
-        $sql.= ' '.(!empty($this->fk_code_ventilation)?$this->fk_code_ventilation:0).',';
-        $sql.= ' '.$this->rang.',';
-        $sql.= ' '.$this->special_code.',';
-        $sql.= " '".$this->db->escape($this->info_bits)."',";
-        $sql.= " ".price2num($this->total_ht).",";
-        $sql.= " ".price2num($this->total_tva).",";
-        $sql.= " ".price2num($this->total_ttc).",";
-        $sql.= " ".price2num($this->total_localtax1).",";
-        $sql.= " ".price2num($this->total_localtax2);
+        $sql .= ' (fk_facture_fourn, fk_parent_line, label, description, qty,';
+        $sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+        $sql .= ' fk_product, product_type, remise_percent, pu_ht, pu_ttc,';
+        $sql .= ' date_start, date_end, fk_code_ventilation, rang, special_code,';
+        $sql .= ' info_bits, total_ht, tva, total_ttc, total_localtax1, total_localtax2, fk_unit';
+        $sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+        $sql .= ')';
+        $sql .= " VALUES (".$this->fk_facture_fourn.",";
+        $sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
+        $sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+        $sql .= " '".$this->db->escape($this->desc)."',";
+        $sql .= " ".price2num($this->qty).",";
+
+        $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+        $sql .= " ".price2num($this->tva_tx).",";
+        $sql .= " ".price2num($this->localtax1_tx).",";
+        $sql .= " ".price2num($this->localtax2_tx).",";
+        $sql .= " '".$this->db->escape($this->localtax1_type)."',";
+        $sql .= " '".$this->db->escape($this->localtax2_type)."',";
+        $sql .= ' '.(!empty($this->fk_product) ? $this->fk_product : "null").',';
+        $sql .= " ".$this->product_type.",";
+        $sql .= " ".price2num($this->remise_percent).",";
+        $sql .= " ".price2num($this->subprice).",";
+        $sql .= " ".price2num($this->total_ttc / $this->qty).",";
+        $sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
+        $sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").",";
+        $sql .= ' '.(!empty($this->fk_code_ventilation) ? $this->fk_code_ventilation : 0).',';
+        $sql .= ' '.$this->rang.',';
+        $sql .= ' '.$this->special_code.',';
+        $sql .= " '".$this->db->escape($this->info_bits)."',";
+        $sql .= " ".price2num($this->total_ht).",";
+        $sql .= " ".price2num($this->total_tva).",";
+        $sql .= " ".price2num($this->total_ttc).",";
+        $sql .= " ".price2num($this->total_localtax1).",";
+        $sql .= " ".price2num($this->total_localtax2);
         $sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-        $sql.= ", ".(int) $this->fk_multicurrency;
-        $sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql.= ", ".price2num($this->multicurrency_subprice);
-        $sql.= ", ".price2num($this->multicurrency_total_ht);
-        $sql.= ", ".price2num($this->multicurrency_total_tva);
-        $sql.= ", ".price2num($this->multicurrency_total_ttc);
-        $sql.= ')';
+        $sql .= ", ".(int) $this->fk_multicurrency;
+        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+        $sql .= ", ".price2num($this->multicurrency_subprice);
+        $sql .= ", ".price2num($this->multicurrency_total_ht);
+        $sql .= ", ".price2num($this->multicurrency_total_tva);
+        $sql .= ", ".price2num($this->multicurrency_total_ttc);
+        $sql .= ')';
 
         dol_syslog(get_class($this)."::insert", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-            $this->rowid=$this->id;
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+            $this->rowid = $this->id;
 
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-                $result=$this->insertExtraFields();
+                $result = $this->insertExtraFields();
                 if ($result < 0)
                 {
                     $error++;
                 }
             }
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('LINEBILL_SUPPLIER_CREATE',$user);
+                $result = $this->call_trigger('LINEBILL_SUPPLIER_CREATE', $user);
                 if ($result < 0)
                 {
                     $this->db->rollback();
@@ -2781,7 +2781,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }
@@ -2797,16 +2797,16 @@ 
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
-        $sql.= "  total_ht='".price2num($this->total_ht)."'";
-        $sql.= ", tva='".price2num($this->total_tva)."'";
-        $sql.= ", total_localtax1='".price2num($this->total_localtax1)."'";
-        $sql.= ", total_localtax2='".price2num($this->total_localtax2)."'";
-        $sql.= ", total_ttc='".price2num($this->total_ttc)."'";
-        $sql.= " WHERE rowid = ".$this->rowid;
+        $sql .= "  total_ht='".price2num($this->total_ht)."'";
+        $sql .= ", tva='".price2num($this->total_tva)."'";
+        $sql .= ", total_localtax1='".price2num($this->total_localtax1)."'";
+        $sql .= ", total_localtax2='".price2num($this->total_localtax2)."'";
+        $sql .= ", total_ttc='".price2num($this->total_ttc)."'";
+        $sql .= " WHERE rowid = ".$this->rowid;
 
         dol_syslog("FactureFournisseurLigne.class.php::update_total", LOG_DEBUG);
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->db->commit();
@@ -2814,7 +2814,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }

Braces +415 added lines, -208 removed lines

@@ -220,9 +220,15 @@ 
         $now=dol_now();
 
         // Clean parameters
-        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-        if (empty($this->type)) $this->type = self::TYPE_STANDARD;
-        if (empty($this->date)) $this->date=$now;
+        if (isset($this->ref_supplier)) {
+        	$this->ref_supplier=trim($this->ref_supplier);
+        }
+        if (empty($this->type)) {
+        	$this->type = self::TYPE_STANDARD;
+        }
+        if (empty($this->date)) {
+        	$this->date=$now;
+        }
 
         $socid = $this->socid;
         $ref_supplier = $this->ref_supplier;
@@ -230,8 +236,11 @@ 
         $remise = $this->remise;
 
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
@@ -241,7 +250,9 @@ 
 
         $this->db->begin();
 
-        if (! $remise) $remise = 0 ;
+        if (! $remise) {
+        	$remise = 0 ;
+        }
         $totalht = ($amount - $remise);
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (";
@@ -304,7 +315,9 @@ 
 
             dol_syslog(get_class($this)."::create", LOG_DEBUG);
             $resql=$this->db->query($sql);
-            if (! $resql) $error++;
+            if (! $resql) {
+            	$error++;
+            }
 
             // Add object linked
             if (! $error && $this->id && ! empty($this->origin) && ! empty($this->origin_id))
@@ -317,9 +330,11 @@ 
                 }
             }
 
-			if (count($this->lines) && is_object($this->lines[0]))	// If this->lines is array of InvoiceLines (preferred mode)
+			if (count($this->lines) && is_object($this->lines[0])) {
+				// If this->lines is array of InvoiceLines (preferred mode)
 			{
                 dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
+			}
                 foreach ($this->lines as $i => $val)
                 {
                     $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
@@ -343,16 +358,14 @@ 
                             (! empty($this->lines[$i]->info_bits)?$this->lines[$i]->info_bits:''),
                             $this->lines[$i]->product_type
                         );
-                    }
-                    else
+                    } else
                     {
                         $this->error=$this->db->lasterror();
                         $this->db->rollback();
                         return -5;
                     }
                 }
-			}
-			else	// If this->lines is an array of invoice line arrays
+			} else	// If this->lines is an array of invoice line arrays
 			{
 			    dol_syslog("There is ".count($this->lines)." lines that are array lines");
 			    foreach ($this->lines as $i => $val)
@@ -361,7 +374,9 @@ 
 
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
-                	if (! is_object($line)) $line = (object) $line;
+                	if (! is_object($line)) {
+                		$line = (object) $line;
+                	}
 
                 	$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
 			        $sql .= ' VALUES ('.$this->id.')';
@@ -384,8 +399,7 @@ 
 			                (! empty($line->info_bits)?$line->info_bits:''),
 			                $line->product_type
 			                );
-			        }
-			        else
+			        } else
 			        {
 			            $this->error=$this->db->lasterror();
 			            $this->db->rollback();
@@ -407,22 +421,28 @@ 
 				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
-	            	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+	            	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+	            		// For avoid conflicts if trigger used
 					{
-						$result=$this->insertExtraFields();               // This also set $this->error or $this->errors if errors are found
+						$result=$this->insertExtraFields();
+	            	}
+	            	// This also set $this->error or $this->errors if errors are found
 						if ($result < 0)
 						{
 							$error++;
 						}
 					}
+				} else if ($reshook < 0) {
+					$error++;
 				}
-				else if ($reshook < 0) $error++;
 
 				if (! $error)
 				{
                     // Call trigger
                     $result=$this->call_trigger('BILL_SUPPLIER_CREATE',$user);
-                    if ($result < 0) $error++;
+                    if ($result < 0) {
+                    	$error++;
+                    }
                     // End call triggers
 				}
 
@@ -430,29 +450,25 @@ 
                 {
                     $this->db->commit();
                     return $this->id;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     return -4;
                 }
-            }
-            else
+            } else
             {
                 $this->error=$langs->trans('FailedToUpdatePrice');
                 $this->db->rollback();
                 return -3;
             }
-        }
-        else
+        } else
         {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error=$langs->trans('ErrorRefAlreadyExists');
                 $this->db->rollback();
                 return -1;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->lasterror();
                 $this->db->rollback();
@@ -520,8 +536,12 @@ 
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (t.fk_cond_reglement = cr.rowid AND cr.entity = " . getEntity('c_payment_term') . ")";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON (t.fk_mode_reglement = p.id AND p.entity = " . getEntity('c_paiement') . ")";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
-        if ($id)  $sql.= " WHERE t.rowid=".$id;
-        if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
+        if ($id) {
+        	$sql.= " WHERE t.rowid=".$id;
+        }
+        if ($ref) {
+        	$sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -604,7 +624,9 @@ 
                 $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
                 $this->fetch_optionals($this->id,$extralabels);
 
-                if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+                if ($this->statut == self::STATUS_DRAFT) {
+                	$this->brouillon = 1;
+                }
 
                 $result=$this->fetch_lines();
                 if ($result < 0)
@@ -613,8 +635,7 @@ 
                     return -3;
                 }
 
-            }
-            else
+            } else
             {
                 $this->error='Bill with id '.$id.' not found';
                 dol_syslog(get_class($this).'::fetch '.$this->error);
@@ -623,8 +644,7 @@ 
 
             $this->db->free($resql);
             return 1;
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -716,8 +736,7 @@ 
             }
             $this->db->free($resql_rows);
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -738,36 +757,92 @@ 
         $error=0;
 
         // Clean parameters
-        if (empty($this->type)) $this->type= self::TYPE_STANDARD;
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-        if (isset($this->entity)) $this->entity=trim($this->entity);
-        if (isset($this->type)) $this->type=trim($this->type);
-        if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
-        if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-        if (isset($this->paye)) $this->paye=trim($this->paye);
-        if (isset($this->amount)) $this->amount=trim($this->amount);
-        if (isset($this->remise)) $this->remise=trim($this->remise);
-        if (isset($this->close_code)) $this->close_code=trim($this->close_code);
-        if (isset($this->close_note)) $this->close_note=trim($this->close_note);
-        if (isset($this->tva)) $this->tva=trim($this->tva);
-        if (isset($this->localtax1)) $this->localtax1=trim($this->localtax1);
-        if (isset($this->localtax2)) $this->localtax2=trim($this->localtax2);
-        if (empty($this->total_ht)) $this->total_ht=0;
-        if (empty($this->total_tva)) $this->total_tva=0;
+        if (empty($this->type)) {
+        	$this->type= self::TYPE_STANDARD;
+        }
+		if (isset($this->ref)) {
+			$this->ref=trim($this->ref);
+		}
+        if (isset($this->ref_supplier)) {
+        	$this->ref_supplier=trim($this->ref_supplier);
+        }
+        if (isset($this->entity)) {
+        	$this->entity=trim($this->entity);
+        }
+        if (isset($this->type)) {
+        	$this->type=trim($this->type);
+        }
+        if (isset($this->fk_soc)) {
+        	$this->fk_soc=trim($this->fk_soc);
+        }
+        if (isset($this->libelle)) {
+        	$this->libelle=trim($this->libelle);
+        }
+        if (isset($this->paye)) {
+        	$this->paye=trim($this->paye);
+        }
+        if (isset($this->amount)) {
+        	$this->amount=trim($this->amount);
+        }
+        if (isset($this->remise)) {
+        	$this->remise=trim($this->remise);
+        }
+        if (isset($this->close_code)) {
+        	$this->close_code=trim($this->close_code);
+        }
+        if (isset($this->close_note)) {
+        	$this->close_note=trim($this->close_note);
+        }
+        if (isset($this->tva)) {
+        	$this->tva=trim($this->tva);
+        }
+        if (isset($this->localtax1)) {
+        	$this->localtax1=trim($this->localtax1);
+        }
+        if (isset($this->localtax2)) {
+        	$this->localtax2=trim($this->localtax2);
+        }
+        if (empty($this->total_ht)) {
+        	$this->total_ht=0;
+        }
+        if (empty($this->total_tva)) {
+        	$this->total_tva=0;
+        }
         //	if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1);
         //	if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2);
-        if (isset($this->total_ttc)) $this->total_ttc=trim($this->total_ttc);
-        if (isset($this->statut)) $this->statut=(int) $this->statut;
-        if (isset($this->author)) $this->author=trim($this->author);
-        if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-        if (isset($this->fk_facture_source)) $this->fk_facture_source=trim($this->fk_facture_source);
-        if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
-        if (isset($this->cond_reglement_id)) $this->cond_reglement_id=trim($this->cond_reglement_id);
-        if (isset($this->note_private)) $this->note=trim($this->note_private);
-        if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-        if (isset($this->model_pdf)) $this->model_pdf=trim($this->model_pdf);
-        if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+        if (isset($this->total_ttc)) {
+        	$this->total_ttc=trim($this->total_ttc);
+        }
+        if (isset($this->statut)) {
+        	$this->statut=(int) $this->statut;
+        }
+        if (isset($this->author)) {
+        	$this->author=trim($this->author);
+        }
+        if (isset($this->fk_user_valid)) {
+        	$this->fk_user_valid=trim($this->fk_user_valid);
+        }
+        if (isset($this->fk_facture_source)) {
+        	$this->fk_facture_source=trim($this->fk_facture_source);
+        }
+        if (isset($this->fk_project)) {
+        	$this->fk_project=trim($this->fk_project);
+        }
+        if (isset($this->cond_reglement_id)) {
+        	$this->cond_reglement_id=trim($this->cond_reglement_id);
+        }
+        if (isset($this->note_private)) {
+        	$this->note=trim($this->note_private);
+        }
+        if (isset($this->note_public)) {
+        	$this->note_public=trim($this->note_public);
+        }
+        if (isset($this->model_pdf)) {
+        	$this->model_pdf=trim($this->model_pdf);
+        }
+        if (isset($this->import_key)) {
+        	$this->import_key=trim($this->import_key);
+        }
 
 
         // Check parameters
@@ -782,7 +857,9 @@ 
         $sql.= " fk_soc=".(isset($this->fk_soc)?$this->fk_soc:"null").",";
         $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
         $sql.= " datef=".(dol_strlen($this->date)!=0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
-        if (dol_strlen($this->tms) != 0) $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+        if (dol_strlen($this->tms) != 0) {
+        	$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+        }
         $sql.= " libelle=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
         $sql.= " paye=".(isset($this->paye)?$this->paye:"null").",";
         $sql.= " amount=".(isset($this->amount)?$this->amount:"null").",";
@@ -830,7 +907,9 @@ 
             {
                 // Call trigger
                 $result=$this->call_trigger('BILL_SUPPLIER_UPDATE',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                	$error++;
+                }
                 // End call triggers
             }
         }
@@ -845,8 +924,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -899,8 +977,7 @@ 
                 if (! $resql2) {
                 	$error++;
                 }
-            }
-            else {
+            } else {
             	$error++;
             }
         }
@@ -909,14 +986,18 @@ 
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
         if (! $error)
         {
         	// Delete linked object
         	$res = $this->deleteObjectLinked();
-        	if ($res < 0) $error++;
+        	if ($res < 0) {
+        		$error++;
+        	}
         }
 
         if (! $error)
@@ -931,9 +1012,11 @@ 
         		$file = $dir . "/" . $ref . ".pdf";
         		if (file_exists($file))
         		{
-        			if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+        			if (! dol_delete_file($file,0,0,0,$this)) {
+        				// For triggers
         			{
         				$this->error='ErrorFailToDeleteFile';
+        			}
         				$error++;
         			}
         		}
@@ -951,9 +1034,11 @@ 
         }
 
         // Remove extrafields
-        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
+        	// For avoid conflicts if trigger used
         {
         	$result=$this->deleteExtraFields();
+        }
         	if ($result < 0)
         	{
         		$error++;
@@ -966,8 +1051,7 @@ 
         	dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
         	$this->db->commit();
         	return 1;
-        }
-        else
+        } else
         {
         	$this->error=$this->db->lasterror();
         	$this->db->rollback();
@@ -1001,10 +1085,11 @@ 
         {
             // Call trigger
             $result=$this->call_trigger('BILL_SUPPLIER_PAYED',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
-        }
-        else
+        } else
         {
             $error++;
             $this->error=$this->db->error();
@@ -1015,8 +1100,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -1049,10 +1133,11 @@ 
         {
             // Call trigger
             $result=$this->call_trigger('BILL_SUPPLIER_UNPAYED',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
-        }
-        else
+        } else
         {
             $error++;
             $this->error=$this->db->lasterror();
@@ -1063,8 +1148,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -1095,9 +1179,11 @@ 
         $this->fetch_lines();
 
         // Check parameters
-        if ($this->statut > self::STATUS_DRAFT)	// This is to avoid to validate twice (avoid errors on logs and stock management)
+        if ($this->statut > self::STATUS_DRAFT) {
+        	// This is to avoid to validate twice (avoid errors on logs and stock management)
         {
             dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
+        }
             return 0;
         }
         if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->ref_supplier))
@@ -1119,12 +1205,12 @@ 
         if ($force_number)
         {
             $num = $force_number;
-        }
-        else if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+        } else if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) {
+        	// empty should not happened, but when it occurs, the test save life
         {
             $num = $this->getNextNumRef($this->thirdparty);
         }
-        else
+        } else
 		{
             $num = $this->ref;
         }
@@ -1154,7 +1240,9 @@ 
 						$mouvP->origin = &$this;
                         // We increase stock for product
                         $up_ht_disc=$this->lines[$i]->pu_ht;
-                        if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+                        if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
+                        	$up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+                        }
                         $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr",$num));
                         if ($result < 0) { $error++; }
                         unset($this->line);
@@ -1167,7 +1255,9 @@ 
             {
                 // Call trigger
                 $result=$this->call_trigger('BILL_SUPPLIER_VALIDATE',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                	$error++;
+                }
                 // End call triggers
             }
 
@@ -1219,14 +1309,12 @@ 
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -1286,21 +1374,21 @@ 
             {
                 // Call trigger
                 $result=$this->call_trigger('BILL_SUPPLIER_UNVALIDATE',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                	$error++;
+                }
                 // End call triggers
             }
             if ($error == 0)
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -1347,14 +1435,30 @@ 
         global $mysoc;
 
         // Clean parameters
-        if (empty($remise_percent)) $remise_percent=0;
-        if (empty($qty)) $qty=0;
-        if (empty($info_bits)) $info_bits=0;
-        if (empty($rang)) $rang=0;
-        if (empty($ventil)) $ventil=0;
-        if (empty($txtva)) $txtva=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
+        if (empty($remise_percent)) {
+        	$remise_percent=0;
+        }
+        if (empty($qty)) {
+        	$qty=0;
+        }
+        if (empty($info_bits)) {
+        	$info_bits=0;
+        }
+        if (empty($rang)) {
+        	$rang=0;
+        }
+        if (empty($ventil)) {
+        	$ventil=0;
+        }
+        if (empty($txtva)) {
+        	$txtva=0;
+        }
+        if (empty($txlocaltax1)) {
+        	$txlocaltax1=0;
+        }
+        if (empty($txlocaltax2)) {
+        	$txlocaltax2=0;
+        }
 
         $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
@@ -1388,7 +1492,9 @@ 
 		$pu_ht_devise = $tabprice[19];
 
         // Check parameters
-        if ($type < 0) return -1;
+        if ($type < 0) {
+        	return -1;
+        }
 
         // Insert line
         $this->line=new SupplierInvoiceLine($this->db);
@@ -1442,7 +1548,9 @@ 
         if ($result > 0)
         {
             // Reorder if child line
-            if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
+            if (! empty($fk_parent_line)) {
+            	$this->line_order(true,'DESC');
+            }
 
             // Mise a jour informations denormalisees au niveau de la facture meme
             $result=$this->update_price(1,'auto',0,$this->thirdparty);	// The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
@@ -1450,15 +1558,13 @@ 
             {
                 $this->db->commit();
                 return $this->line->id;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->error();
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->line->error;
             $this->db->rollback();
@@ -1502,12 +1608,20 @@ 
 
         // Check parameters
         //if (! is_numeric($pu) || ! is_numeric($qty)) return -1;
-        if ($type < 0) return -1;
+        if ($type < 0) {
+        	return -1;
+        }
 
         // Clean parameters
-		if (empty($vatrate)) $vatrate=0;
-        if (empty($txlocaltax1)) $txlocaltax1=0;
-        if (empty($txlocaltax2)) $txlocaltax2=0;
+		if (empty($vatrate)) {
+			$vatrate=0;
+		}
+        if (empty($txlocaltax1)) {
+        	$txlocaltax1=0;
+        }
+        if (empty($txlocaltax2)) {
+        	$txlocaltax2=0;
+        }
 
         $txlocaltax1=price2num($txlocaltax1);
         $txlocaltax2=price2num($txlocaltax2);
@@ -1545,15 +1659,16 @@ 
         $multicurrency_total_ttc = $tabprice[18];
 		$pu_ht_devise = $tabprice[19];
 
-        if (empty($info_bits)) $info_bits=0;
+        if (empty($info_bits)) {
+        	$info_bits=0;
+        }
 
         if ($idproduct)
         {
             $product=new Product($this->db);
             $result=$product->fetch($idproduct);
             $product_type = $product->type;
-        }
-        else
+        } else
         {
             $product_type = $type;
         }
@@ -1680,8 +1795,7 @@ 
                 //$this->date_validation   = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders)
             }
             $this->db->free($result);
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -1710,7 +1824,9 @@ 
 		$sql.= " AND f.paye = 0";					// Pas classee payee completement
 		$sql.= " AND pf.fk_paiementfourn IS NULL";	// Aucun paiement deja fait
 		$sql.= " AND ff.fk_statut IS NULL";			// Renvoi vrai si pas facture de remplacement
-		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql.=" AND f.fk_soc = ".$socid;
+		}
 		$sql.= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_replacable_supplier_invoices", LOG_DEBUG);
@@ -1725,8 +1841,7 @@ 
 			}
 			//print_r($return);
 			return $return;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -1755,7 +1870,9 @@ 
 		$sql.= " AND f.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
 		$sql.= " AND ff.type IS NULL";									// Renvoi vrai si pas facture de remplacement
 		$sql.= " AND f.type != ".self::TYPE_CREDIT_NOTE;				// Type non 2 si facture non avoir
-		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql.=" AND f.fk_soc = ".$socid;
+		}
 		$sql.= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_qualified_avoir_supplier_invoices", LOG_DEBUG);
@@ -1765,8 +1882,12 @@ 
 			while ($obj=$this->db->fetch_object($resql))
 			{
 				$qualified=0;
-				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified=1;
-				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified=1;
+				if ($obj->fk_statut == self::STATUS_VALIDATED) {
+					$qualified=1;
+				}
+				if ($obj->fk_statut == self::STATUS_CLOSED) {
+					$qualified=1;
+				}
 				if ($qualified)
 				{
 					$paymentornot=($obj->fk_paiementfourn?1:0);
@@ -1775,8 +1896,7 @@ 
 			}
 
 			return $return;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -1795,12 +1915,18 @@ 
 
         $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) {
+        	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        }
         $sql.= ' WHERE ff.paye=0';
         $sql.= ' AND ff.fk_statut > 0';
         $sql.= " AND ff.entity = ".$conf->entity;
-        if ($user->societe_id) $sql.=' AND ff.fk_soc = '.$user->societe_id;
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+        if ($user->societe_id) {
+        	$sql.=' AND ff.fk_soc = '.$user->societe_id;
+        }
+        if (!$user->rights->societe->client->voir && !$user->societe_id) {
+        	$sql.= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1830,8 +1956,7 @@ 
             }
             $this->db->free($resql);
             return $response;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             $this->error=$this->db->error();
@@ -1858,42 +1983,75 @@ 
 
         $result='';
 
-        if ($option == 'document')	$url = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$this->id;
-        else $url = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id;
+        if ($option == 'document') {
+        	$url = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$this->id;
+        } else {
+        	$url = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id;
+        }
 
-        if ($short) return $url;
+        if ($short) {
+        	return $url;
+        }
 
         if ($option !== 'nolink')
         {
         	// 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';
+        	}
         }
 
         $picto='bill';
-        if ($this->type == self::TYPE_REPLACEMENT) $picto.='r'; // Replacement invoice
-        if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a'; // Credit note
-        if ($this->type == self::TYPE_DEPOSIT)     $picto.='d'; // Deposit invoice
+        if ($this->type == self::TYPE_REPLACEMENT) {
+        	$picto.='r';
+        }
+        // Replacement invoice
+        if ($this->type == self::TYPE_CREDIT_NOTE) {
+        	$picto.='a';
+        }
+        // Credit note
+        if ($this->type == self::TYPE_DEPOSIT) {
+        	$picto.='d';
+        }
+        // Deposit invoice
 
         $label = '<u>' . $langs->trans("ShowSupplierInvoice") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->ref_supplier))
-            $label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-        if ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
-        if ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
-        if ($this->type == self::TYPE_DEPOSIT)     $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
-        if ($moretitle) $label.=' - '.$moretitle;
+        if (! empty($this->ref)) {
+                    $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        }
+        if (! empty($this->ref_supplier)) {
+                    $label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
+        }
+        if (! empty($this->total_ht)) {
+                    $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+        }
+        if (! empty($this->total_tva)) {
+                    $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+        }
+        if (! empty($this->total_ttc)) {
+                    $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        }
+        if ($this->type == self::TYPE_REPLACEMENT) {
+        	$label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
+        }
+        if ($this->type == self::TYPE_CREDIT_NOTE) {
+        	$label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
+        }
+        if ($this->type == self::TYPE_DEPOSIT) {
+        	$label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
+        }
+        if ($moretitle) {
+        	$label.=' - '.$moretitle;
+        }
 
         $ref=$this->ref;
-        if (empty($ref)) $ref=$this->id;
+        if (empty($ref)) {
+        	$ref=$this->id;
+        }
 
         $linkclose='';
         if (empty($notooltip))
@@ -1911,7 +2069,9 @@ 
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
+        if ($withpicto) {
+        	$result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
+        }
         $result.=$linkstart.($max?dol_trunc($ref,$max):$ref).$linkend;
         return $result;
     }
@@ -1930,7 +2090,9 @@ 
         $langs->load("orders");
 
         // Clean parameters (if not defined or using deprecated value)
-        if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER='mod_facture_fournisseur_cactus';
+        if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) {
+        	$conf->global->INVOICE_SUPPLIER_ADDON_NUMBER='mod_facture_fournisseur_cactus';
+        }
 
         $mybool=false;
 
@@ -1961,8 +2123,7 @@ 
         if ($numref != "")
         {
         	return $numref;
-        }
-        else
+        } else
        {
        		$this->error=$obj->error;
         	//dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
@@ -2042,8 +2203,7 @@ 
 				    $line->total_ttc=59.8;
 				    $line->total_tva=9.8;
 	    			$line->remise_percent=50;
-				}
-				else
+				} else
 				{
 				    $line->total_ht=100;
 				    $line->total_ttc=119.6;
@@ -2107,8 +2267,7 @@ 
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -2156,10 +2315,12 @@ 
         // Loop on each line of new invoice
         foreach($object->lines as $i => $line)
         {
-            if (isset($object->lines[$i]->info_bits) && ($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
+            if (isset($object->lines[$i]->info_bits) && ($object->lines[$i]->info_bits & 0x02) == 0x02) {
+            	// We do not clone line of discounts
             {
                 unset($object->lines[$i]);
             }
+            }
         }
 
         // Create clone
@@ -2186,8 +2347,7 @@ 
         {
             $this->db->commit();
             return $object->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -2216,8 +2376,7 @@ 
 			if (! empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
 			{
 				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
-			}
-			else
+			} else
 			{
 				$modele = '';       // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
@@ -2226,8 +2385,7 @@ 
 		if (empty($modele))
 		{
 		    return 0;
-		}
-		else
+		} else
 		{
             $modelpath = "core/modules/supplier_invoice/pdf/";
 
@@ -2525,8 +2683,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -2547,17 +2704,27 @@ 
 		$qty  = price2num($this->qty);
 
 		// Check parameters
-		if (empty($this->qty)) $this->qty=0;
+		if (empty($this->qty)) {
+			$this->qty=0;
+		}
 
 		if ($this->product_type < 0) {
 			return -1;
 		}
 
 		// Clean parameters
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->tva_tx))  		  $this->tva_tx = 0;
-		if (empty($this->localtax1_tx))   $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx))   $this->localtax2_tx = 0;
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
 
 		$this->db->begin();
 
@@ -2616,10 +2783,12 @@ 
 		$this->rowid = $this->id;
 		$error = 0;
 
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			// For avoid conflicts if trigger used
 		{
 			if ($this->insertExtraFields() < 0) {
 				$error++;
+		}
 			}
 		}
 
@@ -2660,26 +2829,64 @@ 
 
         // Clean parameters
         $this->desc=trim($this->desc);
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type='0';
-        if (empty($this->localtax2_type)) $this->localtax2_type='0';
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->subprice)) $this->subprice=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
-
-        if (empty($this->pa_ht)) $this->pa_ht=0;
-        if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
-        if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
-        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+        if (empty($this->tva_tx)) {
+        	$this->tva_tx=0;
+        }
+        if (empty($this->localtax1_tx)) {
+        	$this->localtax1_tx=0;
+        }
+        if (empty($this->localtax2_tx)) {
+        	$this->localtax2_tx=0;
+        }
+        if (empty($this->localtax1_type)) {
+        	$this->localtax1_type='0';
+        }
+        if (empty($this->localtax2_type)) {
+        	$this->localtax2_type='0';
+        }
+        if (empty($this->total_localtax1)) {
+        	$this->total_localtax1=0;
+        }
+        if (empty($this->total_localtax2)) {
+        	$this->total_localtax2=0;
+        }
+        if (empty($this->rang)) {
+        	$this->rang=0;
+        }
+        if (empty($this->remise_percent)) {
+        	$this->remise_percent=0;
+        }
+        if (empty($this->info_bits)) {
+        	$this->info_bits=0;
+        }
+        if (empty($this->subprice)) {
+        	$this->subprice=0;
+        }
+        if (empty($this->special_code)) {
+        	$this->special_code=0;
+        }
+        if (empty($this->fk_parent_line)) {
+        	$this->fk_parent_line=0;
+        }
+        if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
+        	$this->situation_percent = 100;
+        }
+
+        if (empty($this->pa_ht)) {
+        	$this->pa_ht=0;
+        }
+        if (empty($this->multicurrency_subprice)) {
+        	$this->multicurrency_subprice=0;
+        }
+        if (empty($this->multicurrency_total_ht)) {
+        	$this->multicurrency_total_ht=0;
+        }
+        if (empty($this->multicurrency_total_tva)) {
+        	$this->multicurrency_total_tva=0;
+        }
+        if (empty($this->multicurrency_total_ttc)) {
+        	$this->multicurrency_total_ttc=0;
+        }
 
 
         // Check parameters
@@ -2754,9 +2961,11 @@ 
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
             $this->rowid=$this->id;
 
-            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            	// For avoid conflicts if trigger used
             {
                 $result=$this->insertExtraFields();
+            }
                 if ($result < 0)
                 {
                     $error++;
@@ -2778,8 +2987,7 @@ 
             $this->db->commit();
             return $this->id;
 
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -2811,8 +3019,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();

htdocs/core/modules/product/doc/pdf_standard.modules.php

Doc Comments +2 added lines, -2 removed lines

@@ -570,8 +570,8 @@
 	 *   Show table for lines
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		integer		$tab_top		Top position of table
+	 *   @param		integer		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title

Braces +43 added lines, -27 removed lines

@@ -113,7 +113,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+			$this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -132,9 +135,13 @@ 
 	{
 		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+			$outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output='ISO-8859-1';
+		}
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -153,8 +160,7 @@ 
 			{
 				$dir = $conf->produit->dir_output;
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->produit->dir_output . "/" . $objectref;
@@ -218,14 +224,18 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (! empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
@@ -282,7 +292,9 @@ 
 						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj=new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (! empty($salerepobj->signature)) {
+							$notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 				if ($notetoshow)
@@ -300,8 +312,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -527,7 +538,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -539,20 +552,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 				
 				return 1;   // Pas d'erreur
-			}
-			else
+			} else
 			{
 				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("ErrorConstantNotDefined","PRODUCT_OUTPUTDIR");
 			return 0;
@@ -579,7 +591,9 @@ 
 	
 	    // Force to disable hidetop and hidebottom
 	    $hidebottom=0;
-	    if ($hidetop) $hidetop=-1;
+	    if ($hidetop) {
+	    	$hidetop=-1;
+	    }
 	
 	    $currency = !empty($currency) ? $currency : $conf->currency;
 	    $default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -595,7 +609,9 @@ 
 	        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 	
 	        //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-	        if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+	        if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+	        	$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+	        }
 	    }
 	
 	    $pdf->SetDrawColor(128,128,128);
@@ -636,8 +652,7 @@ 
 	        if($conf->global->PRODUCT_USE_UNITS)
 	        {
 	            $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-	        }
-	        else
+	        } else
 	        {
 	            $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
 	        }
@@ -694,8 +709,11 @@ 
 	    $outputlangs->load("orders");
 	    $default_font_size = pdf_getPDFFontSize($outputlangs);
 	
-	    if ($object->type == 1) $titlekey='ServiceSheet';
-	    else $titlekey='ProductSheet';
+	    if ($object->type == 1) {
+	    	$titlekey='ServiceSheet';
+	    } else {
+	    	$titlekey='ProductSheet';
+	    }
 	        
 	    pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 	
@@ -721,16 +739,14 @@ 
 	        {
 	            $height=pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-	        }
-	        else
+	        } else
 	        {
 	            $pdf->SetTextColor(200,0,0);
 	            $pdf->SetFont('','B', $default_font_size -2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $text=$this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');

Indentation +197 added lines, -197 removed lines

@@ -36,47 +36,47 @@ 
  */
 class pdf_standard extends ModelePDFProduct
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * @var array() Minimum version of PHP required by module.
+	 * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.3 = array(5, 3)
-     */
+	 */
 	public $phpmin = array(5, 2);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @public string
-     */
+	 * Dolibarr version of the loaded document
+	 * @public string
+	 */
 	public $version = 'dolibarr';
 
-    public $page_largeur;
-    public $page_hauteur;
-    public $format;
+	public $page_largeur;
+	public $page_hauteur;
+	public $format;
 	public $marge_gauche;
 	public $marge_droite;
 	public $marge_haute;
 	public $marge_basse;
 
-    public $emetteur;	// Objet societe qui emet
+	public $emetteur;	// Objet societe qui emet
 
 
 	/**
@@ -148,7 +148,7 @@ 
 
 		if ($conf->produit->dir_output)
 		{
-		    // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->produit->dir_output;
@@ -193,21 +193,21 @@ 
 				$pdf->SetAutoPageBreak(1,0);
 
 				$heightforinfotot = 40;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb=0;
@@ -251,23 +251,23 @@ 
 
 				if ($object->weight)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight), 0, 1);
-				    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight), 0, 1);
+					$nexY = $pdf->GetY();
 				}
 				if ($object->weight)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != ''?$object->length:'?').' x '.($object->width != ''?$object->width:'?').' x '.($object->height != ''?$object->height:'?'), 0, 1);
-				    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != ''?$object->length:'?').' x '.($object->width != ''?$object->width:'?').' x '.($object->height != ''?$object->height:'?'), 0, 1);
+					$nexY = $pdf->GetY();
 				}
 				if ($object->surface)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface), 0, 1);
-				    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface), 0, 1);
+					$nexY = $pdf->GetY();
 				}
 				if ($object->volume)
 				{
-    				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume), 0, 1);
-	   			    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume), 0, 1);
+	   				$nexY = $pdf->GetY();
 				}
 
 
@@ -572,102 +572,102 @@ 
 	 */
 	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
 	{
-	    global $conf;
+		global $conf;
 
-	    // Force to disable hidetop and hidebottom
-	    $hidebottom=0;
-	    if ($hidetop) $hidetop=-1;
+		// Force to disable hidetop and hidebottom
+		$hidebottom=0;
+		if ($hidetop) $hidetop=-1;
 
-	    $currency = !empty($currency) ? $currency : $conf->currency;
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$currency = !empty($currency) ? $currency : $conf->currency;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    // Amount in (at tab_top - 1)
-	    $pdf->SetTextColor(0,0,0);
-	    $pdf->SetFont('','', $default_font_size - 2);
+		// Amount in (at tab_top - 1)
+		$pdf->SetTextColor(0,0,0);
+		$pdf->SetFont('','', $default_font_size - 2);
 
-	    if (empty($hidetop))
-	    {
-	        $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
-	        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
-	        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+		if (empty($hidetop))
+		{
+			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
-	        //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-	        if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
-	    }
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+		}
 
-	    $pdf->SetDrawColor(128,128,128);
-	    $pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetDrawColor(128,128,128);
+		$pdf->SetFont('','', $default_font_size - 1);
 
-	    // Output Rect
-	    $this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+		// Output Rect
+		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
 
-	    if (empty($hidetop))
-	    {
-	        $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+		if (empty($hidetop))
+		{
+			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
 
-	        $pdf->SetXY($this->posxdesc-1, $tab_top+1);
-	        $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
-	    }
+			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
+			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
+		}
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
-	        if (empty($hidetop))
-	        {
-	            $pdf->SetXY($this->posxtva-3, $tab_top+1);
-	            $pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
-	        }
-	    }
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxtva-3, $tab_top+1);
+				$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
+			}
+		}
 
-	    $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxup-1, $tab_top+1);
-	        $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
-	    }
+		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxup-1, $tab_top+1);
+			$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
+		}
 
-	    $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxqty-1, $tab_top+1);
-	        if($conf->global->PRODUCT_USE_UNITS)
-	        {
-	            $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-	        }
-	        else
-	        {
-	            $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-	        }
-	    }
-
-	    if($conf->global->PRODUCT_USE_UNITS) {
-	        $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
-	        if (empty($hidetop)) {
-	            $pdf->SetXY($this->posxunit - 1, $tab_top + 1);
-	            $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
-	                'C');
-	        }
-	    }
+		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxqty-1, $tab_top+1);
+			if($conf->global->PRODUCT_USE_UNITS)
+			{
+				$pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+			}
+			else
+			{
+				$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+			}
+		}
 
-	    $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        if ($this->atleastonediscount)
-	        {
-	            $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
-	            $pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
-	        }
-	    }
+		if($conf->global->PRODUCT_USE_UNITS) {
+			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
+				$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
+					'C');
+			}
+		}
 
-	    if ($this->atleastonediscount)
-	    {
-	        $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-	    }
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->postotalht-1, $tab_top+1);
-	        $pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
-	    }
+		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			if ($this->atleastonediscount)
+			{
+				$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+				$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
+			}
+		}
+
+		if ($this->atleastonediscount)
+		{
+			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		}
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->postotalht-1, $tab_top+1);
+			$pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
+		}
 	}
 
 	/**
@@ -682,74 +682,74 @@ 
 	 */
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey="")
 	{
-	    global $conf,$langs,$hookmanager;
+		global $conf,$langs,$hookmanager;
 
-	    $outputlangs->load("main");
-	    $outputlangs->load("bills");
-	    $outputlangs->load("propal");
-	    $outputlangs->load("companies");
-	    $outputlangs->load("orders");
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$outputlangs->load("main");
+		$outputlangs->load("bills");
+		$outputlangs->load("propal");
+		$outputlangs->load("companies");
+		$outputlangs->load("orders");
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    if ($object->type == 1) $titlekey='ServiceSheet';
-	    else $titlekey='ProductSheet';
+		if ($object->type == 1) $titlekey='ServiceSheet';
+		else $titlekey='ProductSheet';
 
-	    pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
-	    // Show Draft Watermark
-	    if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
-	    {
-	        pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
-	    }
+		// Show Draft Watermark
+		if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+		{
+			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+		}
 
-	    $pdf->SetTextColor(0,0,60);
-	    $pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('','B', $default_font_size + 3);
 
-	    $posy=$this->marge_haute;
-	    $posx=$this->page_largeur-$this->marge_droite-100;
+		$posy=$this->marge_haute;
+		$posx=$this->page_largeur-$this->marge_droite-100;
 
-	    $pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche,$posy);
 
-	    // Logo
-	    $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-	    if ($this->emetteur->logo)
-	    {
-	        if (is_readable($logo))
-	        {
-	            $height=pdf_getHeightForLogo($logo);
-	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-	        }
-	        else
-	        {
-	            $pdf->SetTextColor(200,0,0);
-	            $pdf->SetFont('','B', $default_font_size -2);
-	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
-	        }
-	    }
-	    else
-	    {
-	        $text=$this->emetteur->name;
-	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-	    }
+		// Logo
+		$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+		if ($this->emetteur->logo)
+		{
+			if (is_readable($logo))
+			{
+				$height=pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			}
+			else
+			{
+				$pdf->SetTextColor(200,0,0);
+				$pdf->SetFont('','B', $default_font_size -2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+			}
+		}
+		else
+		{
+			$text=$this->emetteur->name;
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+		}
 
-	    $pdf->SetFont('','B', $default_font_size + 3);
-	    $pdf->SetXY($posx,$posy);
-	    $pdf->SetTextColor(0,0,60);
-	    $title=$outputlangs->transnoentities($titlekey);
-	    $pdf->MultiCell(100, 3, $title, '', 'R');
+		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$title=$outputlangs->transnoentities($titlekey);
+		$pdf->MultiCell(100, 3, $title, '', 'R');
 
-	    $pdf->SetFont('','B',$default_font_size);
+		$pdf->SetFont('','B',$default_font_size);
 
-	    $posy+=5;
-	    $pdf->SetXY($posx,$posy);
-	    $pdf->SetTextColor(0,0,60);
-	    $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$posy+=5;
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
 
-	    $posy+=1;
-	    $pdf->SetFont('','', $default_font_size - 1);
+		$posy+=1;
+		$pdf->SetFont('','', $default_font_size - 1);
 
-	    /*if ($object->ref_client)
+		/*if ($object->ref_client)
 	    {
 	        $posy+=5;
 	        $pdf->SetXY($posx,$posy);
@@ -757,14 +757,14 @@ 
 	        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 	    }*/
 
-	    /*$posy+=4;
+		/*$posy+=4;
 	    $pdf->SetXY($posx,$posy);
 	    $pdf->SetTextColor(0,0,60);
 	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
 	    */
 
-	    // Get contact
-	    /*
+		// Get contact
+		/*
 	    if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 	    {
 	        $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
@@ -779,14 +779,14 @@ 
 	        }
 	    }*/
 
-	    $posy+=2;
+		$posy+=2;
 
-	    // Show list of linked objects
-	    $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		// Show list of linked objects
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
-	    if ($showaddress)
-	    {
-	        /*
+		if ($showaddress)
+		{
+			/*
 	        // Sender properties
 	        $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
@@ -817,9 +817,9 @@ 
 	        $pdf->SetFont('','', $default_font_size - 1);
 	        $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 	        */
-	    }
+		}
 
-	    $pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0,0,0);
 	}
 
 	/**
@@ -833,9 +833,9 @@ 
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-	    global $conf;
-	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-	    return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		global $conf;
+		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }

Spacing +134 added lines, -134 removed lines

@@ -76,7 +76,7 @@ 
 	public $marge_haute;
 	public $marge_basse;
 
-    public $emetteur;	// Objet societe qui emet
+    public $emetteur; // Objet societe qui emet
 
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		$langs->load("main");
 		$langs->load("companies");
@@ -97,23 +97,23 @@ 
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_freetext = 0;				   // Support add of a personalised text
+		$this->option_logo = 1; // Affiche logo
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_freetext = 0; // Support add of a personalised text
 
 		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
@@ -128,13 +128,13 @@ 
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -152,24 +152,24 @@ 
 			if ($object->specimen)
 			{
 				$dir = $conf->produit->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
+				$file = $dir."/SPECIMEN.pdf";
 			}
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->produit->dir_output . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
+				$dir = $conf->produit->dir_output."/".$objectref;
+				$file = $dir."/".$objectref.".pdf";
 			}
 
 			$productFournisseur = new ProductFournisseur($this->db);
 			$supplierprices = $productFournisseur->list_product_fournisseur_price($object->id);
 			$object->supplierprices = $supplierprices;
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -177,24 +177,24 @@ 
 			if (file_exists($dir))
 			{
 							// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Create pdf instance
-				$pdf=pdf_getInstance($this->format);
-				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1,0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-				$heightforinfotot = 40;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+				$heightforinfotot = 40; // Height reserved to output the info and total part
+		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
 
                 if (class_exists('TCPDF'))
                 {
@@ -203,51 +203,51 @@ 
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Order"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
 
 				$tab_top = 42;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
 				$tab_height = 130;
 				$tab_height_newpage = 150;
 
 				//
-				$pdf->SetFont('','B', $default_font_size);
+				$pdf->SetFont('', 'B', $default_font_size);
 				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $tab_top, dol_htmlentitiesbr($object->label), 0, 1);
 				$nexY = $pdf->GetY();
 
-				$pdf->SetFont('','', $default_font_size);
+				$pdf->SetFont('', '', $default_font_size);
 				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, dol_htmlentitiesbr($object->description), 0, 1);
 				$nexY = $pdf->GetY();
 
-				$nexY+=5;
+				$nexY += 5;
 
 				if ($object->weight)
 				{
@@ -256,7 +256,7 @@ 
 				}
 				if ($object->weight)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != ''?$object->length:'?').' x '.($object->width != ''?$object->width:'?').' x '.($object->height != ''?$object->height:'?'), 0, 1);
+				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?'), 0, 1);
 				    $nexY = $pdf->GetY();
 				}
 				if ($object->surface)
@@ -273,37 +273,37 @@ 
 
 				// Affiche notes
 				// TODO There is no public note on product yet
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
-				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
 				{
 					// Get first sale rep
 					if (is_object($object->thirdparty))
 					{
-						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
-						$salerepobj=new User($this->db);
+						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
+						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
 				if ($notetoshow)
 				{
 					$tab_top = 88;
 
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
+					$height_note = $nexY - $tab_top;
 
 					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+					$pdf->SetDrawColor(192, 192, 192);
+					$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
 
 					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
+					$tab_top = $nexY + 6;
 				}
 				else
 				{
-					$height_note=0;
+					$height_note = 0;
 				}
 
 				$iniY = $tab_top + 7;
@@ -523,35 +523,35 @@ 
 				//$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
 				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
 				
-				return 1;   // Pas d'erreur
+				return 1; // Pas d'erreur
 			}
 			else
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","PRODUCT_OUTPUTDIR");
+			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -570,77 +570,77 @@ 
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 	    global $conf;
 
 	    // Force to disable hidetop and hidebottom
-	    $hidebottom=0;
-	    if ($hidetop) $hidetop=-1;
+	    $hidebottom = 0;
+	    if ($hidetop) $hidetop = -1;
 
 	    $currency = !empty($currency) ? $currency : $conf->currency;
 	    $default_font_size = pdf_getPDFFontSize($outputlangs);
 
 	    // Amount in (at tab_top - 1)
-	    $pdf->SetTextColor(0,0,0);
-	    $pdf->SetFont('','', $default_font_size - 2);
+	    $pdf->SetTextColor(0, 0, 0);
+	    $pdf->SetFont('', '', $default_font_size - 2);
 
 	    if (empty($hidetop))
 	    {
-	        $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
-	        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+	        $titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+	        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 	        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 	        //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-	        if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+	        if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 	    }
 
-	    $pdf->SetDrawColor(128,128,128);
-	    $pdf->SetFont('','', $default_font_size - 1);
+	    $pdf->SetDrawColor(128, 128, 128);
+	    $pdf->SetFont('', '', $default_font_size - 1);
 
 	    // Output Rect
-	    $this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+	    $this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
 
 	    if (empty($hidetop))
 	    {
-	        $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+	        $pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line prend une position y en 2eme param et 4eme param
 
-	        $pdf->SetXY($this->posxdesc-1, $tab_top+1);
-	        $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
+	        $pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
+	        $pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 	    }
 
 	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
 	    {
-	        $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+	        $pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
 	        if (empty($hidetop))
 	        {
-	            $pdf->SetXY($this->posxtva-3, $tab_top+1);
-	            $pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
+	            $pdf->SetXY($this->posxtva - 3, $tab_top + 1);
+	            $pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 	        }
 	    }
 
-	    $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+	    $pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
 	    if (empty($hidetop))
 	    {
-	        $pdf->SetXY($this->posxup-1, $tab_top+1);
-	        $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
+	        $pdf->SetXY($this->posxup - 1, $tab_top + 1);
+	        $pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 	    }
 
-	    $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+	    $pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
 	    if (empty($hidetop))
 	    {
-	        $pdf->SetXY($this->posxqty-1, $tab_top+1);
-	        if($conf->global->PRODUCT_USE_UNITS)
+	        $pdf->SetXY($this->posxqty - 1, $tab_top + 1);
+	        if ($conf->global->PRODUCT_USE_UNITS)
 	        {
-	            $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+	            $pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 	        }
 	        else
 	        {
-	            $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+	            $pdf->MultiCell($this->posxdiscount - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 	        }
 	    }
 
-	    if($conf->global->PRODUCT_USE_UNITS) {
+	    if ($conf->global->PRODUCT_USE_UNITS) {
 	        $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 	        if (empty($hidetop)) {
 	            $pdf->SetXY($this->posxunit - 1, $tab_top + 1);
@@ -649,13 +649,13 @@ 
 	        }
 	    }
 
-	    $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+	    $pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
 	    if (empty($hidetop))
 	    {
 	        if ($this->atleastonediscount)
 	        {
-	            $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
-	            $pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
+	            $pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
+	            $pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 	        }
 	    }
 
@@ -665,8 +665,8 @@ 
 	    }
 	    if (empty($hidetop))
 	    {
-	        $pdf->SetXY($this->postotalht-1, $tab_top+1);
-	        $pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
+	        $pdf->SetXY($this->postotalht - 1, $tab_top + 1);
+	        $pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 	    }
 	}
 
@@ -680,9 +680,9 @@ 
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	void
 	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey="")
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
-	    global $conf,$langs,$hookmanager;
+	    global $conf, $langs, $hookmanager;
 
 	    $outputlangs->load("main");
 	    $outputlangs->load("bills");
@@ -691,63 +691,63 @@ 
 	    $outputlangs->load("orders");
 	    $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    if ($object->type == 1) $titlekey='ServiceSheet';
-	    else $titlekey='ProductSheet';
+	    if ($object->type == 1) $titlekey = 'ServiceSheet';
+	    else $titlekey = 'ProductSheet';
 
-	    pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+	    pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 	    // Show Draft Watermark
-	    if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+	    if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
 	    {
-	        pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+	        pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 	    }
 
-	    $pdf->SetTextColor(0,0,60);
-	    $pdf->SetFont('','B', $default_font_size + 3);
+	    $pdf->SetTextColor(0, 0, 60);
+	    $pdf->SetFont('', 'B', $default_font_size + 3);
 
-	    $posy=$this->marge_haute;
-	    $posx=$this->page_largeur-$this->marge_droite-100;
+	    $posy = $this->marge_haute;
+	    $posx = $this->page_largeur - $this->marge_droite - 100;
 
-	    $pdf->SetXY($this->marge_gauche,$posy);
+	    $pdf->SetXY($this->marge_gauche, $posy);
 
 	    // Logo
-	    $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+	    $logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 	    if ($this->emetteur->logo)
 	    {
 	        if (is_readable($logo))
 	        {
-	            $height=pdf_getHeightForLogo($logo);
-	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+	            $height = pdf_getHeightForLogo($logo);
+	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 	        }
 	        else
 	        {
-	            $pdf->SetTextColor(200,0,0);
-	            $pdf->SetFont('','B', $default_font_size -2);
-	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+	            $pdf->SetTextColor(200, 0, 0);
+	            $pdf->SetFont('', 'B', $default_font_size - 2);
+	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
 	    }
 	    else
 	    {
-	        $text=$this->emetteur->name;
+	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
 
-	    $pdf->SetFont('','B', $default_font_size + 3);
-	    $pdf->SetXY($posx,$posy);
-	    $pdf->SetTextColor(0,0,60);
-	    $title=$outputlangs->transnoentities($titlekey);
+	    $pdf->SetFont('', 'B', $default_font_size + 3);
+	    $pdf->SetXY($posx, $posy);
+	    $pdf->SetTextColor(0, 0, 60);
+	    $title = $outputlangs->transnoentities($titlekey);
 	    $pdf->MultiCell(100, 3, $title, '', 'R');
 
-	    $pdf->SetFont('','B',$default_font_size);
+	    $pdf->SetFont('', 'B', $default_font_size);
 
-	    $posy+=5;
-	    $pdf->SetXY($posx,$posy);
-	    $pdf->SetTextColor(0,0,60);
-	    $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+	    $posy += 5;
+	    $pdf->SetXY($posx, $posy);
+	    $pdf->SetTextColor(0, 0, 60);
+	    $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
 
-	    $posy+=1;
-	    $pdf->SetFont('','', $default_font_size - 1);
+	    $posy += 1;
+	    $pdf->SetFont('', '', $default_font_size - 1);
 
 	    /*if ($object->ref_client)
 	    {
@@ -779,7 +779,7 @@ 
 	        }
 	    }*/
 
-	    $posy+=2;
+	    $posy += 2;
 
 	    // Show list of linked objects
 	    $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
@@ -819,7 +819,7 @@ 
 	        */
 	    }
 
-	    $pdf->SetTextColor(0,0,0);
+	    $pdf->SetTextColor(0, 0, 0);
 	}
 
 	/**
@@ -831,11 +831,11 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 	    global $conf;
-	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-	    return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+	    $showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+	    return pdf_pagefoot($pdf, $outputlangs, 'PRODUCT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
 }

htdocs/core/class/html.formfile.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -1676,7 +1676,7 @@
      * @param   array     $file           File
      * @param   string    $modulepart     propal, facture, facture_fourn, ...
      * @param   string    $relativepath   Relative path of docs
-     * @param   string    $ruleforpicto   Rule for picto: 0=Preview picto, 1=Use picto of mime type of file)
+     * @param   integer    $ruleforpicto   Rule for picto: 0=Preview picto, 1=Use picto of mime type of file)
      * @param	string	  $param		  More param on http links
      * @return  string    $out            Output string with HTML
      */

Braces +367 added lines, -227 removed lines

@@ -77,7 +77,9 @@ 
         $hookmanager->initHooks(array('formfile'));
 
 
-        if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
+        if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
+        	$useajax=0;
+        }
 
 		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
         {
@@ -86,8 +88,7 @@ 
         	// TODO: This does not support option savingdocmask
         	// TODO: This break feature to upload links too
         	return $this->_formAjaxFileUpload($object);
-        }
-        else
+        } else
        	{
 	        //If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
 	        if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
@@ -98,8 +99,12 @@ 
 
             $out = "\n\n<!-- Start form attach new file -->\n";
 
-            if (empty($title)) $title=$langs->trans("AttachANewFile");
-            if ($title != 'none') $out.=load_fiche_titre($title, null, null);
+            if (empty($title)) {
+            	$title=$langs->trans("AttachANewFile");
+            }
+            if ($title != 'none') {
+            	$out.=load_fiche_titre($title, null, null);
+            }
 
             $out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
             $out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="">';
@@ -109,18 +114,30 @@ 
             $out .= '<table width="100%" class="nobordernopadding">';
             $out .= '<tr>';
 
-            if (! empty($options)) $out .= '<td>'.$options.'</td>';
+            if (! empty($options)) {
+            	$out .= '<td>'.$options.'</td>';
+            }
 
             $out .= '<td valign="middle">';
 
             $max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
             $maxphp=@ini_get('upload_max_filesize');	// En inconnu
-            if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
-            if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
-            if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
-            if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
+            if (preg_match('/k$/i',$maxphp)) {
+            	$maxphp=$maxphp*1;
+            }
+            if (preg_match('/m$/i',$maxphp)) {
+            	$maxphp=$maxphp*1024;
+            }
+            if (preg_match('/g$/i',$maxphp)) {
+            	$maxphp=$maxphp*1024*1024;
+            }
+            if (preg_match('/t$/i',$maxphp)) {
+            	$maxphp=$maxphp*1024*1024*1024;
+            }
             // Now $max and $maxphp are in Kb
-            if ($maxphp > 0) $max=min($max,$maxphp);
+            if ($maxphp > 0) {
+            	$max=min($max,$maxphp);
+            }
 
             if ($max > 0)
             {
@@ -150,8 +167,7 @@ 
                     $out .= ' ';
                     $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
                 }
-            }
-            else
+            } else
             {
                 $out .= ' ('.$langs->trans("UploadDisabled").')';
             }
@@ -160,7 +176,9 @@ 
             if ($savingdocmask)
             {
             	$out .= '<tr>';
-   	            if (! empty($options)) $out .= '<td>'.$options.'</td>';
+   	            if (! empty($options)) {
+   	            	$out .= '<td>'.$options.'</td>';
+   	            }
 	            $out .= '<td valign="middle" class="nowrap">';
 				$out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
             	$out .= '</td>';
@@ -170,7 +188,9 @@ 
             $out .= "</table>";
 
             $out .= '</form>';
-            if (empty($sectionid)) $out .= '<br>';
+            if (empty($sectionid)) {
+            	$out .= '<br>';
+            }
 
             $out .= "\n<!-- End form attach new file -->\n";
 
@@ -187,11 +207,15 @@ 
 
 	            $out .= '<div class="valignmiddle" >';
 	            $out .= '<div class="inline-block" style="padding-right: 10px;">';
-	            if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
+	            if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) {
+	            	$out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
+	            }
 	            $out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
 	            $out .= '</div>';
 	            $out .= '<div class="inline-block" style="padding-right: 10px;">';
-	            if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
+	            if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) {
+	            	$out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
+	            }
 	            $out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
 	            $out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
 	            $out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
@@ -286,7 +310,9 @@ 
         global $langs, $conf, $user, $hookmanager;
         global $form, $bc;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (! is_object($form)) {
+        	$form=new Form($this->db);
+        }
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -296,10 +322,12 @@ 
         }
 
         $printer=0;
-        if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport')))	// The direct print feature is implemented only for such elements
+        if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport'))) {
+        	// The direct print feature is implemented only for such elements
         {
             $printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
         }
+        }
 
         $hookmanager->initHooks(array('formfile'));
         $forname='builddoc';
@@ -338,7 +366,9 @@ 
         }
 
         $titletoshow=$langs->trans("Documents");
-        if (! empty($title)) $titletoshow=$title;
+        if (! empty($title)) {
+        	$titletoshow=$title;
+        }
 
         // Show table
         if ($genallowed)
@@ -348,216 +378,215 @@ 
             if ($modulepart == 'company')
             {
                 $showempty=1;
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
                     $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
                 }
-            }
-            else if ($modulepart == 'propal')
+            } else if ($modulepart == 'propal')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
                     $modellist=ModelePDFPropales::liste_modeles($this->db);
                 }
-            }
-			else if ($modulepart == 'supplier_proposal')
+            } else if ($modulepart == 'supplier_proposal')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
                     $modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
                 }
-            }
-            else if ($modulepart == 'commande')
+            } else if ($modulepart == 'commande')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
                     $modellist=ModelePDFCommandes::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'expedition')
+            } elseif ($modulepart == 'expedition')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
                     $modellist=ModelePDFExpedition::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'livraison')
+            } elseif ($modulepart == 'livraison')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
                     $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
                 }
-            }
-            else if ($modulepart == 'ficheinter')
+            } else if ($modulepart == 'ficheinter')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
                     $modellist=ModelePDFFicheinter::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'facture')
+            } elseif ($modulepart == 'facture')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
                     $modellist=ModelePDFFactures::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'contract')
+            } elseif ($modulepart == 'contract')
             {
-            	if (is_array($genallowed)) $modellist=$genallowed;
-            	else
+            	if (is_array($genallowed)) {
+            		$modellist=$genallowed;
+            	} else
             	{
             		include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
             		$modellist=ModelePDFContract::liste_modeles($this->db);
             	}
-            }
-            elseif ($modulepart == 'project')
+            } elseif ($modulepart == 'project')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
                     $modellist=ModelePDFProjects::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'project_task')
+            } elseif ($modulepart == 'project_task')
             {
-            	if (is_array($genallowed)) $modellist=$genallowed;
-            	else
+            	if (is_array($genallowed)) {
+            		$modellist=$genallowed;
+            	} else
             	{
             		include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
             		$modellist=ModelePDFTask::liste_modeles($this->db);
             	}
-            }
-            elseif ($modulepart == 'product')
+            } elseif ($modulepart == 'product')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
                     $modellist=ModelePDFProduct::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'export')
+            } elseif ($modulepart == 'export')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
                     $modellist=ModeleExports::liste_modeles($this->db);
                 }
-            }
-            else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
+            } else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
                     $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
                 }
-            }
-            else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+            } else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
                     $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
                 }
-            }
-			else if ($modulepart == 'supplier_payment')
+            } else if ($modulepart == 'supplier_payment')
 			{
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
                     $modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
                 }
-			}
-            else if ($modulepart == 'remisecheque')
+			} else if ($modulepart == 'remisecheque')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
                     $modellist=ModeleChequeReceipts::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'donation')
+            } elseif ($modulepart == 'donation')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
                     $modellist=ModeleDon::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'member')
+            } elseif ($modulepart == 'member')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
                     $modellist=ModelePDFCards::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'agenda')
+            } elseif ($modulepart == 'agenda')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
                     $modellist=ModeleAction::liste_modeles($this->db);
                 }
-            }
-            else if ($modulepart == 'expensereport')
+            } else if ($modulepart == 'expensereport')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
                     $modellist=ModeleExpenseReport::liste_modeles($this->db);
                 }
-            }
-            else if ($modulepart == 'unpaid')
+            } else if ($modulepart == 'unpaid')
             {
                 $modellist='';
-            }
-            elseif ($modulepart == 'user')
+            } elseif ($modulepart == 'user')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
                     $modellist=ModelePDFUser::liste_modeles($this->db);
                 }
-            }
-            elseif ($modulepart == 'usergroup')
+            } elseif ($modulepart == 'usergroup')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                if (is_array($genallowed)) {
+                	$modellist=$genallowed;
+                } else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
                     $modellist=ModelePDFUserGroup::liste_modeles($this->db);
                 }
-            }
-            else //if ($modulepart != 'agenda')
+            } else //if ($modulepart != 'agenda')
             {
             	// For normalized standard modules
             	$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
@@ -575,8 +604,7 @@ 
                 if (class_exists($class))
                 {
                     $modellist=call_user_func($class.'::liste_modeles',$this->db);
-                }
-                else
+                } else
               {
                     dol_print_error($this->db,'Bad value for modulepart');
                     return -1;
@@ -587,10 +615,17 @@ 
             $headershown=1;
 
             $buttonlabeltoshow=$buttonlabel;
-            if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
+            if (empty($buttonlabel)) {
+            	$buttonlabel=$langs->trans('Generate');
+            }
 
-            if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
-            if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
+            if ($conf->browser->layout == 'phone') {
+            	$urlsource.='#'.$forname.'_form';
+            }
+            // So we switch to form after a generation
+            if (empty($noform)) {
+            	$out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
+            }
             $out.= '<input type="hidden" name="action" value="builddoc">';
             $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
@@ -607,15 +642,16 @@ 
             if (! empty($modellist))
             {
                 $out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
-                if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+                if (is_array($modellist) && count($modellist) == 1) {
+                	// If there is only one element
                 {
                     $arraykeys=array_keys($modellist);
+                }
                     $modelselected=$arraykeys[0];
                 }
                 $out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
                 $out.= ajax_combobox('model');
-            }
-            else
+            } else
             {
                 $out.= '<div class="float">'.$langs->trans("Files").'</div>';
             }
@@ -627,10 +663,11 @@ 
                 $formadmin=new FormAdmin($this->db);
                 $defaultlang=$codelang?$codelang:$langs->getDefaultLang();
                 $morecss='maxwidth150';
-                if (! empty($conf->browser->phone)) $morecss='maxwidth100';
+                if (! empty($conf->browser->phone)) {
+                	$morecss='maxwidth100';
+                }
                 $out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
-            }
-            else
+            } else
             {
                 $out.= '&nbsp;';
             }
@@ -638,15 +675,21 @@ 
             // Button
             $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
             $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
+            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) {
+            	$genbutton.= ' disabled';
+            }
             $genbutton.= '>';
             if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
             {
                	$langs->load("errors");
                	$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
             }
-            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-            if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
+            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {
+            	$genbutton='';
+            }
+            if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') {
+            	$genbutton='';
+            }
             $out.= $genbutton;
             $out.= '</th>';
 
@@ -654,7 +697,9 @@ 
             {
                 foreach($hookmanager->hooks['formfile'] as $module)
                 {
-                    if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
+                    if (method_exists($module, 'formBuilddocLineOptions')) {
+                    	$out .= '<th></th>';
+                    }
                 }
             }
             $out.= '</tr>';
@@ -701,13 +746,22 @@ 
 				{
 					// Define relative path for download link (depends on module)
 					$relativepath=$file["name"];										// Cas general
-                    if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
-					if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
+                    if ($modulesubdir) {
+                    	$relativepath=$modulesubdir."/".$file["name"];
+                    }
+                    // Cas propal, facture...
+					if ($modulepart == 'export') {
+						$relativepath = $file["name"];
+					}
+					// Other case
 
 					$out.= '<tr class="oddeven">';
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) {
+						$documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;
+					}
+					// To use another wrapper
 
 					// Show file name with link to download
 					$out.= '<td class="tdoverflowmax300">';
@@ -715,7 +769,9 @@ 
                     $out.= ($tmp?$tmp.' ':'');
 					$out.= '<a class="documentdownload" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
 					$mime=dol_mimetype($relativepath,'',0);
-					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
+					if (preg_match('/text/',$mime)) {
+						$out.= ' target="_blank"';
+					}
 					$out.= ' target="_blank">';
 					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]).' '.$file["name"];
 					$out.= '</a>'."\n";
@@ -764,8 +820,10 @@ 
                         {
                             $out .= $hookmanager->resPrint;		// Complete line
                             $out.= '</tr>';
+                        } else {
+                        	$out = $hookmanager->resPrint;
                         }
-                        else $out = $hookmanager->resPrint;		// Replace line
+                        // Replace line
               		}
 				}
 
@@ -787,7 +845,9 @@ 
                     $out.='<td align="right">';
                     $out.=dol_print_date($file->datea,'dayhour');
                     $out.='</td>';
-                    if ($delallowed || $printer || $morepicto) $out.='<td></td>';
+                    if ($delallowed || $printer || $morepicto) {
+                    	$out.='<td></td>';
+                    }
                     $out.='</tr>'."\n";
                 }
                 $this->numoffiles++;
@@ -807,7 +867,9 @@ 
             $out.= "</div>\n";
             if ($genallowed)
             {
-                if (empty($noform)) $out.= '</form>'."\n";
+                if (empty($noform)) {
+                	$out.= '</form>'."\n";
+                }
             }
         }
         $out.= '<!-- End show_document -->'."\n";
@@ -852,11 +914,17 @@ 
     		foreach($file_list as $file)
     		{
     		    $i++;
-    			if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
+    			if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) {
+    				continue;
+    			}
+    			// Discard this. It does not match provided filter.
 
     			// Define relative path for download link (depends on module)
     			$relativepath=$file["name"];								// Cas general
-    			if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+    			if ($modulesubdir) {
+    				$relativepath=$modulesubdir."/".$file["name"];
+    			}
+    			// Cas propal, facture...
     			// Autre cas
     			if ($modulepart == 'donation')            {
     				$relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
@@ -868,20 +936,27 @@ 
     			$this->infofiles['nboffiles']++;
     			$this->infofiles['files'][]=$file['fullname'];
     			$ext=pathinfo($file["name"], PATHINFO_EXTENSION);
-    			if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
-    			else $this->infofiles['extensions'][$ext]++;
+    			if (empty($this->infofiles[$ext])) {
+    				$this->infofiles['extensions'][$ext]=1;
+    			} else {
+    				$this->infofiles['extensions'][$ext]++;
+    			}
 
     			// Preview
     			if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
     			{
                     $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
-                    if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
+                    if ($tmparray && $tmparray['url']) {
+                    	$tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
+                    }
     			}
 
     			// Download
     		    $tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
     			$mime=dol_mimetype($relativepath,'',0);
-    			if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
+    			if (preg_match('/text/',$mime)) {
+    				$tmpout.= ' target="_blank"';
+    			}
     			$tmpout.= '>';
     			$tmpout.=img_mime($relativepath, $file["name"]).' ';
     			$tmpout.= $langs->trans("Download").' '.$ext;
@@ -890,8 +965,7 @@ 
     		$out.=$tmpout;
     		$out.='</ul></div></dd>
     			</dl>';
-    	}
-    	else
+    	} else
     	{
     	    // TODO Add link to regenerate doc ?
     	    //$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
@@ -936,8 +1010,13 @@ 
 		if (empty($relativepath))
 		{
 		    $relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
-		    if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
-		    if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+		    if ($object->element == 'invoice_supplier') {
+		    	$relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;
+		    }
+		    // TODO Call using a defined value for $relativepath
+		    if ($object->element == 'project_task') {
+		    	$relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+		    }
 		}
 		// For backward compatiblity, we detect file is stored into an old path
 		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $file['level1name'] == 'photos')
@@ -969,21 +1048,28 @@ 
 		);
 		$reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
 
-		if (isset($reshook) && $reshook != '') // null or '' for bypass
+		if (isset($reshook) && $reshook != '') {
+			// null or '' for bypass
 		{
 			return $reshook;
 		}
-		else
+		} else
 		{
 			$param = (isset($object->id)?'&id='.$object->id:'').$param;
 
-			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
+			if ($permtoeditline < 0) {
+				// Old behaviour for backward compatibility. New feature should call method with value 0 or 1
 			{
 			    $permtoeditline=0;
+			}
 			    if (in_array($modulepart, array('product','produit','service')))
 			    {
-			        if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
-			        if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
+			        if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) {
+			        	$permtoeditline=1;
+			        }
+			        if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) {
+			        	$permtoeditline=1;
+			        }
 			    }
 			}
 			if (empty($conf->global->MAIN_UPLOAD_DOC))
@@ -993,8 +1079,12 @@ 
 			}
 
 			// Show list of existing files
-			if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
-			if (empty($url)) $url=$_SERVER["PHP_SELF"];
+			if (empty($useinecm)) {
+				print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
+			}
+			if (empty($url)) {
+				$url=$_SERVER["PHP_SELF"];
+			}
 
 			print '<!-- html.formfile::list_of_documents -->'."\n";
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
@@ -1014,9 +1104,13 @@ 
 				print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref','alpha')).'"></td>';
 				print '<td></td>';
 				print '<td></td>';
-				if (empty($useinecm)) print '<td></td>';
+				if (empty($useinecm)) {
+					print '<td></td>';
+				}
 				print '<td></td>';
-				if (! $disablemove) print '<td></td>';
+				if (! $disablemove) {
+					print '<td></td>';
+				}
 				print "</tr>\n";
 			}
 
@@ -1024,9 +1118,13 @@ 
 			print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 			print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');
+			if (empty($useinecm)) {
+				print_liste_field_titre('',$url,"","",$param,'align="center"');
+			}
 			print_liste_field_titre('');
-			if (! $disablemove) print_liste_field_titre('');
+			if (! $disablemove) {
+				print_liste_field_titre('');
+			}
 			print "</tr>\n";
 
 			// Get list of files stored into database for same relative directory
@@ -1044,16 +1142,20 @@ 
 			}
 
 			$nboffiles=count($filearray);
-			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+			if ($nboffiles > 0) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+			}
 
 			$var=true; $i=0; $nboflines = 0; $lastrowid=0;
-			foreach($filearray as $key => $file)      // filearray must be only files here
+			foreach($filearray as $key => $file) {
+				// filearray must be only files here
 			{
 				if ($file['name'] != '.'
 						&& $file['name'] != '..'
 						&& ! preg_match('/\.meta$/i',$file['name']))
 				{
 					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
+			}
 
 					$editline=0;
 					$nboflines++;
@@ -1065,17 +1167,25 @@ 
 
 					$filepath=$relativepath.$file['name'];
 
-					if (! $editline) print $this->showPreview($file,$modulepart,$filepath);
+					if (! $editline) {
+						print $this->showPreview($file,$modulepart,$filepath);
+					}
 
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a class="paddingleft" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-					if ($forcedownload) print '&attachment=1';
-					if (! empty($object->entity)) print '&entity='.$object->entity;
+					if ($forcedownload) {
+						print '&attachment=1';
+					}
+					if (! empty($object->entity)) {
+						print '&entity='.$object->entity;
+					}
 					print '&file='.urlencode($filepath);
 					print '">';
 
 					print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
-					if ($showrelpart == 1) print $relativepath;
+					if ($showrelpart == 1) {
+						print $relativepath;
+					}
 					//print dol_trunc($file['name'],$maxlength,'middle');
 					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile')))
 					{
@@ -1083,8 +1193,7 @@ 
 					    print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
 					    print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
 					    $editline=1;
-					}
-					else
+					} else
 					{
 					    print $file['name'];
 					    print '</a>';
@@ -1104,16 +1213,22 @@ 
 						if (image_format_supported($file['name']) > 0)
 						{
 						    $minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-						    if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+						    if (! dol_is_file($file['path'].'/'.$minifile)) {
+						    	$minifile=getImageFileNameForSize($file['name'], '_mini', '.png');
+						    }
+						    // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
 						    //print $file['path'].'/'.$minifile.'<br>';
 
 						    $urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 0, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
-						    if (empty($urlforhref)) $urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+						    if (empty($urlforhref)) {
+						    	$urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+						    }
 						    print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
 							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
 							print '</a>';
+						} else {
+							print '&nbsp;';
 						}
-						else print '&nbsp;';
 						print '</td>';
 					}
 					if (! $editline)
@@ -1124,14 +1239,17 @@ 
     					if ($useinecm)
     					{
     					    print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view('default', 0, 'class="paddingrightonly"').'</a>';
-    					}
-    					else
+    					} else
     					{
         					$newmodulepart=$modulepart;
-        					if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
+        					if (in_array($modulepart, array('product','produit','service'))) {
+        						$newmodulepart='produit|service';
+        					}
 
         					$disablecrop=1;
-        					if (in_array($modulepart, array('product','produit','service','expensereport','holiday','project','user'))) $disablecrop=0;
+        					if (in_array($modulepart, array('product','produit','service','expensereport','holiday','project','user'))) {
+        						$disablecrop=0;
+        					}
 
     					    if (! $disablecrop && image_format_supported($file['name']) > 0)
     						{
@@ -1156,9 +1274,15 @@ 
     							$filepath=$file['name'];
     						*/
     						$useajax=1;
-    						if (! empty($conf->dol_use_jmobile)) $useajax=0;
-    						if (empty($conf->use_javascript_ajax)) $useajax=0;
-    						if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
+    						if (! empty($conf->dol_use_jmobile)) {
+    							$useajax=0;
+    						}
+    						if (empty($conf->use_javascript_ajax)) {
+    							$useajax=0;
+    						}
+    						if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+    							$useajax=0;
+    						}
 
     						print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
     					}
@@ -1175,20 +1299,20 @@ 
     					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
     				    		}
     					    	print '</td>';
-    					    }
-    					    else {
+    					    } else {
     					       	print '<td align="center"'.((empty($conf->browser->phone) && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
     					       	print '</td>';
     					    }
 					   }
-					}
-					else
+					} else
 					{
 					    print '<td class="right">';
 					    print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 					    print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 					    print '</td>';
-					    if (empty($disablemove)) print '<td class="right"></td>';
+					    if (empty($disablemove)) {
+					    	print '<td class="right"></td>';
+					    }
 					}
 					print "</tr>\n";
 
@@ -1198,10 +1322,15 @@ 
 			if ($nboffiles == 0)
 			{
 			    $colspan=(empty($useinecm)?'5':'5');
-			    if (empty($disablemove)) $colspan++;
+			    if (empty($disablemove)) {
+			    	$colspan++;
+			    }
 				print '<tr '.$bc[false].'><td colspan="'.$colspan.'" class="opacitymedium">';
-				if (empty($textifempty)) print $langs->trans("NoFileFound");
-				else print $textifempty;
+				if (empty($textifempty)) {
+					print $langs->trans("NoFileFound");
+				} else {
+					print $textifempty;
+				}
 				print '</td></tr>';
 			}
 			print "</table>";
@@ -1251,8 +1380,12 @@ 
         dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
 
         // Show list of documents
-        if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
-        if (empty($url)) $url=$_SERVER["PHP_SELF"];
+        if (empty($useinecm)) {
+        	print load_fiche_titre($langs->trans("AttachedFiles"));
+        }
+        if (empty($url)) {
+        	$url=$_SERVER["PHP_SELF"];
+        }
 
         if (! empty($addfilterfields))
         {
@@ -1280,7 +1413,9 @@ 
 
         print '<tr class="liste_titre">';
         $sortref="fullname";
-        if ($modulepart == 'invoice_supplier') $sortref='level1name';
+        if ($modulepart == 'invoice_supplier') {
+        	$sortref='level1name';
+        }
         print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
         print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
         print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
@@ -1293,68 +1428,55 @@ 
         {
             include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
             $object_instance=new Societe($this->db);
-        }
-        else if ($modulepart == 'invoice')
+        } else if ($modulepart == 'invoice')
         {
             include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
             $object_instance=new Facture($this->db);
-        }
-        else if ($modulepart == 'invoice_supplier')
+        } else if ($modulepart == 'invoice_supplier')
         {
             include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
             $object_instance=new FactureFournisseur($this->db);
-        }
-        else if ($modulepart == 'propal')
+        } else if ($modulepart == 'propal')
         {
             include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
             $object_instance=new Propal($this->db);
-        }
-        else if ($modulepart == 'supplier_proposal')
+        } else if ($modulepart == 'supplier_proposal')
         {
             include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
             $object_instance=new SupplierProposal($this->db);
-        }
-        else if ($modulepart == 'order')
+        } else if ($modulepart == 'order')
         {
             include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
             $object_instance=new Commande($this->db);
-        }
-        else if ($modulepart == 'order_supplier')
+        } else if ($modulepart == 'order_supplier')
         {
             include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
             $object_instance=new CommandeFournisseur($this->db);
-        }
-        else if ($modulepart == 'contract')
+        } else if ($modulepart == 'contract')
         {
             include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
             $object_instance=new Contrat($this->db);
-        }
-        else if ($modulepart == 'product')
+        } else if ($modulepart == 'product')
         {
             include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
             $object_instance=new Product($this->db);
-        }
-        else if ($modulepart == 'tax')
+        } else if ($modulepart == 'tax')
         {
             include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
             $object_instance=new ChargeSociales($this->db);
-        }
-        else if ($modulepart == 'project')
+        } else if ($modulepart == 'project')
         {
         	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
         	$object_instance=new Project($this->db);
-        }
-        else if ($modulepart == 'fichinter')
+        } else if ($modulepart == 'fichinter')
         {
         	include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
         	$object_instance=new Fichinter($this->db);
-        }
-        else if ($modulepart == 'user')
+        } else if ($modulepart == 'user')
         {
         	include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
         	$object_instance=new User($this->db);
-        }
-        else if ($modulepart == 'expensereport')
+        } else if ($modulepart == 'expensereport')
         {
         	include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
         	$object_instance=new ExpenseReport($this->db);
@@ -1391,13 +1513,14 @@ 
                 if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
                 if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
 
-                if (! $id && ! $ref) continue;
+                if (! $id && ! $ref) {
+                	continue;
+                }
                 $found=0;
                 if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
                 {
                     $found=1;
-                }
-                else
+                } else
                 {
                     //print 'Fetch '.$id." - ".$ref.'<br>';
 
@@ -1419,13 +1542,19 @@ 
                     if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
                 }
 
-                if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
+                if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
+                	continue;
+                }
+                // We do not show orphelins files
 
                 print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
                 print '<tr class="oddeven">';
                 print '<td>';
-                if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
-                else print $langs->trans("ObjectDeleted",($id?$id:$ref));
+                if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
+                	print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
+                } else {
+                	print $langs->trans("ObjectDeleted",($id?$id:$ref));
+                }
 
                 //$modulesubdir=dol_sanitizeFileName($ref);
                 $modulesubdir=dirname($relativefile);
@@ -1441,7 +1570,9 @@ 
                 print '<td>';
                 //print "XX".$file['name']; //$file['name'] must be utf8
                 print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-                if ($forcedownload) print '&attachment=1';
+                if ($forcedownload) {
+                	print '&attachment=1';
+                }
                 print '&file='.urlencode($relativefile).'">';
                 print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
                 print dol_trunc($file['name'],$maxlength,'middle');
@@ -1466,14 +1597,19 @@ 
         if (count($filearray) == 0)
         {
             print '<tr '.$bc[false].'><td colspan="5">';
-            if (empty($textifempty)) print $langs->trans("NoFileFound");
-            else print $textifempty;
+            if (empty($textifempty)) {
+            	print $langs->trans("NoFileFound");
+            } else {
+            	print $textifempty;
+            }
             print '</td></tr>';
         }
         print "</table>";
         print '</div>';
 
-        if (! empty($addfilterfields)) print '</form>';
+        if (! empty($addfilterfields)) {
+        	print '</form>';
+        }
         // Fin de zone
     }
 
@@ -1586,7 +1722,9 @@ 
         print_liste_field_titre('','','');
         print '</tr>';
         $nboflinks = count($links);
-        if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+        if ($nboflinks > 0) {
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+        }
 
         $var = true;
         foreach ($links as $link)
@@ -1611,8 +1749,7 @@ 
                 print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
                 print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
                 print '</td>';
-            }
-            else
+            } else
 			{
                 print '<td>';
                 print img_picto('', 'object_globe').' ';
@@ -1670,8 +1807,11 @@ 
             {
                 $out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
                 //$out.= '<a class="pictopreview">';
-            	if (empty($ruleforpicto)) $out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
-                else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+            	if (empty($ruleforpicto)) {
+            		$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
+            	} else {
+                	$out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+                }
                 $out.= '</a>';
             }
         }

Indentation +1324 added lines, -1324 removed lines

@@ -34,289 +34,289 @@ 
  */
 class FormFile
 {
-    private $db;
+	private $db;
 
-    public $error;
-    public $numoffiles;
-    public $infofiles;			// Used to return informations by function getDocumentsLink
+	public $error;
+	public $numoffiles;
+	public $infofiles;			// Used to return informations by function getDocumentsLink
 
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        $this->numoffiles=0;
-        return 1;
-    }
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		$this->numoffiles=0;
+		return 1;
+	}
 
 
-    /**
-     *  Show form to upload a new file
+	/**
+	 *  Show form to upload a new file
 	 *
-     *  @param  string		$url			Url
-     *  @param  string		$title			Title zone (Title or '' or 'none')
-     *  @param  int		$addcancel		1=Add 'Cancel' button
-     *	@param	int		$sectionid		If upload must be done inside a particular ECM section
-     * 	@param	int		$perm			Value of permission to allow upload
-     *  @param  int		$size          		Length of input file area. Deprecated.
-     *  @param	Object		$object			Object to use (when attachment is done on an element)
-     *  @param	string		$options		Add an option column
-     *  @param	integer		$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). 2 should never be used.
-     *  @param	string		$savingdocmask		Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
-     *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
-     *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
-     *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
-     * 	@return	int						<0 if KO, >0 if OK
-     */
-    function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='')
-    {
-        global $conf,$langs, $hookmanager;
-        $hookmanager->initHooks(array('formfile'));
-
-
-        if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
+	 *  @param  string		$url			Url
+	 *  @param  string		$title			Title zone (Title or '' or 'none')
+	 *  @param  int		$addcancel		1=Add 'Cancel' button
+	 *	@param	int		$sectionid		If upload must be done inside a particular ECM section
+	 * 	@param	int		$perm			Value of permission to allow upload
+	 *  @param  int		$size          		Length of input file area. Deprecated.
+	 *  @param	Object		$object			Object to use (when attachment is done on an element)
+	 *  @param	string		$options		Add an option column
+	 *  @param	integer		$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). 2 should never be used.
+	 *  @param	string		$savingdocmask		Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
+	 *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
+	 *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
+	 *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
+	 * 	@return	int						<0 if KO, >0 if OK
+	 */
+	function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='')
+	{
+		global $conf,$langs, $hookmanager;
+		$hookmanager->initHooks(array('formfile'));
+
+
+		if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
 
 		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
-        {
-        	// TODO: Check this works with 2 forms on same page
-        	// TODO: Check this works with GED module, otherwise, force useajax to 0
-        	// TODO: This does not support option savingdocmask
-        	// TODO: This break feature to upload links too
-        	return $this->_formAjaxFileUpload($object);
-        }
-        else
-       	{
-	        //If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
-	        if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
-		        return 1;
-	        }
-
-            $maxlength=$size;
-
-            $out = "\n\n<!-- Start form attach new file -->\n";
-
-            if (empty($title)) $title=$langs->trans("AttachANewFile");
-            if ($title != 'none') $out.=load_fiche_titre($title, null, null);
-
-            $out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
-            $out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="">';
-            $out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';
-            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-            $out .= '<table width="100%" class="nobordernopadding">';
-            $out .= '<tr>';
-
-            if (! empty($options)) $out .= '<td>'.$options.'</td>';
-
-            $out .= '<td valign="middle">';
-
-            $max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
-            $maxphp=@ini_get('upload_max_filesize');	// En inconnu
-            if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
-            if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
-            if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
-            if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
-            // Now $max and $maxphp are in Kb
-            if ($maxphp > 0) $max=min($max,$maxphp);
-
-            if ($max > 0)
-            {
-                $out .= '<input type="hidden" name="max_file_size" value="'.($max*1024).'">';
-            }
-
-            $out .= '<input class="flat minwidth400" type="file"';
-            $out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
-            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-            $out .= (!empty($accept)?' accept="'.$accept.'"':'accept=""');
-            $out .= '>';
-            $out .= ' ';
-            $out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';
-            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-            $out .= '>';
-
-            if ($addcancel)
-            {
-                $out .= ' &nbsp; ';
-                $out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-            }
-
-            if (! empty($conf->global->MAIN_UPLOAD_DOC))
-            {
-                if ($perm)
-                {
-                	$langs->load('other');
-                    $out .= ' ';
-                    $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
-                }
-            }
-            else
-            {
-                $out .= ' ('.$langs->trans("UploadDisabled").')';
-            }
-            $out .= "</td></tr>";
-
-            if ($savingdocmask)
-            {
-            	$out .= '<tr>';
-   	            if (! empty($options)) $out .= '<td>'.$options.'</td>';
-	            $out .= '<td valign="middle" class="nowrap">';
+		{
+			// TODO: Check this works with 2 forms on same page
+			// TODO: Check this works with GED module, otherwise, force useajax to 0
+			// TODO: This does not support option savingdocmask
+			// TODO: This break feature to upload links too
+			return $this->_formAjaxFileUpload($object);
+		}
+		else
+	   	{
+			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
+			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
+				return 1;
+			}
+
+			$maxlength=$size;
+
+			$out = "\n\n<!-- Start form attach new file -->\n";
+
+			if (empty($title)) $title=$langs->trans("AttachANewFile");
+			if ($title != 'none') $out.=load_fiche_titre($title, null, null);
+
+			$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
+			$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="">';
+			$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';
+			$out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+			$out .= '<table width="100%" class="nobordernopadding">';
+			$out .= '<tr>';
+
+			if (! empty($options)) $out .= '<td>'.$options.'</td>';
+
+			$out .= '<td valign="middle">';
+
+			$max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
+			$maxphp=@ini_get('upload_max_filesize');	// En inconnu
+			if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
+			if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
+			if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
+			if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
+			// Now $max and $maxphp are in Kb
+			if ($maxphp > 0) $max=min($max,$maxphp);
+
+			if ($max > 0)
+			{
+				$out .= '<input type="hidden" name="max_file_size" value="'.($max*1024).'">';
+			}
+
+			$out .= '<input class="flat minwidth400" type="file"';
+			$out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
+			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+			$out .= (!empty($accept)?' accept="'.$accept.'"':'accept=""');
+			$out .= '>';
+			$out .= ' ';
+			$out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';
+			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+			$out .= '>';
+
+			if ($addcancel)
+			{
+				$out .= ' &nbsp; ';
+				$out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			}
+
+			if (! empty($conf->global->MAIN_UPLOAD_DOC))
+			{
+				if ($perm)
+				{
+					$langs->load('other');
+					$out .= ' ';
+					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
+				}
+			}
+			else
+			{
+				$out .= ' ('.$langs->trans("UploadDisabled").')';
+			}
+			$out .= "</td></tr>";
+
+			if ($savingdocmask)
+			{
+				$out .= '<tr>';
+   				if (! empty($options)) $out .= '<td>'.$options.'</td>';
+				$out .= '<td valign="middle" class="nowrap">';
 				$out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
-            	$out .= '</td>';
-            	$out .= '</tr>';
-            }
-
-            $out .= "</table>";
-
-            $out .= '</form>';
-            if (empty($sectionid)) $out .= '<br>';
-
-            $out .= "\n<!-- End form attach new file -->\n";
-
-            if ($linkfiles)
-            {
-	            $out .= "\n<!-- Start form attach new link -->\n";
-	            $langs->load('link');
-	            $title = $langs->trans("LinkANewFile");
-	            $out .= load_fiche_titre($title, null, null);
-	            $out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">';
-	            $out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">';
-	            $out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">';
-	            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-	            $out .= '<div class="valignmiddle" >';
-	            $out .= '<div class="inline-block" style="padding-right: 10px;">';
-	            if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
-	            $out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
-	            $out .= '</div>';
-	            $out .= '<div class="inline-block" style="padding-right: 10px;">';
-	            if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
-	            $out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
-	            $out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
-	            $out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
-	            $out .= '</div>';
-	            $out .= '<div class="inline-block" style="padding-right: 10px;">';
-	            $out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
-	            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-	            $out .= '>';
-	            $out .= '</div>';
-                $out .= '</div>';
-                $out .= '<div class="clearboth"></div>';
-	            $out .= '</form><br>';
-	            $parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
-	            $res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
-
-	            $out .= "\n<!-- End form attach new file -->\n";
-            }
-
-            if (empty($res))
-            {
-        		print '<div class="attacharea attacharea'.$htmlname.'">';
-            	print $out;
-            	print '</div>';
-            }
-
-            print $hookmanager->resPrint;
-
-            return 1;
-        }
-    }
-
-    /**
-     *      Show the box with list of available documents for object
-     *
-     *      @param      string				$modulepart         propal, facture, facture_fourn, ...
-     *      @param      string				$modulesubdir       Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-     *      @param      string				$filedir            Directory to scan
-     *      @param      string				$urlsource          Url of origin page (for return)
-     *      @param      int					$genallowed         Generation is allowed (1/0 or array of formats)
-     *      @param      int					$delallowed         Remove is allowed (1/0)
-     *      @param      string				$modelselected      Model to preselect by default
-     *      @param      integer				$allowgenifempty	Show warning if no model activated
-     *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
-     *      @param      int					$iconPDF            Show only PDF icon with link (1/0)
-     * 		@param		int					$notused	        Not used
-     * 		@param		integer				$noform				Do not output html form tags
-     * 		@param		string				$param				More param on http links
-     * 		@param		string				$title				Title to show on top of form
-     * 		@param		string				$buttonlabel		Label on submit button
-     * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
-     * 		@return		int										<0 if KO, number of shown files if OK
-     *      @deprecated                                         Use print xxx->showdocuments() instead.
-     */
-    function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
-    {
-        $this->numoffiles=0;
-        print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$notused,$noform,$param,$title,$buttonlabel,$codelang);
-        return $this->numoffiles;
-    }
-
-    /**
-     *      Return a string to show the box with list of available documents for object.
-     *      This also set the property $this->numoffiles
-     *
-     *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule_temp', ...)
-     *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-     *      @param      string				$filedir            Directory to scan
-     *      @param      string				$urlsource          Url of origin page (for return)
-     *      @param      int					$genallowed         Generation is allowed (1/0 or array list of templates)
-     *      @param      int					$delallowed         Remove is allowed (1/0)
-     *      @param      string				$modelselected      Model to preselect by default
-     *      @param      integer				$allowgenifempty	Allow generation even if list of template ($genallowed) is empty (show however a warning)
-     *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
-     *      @param      int					$iconPDF            Deprecated, see getDocumentsLink
-     * 		@param		int					$notused	        Not used
-     * 		@param		integer				$noform				Do not output html form tags
-     * 		@param		string				$param				More param on http links
-     * 		@param		string				$title				Title to show on top of form
-     * 		@param		string				$buttonlabel		Label on submit button
-     * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
-     * 		@param		string				$morepicto			Add more HTML content into cell with picto
-     *      @param      Object              $object             Object when method is called from an object card.
-     * 		@return		string              					Output string with HTML array of documents (might be empty string)
-     */
-    function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null)
-    {
+				$out .= '</td>';
+				$out .= '</tr>';
+			}
+
+			$out .= "</table>";
+
+			$out .= '</form>';
+			if (empty($sectionid)) $out .= '<br>';
+
+			$out .= "\n<!-- End form attach new file -->\n";
+
+			if ($linkfiles)
+			{
+				$out .= "\n<!-- Start form attach new link -->\n";
+				$langs->load('link');
+				$title = $langs->trans("LinkANewFile");
+				$out .= load_fiche_titre($title, null, null);
+				$out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">';
+				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">';
+				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">';
+				$out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+				$out .= '<div class="valignmiddle" >';
+				$out .= '<div class="inline-block" style="padding-right: 10px;">';
+				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
+				$out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
+				$out .= '</div>';
+				$out .= '<div class="inline-block" style="padding-right: 10px;">';
+				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
+				$out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
+				$out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
+				$out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
+				$out .= '</div>';
+				$out .= '<div class="inline-block" style="padding-right: 10px;">';
+				$out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
+				$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+				$out .= '>';
+				$out .= '</div>';
+				$out .= '</div>';
+				$out .= '<div class="clearboth"></div>';
+				$out .= '</form><br>';
+				$parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
+				$res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
+
+				$out .= "\n<!-- End form attach new file -->\n";
+			}
+
+			if (empty($res))
+			{
+				print '<div class="attacharea attacharea'.$htmlname.'">';
+				print $out;
+				print '</div>';
+			}
+
+			print $hookmanager->resPrint;
+
+			return 1;
+		}
+	}
+
+	/**
+	 *      Show the box with list of available documents for object
+	 *
+	 *      @param      string				$modulepart         propal, facture, facture_fourn, ...
+	 *      @param      string				$modulesubdir       Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+	 *      @param      string				$filedir            Directory to scan
+	 *      @param      string				$urlsource          Url of origin page (for return)
+	 *      @param      int					$genallowed         Generation is allowed (1/0 or array of formats)
+	 *      @param      int					$delallowed         Remove is allowed (1/0)
+	 *      @param      string				$modelselected      Model to preselect by default
+	 *      @param      integer				$allowgenifempty	Show warning if no model activated
+	 *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
+	 *      @param      int					$iconPDF            Show only PDF icon with link (1/0)
+	 * 		@param		int					$notused	        Not used
+	 * 		@param		integer				$noform				Do not output html form tags
+	 * 		@param		string				$param				More param on http links
+	 * 		@param		string				$title				Title to show on top of form
+	 * 		@param		string				$buttonlabel		Label on submit button
+	 * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
+	 * 		@return		int										<0 if KO, number of shown files if OK
+	 *      @deprecated                                         Use print xxx->showdocuments() instead.
+	 */
+	function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
+	{
+		$this->numoffiles=0;
+		print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$notused,$noform,$param,$title,$buttonlabel,$codelang);
+		return $this->numoffiles;
+	}
+
+	/**
+	 *      Return a string to show the box with list of available documents for object.
+	 *      This also set the property $this->numoffiles
+	 *
+	 *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule_temp', ...)
+	 *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+	 *      @param      string				$filedir            Directory to scan
+	 *      @param      string				$urlsource          Url of origin page (for return)
+	 *      @param      int					$genallowed         Generation is allowed (1/0 or array list of templates)
+	 *      @param      int					$delallowed         Remove is allowed (1/0)
+	 *      @param      string				$modelselected      Model to preselect by default
+	 *      @param      integer				$allowgenifempty	Allow generation even if list of template ($genallowed) is empty (show however a warning)
+	 *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
+	 *      @param      int					$iconPDF            Deprecated, see getDocumentsLink
+	 * 		@param		int					$notused	        Not used
+	 * 		@param		integer				$noform				Do not output html form tags
+	 * 		@param		string				$param				More param on http links
+	 * 		@param		string				$title				Title to show on top of form
+	 * 		@param		string				$buttonlabel		Label on submit button
+	 * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
+	 * 		@param		string				$morepicto			Add more HTML content into cell with picto
+	 *      @param      Object              $object             Object when method is called from an object card.
+	 * 		@return		string              					Output string with HTML array of documents (might be empty string)
+	 */
+	function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null)
+	{
 		// Deprecation warning
 		if (0 !== $iconPDF) {
 			dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
 		}
 
-        global $langs, $conf, $user, $hookmanager;
-        global $form, $bc;
+		global $langs, $conf, $user, $hookmanager;
+		global $form, $bc;
 
-        if (! is_object($form)) $form=new Form($this->db);
+		if (! is_object($form)) $form=new Form($this->db);
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        // For backward compatibility
-        if (! empty($iconPDF)) {
-        	return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
-        }
+		// For backward compatibility
+		if (! empty($iconPDF)) {
+			return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
+		}
 
-        $printer=0;
-        if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport')))	// The direct print feature is implemented only for such elements
-        {
-            $printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
-        }
+		$printer=0;
+		if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport')))	// The direct print feature is implemented only for such elements
+		{
+			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
+		}
 
-        $hookmanager->initHooks(array('formfile'));
-        $forname='builddoc';
-        $out='';
+		$hookmanager->initHooks(array('formfile'));
+		$forname='builddoc';
+		$out='';
 
-        $headershown=0;
-        $showempty=0;
-        $i=0;
+		$headershown=0;
+		$showempty=0;
+		$i=0;
 
-        $out.= "\n".'<!-- Start show_document -->'."\n";
-        //print 'filedir='.$filedir;
+		$out.= "\n".'<!-- Start show_document -->'."\n";
+		//print 'filedir='.$filedir;
 
-        if (preg_match('/massfilesarea_/', $modulepart))
-        {
-	        $out.='<div id="show_files"><br></div>'."\n";
+		if (preg_match('/massfilesarea_/', $modulepart))
+		{
+			$out.='<div id="show_files"><br></div>'."\n";
 			$title=$langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
 			$title.='<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
@@ -337,373 +337,373 @@ 
 					});
 				});
 				</script>';
-        }
-
-        $titletoshow=$langs->trans("Documents");
-        if (! empty($title)) $titletoshow=$title;
-
-        // Show table
-        if ($genallowed)
-        {
-            $modellist=array();
-
-            if ($modulepart == 'company')
-            {
-                $showempty=1;
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
-                    $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
-                }
-            }
-            else if ($modulepart == 'propal')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
-                    $modellist=ModelePDFPropales::liste_modeles($this->db);
-                }
-            }
+		}
+
+		$titletoshow=$langs->trans("Documents");
+		if (! empty($title)) $titletoshow=$title;
+
+		// Show table
+		if ($genallowed)
+		{
+			$modellist=array();
+
+			if ($modulepart == 'company')
+			{
+				$showempty=1;
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
+					$modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
+				}
+			}
+			else if ($modulepart == 'propal')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
+					$modellist=ModelePDFPropales::liste_modeles($this->db);
+				}
+			}
 			else if ($modulepart == 'supplier_proposal')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
-                    $modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
-                }
-            }
-            else if ($modulepart == 'commande')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
-                    $modellist=ModelePDFCommandes::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'expedition')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-                    $modellist=ModelePDFExpedition::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'livraison')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
-                    $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
-                }
-            }
-            else if ($modulepart == 'ficheinter')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
-                    $modellist=ModelePDFFicheinter::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'facture')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-                    $modellist=ModelePDFFactures::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'contract')
-            {
-            	if (is_array($genallowed)) $modellist=$genallowed;
-            	else
-            	{
-            		include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
-            		$modellist=ModelePDFContract::liste_modeles($this->db);
-            	}
-            }
-            elseif ($modulepart == 'project')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
-                    $modellist=ModelePDFProjects::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'project_task')
-            {
-            	if (is_array($genallowed)) $modellist=$genallowed;
-            	else
-            	{
-            		include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
-            		$modellist=ModelePDFTask::liste_modeles($this->db);
-            	}
-            }
-            elseif ($modulepart == 'product')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
-                    $modellist=ModelePDFProduct::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'export')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
-                    $modellist=ModeleExports::liste_modeles($this->db);
-                }
-            }
-            else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
-                    $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
-                }
-            }
-            else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
-                    $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
-                }
-            }
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
+					$modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
+				}
+			}
+			else if ($modulepart == 'commande')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
+					$modellist=ModelePDFCommandes::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'expedition')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
+					$modellist=ModelePDFExpedition::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'livraison')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
+					$modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
+				}
+			}
+			else if ($modulepart == 'ficheinter')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
+					$modellist=ModelePDFFicheinter::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'facture')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+					$modellist=ModelePDFFactures::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'contract')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
+					$modellist=ModelePDFContract::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'project')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
+					$modellist=ModelePDFProjects::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'project_task')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
+					$modellist=ModelePDFTask::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'product')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
+					$modellist=ModelePDFProduct::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'export')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
+					$modellist=ModeleExports::liste_modeles($this->db);
+				}
+			}
+			else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
+					$modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
+				}
+			}
+			else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
+					$modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
+				}
+			}
 			else if ($modulepart == 'supplier_payment')
 			{
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
-                    $modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
-                }
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
+					$modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
+				}
 			}
-            else if ($modulepart == 'remisecheque')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
-                    $modellist=ModeleChequeReceipts::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'donation')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
-                    $modellist=ModeleDon::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'member')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
-                    $modellist=ModelePDFCards::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'agenda')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
-                    $modellist=ModeleAction::liste_modeles($this->db);
-                }
-            }
-            else if ($modulepart == 'expensereport')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
-                    $modellist=ModeleExpenseReport::liste_modeles($this->db);
-                }
-            }
-            else if ($modulepart == 'unpaid')
-            {
-                $modellist='';
-            }
-            elseif ($modulepart == 'user')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
-                    $modellist=ModelePDFUser::liste_modeles($this->db);
-                }
-            }
-            elseif ($modulepart == 'usergroup')
-            {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
-                {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
-                    $modellist=ModelePDFUserGroup::liste_modeles($this->db);
-                }
-            }
-            else //if ($modulepart != 'agenda')
-            {
-            	// For normalized standard modules
-            	$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
-                if (file_exists($file))
-                {
-                	$res=include_once $file;
-                }
-                // For normalized external modules
-                else
+			else if ($modulepart == 'remisecheque')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
+					$modellist=ModeleChequeReceipts::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'donation')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
 				{
-                	$file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
-                	$res=include_once $file;
-                }
-                $class='Modele'.ucfirst($modulepart);
-                if (class_exists($class))
-                {
-                    $modellist=call_user_func($class.'::liste_modeles',$this->db);
-                }
-                else
-              {
-                    dol_print_error($this->db,'Bad value for modulepart');
-                    return -1;
-                }
-            }
-
-            // Set headershown to avoit to have table opened a second time later
-            $headershown=1;
-
-            $buttonlabeltoshow=$buttonlabel;
-            if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
-
-            if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
-            if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
-            $out.= '<input type="hidden" name="action" value="builddoc">';
-            $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-            $out.= load_fiche_titre($titletoshow, '', '');
-            $out.= '<div class="div-table-responsive-no-min">';
-            $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
-
-            $out.= '<tr class="liste_titre">';
-
-            $addcolumforpicto=($delallowed || $printer || $morepicto);
-            $out.= '<th align="center" colspan="'.(3+($addcolumforpicto?'2':'1')).'" class="formdoc liste_titre maxwidthonsmartphone">';
-
-            // Model
-            if (! empty($modellist))
-            {
-                $out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
-                if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-                {
-                    $arraykeys=array_keys($modellist);
-                    $modelselected=$arraykeys[0];
-                }
-                $out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-                $out.= ajax_combobox('model');
-            }
-            else
-            {
-                $out.= '<div class="float">'.$langs->trans("Files").'</div>';
-            }
-
-            // Language code (if multilang)
-            if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
-            {
-                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-                $formadmin=new FormAdmin($this->db);
-                $defaultlang=$codelang?$codelang:$langs->getDefaultLang();
-                $morecss='maxwidth150';
-                if (! empty($conf->browser->phone)) $morecss='maxwidth100';
-                $out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
-            }
-            else
-            {
-                $out.= '&nbsp;';
-            }
-
-            // Button
-            $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-            $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
-            $genbutton.= '>';
-            if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
-            {
-               	$langs->load("errors");
-               	$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
-            }
-            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-            if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
-            $out.= $genbutton;
-            $out.= '</th>';
-
-            if (!empty($hookmanager->hooks['formfile']))
-            {
-                foreach($hookmanager->hooks['formfile'] as $module)
-                {
-                    if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
-                }
-            }
-            $out.= '</tr>';
-
-            // Execute hooks
-            $parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
-            if (is_object($hookmanager))
-            {
-            	$reshook = $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']);
-            	$out.= $hookmanager->resPrint;
-            }
-
-        }
-
-        // Get list of files
-        if (! empty($filedir))
-        {
-            $file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
-
-            $link_list = array();
-            if (is_object($object))
-            {
-                require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-                $link = new Link($this->db);
-                $sortfield = $sortorder = null;
-                $res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
-            }
-
-            $out.= '<!-- html.formfile::showdocuments -->'."\n";
-
-            // Show title of array if not already shown
-            if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && ! $headershown)
-            {
-                $headershown=1;
-                $out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
-                $out.= '<div class="div-table-responsive-no-min">';
-                $out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
-            }
-
-            // Loop on each file found
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
+					$modellist=ModeleDon::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'member')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
+					$modellist=ModelePDFCards::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'agenda')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
+					$modellist=ModeleAction::liste_modeles($this->db);
+				}
+			}
+			else if ($modulepart == 'expensereport')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
+					$modellist=ModeleExpenseReport::liste_modeles($this->db);
+				}
+			}
+			else if ($modulepart == 'unpaid')
+			{
+				$modellist='';
+			}
+			elseif ($modulepart == 'user')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
+					$modellist=ModelePDFUser::liste_modeles($this->db);
+				}
+			}
+			elseif ($modulepart == 'usergroup')
+			{
+				if (is_array($genallowed)) $modellist=$genallowed;
+				else
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
+					$modellist=ModelePDFUserGroup::liste_modeles($this->db);
+				}
+			}
+			else //if ($modulepart != 'agenda')
+			{
+				// For normalized standard modules
+				$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
+				if (file_exists($file))
+				{
+					$res=include_once $file;
+				}
+				// For normalized external modules
+				else
+				{
+					$file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
+					$res=include_once $file;
+				}
+				$class='Modele'.ucfirst($modulepart);
+				if (class_exists($class))
+				{
+					$modellist=call_user_func($class.'::liste_modeles',$this->db);
+				}
+				else
+			  {
+					dol_print_error($this->db,'Bad value for modulepart');
+					return -1;
+				}
+			}
+
+			// Set headershown to avoit to have table opened a second time later
+			$headershown=1;
+
+			$buttonlabeltoshow=$buttonlabel;
+			if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
+
+			if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
+			if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
+			$out.= '<input type="hidden" name="action" value="builddoc">';
+			$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+			$out.= load_fiche_titre($titletoshow, '', '');
+			$out.= '<div class="div-table-responsive-no-min">';
+			$out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
+
+			$out.= '<tr class="liste_titre">';
+
+			$addcolumforpicto=($delallowed || $printer || $morepicto);
+			$out.= '<th align="center" colspan="'.(3+($addcolumforpicto?'2':'1')).'" class="formdoc liste_titre maxwidthonsmartphone">';
+
+			// Model
+			if (! empty($modellist))
+			{
+				$out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
+				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+				{
+					$arraykeys=array_keys($modellist);
+					$modelselected=$arraykeys[0];
+				}
+				$out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				$out.= ajax_combobox('model');
+			}
+			else
+			{
+				$out.= '<div class="float">'.$langs->trans("Files").'</div>';
+			}
+
+			// Language code (if multilang)
+			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+				$formadmin=new FormAdmin($this->db);
+				$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
+				$morecss='maxwidth150';
+				if (! empty($conf->browser->phone)) $morecss='maxwidth100';
+				$out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
+			}
+			else
+			{
+				$out.= '&nbsp;';
+			}
+
+			// Button
+			$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+			$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
+			$genbutton.= '>';
+			if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
+			{
+			   	$langs->load("errors");
+			   	$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+			}
+			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
+			if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
+			$out.= $genbutton;
+			$out.= '</th>';
+
+			if (!empty($hookmanager->hooks['formfile']))
+			{
+				foreach($hookmanager->hooks['formfile'] as $module)
+				{
+					if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
+				}
+			}
+			$out.= '</tr>';
+
+			// Execute hooks
+			$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
+			if (is_object($hookmanager))
+			{
+				$reshook = $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']);
+				$out.= $hookmanager->resPrint;
+			}
+
+		}
+
+		// Get list of files
+		if (! empty($filedir))
+		{
+			$file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
+
+			$link_list = array();
+			if (is_object($object))
+			{
+				require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+				$link = new Link($this->db);
+				$sortfield = $sortorder = null;
+				$res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
+			}
+
+			$out.= '<!-- html.formfile::showdocuments -->'."\n";
+
+			// Show title of array if not already shown
+			if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && ! $headershown)
+			{
+				$headershown=1;
+				$out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
+				$out.= '<div class="div-table-responsive-no-min">';
+				$out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
+			}
+
+			// Loop on each file found
 			if (is_array($file_list))
 			{
 				foreach($file_list as $file)
 				{
 					// Define relative path for download link (depends on module)
 					$relativepath=$file["name"];										// Cas general
-                    if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+					if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
 					if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
 
 					$out.= '<tr class="oddeven">';
@@ -713,8 +713,8 @@ 
 
 					// Show file name with link to download
 					$out.= '<td class="tdoverflowmax300">';
-                    $tmp = $this->showPreview($file,$modulepart,$relativepath,0,$param);
-                    $out.= ($tmp?$tmp.' ':'');
+					$tmp = $this->showPreview($file,$modulepart,$relativepath,0,$param);
+					$out.= ($tmp?$tmp.' ':'');
 					$out.= '<a class="documentdownload" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
 					$mime=dol_mimetype($relativepath,'',0);
 					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
@@ -746,188 +746,188 @@ 
 						if ($printer)
 						{
 							//$out.= '<td align="right">';
-                            $out.= '&nbsp;<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
-                            $out.= ($param?'&amp;'.$param:'');
-                            $out.= '">'.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').'</a>';
+							$out.= '&nbsp;<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
+							$out.= ($param?'&amp;'.$param:'');
+							$out.= '">'.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').'</a>';
 						}
 						if ($morepicto)
 						{
 							$morepicto=preg_replace('/__FILENAMEURLENCODED__/',urlencode($relativepath),$morepicto);
-                        	$out.=$morepicto;
+							$out.=$morepicto;
+						}
+						$out.='</td>';
+					}
+
+					if (is_object($hookmanager))
+					{
+						$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
+						$res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
+						if (empty($res))
+						{
+							$out .= $hookmanager->resPrint;		// Complete line
+							$out.= '</tr>';
 						}
-                        $out.='</td>';
-                    }
-
-                    if (is_object($hookmanager))
-                    {
-            			$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
-                    	$res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
-                        if (empty($res))
-                        {
-                            $out .= $hookmanager->resPrint;		// Complete line
-                            $out.= '</tr>';
-                        }
-                        else $out = $hookmanager->resPrint;		// Replace line
-              		}
+						else $out = $hookmanager->resPrint;		// Replace line
+			  		}
 				}
 
-                $this->numoffiles++;
-            }
-            // Loop on each file found
-            if (is_array($link_list))
-            {
-                $colspan=2;
-
-                foreach($link_list as $file)
-                {
-                    $out.='<tr class="oddeven">';
-                    $out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
-                    $out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-                    $out.=$file->label;
-                    $out.='</a>';
-                    $out.='</td>';
-                    $out.='<td align="right">';
-                    $out.=dol_print_date($file->datea,'dayhour');
-                    $out.='</td>';
-                    if ($delallowed || $printer || $morepicto) $out.='<td></td>';
-                    $out.='</tr>'."\n";
-                }
-                $this->numoffiles++;
-            }
+				$this->numoffiles++;
+			}
+			// Loop on each file found
+			if (is_array($link_list))
+			{
+				$colspan=2;
+
+				foreach($link_list as $file)
+				{
+					$out.='<tr class="oddeven">';
+					$out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
+					$out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
+					$out.=$file->label;
+					$out.='</a>';
+					$out.='</td>';
+					$out.='<td align="right">';
+					$out.=dol_print_date($file->datea,'dayhour');
+					$out.='</td>';
+					if ($delallowed || $printer || $morepicto) $out.='<td></td>';
+					$out.='</tr>'."\n";
+				}
+				$this->numoffiles++;
+			}
 
 		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
-            {
-	        	$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
-    	    }
-
-        }
-
-        if ($headershown)
-        {
-            // Affiche pied du tableau
-            $out.= "</table>\n";
-            $out.= "</div>\n";
-            if ($genallowed)
-            {
-                if (empty($noform)) $out.= '</form>'."\n";
-            }
-        }
-        $out.= '<!-- End show_document -->'."\n";
-        //return ($i?$i:$headershown);
-        return $out;
-    }
-
-    /**
-     *	Show a Document icon with link(s)
-     *  You may want to call this into a div like this:
-     *  print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
-     *
-     *	@param	string	$modulepart		propal, facture, facture_fourn, ...
-     *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-     *	@param	string	$filedir		Full path to directory to scan
-     *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
-     *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
-     */
-    function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter='')
-    {
-        global $conf, $langs;
-
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    	$out='';
-    	$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
-
-    	$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
-
-    	$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
-
-    	// For ajax treatment
+			{
+				$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
+			}
+
+		}
+
+		if ($headershown)
+		{
+			// Affiche pied du tableau
+			$out.= "</table>\n";
+			$out.= "</div>\n";
+			if ($genallowed)
+			{
+				if (empty($noform)) $out.= '</form>'."\n";
+			}
+		}
+		$out.= '<!-- End show_document -->'."\n";
+		//return ($i?$i:$headershown);
+		return $out;
+	}
+
+	/**
+	 *	Show a Document icon with link(s)
+	 *  You may want to call this into a div like this:
+	 *  print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
+	 *
+	 *	@param	string	$modulepart		propal, facture, facture_fourn, ...
+	 *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+	 *	@param	string	$filedir		Full path to directory to scan
+	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
+	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
+	 */
+	function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter='')
+	{
+		global $conf, $langs;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$out='';
+		$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
+
+		$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
+
+		$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
+
+		// For ajax treatment
 		$out.= '<!-- html.formfile::getDocumentsLink -->'."\n";
-    	if (! empty($file_list))
-    	{
-    	    $out='<dl class="dropdown inline-block">
+		if (! empty($file_list))
+		{
+			$out='<dl class="dropdown inline-block">
     			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight').'</a></dt>
     			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields" style="display: none;">';
-    	    $tmpout='';
-
-    		// Loop on each file found
-    		foreach($file_list as $file)
-    		{
-    		    $i++;
-    			if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
-
-    			// Define relative path for download link (depends on module)
-    			$relativepath=$file["name"];								// Cas general
-    			if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
-    			// Autre cas
-    			if ($modulepart == 'donation')            {
-    				$relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
-    			}
-    			if ($modulepart == 'export')              {
-    				$relativepath = $file["name"];
-    			}
-
-    			$this->infofiles['nboffiles']++;
-    			$this->infofiles['files'][]=$file['fullname'];
-    			$ext=pathinfo($file["name"], PATHINFO_EXTENSION);
-    			if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
-    			else $this->infofiles['extensions'][$ext]++;
-
-    			// Preview
-    			if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
-    			{
-                    $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
-                    if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
-    			}
-
-    			// Download
-    		    $tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
-    			$mime=dol_mimetype($relativepath,'',0);
-    			if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
-    			$tmpout.= '>';
-    			$tmpout.=img_mime($relativepath, $file["name"]).' ';
-    			$tmpout.= $langs->trans("Download").' '.$ext;
-    			$tmpout.= '</a></li>'."\n";
-    		}
-    		$out.=$tmpout;
-    		$out.='</ul></div></dd>
+			$tmpout='';
+
+			// Loop on each file found
+			foreach($file_list as $file)
+			{
+				$i++;
+				if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
+
+				// Define relative path for download link (depends on module)
+				$relativepath=$file["name"];								// Cas general
+				if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+				// Autre cas
+				if ($modulepart == 'donation')            {
+					$relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
+				}
+				if ($modulepart == 'export')              {
+					$relativepath = $file["name"];
+				}
+
+				$this->infofiles['nboffiles']++;
+				$this->infofiles['files'][]=$file['fullname'];
+				$ext=pathinfo($file["name"], PATHINFO_EXTENSION);
+				if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
+				else $this->infofiles['extensions'][$ext]++;
+
+				// Preview
+				if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
+				{
+					$tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
+					if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
+				}
+
+				// Download
+				$tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
+				$mime=dol_mimetype($relativepath,'',0);
+				if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
+				$tmpout.= '>';
+				$tmpout.=img_mime($relativepath, $file["name"]).' ';
+				$tmpout.= $langs->trans("Download").' '.$ext;
+				$tmpout.= '</a></li>'."\n";
+			}
+			$out.=$tmpout;
+			$out.='</ul></div></dd>
     			</dl>';
-    	}
-    	else
-    	{
-    	    // TODO Add link to regenerate doc ?
-    	    //$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
-    	}
-
-    	return $out;
-    }
-
-
-    /**
-     *  Show list of documents in $filearray (may be they are all in same directory but may not)
-     *  This also sync database if $upload_dir is defined.
-     *
-     *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this.
-     * 	@param	 Object	$object				Object on which document is linked to.
-     * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper.
-     * 	@param	 string	$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)
-     * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file.
-     * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.
-     * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)
-     * 	@param	 int	$useinecm			Change output for use in ecm module
-     * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
-     *  @param   int	$maxlength          Maximum length of file name shown.
-     *  @param	 string	$title				Title before list
-     *  @param	 string $url				Full url to use for click links ('' = autodetect)
+		}
+		else
+		{
+			// TODO Add link to regenerate doc ?
+			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
+		}
+
+		return $out;
+	}
+
+
+	/**
+	 *  Show list of documents in $filearray (may be they are all in same directory but may not)
+	 *  This also sync database if $upload_dir is defined.
+	 *
+	 *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this.
+	 * 	@param	 Object	$object				Object on which document is linked to.
+	 * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper.
+	 * 	@param	 string	$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)
+	 * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file.
+	 * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.
+	 * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)
+	 * 	@param	 int	$useinecm			Change output for use in ecm module
+	 * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
+	 *  @param   int	$maxlength          Maximum length of file name shown.
+	 *  @param	 string	$title				Title before list
+	 *  @param	 string $url				Full url to use for click links ('' = autodetect)
 	 *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
 	 *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
-     *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this if you want to complete file data with database indexes.
-     *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
-     *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
-     *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
-     *  @param	 int	$addfilterfields	Add line with filters
-     * 	@return	 int						<0 if KO, nb of files shown if OK
-     */
+	 *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this if you want to complete file data with database indexes.
+	 *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
+	 *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
+	 *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
+	 *  @param	 int	$addfilterfields	Add line with filters
+	 * 	@return	 int						<0 if KO, nb of files shown if OK
+	 */
 	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0)
 	{
 		global $user, $conf, $langs, $hookmanager;
@@ -937,21 +937,21 @@ 
 		// Define relative path used to store the file
 		if (empty($relativepath))
 		{
-		    $relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
-		    if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
-		    if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+			$relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
+			if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
+			if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
 		}
 		// For backward compatiblity, we detect file is stored into an old path
 		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $file['level1name'] == 'photos')
 		{
-		    $relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/';
+			$relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/';
 		}
 		// Defined relative dir to DOL_DATA_ROOT
 		$relativedir = '';
 		if ($upload_dir)
 		{
-    		$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-    		$relativedir = preg_replace('/^[\\/]/','',$relativedir);
+			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+			$relativedir = preg_replace('/^[\\/]/','',$relativedir);
 		}
 
 		$hookmanager->initHooks(array('formfile'));
@@ -981,17 +981,17 @@ 
 
 			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
 			{
-			    $permtoeditline=0;
-			    if (in_array($modulepart, array('product','produit','service')))
-			    {
-			        if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
-			        if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
-			    }
+				$permtoeditline=0;
+				if (in_array($modulepart, array('product','produit','service')))
+				{
+					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
+					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
+				}
 			}
 			if (empty($conf->global->MAIN_UPLOAD_DOC))
 			{
-			    $permtoeditline=0;
-			    $permonobject=0;
+				$permtoeditline=0;
+				$permonobject=0;
 			}
 
 			// Show list of existing files
@@ -1001,10 +1001,10 @@ 
 			print '<!-- html.formfile::list_of_documents -->'."\n";
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
-			    print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
-			    print '<input type="hidden" name="action" value="renamefile">';
-			    print '<input type="hidden" name="id" value="'.$object->id.'">';
-			    print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
+				print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
+				print '<input type="hidden" name="action" value="renamefile">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
 			}
 
 			print '<div class="div-table-responsive-no-min">';
@@ -1038,11 +1038,11 @@ 
 
 				/*var_dump($sortfield);
 				var_dump($sortorder);*/
-    			if ($sortfield && $sortorder)
-    			{
-        			$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
-    			}
-    			//var_dump($filearray);
+				if ($sortfield && $sortorder)
+				{
+					$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+				}
+				//var_dump($filearray);
 			}
 
 			$nboffiles=count($filearray);
@@ -1059,9 +1059,9 @@ 
 
 					$editline=0;
 					$nboflines++;
-			        print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
-			        // Do we have entry into database ?
-			        print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
+					print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
+					// Do we have entry into database ?
+					print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
 					print '<tr id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'-AFTER'.$lastrowid.'POS'.($i+1)).'" '.$bcdd[$var].'>';
 					print '<td class="tdoverflowmax300">';
 
@@ -1081,15 +1081,15 @@ 
 					//print dol_trunc($file['name'],$maxlength,'middle');
 					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile')))
 					{
-					    print '</a>';
-					    print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
-					    print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
-					    $editline=1;
+						print '</a>';
+						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
+						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
+						$editline=1;
 					}
 					else
 					{
-					    print $file['name'];
-					    print '</a>';
+						print $file['name'];
+						print '</a>';
 					}
 
 					print "</td>\n";
@@ -1105,13 +1105,13 @@ 
 						print '<td align="center">';
 						if (image_format_supported($file['name']) > 0)
 						{
-						    $minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-						    if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
-						    //print $file['path'].'/'.$minifile.'<br>';
+							$minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+							if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+							//print $file['path'].'/'.$minifile.'<br>';
 
-						    $urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 0, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
-						    if (empty($urlforhref)) $urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
-						    print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
+							$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 0, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
+							if (empty($urlforhref)) $urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+							print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
 							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
 							print '</a>';
 						}
@@ -1120,77 +1120,77 @@ 
 					}
 					if (! $editline)
 					{
-    					// Delete or view link
-    					// ($param must start with &)
-    					print '<td class="valignmiddle right"><!-- action on files -->';
-    					if ($useinecm)
-    					{
-    					    print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view('default', 0, 'class="paddingrightonly"').'</a>';
-    					}
-    					else
-    					{
-        					$newmodulepart=$modulepart;
-        					if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
-
-        					$disablecrop=1;
-        					if (in_array($modulepart, array('product','produit','service','expensereport','holiday','project','user'))) $disablecrop=0;
-
-    					    if (! $disablecrop && image_format_supported($file['name']) > 0)
-    						{
-    							if ($permtoeditline)
-    							{
-       								// Link to resize
-       			               		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','class="paddingrightonly"',1).'</a>';
-    							}
-    						}
-
-    						if ($permtoeditline)
-    						{
-    						    print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
-    						}
-    					}
-    					if ($permonobject)
-    					{
-    						/*
+						// Delete or view link
+						// ($param must start with &)
+						print '<td class="valignmiddle right"><!-- action on files -->';
+						if ($useinecm)
+						{
+							print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view('default', 0, 'class="paddingrightonly"').'</a>';
+						}
+						else
+						{
+							$newmodulepart=$modulepart;
+							if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
+
+							$disablecrop=1;
+							if (in_array($modulepart, array('product','produit','service','expensereport','holiday','project','user'))) $disablecrop=0;
+
+							if (! $disablecrop && image_format_supported($file['name']) > 0)
+							{
+								if ($permtoeditline)
+								{
+	   								// Link to resize
+	   						   		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','class="paddingrightonly"',1).'</a>';
+								}
+							}
+
+							if ($permtoeditline)
+							{
+								print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
+							}
+						}
+						if ($permonobject)
+						{
+							/*
     						if ($file['level1name'] <> $object->id)
     							$filepath=$file['level1name'].'/'.$file['name'];
     						else
     							$filepath=$file['name'];
     						*/
-    						$useajax=1;
-    						if (! empty($conf->dol_use_jmobile)) $useajax=0;
-    						if (empty($conf->use_javascript_ajax)) $useajax=0;
-    						if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
-
-    						print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
-    					}
-					    print "</td>";
-
-					    if (empty($disablemove))
-					    {
-    					    if ($nboffiles > 1 && empty($conf->browser->phone)) {
-    					    	print '<td align="center" class="linecolmove tdlineupdown">';
-    					    	if ($i > 0) {
-    					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
-    					    	}
-    					        if ($i < $nboffiles-1) {
-    					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
-    				    		}
-    					    	print '</td>';
-    					    }
-    					    else {
-    					       	print '<td align="center"'.((empty($conf->browser->phone) && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
-    					       	print '</td>';
-    					    }
+							$useajax=1;
+							if (! empty($conf->dol_use_jmobile)) $useajax=0;
+							if (empty($conf->use_javascript_ajax)) $useajax=0;
+							if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
+
+							print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
+						}
+						print "</td>";
+
+						if (empty($disablemove))
+						{
+							if ($nboffiles > 1 && empty($conf->browser->phone)) {
+								print '<td align="center" class="linecolmove tdlineupdown">';
+								if ($i > 0) {
+									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
+								}
+								if ($i < $nboffiles-1) {
+									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
+								}
+								print '</td>';
+							}
+							else {
+							   	print '<td align="center"'.((empty($conf->browser->phone) && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
+							   	print '</td>';
+							}
 					   }
 					}
 					else
 					{
-					    print '<td class="right">';
-					    print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-					    print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-					    print '</td>';
-					    if (empty($disablemove)) print '<td class="right"></td>';
+						print '<td class="right">';
+						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+						print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+						print '</td>';
+						if (empty($disablemove)) print '<td class="right"></td>';
 					}
 					print "</tr>\n";
 
@@ -1199,8 +1199,8 @@ 
 			}
 			if ($nboffiles == 0)
 			{
-			    $colspan=(empty($useinecm)?'5':'5');
-			    if (empty($disablemove)) $colspan++;
+				$colspan=(empty($useinecm)?'5':'5');
+				if (empty($disablemove)) $colspan++;
 				print '<tr '.$bc[false].'><td colspan="'.$colspan.'" class="opacitymedium">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
 				else print $textifempty;
@@ -1211,14 +1211,14 @@ 
 
 			if (! $editline && $nboflines > 1) {
 				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
-				    $table_element_line = 'ecm_files';
-				    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+					$table_element_line = 'ecm_files';
+					include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 				}
 			}
 
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
-			    print '</form>';
+				print '</form>';
 			}
 
 			return $nboffiles;
@@ -1226,459 +1226,459 @@ 
 	}
 
 
-    /**
-     *	Show list of documents in a directory
-     *
-     *  @param	string	$upload_dir         Directory that was scanned
-     *  @param  array	$filearray          Array of files loaded by dol_dir_list function before calling this function
-     *  @param  string	$modulepart         Value for modulepart used by download wrapper
-     *  @param  string	$param              Parameters on sort links
-     *  @param  int		$forcedownload      Force to open dialog box "Save As" when clicking on file
-     *  @param  string	$relativepath       Relative path of docs (autodefined if not provided)
-     *  @param  int		$permtodelete       Permission to delete
-     *  @param  int		$useinecm           Change output for use in ecm module
-     *  @param  int		$textifempty        Text to show if filearray is empty
-     *  @param  int		$maxlength          Maximum length of file name shown
-     *  @param	string 	$url				Full url to use for click links ('' = autodetect)
-     *  @param	int		$addfilterfields	Add line with filters
-     *  @return int                 		<0 if KO, nb of files shown if OK
-     */
-    function list_of_autoecmfiles($upload_dir,$filearray,$modulepart,$param,$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$url='',$addfilterfields=0)
-    {
-        global $user, $conf, $langs, $form;
-        global $bc;
-        global $sortfield, $sortorder;
+	/**
+	 *	Show list of documents in a directory
+	 *
+	 *  @param	string	$upload_dir         Directory that was scanned
+	 *  @param  array	$filearray          Array of files loaded by dol_dir_list function before calling this function
+	 *  @param  string	$modulepart         Value for modulepart used by download wrapper
+	 *  @param  string	$param              Parameters on sort links
+	 *  @param  int		$forcedownload      Force to open dialog box "Save As" when clicking on file
+	 *  @param  string	$relativepath       Relative path of docs (autodefined if not provided)
+	 *  @param  int		$permtodelete       Permission to delete
+	 *  @param  int		$useinecm           Change output for use in ecm module
+	 *  @param  int		$textifempty        Text to show if filearray is empty
+	 *  @param  int		$maxlength          Maximum length of file name shown
+	 *  @param	string 	$url				Full url to use for click links ('' = autodetect)
+	 *  @param	int		$addfilterfields	Add line with filters
+	 *  @return int                 		<0 if KO, nb of files shown if OK
+	 */
+	function list_of_autoecmfiles($upload_dir,$filearray,$modulepart,$param,$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$url='',$addfilterfields=0)
+	{
+		global $user, $conf, $langs, $form;
+		global $bc;
+		global $sortfield, $sortorder;
 		global $search_doc_ref;
 
-        dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
+		dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
 
-        // Show list of documents
-        if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
-        if (empty($url)) $url=$_SERVER["PHP_SELF"];
+		// Show list of documents
+		if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
+		if (empty($url)) $url=$_SERVER["PHP_SELF"];
 
-        if (! empty($addfilterfields))
-        {
-        	print '<form action="'.$_SERVER['PHP_SELF'].'">';
-        	print '<input type="hidden" name="module" value="'.$modulepart.'">';
-        }
+		if (! empty($addfilterfields))
+		{
+			print '<form action="'.$_SERVER['PHP_SELF'].'">';
+			print '<input type="hidden" name="module" value="'.$modulepart.'">';
+		}
 
 		print '<div class="div-table-responsive-no-min">';
-        print '<table width="100%" class="noborder">'."\n";
-
-        if (! empty($addfilterfields))
-        {
-        	print '<tr class="liste_titre nodrag nodrop">';
-        	print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
-        	print '<td></td>';
-        	print '<td></td>';
-        	print '<td></td>';
+		print '<table width="100%" class="noborder">'."\n";
+
+		if (! empty($addfilterfields))
+		{
+			print '<tr class="liste_titre nodrag nodrop">';
+			print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
 			// Action column
 			print '<td class="liste_titre" align="middle">';
 			$searchpicto=$form->showFilterButtons();
 			print $searchpicto;
 			print '</td>';
-        	print "</tr>\n";
-        }
-
-        print '<tr class="liste_titre">';
-        $sortref="fullname";
-        if ($modulepart == 'invoice_supplier') $sortref='level1name';
-        print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
-        print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
-        print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
-        print_liste_field_titre("Date",$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-        print_liste_field_titre('','','');
-        print '</tr>'."\n";
-
-        // To show ref or specific information according to view to show (defined by $module)
-        if ($modulepart == 'company')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-            $object_instance=new Societe($this->db);
-        }
-        else if ($modulepart == 'invoice')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-            $object_instance=new Facture($this->db);
-        }
-        else if ($modulepart == 'invoice_supplier')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-            $object_instance=new FactureFournisseur($this->db);
-        }
-        else if ($modulepart == 'propal')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-            $object_instance=new Propal($this->db);
-        }
-        else if ($modulepart == 'supplier_proposal')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-            $object_instance=new SupplierProposal($this->db);
-        }
-        else if ($modulepart == 'order')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-            $object_instance=new Commande($this->db);
-        }
-        else if ($modulepart == 'order_supplier')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-            $object_instance=new CommandeFournisseur($this->db);
-        }
-        else if ($modulepart == 'contract')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-            $object_instance=new Contrat($this->db);
-        }
-        else if ($modulepart == 'product')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-            $object_instance=new Product($this->db);
-        }
-        else if ($modulepart == 'tax')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-            $object_instance=new ChargeSociales($this->db);
-        }
-        else if ($modulepart == 'project')
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-        	$object_instance=new Project($this->db);
-        }
-        else if ($modulepart == 'fichinter')
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-        	$object_instance=new Fichinter($this->db);
-        }
-        else if ($modulepart == 'user')
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-        	$object_instance=new User($this->db);
-        }
-        else if ($modulepart == 'expensereport')
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-        	$object_instance=new ExpenseReport($this->db);
-        }
-
-        $var=true;
-        foreach($filearray as $key => $file)
-        {
-        	if (!is_dir($file['name'])
-            && $file['name'] != '.'
-            && $file['name'] != '..'
-            && $file['name'] != 'CVS'
-            && ! preg_match('/\.meta$/i',$file['name']))
-            {
-                // Define relative path used to store the file
-                $relativefile=preg_replace('/'.preg_quote($upload_dir.'/','/').'/','',$file['fullname']);
-
-                //var_dump($file);
-                $id=0; $ref=''; $label='';
-
-                // To show ref or specific information according to view to show (defined by $module)
-                if ($modulepart == 'company')           { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'invoice')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'invoice_supplier')  { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } }	// $ref may be also id with old supplier invoices
-                if ($modulepart == 'propal')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+			print "</tr>\n";
+		}
+
+		print '<tr class="liste_titre">';
+		$sortref="fullname";
+		if ($modulepart == 'invoice_supplier') $sortref='level1name';
+		print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
+		print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
+		print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre("Date",$url,"date","",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre('','','');
+		print '</tr>'."\n";
+
+		// To show ref or specific information according to view to show (defined by $module)
+		if ($modulepart == 'company')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+			$object_instance=new Societe($this->db);
+		}
+		else if ($modulepart == 'invoice')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$object_instance=new Facture($this->db);
+		}
+		else if ($modulepart == 'invoice_supplier')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+			$object_instance=new FactureFournisseur($this->db);
+		}
+		else if ($modulepart == 'propal')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+			$object_instance=new Propal($this->db);
+		}
+		else if ($modulepart == 'supplier_proposal')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+			$object_instance=new SupplierProposal($this->db);
+		}
+		else if ($modulepart == 'order')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+			$object_instance=new Commande($this->db);
+		}
+		else if ($modulepart == 'order_supplier')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+			$object_instance=new CommandeFournisseur($this->db);
+		}
+		else if ($modulepart == 'contract')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+			$object_instance=new Contrat($this->db);
+		}
+		else if ($modulepart == 'product')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+			$object_instance=new Product($this->db);
+		}
+		else if ($modulepart == 'tax')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+			$object_instance=new ChargeSociales($this->db);
+		}
+		else if ($modulepart == 'project')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+			$object_instance=new Project($this->db);
+		}
+		else if ($modulepart == 'fichinter')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+			$object_instance=new Fichinter($this->db);
+		}
+		else if ($modulepart == 'user')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+			$object_instance=new User($this->db);
+		}
+		else if ($modulepart == 'expensereport')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+			$object_instance=new ExpenseReport($this->db);
+		}
+
+		$var=true;
+		foreach($filearray as $key => $file)
+		{
+			if (!is_dir($file['name'])
+			&& $file['name'] != '.'
+			&& $file['name'] != '..'
+			&& $file['name'] != 'CVS'
+			&& ! preg_match('/\.meta$/i',$file['name']))
+			{
+				// Define relative path used to store the file
+				$relativefile=preg_replace('/'.preg_quote($upload_dir.'/','/').'/','',$file['fullname']);
+
+				//var_dump($file);
+				$id=0; $ref=''; $label='';
+
+				// To show ref or specific information according to view to show (defined by $module)
+				if ($modulepart == 'company')           { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
+				if ($modulepart == 'invoice')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+				if ($modulepart == 'invoice_supplier')  { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } }	// $ref may be also id with old supplier invoices
+				if ($modulepart == 'propal')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
 				if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'order')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'order_supplier')    { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'contract')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'product')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'tax')               { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-                if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-                if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-                if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-
-                if (! $id && ! $ref) continue;
-                $found=0;
-                if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
-                {
-                    $found=1;
-                }
-                else
-                {
-                    //print 'Fetch '.$id." - ".$ref.'<br>';
-
-                    if ($id) {
-                        $result = $object_instance->fetch($id);
-                    } else {
-                        //fetchOneLike looks for objects with wildcards in its reference.
-                        //It is useful for those masks who get underscores instead of their actual symbols
-                        //fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
-                        //that's why we look only look fetchOneLike when fetch returns 0
-                        if (!$result = $object_instance->fetch('', $ref)) {
-                            $result = $object_instance->fetchOneLike($ref);
-                        }
-                    }
+				if ($modulepart == 'order')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+				if ($modulepart == 'order_supplier')    { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+				if ($modulepart == 'contract')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+				if ($modulepart == 'product')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+				if ($modulepart == 'tax')               { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
+				if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+				if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+				if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
+				if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
+
+				if (! $id && ! $ref) continue;
+				$found=0;
+				if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
+				{
+					$found=1;
+				}
+				else
+				{
+					//print 'Fetch '.$id." - ".$ref.'<br>';
+
+					if ($id) {
+						$result = $object_instance->fetch($id);
+					} else {
+						//fetchOneLike looks for objects with wildcards in its reference.
+						//It is useful for those masks who get underscores instead of their actual symbols
+						//fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
+						//that's why we look only look fetchOneLike when fetch returns 0
+						if (!$result = $object_instance->fetch('', $ref)) {
+							$result = $object_instance->fetchOneLike($ref);
+						}
+					}
 
 					if ($result > 0) {  // Save object into a cache
 						$found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
 					}
-                    if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
-                }
-
-                if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
-
-                print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
-                print '<tr class="oddeven">';
-                print '<td>';
-                if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
-                else print $langs->trans("ObjectDeleted",($id?$id:$ref));
-
-                //$modulesubdir=dol_sanitizeFileName($ref);
-                $modulesubdir=dirname($relativefile);
-
-                //$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-                $filedir=$file['path'];
-                //$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-                //print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
-
-                print '</td>';
-
-                // File
-                print '<td>';
-                //print "XX".$file['name']; //$file['name'] must be utf8
-                print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-                if ($forcedownload) print '&attachment=1';
-                print '&file='.urlencode($relativefile).'">';
-                print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
-                print dol_trunc($file['name'],$maxlength,'middle');
-                print '</a>';
-
-                print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$');
-
-                print "</td>\n";
-                print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
-                print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
-                print '<td align="right">';
-                //if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-                //if ($forcedownload) print '&attachment=1';
-                //print '&file='.urlencode($relativefile).'">';
-                //print img_view().'</a> &nbsp; ';
-                //if ($permtodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
-                //else print '&nbsp;';
-                print "</td></tr>\n";
-            }
-        }
-
-        if (count($filearray) == 0)
-        {
-            print '<tr '.$bc[false].'><td colspan="5">';
-            if (empty($textifempty)) print $langs->trans("NoFileFound");
-            else print $textifempty;
-            print '</td></tr>';
-        }
-        print "</table>";
-        print '</div>';
-
-        if (! empty($addfilterfields)) print '</form>';
-        // Fin de zone
-    }
-
-    /**
-     *    Show form to upload a new file with jquery fileupload.
-     *    This form use the fileupload.php file.
-     *
-     *    @param	Object	$object		Object to use
-     *    @return	void
-     */
-    private function _formAjaxFileUpload($object)
-    {
-        global $langs;
-
-        // PHP post_max_size
-        $post_max_size				= ini_get('post_max_size');
-        $mul_post_max_size			= substr($post_max_size, -1);
-        $mul_post_max_size			= ($mul_post_max_size == 'M' ? 1048576 : ($mul_post_max_size == 'K' ? 1024 : ($mul_post_max_size == 'G' ? 1073741824 : 1)));
-        $post_max_size				= $mul_post_max_size * (int) $post_max_size;
-        // PHP upload_max_filesize
-        $upload_max_filesize		= ini_get('upload_max_filesize');
-        $mul_upload_max_filesize	= substr($upload_max_filesize, -1);
-        $mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));
-        $upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;
-        // Max file size
-        $max_file_size 				= (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
-
-        // Include main
-        include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';
-
-        // Include template
-        include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php';
-
-    }
-
-    /**
-     * Show array with linked files
-     *
-     * @param 	Object		$object			Object
-     * @param 	int			$permtodelete	Deletion is allowed
-     * @param 	string		$action			Action
-     * @param 	string		$selected		???
-     * @param	string		$param			More param to add into URL
-     * @return 	int							Number of links
-     */
-    public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
-    {
-        global $user, $conf, $langs, $user;
-        global $bc;
-        global $sortfield, $sortorder;
-
-        $langs->load("link");
-
-        require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-        $link = new Link($this->db);
-        $links = array();
-        if ($sortfield == "name") {
-            $sortfield = "label";
-        } elseif ($sortfield == "date") {
-            $sortfield = "datea";
-        } else {
-            $sortfield = null;
-        }
-        $res = $link->fetchAll($links, $object->element, $object->id, $sortfield, $sortorder);
-        $param .= (isset($object->id)?'&id=' . $object->id : '');
-
-        // Show list of associated links
-        print load_fiche_titre($langs->trans("LinkedFiles"));
-
-        print '<form action="' . $_SERVER['PHP_SELF'] . ($param?'?'.$param:'') . '" method="POST">';
-
-        print '<table width="100%" class="liste">';
-        print '<tr class="liste_titre">';
-        print_liste_field_titre(
-            $langs->trans("Links"),
-            $_SERVER['PHP_SELF'],
-            "name",
-            "",
-            $param,
-            'align="left"',
-            $sortfield,
-            $sortorder
-        );
-        print_liste_field_titre(
-            "",
-            "",
-            "",
-            "",
-            "",
-            'align="right"'
-        );
-        print_liste_field_titre(
-            $langs->trans("Date"),
-            $_SERVER['PHP_SELF'],
-            "date",
-            "",
-            $param,
-            'align="center"',
-            $sortfield,
-            $sortorder
-        );
-        print_liste_field_titre(
-            '',
-            $_SERVER['PHP_SELF'],
-            "",
-            "",
-            $param,
-            'align="center"'
-        );
-        print_liste_field_titre('','','');
-        print '</tr>';
-        $nboflinks = count($links);
-        if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-        $var = true;
-        foreach ($links as $link)
-        {
-            $var =! $var;
-            print '<tr ' . $bc[$var] . '>';
-            //edit mode
-            if ($action == 'update' && $selected === $link->id)
-            {
-                print '<td>';
-                print '<input type="hidden" name="id" value="' . $object->id . '">';
-                print '<input type="hidden" name="linkid" value="' . $link->id . '">';
-                print '<input type="hidden" name="action" value="confirm_updateline">';
-                print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
-                print '</td>';
-                print '<td>';
-                print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';
-                print '</td>';
-                print '<td align="center">' . dol_print_date(dol_now(), "dayhour", "tzuser") . '</td>';
-                print '<td align="right"></td>';
-                print '<td align="right">';
-                print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
-                print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
-                print '</td>';
-            }
-            else
+					if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
+				}
+
+				if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
+
+				print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
+				print '<tr class="oddeven">';
+				print '<td>';
+				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
+				else print $langs->trans("ObjectDeleted",($id?$id:$ref));
+
+				//$modulesubdir=dol_sanitizeFileName($ref);
+				$modulesubdir=dirname($relativefile);
+
+				//$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+				$filedir=$file['path'];
+				//$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+				//print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
+
+				print '</td>';
+
+				// File
+				print '<td>';
+				//print "XX".$file['name']; //$file['name'] must be utf8
+				print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+				if ($forcedownload) print '&attachment=1';
+				print '&file='.urlencode($relativefile).'">';
+				print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
+				print dol_trunc($file['name'],$maxlength,'middle');
+				print '</a>';
+
+				print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$');
+
+				print "</td>\n";
+				print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
+				print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
+				print '<td align="right">';
+				//if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+				//if ($forcedownload) print '&attachment=1';
+				//print '&file='.urlencode($relativefile).'">';
+				//print img_view().'</a> &nbsp; ';
+				//if ($permtodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
+				//else print '&nbsp;';
+				print "</td></tr>\n";
+			}
+		}
+
+		if (count($filearray) == 0)
+		{
+			print '<tr '.$bc[false].'><td colspan="5">';
+			if (empty($textifempty)) print $langs->trans("NoFileFound");
+			else print $textifempty;
+			print '</td></tr>';
+		}
+		print "</table>";
+		print '</div>';
+
+		if (! empty($addfilterfields)) print '</form>';
+		// Fin de zone
+	}
+
+	/**
+	 *    Show form to upload a new file with jquery fileupload.
+	 *    This form use the fileupload.php file.
+	 *
+	 *    @param	Object	$object		Object to use
+	 *    @return	void
+	 */
+	private function _formAjaxFileUpload($object)
+	{
+		global $langs;
+
+		// PHP post_max_size
+		$post_max_size				= ini_get('post_max_size');
+		$mul_post_max_size			= substr($post_max_size, -1);
+		$mul_post_max_size			= ($mul_post_max_size == 'M' ? 1048576 : ($mul_post_max_size == 'K' ? 1024 : ($mul_post_max_size == 'G' ? 1073741824 : 1)));
+		$post_max_size				= $mul_post_max_size * (int) $post_max_size;
+		// PHP upload_max_filesize
+		$upload_max_filesize		= ini_get('upload_max_filesize');
+		$mul_upload_max_filesize	= substr($upload_max_filesize, -1);
+		$mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));
+		$upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;
+		// Max file size
+		$max_file_size 				= (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
+
+		// Include main
+		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';
+
+		// Include template
+		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php';
+
+	}
+
+	/**
+	 * Show array with linked files
+	 *
+	 * @param 	Object		$object			Object
+	 * @param 	int			$permtodelete	Deletion is allowed
+	 * @param 	string		$action			Action
+	 * @param 	string		$selected		???
+	 * @param	string		$param			More param to add into URL
+	 * @return 	int							Number of links
+	 */
+	public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
+	{
+		global $user, $conf, $langs, $user;
+		global $bc;
+		global $sortfield, $sortorder;
+
+		$langs->load("link");
+
+		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+		$link = new Link($this->db);
+		$links = array();
+		if ($sortfield == "name") {
+			$sortfield = "label";
+		} elseif ($sortfield == "date") {
+			$sortfield = "datea";
+		} else {
+			$sortfield = null;
+		}
+		$res = $link->fetchAll($links, $object->element, $object->id, $sortfield, $sortorder);
+		$param .= (isset($object->id)?'&id=' . $object->id : '');
+
+		// Show list of associated links
+		print load_fiche_titre($langs->trans("LinkedFiles"));
+
+		print '<form action="' . $_SERVER['PHP_SELF'] . ($param?'?'.$param:'') . '" method="POST">';
+
+		print '<table width="100%" class="liste">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre(
+			$langs->trans("Links"),
+			$_SERVER['PHP_SELF'],
+			"name",
+			"",
+			$param,
+			'align="left"',
+			$sortfield,
+			$sortorder
+		);
+		print_liste_field_titre(
+			"",
+			"",
+			"",
+			"",
+			"",
+			'align="right"'
+		);
+		print_liste_field_titre(
+			$langs->trans("Date"),
+			$_SERVER['PHP_SELF'],
+			"date",
+			"",
+			$param,
+			'align="center"',
+			$sortfield,
+			$sortorder
+		);
+		print_liste_field_titre(
+			'',
+			$_SERVER['PHP_SELF'],
+			"",
+			"",
+			$param,
+			'align="center"'
+		);
+		print_liste_field_titre('','','');
+		print '</tr>';
+		$nboflinks = count($links);
+		if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+		$var = true;
+		foreach ($links as $link)
+		{
+			$var =! $var;
+			print '<tr ' . $bc[$var] . '>';
+			//edit mode
+			if ($action == 'update' && $selected === $link->id)
+			{
+				print '<td>';
+				print '<input type="hidden" name="id" value="' . $object->id . '">';
+				print '<input type="hidden" name="linkid" value="' . $link->id . '">';
+				print '<input type="hidden" name="action" value="confirm_updateline">';
+				print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
+				print '</td>';
+				print '<td>';
+				print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';
+				print '</td>';
+				print '<td align="center">' . dol_print_date(dol_now(), "dayhour", "tzuser") . '</td>';
+				print '<td align="right"></td>';
+				print '<td align="right">';
+				print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
+				print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
+				print '</td>';
+			}
+			else
+			{
+				print '<td>';
+				print img_picto('', 'object_globe').' ';
+				print '<a data-ajax="false" href="' . $link->url . '" target="_blank">';
+				print $link->label;
+				print '</a>';
+				print '</td>'."\n";
+				print '<td align="right"></td>';
+				print '<td align="center">' . dol_print_date($link->datea, "dayhour", "tzuser") . '</td>';
+				print '<td align="center"></td>';
+				print '<td align="right">';
+				print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '" class="editfilelink" >' . img_edit() . '</a>';	// id= is included into $param
+				if ($permtodelete) {
+					print ' &nbsp; <a href="'. $_SERVER['PHP_SELF'] .'?action=delete&linkid=' . $link->id . $param . '" class="deletefilelink">' . img_delete() . '</a>';	// id= is included into $param
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+			}
+			print "</tr>\n";
+		}
+		if ($nboflinks == 0)
+		{
+			print '<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">';
+			print $langs->trans("NoLinkFound");
+			print '</td></tr>';
+		}
+		print "</table>";
+
+		print '</form>';
+
+		return $nboflinks;
+	}
+
+
+	/**
+	 * Show detail icon with link for preview
+	 *
+	 * @param   array     $file           File
+	 * @param   string    $modulepart     propal, facture, facture_fourn, ...
+	 * @param   string    $relativepath   Relative path of docs
+	 * @param   string    $ruleforpicto   Rule for picto: 0=Preview picto, 1=Use picto of mime type of file)
+	 * @param	string	  $param		  More param on http links
+	 * @return  string    $out            Output string with HTML
+	 */
+	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
+	{
+		global $langs, $conf;
+
+		$out='';
+		if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
+		{
+			$urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
+			if (count($urladvancedpreview))
 			{
-                print '<td>';
-                print img_picto('', 'object_globe').' ';
-                print '<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-                print $link->label;
-                print '</a>';
-                print '</td>'."\n";
-                print '<td align="right"></td>';
-                print '<td align="center">' . dol_print_date($link->datea, "dayhour", "tzuser") . '</td>';
-                print '<td align="center"></td>';
-                print '<td align="right">';
-                print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '" class="editfilelink" >' . img_edit() . '</a>';	// id= is included into $param
-                if ($permtodelete) {
-                    print ' &nbsp; <a href="'. $_SERVER['PHP_SELF'] .'?action=delete&linkid=' . $link->id . $param . '" class="deletefilelink">' . img_delete() . '</a>';	// id= is included into $param
-                } else {
-                    print '&nbsp;';
-                }
-                print '</td>';
-            }
-            print "</tr>\n";
-        }
-        if ($nboflinks == 0)
-        {
-            print '<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">';
-            print $langs->trans("NoLinkFound");
-            print '</td></tr>';
-        }
-        print "</table>";
-
-        print '</form>';
-
-        return $nboflinks;
-    }
-
-
-    /**
-     * Show detail icon with link for preview
-     *
-     * @param   array     $file           File
-     * @param   string    $modulepart     propal, facture, facture_fourn, ...
-     * @param   string    $relativepath   Relative path of docs
-     * @param   string    $ruleforpicto   Rule for picto: 0=Preview picto, 1=Use picto of mime type of file)
-     * @param	string	  $param		  More param on http links
-     * @return  string    $out            Output string with HTML
-     */
-    public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
-    {
-        global $langs, $conf;
-
-        $out='';
-        if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
-        {
-            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
-            if (count($urladvancedpreview))
-            {
-                $out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
-                //$out.= '<a class="pictopreview">';
-            	if (empty($ruleforpicto)) $out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
-                else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
-                $out.= '</a>';
-            }
-        }
-        return $out;
-    }
+				$out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
+				//$out.= '<a class="pictopreview">';
+				if (empty($ruleforpicto)) $out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
+				else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+				$out.= '</a>';
+			}
+		}
+		return $out;
+	}
 
 }
 

Spacing +408 added lines, -408 removed lines

@@ -38,7 +38,7 @@ 
 
     public $error;
     public $numoffiles;
-    public $infofiles;			// Used to return informations by function getDocumentsLink
+    public $infofiles; // Used to return informations by function getDocumentsLink
 
 
     /**
@@ -49,7 +49,7 @@ 
     function __construct($db)
     {
         $this->db = $db;
-        $this->numoffiles=0;
+        $this->numoffiles = 0;
         return 1;
     }
 
@@ -72,15 +72,15 @@ 
      *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
      * 	@return	int						<0 if KO, >0 if OK
      */
-    function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='')
+    function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '')
     {
-        global $conf,$langs, $hookmanager;
+        global $conf, $langs, $hookmanager;
         $hookmanager->initHooks(array('formfile'));
 
 
-        if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
+        if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax = 0;
 
-		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
+		if ((!empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax == 2))
         {
         	// TODO: Check this works with 2 forms on same page
         	// TODO: Check this works with GED module, otherwise, force useajax to 0
@@ -95,12 +95,12 @@ 
 		        return 1;
 	        }
 
-            $maxlength=$size;
+            $maxlength = $size;
 
             $out = "\n\n<!-- Start form attach new file -->\n";
 
-            if (empty($title)) $title=$langs->trans("AttachANewFile");
-            if ($title != 'none') $out.=load_fiche_titre($title, null, null);
+            if (empty($title)) $title = $langs->trans("AttachANewFile");
+            if ($title != 'none') $out .= load_fiche_titre($title, null, null);
 
             $out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
             $out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="">';
@@ -110,32 +110,32 @@ 
             $out .= '<table width="100%" class="nobordernopadding">';
             $out .= '<tr>';
 
-            if (! empty($options)) $out .= '<td>'.$options.'</td>';
+            if (!empty($options)) $out .= '<td>'.$options.'</td>';
 
             $out .= '<td valign="middle">';
 
-            $max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
-            $maxphp=@ini_get('upload_max_filesize');	// En inconnu
-            if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
-            if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
-            if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
-            if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
+            $max = $conf->global->MAIN_UPLOAD_DOC; // En Kb
+            $maxphp = @ini_get('upload_max_filesize'); // En inconnu
+            if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;
+            if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;
+            if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;
+            if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;
             // Now $max and $maxphp are in Kb
-            if ($maxphp > 0) $max=min($max,$maxphp);
+            if ($maxphp > 0) $max = min($max, $maxphp);
 
             if ($max > 0)
             {
-                $out .= '<input type="hidden" name="max_file_size" value="'.($max*1024).'">';
+                $out .= '<input type="hidden" name="max_file_size" value="'.($max * 1024).'">';
             }
 
             $out .= '<input class="flat minwidth400" type="file"';
-            $out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
-            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-            $out .= (!empty($accept)?' accept="'.$accept.'"':'accept=""');
+            $out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic') ? ' name="userfile"' : ' name="userfile[]" multiple');
+            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
+            $out .= (!empty($accept) ? ' accept="'.$accept.'"' : 'accept=""');
             $out .= '>';
             $out .= ' ';
             $out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';
-            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
             $out .= '>';
 
             if ($addcancel)
@@ -144,13 +144,13 @@ 
                 $out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
             }
 
-            if (! empty($conf->global->MAIN_UPLOAD_DOC))
+            if (!empty($conf->global->MAIN_UPLOAD_DOC))
             {
                 if ($perm)
                 {
                 	$langs->load('other');
                     $out .= ' ';
-                    $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
+                    $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphp), 1);
                 }
             }
             else
@@ -162,9 +162,9 @@ 
             if ($savingdocmask)
             {
             	$out .= '<tr>';
-   	            if (! empty($options)) $out .= '<td>'.$options.'</td>';
+   	            if (!empty($options)) $out .= '<td>'.$options.'</td>';
 	            $out .= '<td valign="middle" class="nowrap">';
-				$out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
+				$out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
             	$out .= '</td>';
             	$out .= '</tr>';
             }
@@ -189,25 +189,25 @@ 
 
 	            $out .= '<div class="valignmiddle" >';
 	            $out .= '<div class="inline-block" style="padding-right: 10px;">';
-	            if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
+	            if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink").':</label> ';
 	            $out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
 	            $out .= '</div>';
 	            $out .= '<div class="inline-block" style="padding-right: 10px;">';
-	            if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
+	            if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label").':</label> ';
 	            $out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
-	            $out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
-	            $out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
+	            $out .= '<input type="hidden" name="objecttype" value="'.$object->element.'">';
+	            $out .= '<input type="hidden" name="objectid" value="'.$object->id.'">';
 	            $out .= '</div>';
 	            $out .= '<div class="inline-block" style="padding-right: 10px;">';
 	            $out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
-	            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+	            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
 	            $out .= '>';
 	            $out .= '</div>';
                 $out .= '</div>';
                 $out .= '<div class="clearboth"></div>';
 	            $out .= '</form><br>';
-	            $parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
-	            $res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
+	            $parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm);
+	            $res = $hookmanager->executeHooks('formattachOptions', $parameters, $object);
 
 	            $out .= "\n<!-- End form attach new file -->\n";
             }
@@ -247,10 +247,10 @@ 
      * 		@return		int										<0 if KO, number of shown files if OK
      *      @deprecated                                         Use print xxx->showdocuments() instead.
      */
-    function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
+    function show_documents($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '')
     {
-        $this->numoffiles=0;
-        print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$notused,$noform,$param,$title,$buttonlabel,$codelang);
+        $this->numoffiles = 0;
+        print $this->showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed, $modelselected, $allowgenifempty, $forcenomultilang, $iconPDF, $notused, $noform, $param, $title, $buttonlabel, $codelang);
         return $this->numoffiles;
     }
 
@@ -278,47 +278,47 @@ 
      *      @param      Object              $object             Object when method is called from an object card.
      * 		@return		string              					Output string with HTML array of documents (might be empty string)
      */
-    function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null)
+    function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null)
     {
 		// Deprecation warning
 		if (0 !== $iconPDF) {
-			dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
+			dol_syslog(__METHOD__.": passing iconPDF parameter is deprecated", LOG_WARNING);
 		}
 
         global $langs, $conf, $user, $hookmanager;
         global $form, $bc;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (!is_object($form)) $form = new Form($this->db);
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         // For backward compatibility
-        if (! empty($iconPDF)) {
+        if (!empty($iconPDF)) {
         	return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
         }
 
-        $printer=0;
-        if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport')))	// The direct print feature is implemented only for such elements
+        $printer = 0;
+        if (in_array($modulepart, array('facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport')))	// The direct print feature is implemented only for such elements
         {
-            $printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
+            $printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled)) ?true:false;
         }
 
         $hookmanager->initHooks(array('formfile'));
-        $forname='builddoc';
-        $out='';
+        $forname = 'builddoc';
+        $out = '';
 
-        $headershown=0;
-        $showempty=0;
-        $i=0;
+        $headershown = 0;
+        $showempty = 0;
+        $i = 0;
 
-        $out.= "\n".'<!-- Start show_document -->'."\n";
+        $out .= "\n".'<!-- Start show_document -->'."\n";
         //print 'filedir='.$filedir;
 
         if (preg_match('/massfilesarea_/', $modulepart))
         {
-	        $out.='<div id="show_files"><br></div>'."\n";
-			$title=$langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
-			$title.='<script type="text/javascript" language="javascript">
+	        $out .= '<div id="show_files"><br></div>'."\n";
+			$title = $langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
+			$title .= '<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
 					jQuery(\'#togglemassfilesarea\').click(function() {
 						if (jQuery(\'#togglemassfilesarea\').attr(\'ref\') == "shown")
@@ -339,435 +339,435 @@ 
 				</script>';
         }
 
-        $titletoshow=$langs->trans("Documents");
-        if (! empty($title)) $titletoshow=$title;
+        $titletoshow = $langs->trans("Documents");
+        if (!empty($title)) $titletoshow = $title;
 
         // Show table
         if ($genallowed)
         {
-            $modellist=array();
+            $modellist = array();
 
             if ($modulepart == 'company')
             {
-                $showempty=1;
-                if (is_array($genallowed)) $modellist=$genallowed;
+                $showempty = 1;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
-                    $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
+                    $modellist = ModeleThirdPartyDoc::liste_modeles($this->db);
                 }
             }
             else if ($modulepart == 'propal')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
-                    $modellist=ModelePDFPropales::liste_modeles($this->db);
+                    $modellist = ModelePDFPropales::liste_modeles($this->db);
                 }
             }
 			else if ($modulepart == 'supplier_proposal')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
-                    $modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
+                    $modellist = ModelePDFSupplierProposal::liste_modeles($this->db);
                 }
             }
             else if ($modulepart == 'commande')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
-                    $modellist=ModelePDFCommandes::liste_modeles($this->db);
+                    $modellist = ModelePDFCommandes::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'expedition')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-                    $modellist=ModelePDFExpedition::liste_modeles($this->db);
+                    $modellist = ModelePDFExpedition::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'livraison')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
-                    $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
+                    $modellist = ModelePDFDeliveryOrder::liste_modeles($this->db);
                 }
             }
             else if ($modulepart == 'ficheinter')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
-                    $modellist=ModelePDFFicheinter::liste_modeles($this->db);
+                    $modellist = ModelePDFFicheinter::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'facture')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-                    $modellist=ModelePDFFactures::liste_modeles($this->db);
+                    $modellist = ModelePDFFactures::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'contract')
             {
-            	if (is_array($genallowed)) $modellist=$genallowed;
+            	if (is_array($genallowed)) $modellist = $genallowed;
             	else
             	{
             		include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
-            		$modellist=ModelePDFContract::liste_modeles($this->db);
+            		$modellist = ModelePDFContract::liste_modeles($this->db);
             	}
             }
             elseif ($modulepart == 'project')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
-                    $modellist=ModelePDFProjects::liste_modeles($this->db);
+                    $modellist = ModelePDFProjects::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'project_task')
             {
-            	if (is_array($genallowed)) $modellist=$genallowed;
+            	if (is_array($genallowed)) $modellist = $genallowed;
             	else
             	{
             		include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
-            		$modellist=ModelePDFTask::liste_modeles($this->db);
+            		$modellist = ModelePDFTask::liste_modeles($this->db);
             	}
             }
             elseif ($modulepart == 'product')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
-                    $modellist=ModelePDFProduct::liste_modeles($this->db);
+                    $modellist = ModelePDFProduct::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'export')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
-                    $modellist=ModeleExports::liste_modeles($this->db);
+                    $modellist = ModeleExports::liste_modeles($this->db);
                 }
             }
             else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
-                    $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
+                    $modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
                 }
             }
             else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
-                    $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
+                    $modellist = ModelePDFSuppliersInvoices::liste_modeles($this->db);
                 }
             }
 			else if ($modulepart == 'supplier_payment')
 			{
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
-                    $modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
+                    $modellist = ModelePDFSuppliersPayments::liste_modeles($this->db);
                 }
 			}
             else if ($modulepart == 'remisecheque')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
-                    $modellist=ModeleChequeReceipts::liste_modeles($this->db);
+                    $modellist = ModeleChequeReceipts::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'donation')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
-                    $modellist=ModeleDon::liste_modeles($this->db);
+                    $modellist = ModeleDon::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'member')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
-                    $modellist=ModelePDFCards::liste_modeles($this->db);
+                    $modellist = ModelePDFCards::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'agenda')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
-                    $modellist=ModeleAction::liste_modeles($this->db);
+                    $modellist = ModeleAction::liste_modeles($this->db);
                 }
             }
             else if ($modulepart == 'expensereport')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
-                    $modellist=ModeleExpenseReport::liste_modeles($this->db);
+                    $modellist = ModeleExpenseReport::liste_modeles($this->db);
                 }
             }
             else if ($modulepart == 'unpaid')
             {
-                $modellist='';
+                $modellist = '';
             }
             elseif ($modulepart == 'user')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
-                    $modellist=ModelePDFUser::liste_modeles($this->db);
+                    $modellist = ModelePDFUser::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'usergroup')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
-                    $modellist=ModelePDFUserGroup::liste_modeles($this->db);
+                    $modellist = ModelePDFUserGroup::liste_modeles($this->db);
                 }
             }
             else //if ($modulepart != 'agenda')
             {
             	// For normalized standard modules
-            	$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
+            	$file = dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php', 0);
                 if (file_exists($file))
                 {
-                	$res=include_once $file;
+                	$res = include_once $file;
                 }
                 // For normalized external modules
                 else
 				{
-                	$file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
-                	$res=include_once $file;
+                	$file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php', 0);
+                	$res = include_once $file;
                 }
-                $class='Modele'.ucfirst($modulepart);
+                $class = 'Modele'.ucfirst($modulepart);
                 if (class_exists($class))
                 {
-                    $modellist=call_user_func($class.'::liste_modeles',$this->db);
+                    $modellist = call_user_func($class.'::liste_modeles', $this->db);
                 }
                 else
               {
-                    dol_print_error($this->db,'Bad value for modulepart');
+                    dol_print_error($this->db, 'Bad value for modulepart');
                     return -1;
                 }
             }
 
             // Set headershown to avoit to have table opened a second time later
-            $headershown=1;
+            $headershown = 1;
 
-            $buttonlabeltoshow=$buttonlabel;
-            if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
+            $buttonlabeltoshow = $buttonlabel;
+            if (empty($buttonlabel)) $buttonlabel = $langs->trans('Generate');
 
-            if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
-            if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
-            $out.= '<input type="hidden" name="action" value="builddoc">';
-            $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            if ($conf->browser->layout == 'phone') $urlsource .= '#'.$forname.'_form'; // So we switch to form after a generation
+            if (empty($noform)) $out .= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" id="'.$forname.'_form" method="post">';
+            $out .= '<input type="hidden" name="action" value="builddoc">';
+            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-            $out.= load_fiche_titre($titletoshow, '', '');
-            $out.= '<div class="div-table-responsive-no-min">';
-            $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
+            $out .= load_fiche_titre($titletoshow, '', '');
+            $out .= '<div class="div-table-responsive-no-min">';
+            $out .= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
 
-            $out.= '<tr class="liste_titre">';
+            $out .= '<tr class="liste_titre">';
 
-            $addcolumforpicto=($delallowed || $printer || $morepicto);
-            $out.= '<th align="center" colspan="'.(3+($addcolumforpicto?'2':'1')).'" class="formdoc liste_titre maxwidthonsmartphone">';
+            $addcolumforpicto = ($delallowed || $printer || $morepicto);
+            $out .= '<th align="center" colspan="'.(3 + ($addcolumforpicto ? '2' : '1')).'" class="formdoc liste_titre maxwidthonsmartphone">';
 
             // Model
-            if (! empty($modellist))
+            if (!empty($modellist))
             {
-                $out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
+                $out .= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
                 if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
                 {
-                    $arraykeys=array_keys($modellist);
-                    $modelselected=$arraykeys[0];
+                    $arraykeys = array_keys($modellist);
+                    $modelselected = $arraykeys[0];
                 }
-                $out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-                $out.= ajax_combobox('model');
+                $out .= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+                $out .= ajax_combobox('model');
             }
             else
             {
-                $out.= '<div class="float">'.$langs->trans("Files").'</div>';
+                $out .= '<div class="float">'.$langs->trans("Files").'</div>';
             }
 
             // Language code (if multilang)
-            if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
+            if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && !$forcenomultilang && (!empty($modellist) || $showempty))
             {
                 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-                $formadmin=new FormAdmin($this->db);
-                $defaultlang=$codelang?$codelang:$langs->getDefaultLang();
-                $morecss='maxwidth150';
-                if (! empty($conf->browser->phone)) $morecss='maxwidth100';
-                $out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
+                $formadmin = new FormAdmin($this->db);
+                $defaultlang = $codelang ? $codelang : $langs->getDefaultLang();
+                $morecss = 'maxwidth150';
+                if (!empty($conf->browser->phone)) $morecss = 'maxwidth100';
+                $out .= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
             }
             else
             {
-                $out.= '&nbsp;';
+                $out .= '&nbsp;';
             }
 
             // Button
             $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-            $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
-            $genbutton.= '>';
-            if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
+            $genbutton .= ' type="submit" value="'.$buttonlabel.'"';
+            if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) $genbutton .= ' disabled';
+            $genbutton .= '>';
+            if ($allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
             {
                	$langs->load("errors");
-               	$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+               	$genbutton .= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
             }
-            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-            if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
-            $out.= $genbutton;
-            $out.= '</th>';
+            if (!$allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton = '';
+            if (empty($modellist) && !$showempty && $modulepart != 'unpaid') $genbutton = '';
+            $out .= $genbutton;
+            $out .= '</th>';
 
             if (!empty($hookmanager->hooks['formfile']))
             {
-                foreach($hookmanager->hooks['formfile'] as $module)
+                foreach ($hookmanager->hooks['formfile'] as $module)
                 {
                     if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
                 }
             }
-            $out.= '</tr>';
+            $out .= '</tr>';
 
             // Execute hooks
-            $parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
+            $parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart'=>$modulepart);
             if (is_object($hookmanager))
             {
-            	$reshook = $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']);
-            	$out.= $hookmanager->resPrint;
+            	$reshook = $hookmanager->executeHooks('formBuilddocOptions', $parameters, $GLOBALS['object']);
+            	$out .= $hookmanager->resPrint;
             }
 
         }
 
         // Get list of files
-        if (! empty($filedir))
+        if (!empty($filedir))
         {
-            $file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
+            $file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
 
             $link_list = array();
             if (is_object($object))
             {
-                require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+                require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
                 $link = new Link($this->db);
                 $sortfield = $sortorder = null;
                 $res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
             }
 
-            $out.= '<!-- html.formfile::showdocuments -->'."\n";
+            $out .= '<!-- html.formfile::showdocuments -->'."\n";
 
             // Show title of array if not already shown
-            if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && ! $headershown)
+            if ((!empty($file_list) || !empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && !$headershown)
             {
-                $headershown=1;
-                $out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
-                $out.= '<div class="div-table-responsive-no-min">';
-                $out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
+                $headershown = 1;
+                $out .= '<div class="titre">'.$titletoshow.'</div>'."\n";
+                $out .= '<div class="div-table-responsive-no-min">';
+                $out .= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
             }
 
             // Loop on each file found
 			if (is_array($file_list))
 			{
-				foreach($file_list as $file)
+				foreach ($file_list as $file)
 				{
 					// Define relative path for download link (depends on module)
-					$relativepath=$file["name"];										// Cas general
-                    if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
-					if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
+					$relativepath = $file["name"]; // Cas general
+                    if ($modulesubdir) $relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...
+					if ($modulepart == 'export') $relativepath = $file["name"]; // Other case
 
-					$out.= '<tr class="oddeven">';
+					$out .= '<tr class="oddeven">';
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper
 
 					// Show file name with link to download
-					$out.= '<td class="tdoverflowmax300">';
-                    $tmp = $this->showPreview($file,$modulepart,$relativepath,0,$param);
-                    $out.= ($tmp?$tmp.' ':'');
-					$out.= '<a class="documentdownload" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
-					$mime=dol_mimetype($relativepath,'',0);
-					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
-					$out.= ' target="_blank">';
-					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]).' '.$file["name"];
-					$out.= '</a>'."\n";
-					$out.= '</td>';
+					$out .= '<td class="tdoverflowmax300">';
+                    $tmp = $this->showPreview($file, $modulepart, $relativepath, 0, $param);
+                    $out .= ($tmp ? $tmp.' ' : '');
+					$out .= '<a class="documentdownload" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';
+					$mime = dol_mimetype($relativepath, '', 0);
+					if (preg_match('/text/', $mime)) $out .= ' target="_blank"';
+					$out .= ' target="_blank">';
+					$out .= img_mime($file["name"], $langs->trans("File").': '.$file["name"]).' '.$file["name"];
+					$out .= '</a>'."\n";
+					$out .= '</td>';
 
 					// Show file size
-					$size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"]));
-					$out.= '<td align="right" class="nowrap">'.dol_print_size($size).'</td>';
+					$size = (!empty($file['size']) ? $file['size'] : dol_filesize($filedir."/".$file["name"]));
+					$out .= '<td align="right" class="nowrap">'.dol_print_size($size).'</td>';
 
 					// Show file date
-					$date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
-					$out.= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
+					$date = (!empty($file['date']) ? $file['date'] : dol_filemtime($filedir."/".$file["name"]));
+					$out .= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
 
 					if ($delallowed || $printer || $morepicto)
 					{
-						$out.= '<td align="right">';
+						$out .= '<td align="right">';
 						if ($delallowed)
 						{
-							$out.= '<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
-							$out.= ($param?'&amp;'.$param:'');
+							$out .= '<a href="'.$urlsource.(strpos($urlsource, '?') ? '&amp;' : '?').'action=remove_file&amp;file='.urlencode($relativepath);
+							$out .= ($param ? '&amp;'.$param : '');
 							//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
 							//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
-							$out.= '">'.img_picto($langs->trans("Delete"), 'delete.png').'</a>';
+							$out .= '">'.img_picto($langs->trans("Delete"), 'delete.png').'</a>';
 							//$out.='</td>';
 						}
 						if ($printer)
 						{
 							//$out.= '<td align="right">';
-                            $out.= '&nbsp;<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
-                            $out.= ($param?'&amp;'.$param:'');
-                            $out.= '">'.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').'</a>';
+                            $out .= '&nbsp;<a href="'.$urlsource.(strpos($urlsource, '?') ? '&amp;' : '?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
+                            $out .= ($param ? '&amp;'.$param : '');
+                            $out .= '">'.img_picto($langs->trans("PrintFile", $relativepath), 'printer.png').'</a>';
 						}
 						if ($morepicto)
 						{
-							$morepicto=preg_replace('/__FILENAMEURLENCODED__/',urlencode($relativepath),$morepicto);
-                        	$out.=$morepicto;
+							$morepicto = preg_replace('/__FILENAMEURLENCODED__/', urlencode($relativepath), $morepicto);
+                        	$out .= $morepicto;
 						}
-                        $out.='</td>';
+                        $out .= '</td>';
                     }
 
                     if (is_object($hookmanager))
                     {
-            			$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
-                    	$res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
+            			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart'=>$modulepart, 'relativepath'=>$relativepath);
+                    	$res = $hookmanager->executeHooks('formBuilddocLineOptions', $parameters, $file);
                         if (empty($res))
                         {
-                            $out .= $hookmanager->resPrint;		// Complete line
-                            $out.= '</tr>';
+                            $out .= $hookmanager->resPrint; // Complete line
+                            $out .= '</tr>';
                         }
-                        else $out = $hookmanager->resPrint;		// Replace line
+                        else $out = $hookmanager->resPrint; // Replace line
               		}
 				}
 
@@ -776,28 +776,28 @@ 
             // Loop on each file found
             if (is_array($link_list))
             {
-                $colspan=2;
+                $colspan = 2;
 
-                foreach($link_list as $file)
+                foreach ($link_list as $file)
                 {
-                    $out.='<tr class="oddeven">';
-                    $out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
-                    $out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-                    $out.=$file->label;
-                    $out.='</a>';
-                    $out.='</td>';
-                    $out.='<td align="right">';
-                    $out.=dol_print_date($file->datea,'dayhour');
-                    $out.='</td>';
-                    if ($delallowed || $printer || $morepicto) $out.='<td></td>';
-                    $out.='</tr>'."\n";
+                    $out .= '<tr class="oddeven">';
+                    $out .= '<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
+                    $out .= '<a data-ajax="false" href="'.$link->url.'" target="_blank">';
+                    $out .= $file->label;
+                    $out .= '</a>';
+                    $out .= '</td>';
+                    $out .= '<td align="right">';
+                    $out .= dol_print_date($file->datea, 'dayhour');
+                    $out .= '</td>';
+                    if ($delallowed || $printer || $morepicto) $out .= '<td></td>';
+                    $out .= '</tr>'."\n";
                 }
                 $this->numoffiles++;
             }
 
 		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
             {
-	        	$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
+	        	$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
     	    }
 
         }
@@ -805,14 +805,14 @@ 
         if ($headershown)
         {
             // Affiche pied du tableau
-            $out.= "</table>\n";
-            $out.= "</div>\n";
+            $out .= "</table>\n";
+            $out .= "</div>\n";
             if ($genallowed)
             {
-                if (empty($noform)) $out.= '</form>'."\n";
+                if (empty($noform)) $out .= '</form>'."\n";
             }
         }
-        $out.= '<!-- End show_document -->'."\n";
+        $out .= '<!-- End show_document -->'."\n";
         //return ($i?$i:$headershown);
         return $out;
     }
@@ -828,69 +828,69 @@ 
      *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
      *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
      */
-    function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter='')
+    function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '')
     {
         global $conf, $langs;
 
     	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    	$out='';
-    	$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
+    	$out = '';
+    	$this->infofiles = array('nboffiles'=>0, 'extensions'=>array(), 'files'=>array());
 
-    	$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
+    	$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
 
-    	$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
+    	$file_list = dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
 
     	// For ajax treatment
-		$out.= '<!-- html.formfile::getDocumentsLink -->'."\n";
-    	if (! empty($file_list))
+		$out .= '<!-- html.formfile::getDocumentsLink -->'."\n";
+    	if (!empty($file_list))
     	{
-    	    $out='<dl class="dropdown inline-block">
+    	    $out = '<dl class="dropdown inline-block">
     			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight').'</a></dt>
     			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields" style="display: none;">';
-    	    $tmpout='';
+    	    $tmpout = '';
 
     		// Loop on each file found
-    		foreach($file_list as $file)
+    		foreach ($file_list as $file)
     		{
     		    $i++;
-    			if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
+    			if ($filter && !preg_match('/'.$filter.'/i', $file["name"])) continue; // Discard this. It does not match provided filter.
 
     			// Define relative path for download link (depends on module)
-    			$relativepath=$file["name"];								// Cas general
-    			if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+    			$relativepath = $file["name"]; // Cas general
+    			if ($modulesubdir) $relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...
     			// Autre cas
-    			if ($modulepart == 'donation')            {
-    				$relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
+    			if ($modulepart == 'donation') {
+    				$relativepath = get_exdir($modulesubdir, 2, 0, 0, null, 'donation').$file["name"];
     			}
-    			if ($modulepart == 'export')              {
+    			if ($modulepart == 'export') {
     				$relativepath = $file["name"];
     			}
 
     			$this->infofiles['nboffiles']++;
-    			$this->infofiles['files'][]=$file['fullname'];
-    			$ext=pathinfo($file["name"], PATHINFO_EXTENSION);
-    			if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
+    			$this->infofiles['files'][] = $file['fullname'];
+    			$ext = pathinfo($file["name"], PATHINFO_EXTENSION);
+    			if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext] = 1;
     			else $this->infofiles['extensions'][$ext]++;
 
     			// Preview
-    			if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
+    			if (!empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
     			{
                     $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
-                    if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
+                    if ($tmparray && $tmparray['url']) $tmpout .= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css'] ? ' class="'.$tmparray['css'].'"' : '').($tmparray['mime'] ? ' mime="'.$tmparray['mime'].'"' : '').($tmparray['target'] ? ' target="'.$tmparray['target'].'"' : '').'>'.img_picto('', 'detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
     			}
 
     			// Download
-    		    $tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
-    			$mime=dol_mimetype($relativepath,'',0);
-    			if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
-    			$tmpout.= '>';
-    			$tmpout.=img_mime($relativepath, $file["name"]).' ';
-    			$tmpout.= $langs->trans("Download").' '.$ext;
-    			$tmpout.= '</a></li>'."\n";
+    		    $tmpout .= '<li><a class="pictopreview" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
+    			$mime = dol_mimetype($relativepath, '', 0);
+    			if (preg_match('/text/', $mime)) $tmpout .= ' target="_blank"';
+    			$tmpout .= '>';
+    			$tmpout .= img_mime($relativepath, $file["name"]).' ';
+    			$tmpout .= $langs->trans("Download").' '.$ext;
+    			$tmpout .= '</a></li>'."\n";
     		}
-    		$out.=$tmpout;
-    		$out.='</ul></div></dd>
+    		$out .= $tmpout;
+    		$out .= '</ul></div></dd>
     			</dl>';
     	}
     	else
@@ -928,40 +928,40 @@ 
      *  @param	 int	$addfilterfields	Add line with filters
      * 	@return	 int						<0 if KO, nb of files shown if OK
      */
-	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0)
+	function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0)
 	{
 		global $user, $conf, $langs, $hookmanager;
-		global $bc,$bcdd;
+		global $bc, $bcdd;
 		global $sortfield, $sortorder, $maxheightmini;
 
 		// Define relative path used to store the file
 		if (empty($relativepath))
 		{
-		    $relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
-		    if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
-		    if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+		    $relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
+		    if ($object->element == 'invoice_supplier') $relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath
+		    if ($object->element == 'project_task') $relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';
 		}
 		// For backward compatiblity, we detect file is stored into an old path
-		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $file['level1name'] == 'photos')
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $file['level1name'] == 'photos')
 		{
-		    $relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/';
+		    $relativepath = preg_replace('/^.*\/produit\//', '', $file['path']).'/';
 		}
 		// Defined relative dir to DOL_DATA_ROOT
 		$relativedir = '';
 		if ($upload_dir)
 		{
-    		$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-    		$relativedir = preg_replace('/^[\\/]/','',$relativedir);
+    		$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
+    		$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
 		}
 
 		$hookmanager->initHooks(array('formfile'));
-		$parameters=array(
+		$parameters = array(
 				'filearray' => $filearray,
 				'modulepart'=> $modulepart,
 				'param' => $param,
 				'forcedownload' => $forcedownload,
-				'relativepath' => $relativepath,    // relative filename to module dir
-				'relativedir' => $relativedir,      // relative dirname to DOL_DATA_ROOT
+				'relativepath' => $relativepath, // relative filename to module dir
+				'relativedir' => $relativedir, // relative dirname to DOL_DATA_ROOT
 				'permtodelete' => $permonobject,
 				'useinecm' => $useinecm,
 				'textifempty' => $textifempty,
@@ -969,7 +969,7 @@ 
 				'title' => $title,
 				'url' => $url
 		);
-		$reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
+		$reshook = $hookmanager->executeHooks('showFilesList', $parameters, $object);
 
 		if (isset($reshook) && $reshook != '') // null or '' for bypass
 		{
@@ -977,29 +977,29 @@ 
 		}
 		else
 		{
-			$param = (isset($object->id)?'&id='.$object->id:'').$param;
+			$param = (isset($object->id) ? '&id='.$object->id : '').$param;
 
 			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
 			{
-			    $permtoeditline=0;
-			    if (in_array($modulepart, array('product','produit','service')))
+			    $permtoeditline = 0;
+			    if (in_array($modulepart, array('product', 'produit', 'service')))
 			    {
-			        if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
-			        if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
+			        if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline = 1;
+			        if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline = 1;
 			    }
 			}
 			if (empty($conf->global->MAIN_UPLOAD_DOC))
 			{
-			    $permtoeditline=0;
-			    $permonobject=0;
+			    $permtoeditline = 0;
+			    $permonobject = 0;
 			}
 
 			// Show list of existing files
-			if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
-			if (empty($url)) $url=$_SERVER["PHP_SELF"];
+			if (empty($useinecm)) print load_fiche_titre($title ? $title : $langs->trans("AttachedFiles"));
+			if (empty($url)) $url = $_SERVER["PHP_SELF"];
 
 			print '<!-- html.formfile::list_of_documents -->'."\n";
-			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)
 			{
 			    print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
 			    print '<input type="hidden" name="action" value="renamefile">';
@@ -1008,27 +1008,27 @@ 
 			}
 
 			print '<div class="div-table-responsive-no-min">';
-			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
+			print '<table width="100%" id="tablelines" class="'.($useinecm ? 'liste noborder' : 'liste').'">'."\n";
 
-			if (! empty($addfilterfields))
+			if (!empty($addfilterfields))
 			{
 				print '<tr class="liste_titre nodrag nodrop">';
-				print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref','alpha')).'"></td>';
+				print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref', 'alpha')).'"></td>';
 				print '<td></td>';
 				print '<td></td>';
 				if (empty($useinecm)) print '<td></td>';
 				print '<td></td>';
-				if (! $disablemove) print '<td></td>';
+				if (!$disablemove) print '<td></td>';
 				print "</tr>\n";
 			}
 
 			print '<tr class="liste_titre nodrag nodrop">';
-			print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
-			print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');
+			print_liste_field_titre('Documents2', $url, "name", "", $param, 'align="left"', $sortfield, $sortorder);
+			print_liste_field_titre('Size', $url, "size", "", $param, 'align="right"', $sortfield, $sortorder);
+			print_liste_field_titre('Date', $url, "date", "", $param, 'align="center"', $sortfield, $sortorder);
+			if (empty($useinecm)) print_liste_field_titre('', $url, "", "", $param, 'align="center"');
 			print_liste_field_titre('');
-			if (! $disablemove) print_liste_field_titre('');
+			if (!$disablemove) print_liste_field_titre('');
 			print "</tr>\n";
 
 			// Get list of files stored into database for same relative directory
@@ -1040,51 +1040,51 @@ 
 				var_dump($sortorder);*/
     			if ($sortfield && $sortorder)
     			{
-        			$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+        			$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
     			}
     			//var_dump($filearray);
 			}
 
-			$nboffiles=count($filearray);
+			$nboffiles = count($filearray);
 			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-			$var=true; $i=0; $nboflines = 0; $lastrowid=0;
-			foreach($filearray as $key => $file)      // filearray must be only files here
+			$var = true; $i = 0; $nboflines = 0; $lastrowid = 0;
+			foreach ($filearray as $key => $file)      // filearray must be only files here
 			{
 				if ($file['name'] != '.'
 						&& $file['name'] != '..'
-						&& ! preg_match('/\.meta$/i',$file['name']))
+						&& !preg_match('/\.meta$/i', $file['name']))
 				{
 					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
 
-					$editline=0;
+					$editline = 0;
 					$nboflines++;
 			        print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
 			        // Do we have entry into database ?
 			        print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
-					print '<tr id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'-AFTER'.$lastrowid.'POS'.($i+1)).'" '.$bcdd[$var].'>';
+					print '<tr id="row-'.($filearray[$key]['rowid'] > 0 ? $filearray[$key]['rowid'] : '-AFTER'.$lastrowid.'POS'.($i + 1)).'" '.$bcdd[$var].'>';
 					print '<td class="tdoverflowmax300">';
 
-					$filepath=$relativepath.$file['name'];
+					$filepath = $relativepath.$file['name'];
 
-					if (! $editline) print $this->showPreview($file,$modulepart,$filepath);
+					if (!$editline) print $this->showPreview($file, $modulepart, $filepath);
 
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a class="paddingleft" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) print '&attachment=1';
-					if (! empty($object->entity)) print '&entity='.$object->entity;
+					if (!empty($object->entity)) print '&entity='.$object->entity;
 					print '&file='.urlencode($filepath);
 					print '">';
 
-					print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
+					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')').' ';
 					if ($showrelpart == 1) print $relativepath;
 					//print dol_trunc($file['name'],$maxlength,'middle');
-					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile')))
+					if (GETPOST('action', 'aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile')))
 					{
 					    print '</a>';
 					    print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
 					    print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
-					    $editline=1;
+					    $editline = 1;
 					}
 					else
 					{
@@ -1094,9 +1094,9 @@ 
 
 					print "</td>\n";
 
-					print '<td align="right" width="80px">'.dol_print_size($file['size'],1,1).'</td>';
+					print '<td align="right" width="80px">'.dol_print_size($file['size'], 1, 1).'</td>';
 
-					print '<td align="center" width="130px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';
+					print '<td align="center" width="130px">'.dol_print_date($file['date'], "dayhour", "tzuser").'</td>';
 
 					// Preview
 					if (empty($useinecm))
@@ -1105,20 +1105,20 @@ 
 						print '<td align="center">';
 						if (image_format_supported($file['name']) > 0)
 						{
-						    $minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-						    if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+						    $minifile = getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+						    if (!dol_is_file($file['path'].'/'.$minifile)) $minifile = getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
 						    //print $file['path'].'/'.$minifile.'<br>';
 
-						    $urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 0, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
-						    if (empty($urlforhref)) $urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+						    $urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+						    if (empty($urlforhref)) $urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
 						    print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
-							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
+							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
 							print '</a>';
 						}
 						else print '&nbsp;';
 						print '</td>';
 					}
-					if (! $editline)
+					if (!$editline)
 					{
     					// Delete or view link
     					// ($param must start with &)
@@ -1129,24 +1129,24 @@ 
     					}
     					else
     					{
-        					$newmodulepart=$modulepart;
-        					if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
+        					$newmodulepart = $modulepart;
+        					if (in_array($modulepart, array('product', 'produit', 'service'))) $newmodulepart = 'produit|service';
 
-        					$disablecrop=1;
-        					if (in_array($modulepart, array('product','produit','service','expensereport','holiday','project','user'))) $disablecrop=0;
+        					$disablecrop = 1;
+        					if (in_array($modulepart, array('product', 'produit', 'service', 'expensereport', 'holiday', 'project', 'user'))) $disablecrop = 0;
 
-    					    if (! $disablecrop && image_format_supported($file['name']) > 0)
+    					    if (!$disablecrop && image_format_supported($file['name']) > 0)
     						{
     							if ($permtoeditline)
     							{
        								// Link to resize
-       			               		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','class="paddingrightonly"',1).'</a>';
+       			               		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), DOL_URL_ROOT.'/theme/common/transform-crop-and-resize', 'class="paddingrightonly"', 1).'</a>';
     							}
     						}
 
     						if ($permtoeditline)
     						{
-    						    print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
+    						    print '<a href="'.(($useinecm && $useajax) ? '#' : $url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
     						}
     					}
     					if ($permonobject)
@@ -1157,12 +1157,12 @@ 
     						else
     							$filepath=$file['name'];
     						*/
-    						$useajax=1;
-    						if (! empty($conf->dol_use_jmobile)) $useajax=0;
-    						if (empty($conf->use_javascript_ajax)) $useajax=0;
-    						if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
+    						$useajax = 1;
+    						if (!empty($conf->dol_use_jmobile)) $useajax = 0;
+    						if (empty($conf->use_javascript_ajax)) $useajax = 0;
+    						if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax = 0;
 
-    						print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
+    						print '<a href="'.(($useinecm && $useajax) ? '#' : $url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
     					}
 					    print "</td>";
 
@@ -1171,15 +1171,15 @@ 
     					    if ($nboffiles > 1 && empty($conf->browser->phone)) {
     					    	print '<td align="center" class="linecolmove tdlineupdown">';
     					    	if ($i > 0) {
-    					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
+    					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default', 0, 'imgupforline').'</a>';
     					    	}
-    					        if ($i < $nboffiles-1) {
-    					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
+    					        if ($i < $nboffiles - 1) {
+    					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
     				    		}
     					    	print '</td>';
     					    }
     					    else {
-    					       	print '<td align="center"'.((empty($conf->browser->phone) && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
+    					       	print '<td align="center"'.((empty($conf->browser->phone) && empty($disablemove)) ? ' class="linecolmove tdlineupdown"' : ' class="linecolmove"').'>';
     					       	print '</td>';
     					    }
 					   }
@@ -1199,7 +1199,7 @@ 
 			}
 			if ($nboffiles == 0)
 			{
-			    $colspan=(empty($useinecm)?'5':'5');
+			    $colspan = (empty($useinecm) ? '5' : '5');
 			    if (empty($disablemove)) $colspan++;
 				print '<tr '.$bc[false].'><td colspan="'.$colspan.'" class="opacitymedium">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
@@ -1209,14 +1209,14 @@ 
 			print "</table>";
 			print '</div>';
 
-			if (! $editline && $nboflines > 1) {
-				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
+			if (!$editline && $nboflines > 1) {
+				if (!empty($conf->use_javascript_ajax) && $permtoeditline) {
 				    $table_element_line = 'ecm_files';
-				    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+				    include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 				}
 			}
 
-			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)
 			{
 			    print '</form>';
 			}
@@ -1243,7 +1243,7 @@ 
      *  @param	int		$addfilterfields	Add line with filters
      *  @return int                 		<0 if KO, nb of files shown if OK
      */
-    function list_of_autoecmfiles($upload_dir,$filearray,$modulepart,$param,$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$url='',$addfilterfields=0)
+    function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permtodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0)
     {
         global $user, $conf, $langs, $form;
         global $bc;
@@ -1254,9 +1254,9 @@ 
 
         // Show list of documents
         if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
-        if (empty($url)) $url=$_SERVER["PHP_SELF"];
+        if (empty($url)) $url = $_SERVER["PHP_SELF"];
 
-        if (! empty($addfilterfields))
+        if (!empty($addfilterfields))
         {
         	print '<form action="'.$_SERVER['PHP_SELF'].'">';
         	print '<input type="hidden" name="module" value="'.$modulepart.'">';
@@ -1265,7 +1265,7 @@ 
 		print '<div class="div-table-responsive-no-min">';
         print '<table width="100%" class="noborder">'."\n";
 
-        if (! empty($addfilterfields))
+        if (!empty($addfilterfields))
         {
         	print '<tr class="liste_titre nodrag nodrop">';
         	print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
@@ -1274,130 +1274,130 @@ 
         	print '<td></td>';
 			// Action column
 			print '<td class="liste_titre" align="middle">';
-			$searchpicto=$form->showFilterButtons();
+			$searchpicto = $form->showFilterButtons();
 			print $searchpicto;
 			print '</td>';
         	print "</tr>\n";
         }
 
         print '<tr class="liste_titre">';
-        $sortref="fullname";
-        if ($modulepart == 'invoice_supplier') $sortref='level1name';
-        print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
-        print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
-        print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
-        print_liste_field_titre("Date",$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-        print_liste_field_titre('','','');
+        $sortref = "fullname";
+        if ($modulepart == 'invoice_supplier') $sortref = 'level1name';
+        print_liste_field_titre("Ref", $url, $sortref, "", $param, 'align="left"', $sortfield, $sortorder);
+        print_liste_field_titre("Documents2", $url, "name", "", $param, 'align="left"', $sortfield, $sortorder);
+        print_liste_field_titre("Size", $url, "size", "", $param, 'align="right"', $sortfield, $sortorder);
+        print_liste_field_titre("Date", $url, "date", "", $param, 'align="center"', $sortfield, $sortorder);
+        print_liste_field_titre('', '', '');
         print '</tr>'."\n";
 
         // To show ref or specific information according to view to show (defined by $module)
         if ($modulepart == 'company')
         {
             include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-            $object_instance=new Societe($this->db);
+            $object_instance = new Societe($this->db);
         }
         else if ($modulepart == 'invoice')
         {
             include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-            $object_instance=new Facture($this->db);
+            $object_instance = new Facture($this->db);
         }
         else if ($modulepart == 'invoice_supplier')
         {
             include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-            $object_instance=new FactureFournisseur($this->db);
+            $object_instance = new FactureFournisseur($this->db);
         }
         else if ($modulepart == 'propal')
         {
             include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-            $object_instance=new Propal($this->db);
+            $object_instance = new Propal($this->db);
         }
         else if ($modulepart == 'supplier_proposal')
         {
             include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-            $object_instance=new SupplierProposal($this->db);
+            $object_instance = new SupplierProposal($this->db);
         }
         else if ($modulepart == 'order')
         {
             include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-            $object_instance=new Commande($this->db);
+            $object_instance = new Commande($this->db);
         }
         else if ($modulepart == 'order_supplier')
         {
             include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-            $object_instance=new CommandeFournisseur($this->db);
+            $object_instance = new CommandeFournisseur($this->db);
         }
         else if ($modulepart == 'contract')
         {
             include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-            $object_instance=new Contrat($this->db);
+            $object_instance = new Contrat($this->db);
         }
         else if ($modulepart == 'product')
         {
             include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-            $object_instance=new Product($this->db);
+            $object_instance = new Product($this->db);
         }
         else if ($modulepart == 'tax')
         {
             include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-            $object_instance=new ChargeSociales($this->db);
+            $object_instance = new ChargeSociales($this->db);
         }
         else if ($modulepart == 'project')
         {
         	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-        	$object_instance=new Project($this->db);
+        	$object_instance = new Project($this->db);
         }
         else if ($modulepart == 'fichinter')
         {
         	include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-        	$object_instance=new Fichinter($this->db);
+        	$object_instance = new Fichinter($this->db);
         }
         else if ($modulepart == 'user')
         {
         	include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-        	$object_instance=new User($this->db);
+        	$object_instance = new User($this->db);
         }
         else if ($modulepart == 'expensereport')
         {
         	include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-        	$object_instance=new ExpenseReport($this->db);
+        	$object_instance = new ExpenseReport($this->db);
         }
 
-        $var=true;
-        foreach($filearray as $key => $file)
+        $var = true;
+        foreach ($filearray as $key => $file)
         {
         	if (!is_dir($file['name'])
             && $file['name'] != '.'
             && $file['name'] != '..'
             && $file['name'] != 'CVS'
-            && ! preg_match('/\.meta$/i',$file['name']))
+            && !preg_match('/\.meta$/i', $file['name']))
             {
                 // Define relative path used to store the file
-                $relativefile=preg_replace('/'.preg_quote($upload_dir.'/','/').'/','',$file['fullname']);
+                $relativefile = preg_replace('/'.preg_quote($upload_dir.'/', '/').'/', '', $file['fullname']);
 
                 //var_dump($file);
-                $id=0; $ref=''; $label='';
+                $id = 0; $ref = ''; $label = '';
 
                 // To show ref or specific information according to view to show (defined by $module)
-                if ($modulepart == 'company')           { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'invoice')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'invoice_supplier')  { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } }	// $ref may be also id with old supplier invoices
-                if ($modulepart == 'propal')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'order')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'order_supplier')    { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'contract')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'product')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'tax')               { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-                if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-                if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-                if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-
-                if (! $id && ! $ref) continue;
-                $found=0;
-                if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
+                if ($modulepart == 'company') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'invoice') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) { $id = $ref; $ref = ''; } }	// $ref may be also id with old supplier invoices
+                if ($modulepart == 'propal') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+				if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'order') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'order_supplier') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'contract') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'product') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'project') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'fichinter') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'user') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
+                if ($modulepart == 'expensereport') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
+
+                if (!$id && !$ref) continue;
+                $found = 0;
+                if (!empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
                 {
-                    $found=1;
+                    $found = 1;
                 }
                 else
                 {
@@ -1416,24 +1416,24 @@ 
                     }
 
 					if ($result > 0) {  // Save object into a cache
-						$found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
+						$found = 1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
 					}
-                    if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
+                    if ($result == 0) { $found = 1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = 'notfound'; unset($filearray[$key]); }
                 }
 
-                if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
+                if (!$found > 0 || !is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue; // We do not show orphelins files
 
                 print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
                 print '<tr class="oddeven">';
                 print '<td>';
-                if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
-                else print $langs->trans("ObjectDeleted",($id?$id:$ref));
+                if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1, 'document');
+                else print $langs->trans("ObjectDeleted", ($id ? $id : $ref));
 
                 //$modulesubdir=dol_sanitizeFileName($ref);
-                $modulesubdir=dirname($relativefile);
+                $modulesubdir = dirname($relativefile);
 
                 //$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-                $filedir=$file['path'];
+                $filedir = $file['path'];
                 //$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
                 //print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
 
@@ -1445,15 +1445,15 @@ 
                 print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
                 if ($forcedownload) print '&attachment=1';
                 print '&file='.urlencode($relativefile).'">';
-                print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
-                print dol_trunc($file['name'],$maxlength,'middle');
+                print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')').' ';
+                print dol_trunc($file['name'], $maxlength, 'middle');
                 print '</a>';
 
-                print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$');
+                print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'], '/').'$');
 
                 print "</td>\n";
-                print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
-                print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
+                print '<td align="right">'.dol_print_size($file['size'], 1, 1).'</td>';
+                print '<td align="center">'.dol_print_date($file['date'], "dayhour").'</td>';
                 print '<td align="right">';
                 //if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
                 //if ($forcedownload) print '&attachment=1';
@@ -1475,7 +1475,7 @@ 
         print "</table>";
         print '</div>';
 
-        if (! empty($addfilterfields)) print '</form>';
+        if (!empty($addfilterfields)) print '</form>';
         // Fin de zone
     }
 
@@ -1501,7 +1501,7 @@ 
         $mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));
         $upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;
         // Max file size
-        $max_file_size 				= (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
+        $max_file_size = (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
 
         // Include main
         include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';
@@ -1521,7 +1521,7 @@ 
      * @param	string		$param			More param to add into URL
      * @return 	int							Number of links
      */
-    public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
+    public function listOfLinks($object, $permtodelete = 1, $action = null, $selected = null, $param = '')
     {
         global $user, $conf, $langs, $user;
         global $bc;
@@ -1529,7 +1529,7 @@ 
 
         $langs->load("link");
 
-        require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
         $link = new Link($this->db);
         $links = array();
         if ($sortfield == "name") {
@@ -1540,12 +1540,12 @@ 
             $sortfield = null;
         }
         $res = $link->fetchAll($links, $object->element, $object->id, $sortfield, $sortorder);
-        $param .= (isset($object->id)?'&id=' . $object->id : '');
+        $param .= (isset($object->id) ? '&id='.$object->id : '');
 
         // Show list of associated links
         print load_fiche_titre($langs->trans("LinkedFiles"));
 
-        print '<form action="' . $_SERVER['PHP_SELF'] . ($param?'?'.$param:'') . '" method="POST">';
+        print '<form action="'.$_SERVER['PHP_SELF'].($param ? '?'.$param : '').'" method="POST">';
 
         print '<table width="100%" class="liste">';
         print '<tr class="liste_titre">';
@@ -1585,7 +1585,7 @@ 
             $param,
             'align="center"'
         );
-        print_liste_field_titre('','','');
+        print_liste_field_titre('', '', '');
         print '</tr>';
         $nboflinks = count($links);
         if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -1593,42 +1593,42 @@ 
         $var = true;
         foreach ($links as $link)
         {
-            $var =! $var;
-            print '<tr ' . $bc[$var] . '>';
+            $var = !$var;
+            print '<tr '.$bc[$var].'>';
             //edit mode
             if ($action == 'update' && $selected === $link->id)
             {
                 print '<td>';
-                print '<input type="hidden" name="id" value="' . $object->id . '">';
-                print '<input type="hidden" name="linkid" value="' . $link->id . '">';
+                print '<input type="hidden" name="id" value="'.$object->id.'">';
+                print '<input type="hidden" name="linkid" value="'.$link->id.'">';
                 print '<input type="hidden" name="action" value="confirm_updateline">';
-                print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
+                print $langs->trans('Link').': <input type="text" name="link" value="'.$link->url.'">';
                 print '</td>';
                 print '<td>';
-                print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';
+                print $langs->trans('Label').': <input type="text" name="label" value="'.$link->label.'">';
                 print '</td>';
-                print '<td align="center">' . dol_print_date(dol_now(), "dayhour", "tzuser") . '</td>';
+                print '<td align="center">'.dol_print_date(dol_now(), "dayhour", "tzuser").'</td>';
                 print '<td align="right"></td>';
                 print '<td align="right">';
-                print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
-                print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
+                print '<input type="submit" name="save" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
+                print '<input type="submit" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'">';
                 print '</td>';
             }
             else
 			{
                 print '<td>';
                 print img_picto('', 'object_globe').' ';
-                print '<a data-ajax="false" href="' . $link->url . '" target="_blank">';
+                print '<a data-ajax="false" href="'.$link->url.'" target="_blank">';
                 print $link->label;
                 print '</a>';
                 print '</td>'."\n";
                 print '<td align="right"></td>';
-                print '<td align="center">' . dol_print_date($link->datea, "dayhour", "tzuser") . '</td>';
+                print '<td align="center">'.dol_print_date($link->datea, "dayhour", "tzuser").'</td>';
                 print '<td align="center"></td>';
                 print '<td align="right">';
-                print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '" class="editfilelink" >' . img_edit() . '</a>';	// id= is included into $param
+                print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'" class="editfilelink" >'.img_edit().'</a>'; // id= is included into $param
                 if ($permtodelete) {
-                    print ' &nbsp; <a href="'. $_SERVER['PHP_SELF'] .'?action=delete&linkid=' . $link->id . $param . '" class="deletefilelink">' . img_delete() . '</a>';	// id= is included into $param
+                    print ' &nbsp; <a href="'.$_SERVER['PHP_SELF'].'?action=delete&linkid='.$link->id.$param.'" class="deletefilelink">'.img_delete().'</a>'; // id= is included into $param
                 } else {
                     print '&nbsp;';
                 }
@@ -1638,7 +1638,7 @@ 
         }
         if ($nboflinks == 0)
         {
-            print '<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">';
+            print '<tr '.$bc[false].'><td colspan="5" class="opacitymedium">';
             print $langs->trans("NoLinkFound");
             print '</td></tr>';
         }
@@ -1660,21 +1660,21 @@ 
      * @param	string	  $param		  More param on http links
      * @return  string    $out            Output string with HTML
      */
-    public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
+    public function showPreview($file, $modulepart, $relativepath, $ruleforpicto = 0, $param = '')
     {
         global $langs, $conf;
 
-        $out='';
-        if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
+        $out = '';
+        if ($conf->browser->layout != 'phone' && !empty($conf->use_javascript_ajax))
         {
-            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
+            $urladvancedpreview = getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param); // Return if a file is qualified for preview.
             if (count($urladvancedpreview))
             {
-                $out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
+                $out .= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime']) ? '' : ' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target']) ? '' : ' target="'.$urladvancedpreview['target'].'"').'>';
                 //$out.= '<a class="pictopreview">';
-            	if (empty($ruleforpicto)) $out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
-                else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
-                $out.= '</a>';
+            	if (empty($ruleforpicto)) $out .= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
+                else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+                $out .= '</a>';
             }
         }
         return $out;