Dolibarr / dolibarr

htdocs/projet/class/project.class.php

Indentation +1293 added lines, -1293 removed lines

@@ -33,49 +33,49 @@ 
 class Project extends CommonObject
 {
 
-    public $element = 'project';    //!< Id that identify managed objects
-    public $table_element = 'projet';  //!< Name of table without prefix where object is stored
-    public $table_element_line = 'projet_task';
-    public $fk_element = 'fk_projet';
-    protected $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto = 'projectpub';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
-
-    var $description;
+	public $element = 'project';    //!< Id that identify managed objects
+	public $table_element = 'projet';  //!< Name of table without prefix where object is stored
+	public $table_element_line = 'projet_task';
+	public $fk_element = 'fk_projet';
+	protected $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $picto = 'projectpub';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
+
+	var $description;
 	/**
 	 * @var string
 	 * @deprecated
 	 * @see title
 	 */
 	public $titre;
-    var $title;
-    var $date_start;
-    var $date_end;
-    var $date_close;
+	var $title;
+	var $date_start;
+	var $date_end;
+	var $date_close;
 
-    var $socid;             // To store id of thirdparty
-    var $thirdparty_name;   // To store name of thirdparty (defined only in some cases)
+	var $socid;             // To store id of thirdparty
+	var $thirdparty_name;   // To store name of thirdparty (defined only in some cases)
 
-    var $user_author_id;    //!< Id of project creator. Not defined if shared project.
+	var $user_author_id;    //!< Id of project creator. Not defined if shared project.
 	var $user_close_id;
-    var $public;      //!< Tell if this is a public or private project
-    var $budget_amount;
+	var $public;      //!< Tell if this is a public or private project
+	var $budget_amount;
 
-    var $statuts_short;
-    var $statuts_long;
+	var $statuts_short;
+	var $statuts_long;
 
-    var $statut;			// 0=draft, 1=opened, 2=closed
-    var $opp_status;		// opportunity status, into table llx_c_lead_status
+	var $statut;			// 0=draft, 1=opened, 2=closed
+	var $opp_status;		// opportunity status, into table llx_c_lead_status
 	var $opp_percent;		// opportunity probability
 
-    var $oldcopy;
+	var $oldcopy;
 
-    var $weekWorkLoad;			// Used to store workload details of a projet
-    var $weekWorkLoadPerTask;	// Used to store workload details of tasks of a projet
+	var $weekWorkLoad;			// Used to store workload details of a projet
+	var $weekWorkLoadPerTask;	// Used to store workload details of tasks of a projet
 
 	/**
 	 * @var int Creation date
@@ -118,411 +118,411 @@ 
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->statuts_short = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
-        $this->statuts_long = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
-    }
+		$this->statuts_short = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
+		$this->statuts_long = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
+	}
 
-    /**
-     *    Create a project into database
-     *
-     *    @param    User	$user       	User making creation
-     *    @param	int		$notrigger		Disable triggers
-     *    @return   int         			<0 if KO, id of created project if OK
-     */
-    function create($user, $notrigger=0)
-    {
-        global $conf, $langs;
+	/**
+	 *    Create a project into database
+	 *
+	 *    @param    User	$user       	User making creation
+	 *    @param	int		$notrigger		Disable triggers
+	 *    @return   int         			<0 if KO, id of created project if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf, $langs;
 
-        $error = 0;
-        $ret = 0;
+		$error = 0;
+		$ret = 0;
 
-        $now=dol_now();
+		$now=dol_now();
 
-        // Check parameters
-        if (!trim($this->ref))
-        {
-            $this->error = 'ErrorFieldsRequired';
-            dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
-            return -1;
-        }
-        if (! empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && ! $this->socid > 0)
-        {
-            $this->error = 'ErrorFieldsRequired';
-            dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
-            return -1;
-        }
+		// Check parameters
+		if (!trim($this->ref))
+		{
+			$this->error = 'ErrorFieldsRequired';
+			dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
+			return -1;
+		}
+		if (! empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && ! $this->socid > 0)
+		{
+			$this->error = 'ErrorFieldsRequired';
+			dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
+			return -1;
+		}
 
-        $this->db->begin();
-
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "projet (";
-        $sql.= "ref";
-        $sql.= ", title";
-        $sql.= ", description";
-        $sql.= ", fk_soc";
-        $sql.= ", fk_user_creat";
-        $sql.= ", fk_statut";
-        $sql.= ", fk_opp_status";
-        $sql.= ", opp_percent";
-        $sql.= ", public";
-        $sql.= ", datec";
-        $sql.= ", dateo";
-        $sql.= ", datee";
-        $sql.= ", opp_amount";
-        $sql.= ", budget_amount";
-        $sql.= ", entity";
-        $sql.= ") VALUES (";
-        $sql.= "'" . $this->db->escape($this->ref) . "'";
-        $sql.= ", '" . $this->db->escape($this->title) . "'";
-        $sql.= ", '" . $this->db->escape($this->description) . "'";
-        $sql.= ", " . ($this->socid > 0 ? $this->socid : "null");
-        $sql.= ", " . $user->id;
-        $sql.= ", ".(is_numeric($this->statut) ? $this->statut : '0');
-        $sql.= ", ".(is_numeric($this->opp_status) ? $this->opp_status : 'NULL');
-        $sql.= ", ".(is_numeric($this->opp_percent) ? $this->opp_percent : 'NULL');
-        $sql.= ", " . ($this->public ? 1 : 0);
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ", " . ($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
-        $sql.= ", " . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
-        $sql.= ", " . (strcmp($this->opp_amount,'') ? price2num($this->opp_amount) : 'null');
-        $sql.= ", " . (strcmp($this->budget_amount,'') ? price2num($this->budget_amount) : 'null');
-        $sql.= ", ".$conf->entity;
-        $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 . "projet");
-            $ret = $this->id;
-
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('PROJECT_CREATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->errno = $this->db->lasterrno();
-            $error++;
-        }
+		$this->db->begin();
 
-        // Update extrafield
-        if (!$error) {
-        	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-        	{
-        		$result=$this->insertExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        		}
-        	}
-        }
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "projet (";
+		$sql.= "ref";
+		$sql.= ", title";
+		$sql.= ", description";
+		$sql.= ", fk_soc";
+		$sql.= ", fk_user_creat";
+		$sql.= ", fk_statut";
+		$sql.= ", fk_opp_status";
+		$sql.= ", opp_percent";
+		$sql.= ", public";
+		$sql.= ", datec";
+		$sql.= ", dateo";
+		$sql.= ", datee";
+		$sql.= ", opp_amount";
+		$sql.= ", budget_amount";
+		$sql.= ", entity";
+		$sql.= ") VALUES (";
+		$sql.= "'" . $this->db->escape($this->ref) . "'";
+		$sql.= ", '" . $this->db->escape($this->title) . "'";
+		$sql.= ", '" . $this->db->escape($this->description) . "'";
+		$sql.= ", " . ($this->socid > 0 ? $this->socid : "null");
+		$sql.= ", " . $user->id;
+		$sql.= ", ".(is_numeric($this->statut) ? $this->statut : '0');
+		$sql.= ", ".(is_numeric($this->opp_status) ? $this->opp_status : 'NULL');
+		$sql.= ", ".(is_numeric($this->opp_percent) ? $this->opp_percent : 'NULL');
+		$sql.= ", " . ($this->public ? 1 : 0);
+		$sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ", " . ($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
+		$sql.= ", " . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
+		$sql.= ", " . (strcmp($this->opp_amount,'') ? price2num($this->opp_amount) : 'null');
+		$sql.= ", " . (strcmp($this->budget_amount,'') ? price2num($this->budget_amount) : 'null');
+		$sql.= ", ".$conf->entity;
+		$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 . "projet");
+			$ret = $this->id;
 
-        if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
-        {
-            $res = $this->setValid($user);
-            if ($res < 0) $error++;
-        }
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROJECT_CREATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			$this->errno = $this->db->lasterrno();
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $this->db->commit();
-            return $ret;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     * Update a project
-     *
-     * @param  User		$user       User object of making update
-     * @param  int		$notrigger  1=Disable all triggers
-     * @return int                  <=0 if KO, >0 if OK
-     */
-    function update($user, $notrigger=0)
-    {
-        global $langs, $conf;
+		// 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 && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
+		{
+			$res = $this->setValid($user);
+			if ($res < 0) $error++;
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+			return $ret;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Update a project
+	 *
+	 * @param  User		$user       User object of making update
+	 * @param  int		$notrigger  1=Disable all triggers
+	 * @return int                  <=0 if KO, >0 if OK
+	 */
+	function update($user, $notrigger=0)
+	{
+		global $langs, $conf;
 
 		$error=0;
 
-        // Clean parameters
-        $this->title = trim($this->title);
-        $this->description = trim($this->description);
+		// Clean parameters
+		$this->title = trim($this->title);
+		$this->description = trim($this->description);
 		if ($this->opp_amount < 0) $this->opp_amount='';
 		if ($this->opp_percent < 0) $this->opp_percent='';
-        if ($this->date_end && $this->date_end < $this->date_start)
-        {
-            $this->error = $langs->trans("ErrorDateEndLowerThanDateStart");
-            $this->errors[] = $this->error;
-            $this->db->rollback();
-            dol_syslog(get_class($this)."::update error -3 " . $this->error, LOG_ERR);
-            return -3;
-        }
+		if ($this->date_end && $this->date_end < $this->date_start)
+		{
+			$this->error = $langs->trans("ErrorDateEndLowerThanDateStart");
+			$this->errors[] = $this->error;
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::update error -3 " . $this->error, LOG_ERR);
+			return -3;
+		}
 
-        if (dol_strlen(trim($this->ref)) > 0)
-        {
-            $this->db->begin();
-
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet SET";
-            $sql.= " ref='" . $this->db->escape($this->ref) . "'";
-            $sql.= ", title = '" . $this->db->escape($this->title) . "'";
-            $sql.= ", description = '" . $this->db->escape($this->description) . "'";
-            $sql.= ", fk_soc = " . ($this->socid > 0 ? $this->socid : "null");
-            $sql.= ", fk_statut = " . $this->statut;
-            $sql.= ", fk_opp_status = " . ((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'null');
+		if (dol_strlen(trim($this->ref)) > 0)
+		{
+			$this->db->begin();
+
+			$sql = "UPDATE " . MAIN_DB_PREFIX . "projet SET";
+			$sql.= " ref='" . $this->db->escape($this->ref) . "'";
+			$sql.= ", title = '" . $this->db->escape($this->title) . "'";
+			$sql.= ", description = '" . $this->db->escape($this->description) . "'";
+			$sql.= ", fk_soc = " . ($this->socid > 0 ? $this->socid : "null");
+			$sql.= ", fk_statut = " . $this->statut;
+			$sql.= ", fk_opp_status = " . ((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'null');
 			$sql.= ", opp_percent = " . ((is_numeric($this->opp_percent) && $this->opp_percent != '') ? $this->opp_percent : 'null');
-            $sql.= ", public = " . ($this->public ? 1 : 0);
-            $sql.= ", datec=" . ($this->date_c != '' ? "'".$this->db->idate($this->date_c)."'" : '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.= ", date_close=" . ($this->date_close != '' ? "'".$this->db->idate($this->date_close)."'" : 'null');
-            $sql.= ", fk_user_close=" . ($this->fk_user_close > 0 ? $this->fk_user_close : "null");
-            $sql.= ", opp_amount = " . (strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : "null");
-            $sql.= ", budget_amount = " . (strcmp($this->budget_amount, '')  ? price2num($this->budget_amount) : "null");
-            $sql.= " WHERE rowid = " . $this->id;
-
-            dol_syslog(get_class($this)."::update", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if ($resql)
-            {
-                if (!$notrigger)
-                {
-                    // Call trigger
-                    $result=$this->call_trigger('PROJECT_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)
-                	{
-                		$olddir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($this->oldcopy->ref);
-                		$newdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($this->ref);
-                		if (file_exists($olddir))
-                		{
+			$sql.= ", public = " . ($this->public ? 1 : 0);
+			$sql.= ", datec=" . ($this->date_c != '' ? "'".$this->db->idate($this->date_c)."'" : '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.= ", date_close=" . ($this->date_close != '' ? "'".$this->db->idate($this->date_close)."'" : 'null');
+			$sql.= ", fk_user_close=" . ($this->fk_user_close > 0 ? $this->fk_user_close : "null");
+			$sql.= ", opp_amount = " . (strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : "null");
+			$sql.= ", budget_amount = " . (strcmp($this->budget_amount, '')  ? price2num($this->budget_amount) : "null");
+			$sql.= " WHERE rowid = " . $this->id;
+
+			dol_syslog(get_class($this)."::update", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				if (!$notrigger)
+				{
+					// Call trigger
+					$result=$this->call_trigger('PROJECT_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)
+					{
+						$olddir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($this->oldcopy->ref);
+						$newdir = $conf->projet->dir_output . "/" . 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");
+							{
+								$langs->load("errors");
 								$this->error=$langs->trans('ErrorFailToRenameDir',$olddir,$newdir);
-                				$error++;
-                			}
-                		}
-                	}
-                }
-                if (! $error )
-                {
-                    $this->db->commit();
-                    $result = 1;
-                }
-                else
-              {
-                    $this->db->rollback();
-                    $result = -1;
-                }
-            }
-            else
+								$error++;
+							}
+						}
+					}
+				}
+				if (! $error )
+				{
+					$this->db->commit();
+					$result = 1;
+				}
+				else
+			  {
+					$this->db->rollback();
+					$result = -1;
+				}
+			}
+			else
 			{
-		        $this->error = $this->db->lasterror();
-		        $this->errors[] = $this->error;
-		        $this->db->rollback();
-			    if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			    {
-			        $result = -4;
-			    }
-			    else
-			    {
-			        $result = -2;
-			    }
-		        dol_syslog(get_class($this)."::update error " . $result . " " . $this->error, LOG_ERR);
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				$this->db->rollback();
+				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+				{
+					$result = -4;
+				}
+				else
+				{
+					$result = -2;
+				}
+				dol_syslog(get_class($this)."::update error " . $result . " " . $this->error, LOG_ERR);
 			}
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::update ref null");
-            $result = -1;
-        }
+		}
+		else
+		{
+			dol_syslog(get_class($this)."::update ref null");
+			$result = -1;
+		}
 
-        return $result;
-    }
-
-    /**
-     * 	Get object from database
-     *
-     * 	@param      int		$id       	Id of object to load
-     * 	@param		string	$ref		Ref of project
-     * 	@return     int      		   	>0 if OK, 0 if not found, <0 if KO
-     */
-    function fetch($id, $ref='')
-    {
-        if (empty($id) && empty($ref)) return -1;
-
-        $sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
-        $sql.= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_close, fk_statut, fk_opp_status, opp_percent, note_private, note_public, model_pdf";
-        $sql.= " FROM " . MAIN_DB_PREFIX . "projet";
-        if (! empty($id))
-        {
-        	$sql.= " WHERE rowid=".$id;
-        }
-        else if (! empty($ref))
-        {
-        	$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-        	$sql.= " AND entity IN (".getEntity('project').")";
-        }
+		return $result;
+	}
 
-        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->title = $obj->title;
-                $this->titre = $obj->title; // TODO deprecated
-                $this->description = $obj->description;
-                $this->date_c = $this->db->jdate($obj->datec);
-                $this->datec = $this->db->jdate($obj->datec); // TODO deprecated
-                $this->date_m = $this->db->jdate($obj->tms);
-                $this->datem = $this->db->jdate($obj->tms);  // TODO deprecated
-                $this->date_start = $this->db->jdate($obj->dateo);
-                $this->date_end = $this->db->jdate($obj->datee);
-                $this->date_close = $this->db->jdate($obj->date_close);
-                $this->note_private = $obj->note_private;
-                $this->note_public = $obj->note_public;
-                $this->socid = $obj->fk_soc;
-                $this->user_author_id = $obj->fk_user_creat;
-                $this->user_close_id = $obj->fk_user_close;
-                $this->public = $obj->public;
-                $this->statut = $obj->fk_statut;
-                $this->opp_status = $obj->fk_opp_status;
-                $this->opp_amount	= $obj->opp_amount;
-                $this->opp_percent	= $obj->opp_percent;
-                $this->budget_amount	= $obj->budget_amount;
-                $this->modelpdf	= $obj->model_pdf;
-
-                $this->db->free($resql);
-
-                // Retreive all extrafield for thirdparty
-                $this->fetch_optionals();
-
-                return 1;
-            }
-
-            $this->db->free($resql);
-
-            if ($num_rows) return 1;
-            else return 0;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     * 	Return list of projects
-     *
-     * 	@param		int		$socid		To filter on a particular third party
-     * 	@return		array				List of projects
-     */
-    function liste_array($socid='')
-    {
-        global $conf;
-
-        $projects = array();
-
-        $sql = "SELECT rowid, title";
-        $sql.= " FROM " . MAIN_DB_PREFIX . "projet";
-        $sql.= " WHERE entity = " . $conf->entity;
-        if (! empty($socid)) $sql.= " AND fk_soc = " . $socid;
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $nump = $this->db->num_rows($resql);
-
-            if ($nump)
-            {
-                $i = 0;
-                while ($i < $nump)
-                {
-                    $obj = $this->db->fetch_object($resql);
-
-                    $projects[$obj->rowid] = $obj->title;
-                    $i++;
-                }
-            }
-            return $projects;
-        }
-        else
-        {
-            print $this->db->lasterror();
-        }
-    }
-
-    /**
-     * 	Return list of elements for type, linked to project
-     *
-     * 	@param		string		$type			'propal','order','invoice','order_supplier','invoice_supplier',...
-     * 	@param		string		$tablename		name of table associated of the type
-     * 	@param		string		$datefieldname	name of date field for filter
-     *  @param		string		$dates			Start date (ex 00:00:00)
-     *  @param		string		$datee			End date (ex 23:59:59)
-     * 	@return		mixed						Array list of object ids linked to project, < 0 or string if error
-     */
-    function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='')
-    {
-        $elements = array();
-
-        if ($this->id <= 0) return $elements;
+	/**
+	 * 	Get object from database
+	 *
+	 * 	@param      int		$id       	Id of object to load
+	 * 	@param		string	$ref		Ref of project
+	 * 	@return     int      		   	>0 if OK, 0 if not found, <0 if KO
+	 */
+	function fetch($id, $ref='')
+	{
+		if (empty($id) && empty($ref)) return -1;
+
+		$sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
+		$sql.= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_close, fk_statut, fk_opp_status, opp_percent, note_private, note_public, model_pdf";
+		$sql.= " FROM " . MAIN_DB_PREFIX . "projet";
+		if (! empty($id))
+		{
+			$sql.= " WHERE rowid=".$id;
+		}
+		else if (! empty($ref))
+		{
+			$sql.= " WHERE ref='".$this->db->escape($ref)."'";
+			$sql.= " AND entity IN (".getEntity('project').")";
+		}
+
+		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->title = $obj->title;
+				$this->titre = $obj->title; // TODO deprecated
+				$this->description = $obj->description;
+				$this->date_c = $this->db->jdate($obj->datec);
+				$this->datec = $this->db->jdate($obj->datec); // TODO deprecated
+				$this->date_m = $this->db->jdate($obj->tms);
+				$this->datem = $this->db->jdate($obj->tms);  // TODO deprecated
+				$this->date_start = $this->db->jdate($obj->dateo);
+				$this->date_end = $this->db->jdate($obj->datee);
+				$this->date_close = $this->db->jdate($obj->date_close);
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
+				$this->socid = $obj->fk_soc;
+				$this->user_author_id = $obj->fk_user_creat;
+				$this->user_close_id = $obj->fk_user_close;
+				$this->public = $obj->public;
+				$this->statut = $obj->fk_statut;
+				$this->opp_status = $obj->fk_opp_status;
+				$this->opp_amount	= $obj->opp_amount;
+				$this->opp_percent	= $obj->opp_percent;
+				$this->budget_amount	= $obj->budget_amount;
+				$this->modelpdf	= $obj->model_pdf;
+
+				$this->db->free($resql);
+
+				// Retreive all extrafield for thirdparty
+				$this->fetch_optionals();
+
+				return 1;
+			}
+
+			$this->db->free($resql);
+
+			if ($num_rows) return 1;
+			else return 0;
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 * 	Return list of projects
+	 *
+	 * 	@param		int		$socid		To filter on a particular third party
+	 * 	@return		array				List of projects
+	 */
+	function liste_array($socid='')
+	{
+		global $conf;
+
+		$projects = array();
+
+		$sql = "SELECT rowid, title";
+		$sql.= " FROM " . MAIN_DB_PREFIX . "projet";
+		$sql.= " WHERE entity = " . $conf->entity;
+		if (! empty($socid)) $sql.= " AND fk_soc = " . $socid;
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$nump = $this->db->num_rows($resql);
+
+			if ($nump)
+			{
+				$i = 0;
+				while ($i < $nump)
+				{
+					$obj = $this->db->fetch_object($resql);
+
+					$projects[$obj->rowid] = $obj->title;
+					$i++;
+				}
+			}
+			return $projects;
+		}
+		else
+		{
+			print $this->db->lasterror();
+		}
+	}
+
+	/**
+	 * 	Return list of elements for type, linked to project
+	 *
+	 * 	@param		string		$type			'propal','order','invoice','order_supplier','invoice_supplier',...
+	 * 	@param		string		$tablename		name of table associated of the type
+	 * 	@param		string		$datefieldname	name of date field for filter
+	 *  @param		string		$dates			Start date (ex 00:00:00)
+	 *  @param		string		$datee			End date (ex 23:59:59)
+	 * 	@return		mixed						Array list of object ids linked to project, < 0 or string if error
+	 */
+	function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='')
+	{
+		$elements = array();
+
+		if ($this->id <= 0) return $elements;
 
 		if ($type == 'agenda')
-        {
-            $sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project=" . $this->id;
-        }
-        elseif ($type == 'expensereport')
 		{
-            $sql = "SELECT ed.rowid FROM " . MAIN_DB_PREFIX . "expensereport as e, " . MAIN_DB_PREFIX . "expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND ed.fk_projet=" . $this->id;
+			$sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project=" . $this->id;
 		}
-        elseif ($type == 'project_task')
+		elseif ($type == 'expensereport')
+		{
+			$sql = "SELECT ed.rowid FROM " . MAIN_DB_PREFIX . "expensereport as e, " . MAIN_DB_PREFIX . "expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND ed.fk_projet=" . $this->id;
+		}
+		elseif ($type == 'project_task')
 		{
 			$sql = "SELECT DISTINCT pt.rowid FROM " . MAIN_DB_PREFIX . "projet_task as pt, " . MAIN_DB_PREFIX . "projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet=" . $this->id;
 		}
@@ -534,9 +534,9 @@ 
 		{
 			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM ' . MAIN_DB_PREFIX . 'stock_mouvement as ms WHERE ms.origintype = "project" AND ms.fk_origin = ' . $this->id . ' AND ms.type_mouvement = 1';
 		}
-        else
+		else
 		{
-            $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet=" . $this->id;
+			$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet=" . $this->id;
 		}
 
 		if ($dates > 0)
@@ -545,7 +545,7 @@ 
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
 			$sql.=" AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
-    	if ($datee > 0)
+		if ($datee > 0)
 		{
 			if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
@@ -553,454 +553,454 @@ 
 		}
 		if (! $sql) return -1;
 
-        //print $sql;
-        dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $nump = $this->db->num_rows($result);
-            if ($nump)
-            {
-                $i = 0;
-                while ($i < $nump)
-                {
-                    $obj = $this->db->fetch_object($result);
-
-                    $elements[$i] = $obj->rowid.(empty($obj->fk_user)?'':'_'.$obj->fk_user);
-
-                    $i++;
-                }
-                $this->db->free($result);
-
-                /* Return array */
-                return $elements;
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+		//print $sql;
+		dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$nump = $this->db->num_rows($result);
+			if ($nump)
+			{
+				$i = 0;
+				while ($i < $nump)
+				{
+					$obj = $this->db->fetch_object($result);
 
-    /**
-     *    Delete a project from database
-     *
-     *    @param       User		$user            User
-     *    @param       int		$notrigger       Disable triggers
-     *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
-     */
-    function delete($user, $notrigger=0)
-    {
-        global $langs, $conf;
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+					$elements[$i] = $obj->rowid.(empty($obj->fk_user)?'':'_'.$obj->fk_user);
 
-        $error = 0;
+					$i++;
+				}
+				$this->db->free($result);
 
-        $this->db->begin();
+				/* Return array */
+				return $elements;
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
 
-        if (!$error)
-        {
-            // Delete linked contacts
-            $res = $this->delete_linked_contact();
-            if ($res < 0)
-            {
-                $this->error = 'ErrorFailToDeleteLinkedContact';
-                //$error++;
-                $this->db->rollback();
-                return 0;
-            }
-        }
+	/**
+	 *    Delete a project from database
+	 *
+	 *    @param       User		$user            User
+	 *    @param       int		$notrigger       Disable triggers
+	 *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $langs, $conf;
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
-        // Set fk_projet into elements to null
-        $listoftables=array(
-        		'facture'=>'fk_projet','propal'=>'fk_projet','commande'=>'fk_projet',
-                'facture_fourn'=>'fk_projet','commande_fournisseur'=>'fk_projet','supplier_proposal'=>'fk_projet',
-        		'expensereport_det'=>'fk_projet','contrat'=>'fk_projet','fichinter'=>'fk_projet','don'=>'fk_projet'
-        		);
-        foreach($listoftables as $key => $value)
-        {
-   	        $sql = "UPDATE " . MAIN_DB_PREFIX . $key . " SET ".$value." = NULL where ".$value." = ". $this->id;
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $this->db->lasterror();
-	        	$error++;
-	        	break;
-	        }
-        }
+		$error = 0;
 
-        // Delete tasks
-        if (! $error)
-        {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_time";
-	        $sql.= " WHERE fk_task IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
-
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $this->db->lasterror();
-	        	$error++;
-	        }
-        }
+		$this->db->begin();
 
-        if (! $error)
-        {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields";
-	        $sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
-
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $this->db->lasterror();
-	        	$error++;
-	        }
-        }
+		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";
-	        $sql.= " WHERE fk_projet=" . $this->id;
-
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $this->db->lasterror();
-	        	$error++;
-	        }
-        }
+		// Set fk_projet into elements to null
+		$listoftables=array(
+				'facture'=>'fk_projet','propal'=>'fk_projet','commande'=>'fk_projet',
+				'facture_fourn'=>'fk_projet','commande_fournisseur'=>'fk_projet','supplier_proposal'=>'fk_projet',
+				'expensereport_det'=>'fk_projet','contrat'=>'fk_projet','fichinter'=>'fk_projet','don'=>'fk_projet'
+				);
+		foreach($listoftables as $key => $value)
+		{
+   			$sql = "UPDATE " . MAIN_DB_PREFIX . $key . " SET ".$value." = NULL where ".$value." = ". $this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+				break;
+			}
+		}
 
-        // Delete project
-        if (! $error)
-        {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet";
-	        $sql.= " WHERE rowid=" . $this->id;
-
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $langs->trans("CantRemoveProject");
-	        	$error++;
-	        }
-        }
+		// Delete tasks
+		if (! $error)
+		{
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_time";
+			$sql.= " WHERE fk_task IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
 
-        if (! $error)
-        {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields";
-	        $sql.= " WHERE fk_object=" . $this->id;
-
-	        $resql = $this->db->query($sql);
-	        if (! $resql)
-	        {
-	        	$this->errors[] = $this->db->lasterror();
-	        	$error++;
-	        }
-        }
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		}
 
-        if (empty($error))
-        {
-            // We remove directory
-            $projectref = dol_sanitizeFileName($this->ref);
-            if ($conf->projet->dir_output)
-            {
-                $dir = $conf->projet->dir_output . "/" . $projectref;
-                if (file_exists($dir))
-                {
-                    $res = @dol_delete_dir_recursive($dir);
-                    if (!$res)
-                    {
-                        $this->errors[] = 'ErrorFailToDeleteDir';
-                        $error++;
-                    }
-                }
-            }
-
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('PROJECT_DELETE',$user);
-
-                if ($result < 0) {
-                    $error++;
-                }
-                // End call triggers
-            }
-        }
+		if (! $error)
+		{
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields";
+			$sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
 
-    	if (empty($error))
-    	{
-            $this->db->commit();
-            return 1;
-        }
-        else
-       {
-        	foreach ( $this->errors as $errmsg )
-        	{
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task";
+			$sql.= " WHERE fk_projet=" . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		}
+
+		// Delete project
+		if (! $error)
+		{
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet";
+			$sql.= " WHERE rowid=" . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $langs->trans("CantRemoveProject");
+				$error++;
+			}
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields";
+			$sql.= " WHERE fk_object=" . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (! $resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		}
+
+		if (empty($error))
+		{
+			// We remove directory
+			$projectref = dol_sanitizeFileName($this->ref);
+			if ($conf->projet->dir_output)
+			{
+				$dir = $conf->projet->dir_output . "/" . $projectref;
+				if (file_exists($dir))
+				{
+					$res = @dol_delete_dir_recursive($dir);
+					if (!$res)
+					{
+						$this->errors[] = 'ErrorFailToDeleteDir';
+						$error++;
+					}
+				}
+			}
+
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROJECT_DELETE',$user);
+
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		}
+
+		if (empty($error))
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+	   {
+			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 " . $this->error, LOG_ERR);
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     * 		Validate a project
-     *
-     * 		@param		User	$user		   User that validate
-     *      @param      int     $notrigger     1=Disable triggers
-     * 		@return		int					   <0 if KO, >0 if OK
-     */
-    function setValid($user, $notrigger=0)
-    {
-        global $langs, $conf;
+			dol_syslog(get_class($this) . "::delete " . $this->error, LOG_ERR);
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * 		Validate a project
+	 *
+	 * 		@param		User	$user		   User that validate
+	 *      @param      int     $notrigger     1=Disable triggers
+	 * 		@return		int					   <0 if KO, >0 if OK
+	 */
+	function setValid($user, $notrigger=0)
+	{
+		global $langs, $conf;
 
 		$error=0;
 
-        if ($this->statut != 1)
-        {
-            // Check parameters
-            if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->title))
-            {
-                $this->error=$langs->trans("ErrorFieldFormat",$langs->transnoentities("Label")).'. '.$langs->trans('RemoveString',$langs->transnoentitiesnoconv("CopyOf"));
-                return -1;
-            }
-
-            $this->db->begin();
-
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet";
-            $sql.= " SET fk_statut = 1";
-            $sql.= " WHERE rowid = " . $this->id;
-            $sql.= " AND entity = " . $conf->entity;
-
-            dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                // Call trigger
-                if (empty($notrigger))
-                {
-                    $result=$this->call_trigger('PROJECT_VALIDATE',$user);
-                    if ($result < 0) { $error++; }
-                    // End call triggers
-                }
-
-                if (!$error)
-                {
-                	$this->statut=1;
-                	$this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    $this->error = join(',', $this->errors);
-                    dol_syslog(get_class($this)."::setValid " . $this->error, LOG_ERR);
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
-        }
-    }
+		if ($this->statut != 1)
+		{
+			// Check parameters
+			if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->title))
+			{
+				$this->error=$langs->trans("ErrorFieldFormat",$langs->transnoentities("Label")).'. '.$langs->trans('RemoveString',$langs->transnoentitiesnoconv("CopyOf"));
+				return -1;
+			}
+
+			$this->db->begin();
+
+			$sql = "UPDATE " . MAIN_DB_PREFIX . "projet";
+			$sql.= " SET fk_statut = 1";
+			$sql.= " WHERE rowid = " . $this->id;
+			$sql.= " AND entity = " . $conf->entity;
+
+			dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				// Call trigger
+				if (empty($notrigger))
+				{
+					$result=$this->call_trigger('PROJECT_VALIDATE',$user);
+					if ($result < 0) { $error++; }
+					// End call triggers
+				}
+
+				if (!$error)
+				{
+					$this->statut=1;
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error = join(',', $this->errors);
+					dol_syslog(get_class($this)."::setValid " . $this->error, LOG_ERR);
+					return -1;
+				}
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		}
+	}
+
+	/**
+	 * 		Close a project
+	 *
+	 * 		@param		User	$user		User that close project
+	 * 		@return		int					<0 if KO, 0 if already closed, >0 if OK
+	 */
+	function setClose($user)
+	{
+		global $langs, $conf;
+
+		$now = dol_now();
+
+		$error=0;
+
+		if ($this->statut != 2)
+		{
+			$this->db->begin();
+
+			$sql = "UPDATE " . MAIN_DB_PREFIX . "projet";
+			$sql.= " SET fk_statut = 2, fk_user_close = ".$user->id.", date_close = '".$this->db->idate($now)."'";
+			$sql.= " WHERE rowid = " . $this->id;
+			$sql.= " AND entity = " . $conf->entity;
+			$sql.= " AND fk_statut = 1";
+
+			if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				// TODO What to do if fk_opp_status is not code 'WON' or 'LOST'
+			}
+
+			dol_syslog(get_class($this)."::setClose", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				// Call trigger
+				$result=$this->call_trigger('PROJECT_CLOSE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+
+				if (!$error)
+				{
+					$this->statut = 2;
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error = join(',', $this->errors);
+					dol_syslog(get_class($this)."::setClose " . $this->error, LOG_ERR);
+					return -1;
+				}
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		}
 
-    /**
-     * 		Close a project
-     *
-     * 		@param		User	$user		User that close project
-     * 		@return		int					<0 if KO, 0 if already closed, >0 if OK
-     */
-    function setClose($user)
-    {
-        global $langs, $conf;
+		return 0;
+	}
 
-        $now = dol_now();
+	/**
+	 *  Return status label 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
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
 
-		$error=0;
+	/**
+	 *  Renvoi status label for 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
+	 * 	@return string				Label
+	 */
+	function LibStatut($statut, $mode=0)
+	{
+		global $langs;
 
-        if ($this->statut != 2)
-        {
-            $this->db->begin();
-
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet";
-            $sql.= " SET fk_statut = 2, fk_user_close = ".$user->id.", date_close = '".$this->db->idate($now)."'";
-            $sql.= " WHERE rowid = " . $this->id;
-            $sql.= " AND entity = " . $conf->entity;
-            $sql.= " AND fk_statut = 1";
-
-            if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	// TODO What to do if fk_opp_status is not code 'WON' or 'LOST'
-            }
-
-            dol_syslog(get_class($this)."::setClose", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                // Call trigger
-                $result=$this->call_trigger('PROJECT_CLOSE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-
-                if (!$error)
-                {
-                    $this->statut = 2;
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    $this->error = join(',', $this->errors);
-                    dol_syslog(get_class($this)."::setClose " . $this->error, LOG_ERR);
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
-        }
+		if ($mode == 0)
+		{
+			return $langs->trans($this->statuts_long[$statut]);
+		}
+		if ($mode == 1)
+		{
+			return $langs->trans($this->statuts_short[$statut]);
+		}
+		if ($mode == 2)
+		{
+			if ($statut == 0)
+				return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
+			if ($statut == 1)
+				return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_short[$statut]);
+			if ($statut == 2)
+				return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+		}
+		if ($mode == 3)
+		{
+			if ($statut == 0)
+				return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
+			if ($statut == 1)
+				return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
+			if ($statut == 2)
+				return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
+		}
+		if ($mode == 4)
+		{
+			if ($statut == 0)
+				return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_long[$statut]);
+			if ($statut == 1)
+				return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_long[$statut]);
+			if ($statut == 2)
+				return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_long[$statut]);
+		}
+		if ($mode == 5)
+		{
+			if ($statut == 0)
+				return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
+			if ($statut == 1)
+				return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
+			if ($statut == 2)
+				return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
+		}
+	}
 
-        return 0;
-    }
-
-    /**
-     *  Return status label 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
-     */
-    function getLibStatut($mode=0)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
-
-    /**
-     *  Renvoi status label for 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
-     * 	@return string				Label
-     */
-    function LibStatut($statut, $mode=0)
-    {
-        global $langs;
-
-        if ($mode == 0)
-        {
-            return $langs->trans($this->statuts_long[$statut]);
-        }
-        if ($mode == 1)
-        {
-            return $langs->trans($this->statuts_short[$statut]);
-        }
-        if ($mode == 2)
-        {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
-        }
-        if ($mode == 3)
-        {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
-            if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
-            if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
-        }
-        if ($mode == 4)
-        {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_long[$statut]);
-            if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_long[$statut]);
-            if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_long[$statut]);
-        }
-        if ($mode == 5)
-        {
-            if ($statut == 0)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
-            if ($statut == 1)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
-            if ($statut == 2)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
-        }
-    }
-
-    /**
-     * 	Return clicable name (with picto eventually)
-     *
-     * 	@param	int		$withpicto		          0=No picto, 1=Include picto into link, 2=Only picto
-     * 	@param	string	$option			          Variant ('', 'nolink')
-     * 	@param	int		$addlabel		          0=Default, 1=Add label into string, >1=Add first chars into string
-     *  @param	string	$moreinpopup	          Text to add into popup
-     *  @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					          String with URL
-     */
-    function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='', $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='';
-        if ($option != 'nolink') $label = '<u>' . $langs->trans("ShowProject") . '</u>';
-        $label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
-        $label .= ($label?'<br>':'').'<b>' . $langs->trans('Label') . ': </b>' . $this->title;	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->thirdparty_name))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('ThirdParty') . ': </b>' . $this->thirdparty_name;	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->dateo))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('DateStart') . ': </b>' . dol_print_date($this->dateo, 'day');	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->datee))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('DateEnd') . ': </b>' . dol_print_date($this->datee, 'day');	// The space must be after the : to not being explode when showing the title in img_picto
-        if ($moreinpopup) $label.='<br>'.$moreinpopup;
-
-        $url='';
-        if ($option != 'nolink')
-        {
-            if (preg_match('/\.php$/',$option)) {
-                $url = dol_buildpath($option,1) . '?id=' . $this->id;
-            }
-            else if ($option == 'task')
-            {
-                $url = DOL_URL_ROOT . '/projet/tasks.php?id=' . $this->id;
-            }
-            else
-            {
-                $url = DOL_URL_ROOT . '/projet/card.php?id=' . $this->id;
-            }
-            // 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';
-        }
+	/**
+	 * 	Return clicable name (with picto eventually)
+	 *
+	 * 	@param	int		$withpicto		          0=No picto, 1=Include picto into link, 2=Only picto
+	 * 	@param	string	$option			          Variant ('', 'nolink')
+	 * 	@param	int		$addlabel		          0=Default, 1=Add label into string, >1=Add first chars into string
+	 *  @param	string	$moreinpopup	          Text to add into popup
+	 *  @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					          String with URL
+	 */
+	function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='', $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='';
+		if ($option != 'nolink') $label = '<u>' . $langs->trans("ShowProject") . '</u>';
+		$label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
+		$label .= ($label?'<br>':'').'<b>' . $langs->trans('Label') . ': </b>' . $this->title;	// The space must be after the : to not being explode when showing the title in img_picto
+		if (! empty($this->thirdparty_name))
+			$label .= ($label?'<br>':'').'<b>' . $langs->trans('ThirdParty') . ': </b>' . $this->thirdparty_name;	// The space must be after the : to not being explode when showing the title in img_picto
+		if (! empty($this->dateo))
+			$label .= ($label?'<br>':'').'<b>' . $langs->trans('DateStart') . ': </b>' . dol_print_date($this->dateo, 'day');	// The space must be after the : to not being explode when showing the title in img_picto
+		if (! empty($this->datee))
+			$label .= ($label?'<br>':'').'<b>' . $langs->trans('DateEnd') . ': </b>' . dol_print_date($this->datee, 'day');	// The space must be after the : to not being explode when showing the title in img_picto
+		if ($moreinpopup) $label.='<br>'.$moreinpopup;
+
+		$url='';
+		if ($option != 'nolink')
+		{
+			if (preg_match('/\.php$/',$option)) {
+				$url = dol_buildpath($option,1) . '?id=' . $this->id;
+			}
+			else if ($option == 'task')
+			{
+				$url = DOL_URL_ROOT . '/projet/tasks.php?id=' . $this->id;
+			}
+			else
+			{
+				$url = DOL_URL_ROOT . '/projet/card.php?id=' . $this->id;
+			}
+			// 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) && $user->rights->projet->lire)
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowProject");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+		$linkclose='';
+		if (empty($notooltip) && $user->rights->projet->lire)
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowProject");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
 
 		if (! is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
@@ -1012,49 +1012,49 @@ 
 		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);
 		if ($reshook > 0)
 			$linkclose = $hookmanager->resPrint;
-        }
+		}
+
+		$picto = 'projectpub';
+		if (!$this->public) $picto = 'project';
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
 
-        $picto = 'projectpub';
-        if (!$this->public) $picto = 'project';
-
-        $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.=' ';
-        if ($withpicto != 2) $result.=$linkstart . $this->ref . $linkend . (($addlabel && $this->title) ? $sep . dol_trunc($this->title, ($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()
-    {
-        global $user, $langs, $conf;
-
-        $now=dol_now();
-
-        // Initialise parameters
-        $this->id = 0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->socid = 1;
-        $this->date_c = $now;
-        $this->date_m = $now;
-        $this->date_start = $now;
-        $this->date_end = $now + (3600 * 24 * 365);
-        $this->note_public = 'SPECIMEN';
+		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->title) ? $sep . dol_trunc($this->title, ($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()
+	{
+		global $user, $langs, $conf;
+
+		$now=dol_now();
+
+		// Initialise parameters
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->socid = 1;
+		$this->date_c = $now;
+		$this->date_m = $now;
+		$this->date_start = $now;
+		$this->date_end = $now + (3600 * 24 * 365);
+		$this->note_public = 'SPECIMEN';
 		$this->fk_ele = 20000;
-        $this->opp_amount = 20000;
-        $this->budget_amount = 10000;
+		$this->opp_amount = 20000;
+		$this->budget_amount = 10000;
 
-        /*
+		/*
         $nbp = mt_rand(1, 9);
         $xnbp = 0;
         while ($xnbp < $nbp)
@@ -1068,166 +1068,166 @@ 
             $xnbp++;
         }
         */
-    }
-
-    /**
-     * 	Check if user has permission on current project
-     *
-     * 	@param	User	$user		Object user to evaluate
-     * 	@param  string	$mode		Type of permission we want to know: 'read', 'write'
-     * 	@return	int					>0 if user has permission, <0 if user has no permission
-     */
-    function restrictedProjectArea($user, $mode='read')
-    {
-        // To verify role of users
-        $userAccess = 0;
-        if (($mode == 'read' && ! empty($user->rights->projet->all->lire)) || ($mode == 'write' && ! empty($user->rights->projet->all->creer)) || ($mode == 'delete' && ! empty($user->rights->projet->all->supprimer)))
-        {
-            $userAccess = 1;
-        }
-        else if ($this->public && (($mode == 'read' && ! empty($user->rights->projet->lire)) || ($mode == 'write' && ! empty($user->rights->projet->creer)) || ($mode == 'delete' && ! empty($user->rights->projet->supprimer))))
-        {
-            $userAccess = 1;
-        }
-        else
-		{
-            foreach (array('internal', 'external') as $source)
-            {
-                $userRole = $this->liste_contact(4, $source);
-                $num = count($userRole);
-
-                $nblinks = 0;
-                while ($nblinks < $num)
-                {
-                    if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
-                    {
-                        if ($mode == 'read'   && $user->rights->projet->lire)      $userAccess++;
-                        if ($mode == 'write'  && $user->rights->projet->creer)     $userAccess++;
-                        if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
-                    }
-                    $nblinks++;
-                }
-            }
-            //if (empty($nblinks))	// If nobody has permission, we grant creator
-            //{
-            //	if ((!empty($this->user_author_id) && $this->user_author_id == $user->id))
-            //	{
-            //		$userAccess = 1;
-            //	}
-            //}
-        }
+	}
 
-        return ($userAccess?$userAccess:-1);
-    }
-
-    /**
-     * Return array of projects a user has permission on, is affected to, or all projects
-     *
-     * @param 	User	$user			User object
-     * @param 	int		$mode			0=All project I have permission on (assigned to me and public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
-     * @param 	int		$list			0=Return array,1=Return string list
-     * @param	int		$socid			0=No filter on third party, id of third party
-     * @param	string		$filter			additionnal filter on project (statut, ref, ...)
-     * @return 	array or string			Array of projects id, or string with projects id separated with ","
-     */
-    function getProjectsAuthorizedForUser($user, $mode=0, $list=0, $socid=0, $filter='')
-    {
-        $projects = array();
-        $temp = array();
-
-        $sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
-        $sql.= " FROM " . MAIN_DB_PREFIX . "projet as p";
-        if ($mode == 0 || $mode == 1)
-        {
-            $sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
-        }
-        $sql.= " WHERE p.entity IN (".getEntity('project').")";
-        // Internal users must see project he is contact to even if project linked to a third party he can't see.
-        //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 > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
-
-        // Get id of types of contacts for projects (This list never contains a lot of elements)
-        $listofprojectcontacttype=array();
-        $sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-        $sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
-        $sql2.= " AND ctc.source = 'internal'";
-        $resql = $this->db->query($sql2);
-        if ($resql)
-        {
-            while($obj = $this->db->fetch_object($resql))
-            {
-                $listofprojectcontacttype[$obj->rowid]=$obj->code;
-            }
-        }
-        else dol_print_error($this->db);
-        if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
+	/**
+	 * 	Check if user has permission on current project
+	 *
+	 * 	@param	User	$user		Object user to evaluate
+	 * 	@param  string	$mode		Type of permission we want to know: 'read', 'write'
+	 * 	@return	int					>0 if user has permission, <0 if user has no permission
+	 */
+	function restrictedProjectArea($user, $mode='read')
+	{
+		// To verify role of users
+		$userAccess = 0;
+		if (($mode == 'read' && ! empty($user->rights->projet->all->lire)) || ($mode == 'write' && ! empty($user->rights->projet->all->creer)) || ($mode == 'delete' && ! empty($user->rights->projet->all->supprimer)))
+		{
+			$userAccess = 1;
+		}
+		else if ($this->public && (($mode == 'read' && ! empty($user->rights->projet->lire)) || ($mode == 'write' && ! empty($user->rights->projet->creer)) || ($mode == 'delete' && ! empty($user->rights->projet->supprimer))))
+		{
+			$userAccess = 1;
+		}
+		else
+		{
+			foreach (array('internal', 'external') as $source)
+			{
+				$userRole = $this->liste_contact(4, $source);
+				$num = count($userRole);
 
-        if ($mode == 0)
-        {
-            $sql.= " AND ec.element_id = p.rowid";
-            $sql.= " AND ( p.public = 1";
-            $sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-            $sql.= " AND ec.fk_socpeople = ".$user->id.")";
-            $sql.= " )";
-        }
-        if ($mode == 1)
-        {
-            $sql.= " AND ec.element_id = p.rowid";
-            $sql.= " AND (";
-            $sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-            $sql.= " AND ec.fk_socpeople = ".$user->id.")";
-            $sql.= " )";
-        }
-        if ($mode == 2)
-        {
-            // No filter. Use this if user has permission to see all project
-        }
+				$nblinks = 0;
+				while ($nblinks < $num)
+				{
+					if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
+					{
+						if ($mode == 'read'   && $user->rights->projet->lire)      $userAccess++;
+						if ($mode == 'write'  && $user->rights->projet->creer)     $userAccess++;
+						if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
+					}
+					$nblinks++;
+				}
+			}
+			//if (empty($nblinks))	// If nobody has permission, we grant creator
+			//{
+			//	if ((!empty($this->user_author_id) && $this->user_author_id == $user->id))
+			//	{
+			//		$userAccess = 1;
+			//	}
+			//}
+		}
+
+		return ($userAccess?$userAccess:-1);
+	}
+
+	/**
+	 * Return array of projects a user has permission on, is affected to, or all projects
+	 *
+	 * @param 	User	$user			User object
+	 * @param 	int		$mode			0=All project I have permission on (assigned to me and public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
+	 * @param 	int		$list			0=Return array,1=Return string list
+	 * @param	int		$socid			0=No filter on third party, id of third party
+	 * @param	string		$filter			additionnal filter on project (statut, ref, ...)
+	 * @return 	array or string			Array of projects id, or string with projects id separated with ","
+	 */
+	function getProjectsAuthorizedForUser($user, $mode=0, $list=0, $socid=0, $filter='')
+	{
+		$projects = array();
+		$temp = array();
+
+		$sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
+		$sql.= " FROM " . MAIN_DB_PREFIX . "projet as p";
+		if ($mode == 0 || $mode == 1)
+		{
+			$sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
+		}
+		$sql.= " WHERE p.entity IN (".getEntity('project').")";
+		// Internal users must see project he is contact to even if project linked to a third party he can't see.
+		//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 > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+
+		// Get id of types of contacts for projects (This list never contains a lot of elements)
+		$listofprojectcontacttype=array();
+		$sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+		$sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
+		$sql2.= " AND ctc.source = 'internal'";
+		$resql = $this->db->query($sql2);
+		if ($resql)
+		{
+			while($obj = $this->db->fetch_object($resql))
+			{
+				$listofprojectcontacttype[$obj->rowid]=$obj->code;
+			}
+		}
+		else dol_print_error($this->db);
+		if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
+
+		if ($mode == 0)
+		{
+			$sql.= " AND ec.element_id = p.rowid";
+			$sql.= " AND ( p.public = 1";
+			$sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
+			$sql.= " )";
+		}
+		if ($mode == 1)
+		{
+			$sql.= " AND ec.element_id = p.rowid";
+			$sql.= " AND (";
+			$sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
+			$sql.= " )";
+		}
+		if ($mode == 2)
+		{
+			// No filter. Use this if user has permission to see all project
+		}
 
 	$sql.= $filter;
-        //print $sql;
+		//print $sql;
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $row = $this->db->fetch_row($resql);
-                $projects[$row[0]] = $row[1];
-                $temp[] = $row[0];
-                $i++;
-            }
-
-            $this->db->free($resql);
-
-            if ($list)
-            {
-                if (empty($temp)) return '0';
-                $result = implode(',', $temp);
-                return $result;
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$row = $this->db->fetch_row($resql);
+				$projects[$row[0]] = $row[1];
+				$temp[] = $row[0];
+				$i++;
+			}
+
+			$this->db->free($resql);
 
-        return $projects;
-    }
+			if ($list)
+			{
+				if (empty($temp)) return '0';
+				$result = implode(',', $temp);
+				return $result;
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+
+		return $projects;
+	}
 
-     /**
-      * Load an object from its id and create a new one in database
+	 /**
+	  * Load an object from its id and create a new one in database
 	  *
 	  *	@param	int		$fromid     	Id of object to clone
 	  *	@param	bool	$clone_contact	Clone contact of project
 	  *	@param	bool	$clone_task		Clone task of project
 	  *	@param	bool	$clone_project_file		Clone file of project
 	  *	@param	bool	$clone_task_file		Clone file of task (if task are copied)
-      *	@param	bool	$clone_note		Clone note of project
-      * @param	bool	$move_date		Move task date on clone
-      *	@param	integer	$notrigger		No trigger flag
-      * @param  int     $newthirdpartyid  New thirdparty id
+	  *	@param	bool	$clone_note		Clone note of project
+	  * @param	bool	$move_date		Move task date on clone
+	  *	@param	integer	$notrigger		No trigger flag
+	  * @param  int     $newthirdpartyid  New thirdparty id
 	  * @return	int						New id of clone
 	  */
 	function createFromClone($fromid,$clone_contact=false,$clone_task=true,$clone_project_file=false,$clone_task_file=false,$clone_note=true,$move_date=true,$notrigger=0,$newthirdpartyid=0)
@@ -1257,40 +1257,40 @@ 
 
 		$clone_project->id=0;
 		if ($move_date) {
-	        $clone_project->date_start = $now;
-	        if (!(empty($clone_project->date_end)))
-	        {
-	        	$clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start);
-	        }
+			$clone_project->date_start = $now;
+			if (!(empty($clone_project->date_end)))
+			{
+				$clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start);
+			}
 		}
 
-        $clone_project->datec = $now;
+		$clone_project->datec = $now;
 
-        if (! $clone_note)
-        {
-        	    $clone_project->note_private='';
-    			$clone_project->note_public='';
-        }
+		if (! $clone_note)
+		{
+				$clone_project->note_private='';
+				$clone_project->note_public='';
+		}
 
 		//Generate next ref
 		$defaultref='';
-    	$obj = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON;
-    	// Search template files
-    	$file=''; $classname=''; $filefound=0;
-    	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-    	foreach($dirmodels as $reldir)
-    	{
-    	    $file=dol_buildpath($reldir."core/modules/project/".$obj.'.php',0);
-    	    if (file_exists($file))
-    	    {
-    	        $filefound=1;
-    	        dol_include_once($reldir."core/modules/project/".$obj.'.php');
-            	$modProject = new $obj;
-            	$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty)?$clone_project->thirdparty:null, $clone_project);
-            	break;
-    	    }
-    	}
-    	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+		$obj = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON;
+		// Search template files
+		$file=''; $classname=''; $filefound=0;
+		$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+		foreach($dirmodels as $reldir)
+		{
+			$file=dol_buildpath($reldir."core/modules/project/".$obj.'.php',0);
+			if (file_exists($file))
+			{
+				$filefound=1;
+				dol_include_once($reldir."core/modules/project/".$obj.'.php');
+				$modProject = new $obj;
+				$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty)?$clone_project->thirdparty:null, $clone_project);
+				break;
+			}
+		}
+		if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
 
 		$clone_project->ref=$defaultref;
 		$clone_project->title=$langs->trans("CopyOf").' '.$clone_project->title;
@@ -1312,13 +1312,13 @@ 
 
 			//Note Update
 			if (!$clone_note)
-       		{
-        	    $clone_project->note_private='';
-    			$clone_project->note_public='';
-        	}
-        	else
-        	{
-        		$this->db->begin();
+	   		{
+				$clone_project->note_private='';
+				$clone_project->note_public='';
+			}
+			else
+			{
+				$this->db->begin();
 				$res=$clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES),'_public');
 				if ($res < 0)
 				{
@@ -1343,7 +1343,7 @@ 
 				{
 					$this->db->commit();
 				}
-        	}
+			}
 
 			//Duplicate contact
 			if ($clone_contact)
@@ -1420,45 +1420,45 @@ 
 				$tab_conv_child_parent=array();
 
 				// Loop on each task, to clone it
-			    foreach ($tasksarray as $tasktoclone)
-			    {
+				foreach ($tasksarray as $tasktoclone)
+				{
 					$result_clone = $taskstatic->createFromClone($tasktoclone->id,$clone_project_id,$tasktoclone->fk_parent,$move_date,true,false,$clone_task_file,true,false);
 					if ($result_clone <= 0)
-				    {
-				    	$this->error.=$result_clone->error;
+					{
+						$this->error.=$result_clone->error;
 						$error++;
-				    }
-				    else
-				    {
-				    	$new_task_id=$result_clone;
-				    	$taskstatic->fetch($tasktoclone->id);
-
-				    	//manage new parent clone task id
-				    	// if the current task has child we store the original task id and the equivalent clone task id
+					}
+					else
+					{
+						$new_task_id=$result_clone;
+						$taskstatic->fetch($tasktoclone->id);
+
+						//manage new parent clone task id
+						// if the current task has child we store the original task id and the equivalent clone task id
 						if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id,$tab_conv_child_parent))
 						{
 							$tab_conv_child_parent[$tasktoclone->id] =  $new_task_id;
 						}
-				    }
-
-			    }
-
-			    //Parse all clone node to be sure to update new parent
-			    $tasksarray=$taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0);
-			    foreach ($tasksarray as $task_cloned)
-			    {
-			    	$taskstatic->fetch($task_cloned->id);
-			    	if ($taskstatic->fk_task_parent!=0)
-			    	{
-			    		$taskstatic->fk_task_parent=$tab_conv_child_parent[$taskstatic->fk_task_parent];
-			    	}
-			    	$res=$taskstatic->update($user,$notrigger);
-			    	if ($result_clone <= 0)
-				    {
-				    	$this->error.=$taskstatic->error;
+					}
+
+				}
+
+				//Parse all clone node to be sure to update new parent
+				$tasksarray=$taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0);
+				foreach ($tasksarray as $task_cloned)
+				{
+					$taskstatic->fetch($task_cloned->id);
+					if ($taskstatic->fk_task_parent!=0)
+					{
+						$taskstatic->fk_task_parent=$tab_conv_child_parent[$taskstatic->fk_task_parent];
+					}
+					$res=$taskstatic->update($user,$notrigger);
+					if ($result_clone <= 0)
+					{
+						$this->error.=$taskstatic->error;
 						$error++;
-				    }
-			    }
+					}
+				}
 			}
 		}
 
@@ -1498,51 +1498,51 @@ 
 
 		$tasksarray=$taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
 
-	    foreach ($tasksarray as $tasktoshiftdate)
-	    {
-	    	$to_update=false;
-	    	// Fetch only if update of date will be made
-	    	if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end)))
-	    	{
-	    		//dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG);
-	    		$to_update=true;
-		    	$task = new Task($this->db);
-		    	$result = $task->fetch($tasktoshiftdate->id);
-		    	if (!$result)
-		    	{
-		    		$error++;
-		    		$this->error.=$task->error;
-		    	}
-	    	}
+		foreach ($tasksarray as $tasktoshiftdate)
+		{
+			$to_update=false;
+			// Fetch only if update of date will be made
+			if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end)))
+			{
+				//dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG);
+				$to_update=true;
+				$task = new Task($this->db);
+				$result = $task->fetch($tasktoshiftdate->id);
+				if (!$result)
+				{
+					$error++;
+					$this->error.=$task->error;
+				}
+			}
 			//print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit;
 
-	    	//Calcultate new task start date with difference between old proj start date and origin task start date
-	    	if (!empty($tasktoshiftdate->date_start))
-	    	{
+			//Calcultate new task start date with difference between old proj start date and origin task start date
+			if (!empty($tasktoshiftdate->date_start))
+			{
 				$task->date_start			= $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start);
-	    	}
+			}
 
-	    	//Calcultate new task end date with difference between origin proj end date and origin task end date
-	    	if (!empty($tasktoshiftdate->date_end))
-	    	{
+			//Calcultate new task end date with difference between origin proj end date and origin task end date
+			if (!empty($tasktoshiftdate->date_end))
+			{
 				$task->date_end		    	= $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start);
-	    	}
+			}
 
 			if ($to_update)
 			{
-		    	$result = $task->update($user);
-		    	if (!$result)
-		    	{
-		    		$error++;
-		    		$this->error.=$task->error;
-		    	}
+				$result = $task->update($user);
+				if (!$result)
+				{
+					$error++;
+					$this->error.=$task->error;
+				}
 			}
-	    }
-	    if ($error!=0)
-	    {
-	    	return -1;
-	    }
-	    return $result;
+		}
+		if ($error!=0)
+		{
+			return -1;
+		}
+		return $result;
 	}
 
 
@@ -1654,109 +1654,109 @@ 
 	 * @return 	int						<0 if OK, >0 if KO
 	 */
 	public function loadTimeSpent($datestart,$taskid=0,$userid=0)
-    {
-        $error=0;
-
-        if (empty($datestart)) dol_print_error('','Error datestart parameter is empty');
-
-        $sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.fk_task";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
-        $sql.= " WHERE ptt.fk_task = pt.rowid";
-        $sql.= " AND pt.fk_projet = ".$this->id;
-        $sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
-        $sql.= " AND ptt.task_date <= '".$this->db->idate($datestart + (7 * 24 * 3600) - 1)."')";
-        if ($task_id) $sql.= " AND ptt.fk_task=".$taskid;
-        if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid;
-
-        //print $sql;
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
+	{
+		$error=0;
 
-                $num = $this->db->num_rows($resql);
-                $i = 0;
-                // Loop on each record found, so each couple (project id, task id)
-                 while ($i < $num)
-                {
-                        $obj=$this->db->fetch_object($resql);
-                        $day=$this->db->jdate($obj->task_date);
-                        $this->weekWorkLoad[$day] +=  $obj->task_duration;
-                        $this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
-                        $i++;
-                }
-                $this->db->free($resql);
-                return 1;
-         }
-        else
-        {
-                $this->error="Error ".$this->db->lasterror();
-                dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-                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;
-
-        $mine=0; $socid=$user->societe_id;
-
-        $projectsListId = $this->getProjectsAuthorizedForUser($user,$mine?$mine:($user->rights->projet->all->lire?2:0),1,$socid);
-
-        $sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
-        $sql.= " FROM (".MAIN_DB_PREFIX."projet as p";
-        $sql.= ")";
-        $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.= " WHERE p.fk_statut = 1";
-        $sql.= " AND p.entity IN (".getEntity('project', 0).')';
-        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))";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $project_static = new Project($this->db);
-
-            $response = new WorkboardResponse();
-            $response->warning_delay = $conf->projet->warning_delay/60/60/24;
-            $response->label = $langs->trans("OpenedProjects");
-            if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
-            else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
-            $response->img = img_object('',"projectpub");
-
-            // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-
-                $project_static->statut = $obj->status;
-                $project_static->opp_status = $obj->opp_status;
-                $project_static->datee = $this->db->jdate($obj->datee);
-
-                if ($project_static->hasDelay()) {
-                    $response->nbtodolate++;
-                }
-            }
-
-            return $response;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
+		if (empty($datestart)) dol_print_error('','Error datestart parameter is empty');
+
+		$sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.fk_task";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
+		$sql.= " WHERE ptt.fk_task = pt.rowid";
+		$sql.= " AND pt.fk_projet = ".$this->id;
+		$sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
+		$sql.= " AND ptt.task_date <= '".$this->db->idate($datestart + (7 * 24 * 3600) - 1)."')";
+		if ($task_id) $sql.= " AND ptt.fk_task=".$taskid;
+		if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid;
+
+		//print $sql;
+		$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)
+				{
+						$obj=$this->db->fetch_object($resql);
+						$day=$this->db->jdate($obj->task_date);
+						$this->weekWorkLoad[$day] +=  $obj->task_duration;
+						$this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
+						$i++;
+				}
+				$this->db->free($resql);
+				return 1;
+		 }
+		else
+		{
+				$this->error="Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+				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;
+
+		$mine=0; $socid=$user->societe_id;
+
+		$projectsListId = $this->getProjectsAuthorizedForUser($user,$mine?$mine:($user->rights->projet->all->lire?2:0),1,$socid);
+
+		$sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
+		$sql.= " FROM (".MAIN_DB_PREFIX."projet as p";
+		$sql.= ")";
+		$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.= " WHERE p.fk_statut = 1";
+		$sql.= " AND p.entity IN (".getEntity('project', 0).')';
+		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))";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$project_static = new Project($this->db);
+
+			$response = new WorkboardResponse();
+			$response->warning_delay = $conf->projet->warning_delay/60/60/24;
+			$response->label = $langs->trans("OpenedProjects");
+			if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
+			else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
+			$response->img = img_object('',"projectpub");
+
+			// This assignment in condition is not a bug. It allows walking the results.
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
+
+				$project_static->statut = $obj->status;
+				$project_static->opp_status = $obj->opp_status;
+				$project_static->datee = $this->db->jdate($obj->datee);
+
+				if ($project_static->hasDelay()) {
+					$response->nbtodolate++;
+				}
+			}
+
+			return $response;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
 
 
 	/**
@@ -1784,36 +1784,36 @@ 
 	 */
 	function load_state_board()
 	{
-	    global $user;
+		global $user;
 
-	    $this->nb=array();
+		$this->nb=array();
 
-	    $sql = "SELECT count(p.rowid) as nb";
-	    $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-	    $sql.= " WHERE";
-	    $sql.= " p.entity IN (".getEntity('projet').")";
+		$sql = "SELECT count(p.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql.= " WHERE";
+		$sql.= " p.entity IN (".getEntity('projet').")";
 		if (! $user->rights->projet->all->lire)
 		{
 			$projectsListId = $this->getProjectsAuthorizedForUser($user,0,1);
 			$sql .= "AND p.rowid IN (".$projectsListId.")";
 		}
 
-	    $resql=$this->db->query($sql);
-	    if ($resql)
-	    {
-	        while ($obj=$this->db->fetch_object($resql))
-	        {
-	            $this->nb["projects"]=$obj->nb;
-	        }
-	        $this->db->free($resql);
-	        return 1;
-	    }
-	    else
-	    {
-	        dol_print_error($this->db);
-	        $this->error=$this->db->error();
-	        return -1;
-	    }
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["projects"]=$obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
 	}
 
 
@@ -1824,14 +1824,14 @@ 
 	 */
 	public function hasDelay()
 	{
-	    global $conf;
+		global $conf;
 
-        if (! ($this->statut == 1)) return false;
-        if (! $this->datee && ! $this->date_end) return false;
+		if (! ($this->statut == 1)) return false;
+		if (! $this->datee && ! $this->date_end) return false;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay);
+		return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay);
 	}
 
 
@@ -1843,44 +1843,44 @@ 
 	 */
 	function info($id)
 	{
-	    $sql = 'SELECT c.rowid, datec as datec, tms as datem,';
-	    $sql.= ' date_close as datecloture,';
-	    $sql.= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture';
-	    $sql.= ' FROM '.MAIN_DB_PREFIX.'projet 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_cloture)
-	            {
-	                $cluser = new User($this->db);
-	                $cluser->fetch($obj->fk_user_cloture);
-	                $this->user_cloture   = $cluser;
-	            }
-
-	            $this->date_creation     = $this->db->jdate($obj->datec);
-	            $this->date_modification = $this->db->jdate($obj->datem);
-	            $this->date_cloture      = $this->db->jdate($obj->datecloture);
-	        }
-
-	        $this->db->free($result);
-
-	    }
-	    else
-	    {
-	        dol_print_error($this->db);
-	    }
+		$sql = 'SELECT c.rowid, datec as datec, tms as datem,';
+		$sql.= ' date_close as datecloture,';
+		$sql.= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'projet 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_cloture)
+				{
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture   = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_cloture      = $this->db->jdate($obj->datecloture);
+			}
+
+			$this->db->free($result);
+
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
 	}
 
 	/**
@@ -1952,10 +1952,10 @@ 
 	 */
 	function getLinesArray($user)
 	{
-	    require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-	    $taskstatic = new Task($this->db);
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		$taskstatic = new Task($this->db);
 
-	    $this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0);
+		$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0);
 	}
 
 }

Spacing +395 added lines, -395 removed lines

@@ -25,7 +25,7 @@ 
  * 		\ingroup    projet
  * 		\brief      File of class to manage projects
  */
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  *	Class to manage projects
@@ -33,11 +33,11 @@ 
 class Project extends CommonObject
 {
 
-    public $element = 'project';    //!< Id that identify managed objects
-    public $table_element = 'projet';  //!< Name of table without prefix where object is stored
+    public $element = 'project'; //!< Id that identify managed objects
+    public $table_element = 'projet'; //!< Name of table without prefix where object is stored
     public $table_element_line = 'projet_task';
     public $fk_element = 'fk_projet';
-    protected $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+    protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'projectpub';
 
     /**
@@ -57,25 +57,25 @@ 
     var $date_end;
     var $date_close;
 
-    var $socid;             // To store id of thirdparty
-    var $thirdparty_name;   // To store name of thirdparty (defined only in some cases)
+    var $socid; // To store id of thirdparty
+    var $thirdparty_name; // To store name of thirdparty (defined only in some cases)
 
-    var $user_author_id;    //!< Id of project creator. Not defined if shared project.
+    var $user_author_id; //!< Id of project creator. Not defined if shared project.
 	var $user_close_id;
-    var $public;      //!< Tell if this is a public or private project
+    var $public; //!< Tell if this is a public or private project
     var $budget_amount;
 
     var $statuts_short;
     var $statuts_long;
 
-    var $statut;			// 0=draft, 1=opened, 2=closed
-    var $opp_status;		// opportunity status, into table llx_c_lead_status
-	var $opp_percent;		// opportunity probability
+    var $statut; // 0=draft, 1=opened, 2=closed
+    var $opp_status; // opportunity status, into table llx_c_lead_status
+	var $opp_percent; // opportunity probability
 
     var $oldcopy;
 
-    var $weekWorkLoad;			// Used to store workload details of a projet
-    var $weekWorkLoadPerTask;	// Used to store workload details of tasks of a projet
+    var $weekWorkLoad; // Used to store workload details of a projet
+    var $weekWorkLoadPerTask; // Used to store workload details of tasks of a projet
 
 	/**
 	 * @var int Creation date
@@ -138,14 +138,14 @@ 
      *    @param	int		$notrigger		Disable triggers
      *    @return   int         			<0 if KO, id of created project if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
         global $conf, $langs;
 
         $error = 0;
         $ret = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Check parameters
         if (!trim($this->ref))
@@ -154,7 +154,7 @@ 
             dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
             return -1;
         }
-        if (! empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && ! $this->socid > 0)
+        if (!empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && !$this->socid > 0)
         {
             $this->error = 'ErrorFieldsRequired';
             dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
@@ -163,51 +163,51 @@ 
 
         $this->db->begin();
 
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "projet (";
-        $sql.= "ref";
-        $sql.= ", title";
-        $sql.= ", description";
-        $sql.= ", fk_soc";
-        $sql.= ", fk_user_creat";
-        $sql.= ", fk_statut";
-        $sql.= ", fk_opp_status";
-        $sql.= ", opp_percent";
-        $sql.= ", public";
-        $sql.= ", datec";
-        $sql.= ", dateo";
-        $sql.= ", datee";
-        $sql.= ", opp_amount";
-        $sql.= ", budget_amount";
-        $sql.= ", entity";
-        $sql.= ") VALUES (";
-        $sql.= "'" . $this->db->escape($this->ref) . "'";
-        $sql.= ", '" . $this->db->escape($this->title) . "'";
-        $sql.= ", '" . $this->db->escape($this->description) . "'";
-        $sql.= ", " . ($this->socid > 0 ? $this->socid : "null");
-        $sql.= ", " . $user->id;
-        $sql.= ", ".(is_numeric($this->statut) ? $this->statut : '0');
-        $sql.= ", ".(is_numeric($this->opp_status) ? $this->opp_status : 'NULL');
-        $sql.= ", ".(is_numeric($this->opp_percent) ? $this->opp_percent : 'NULL');
-        $sql.= ", " . ($this->public ? 1 : 0);
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ", " . ($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
-        $sql.= ", " . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
-        $sql.= ", " . (strcmp($this->opp_amount,'') ? price2num($this->opp_amount) : 'null');
-        $sql.= ", " . (strcmp($this->budget_amount,'') ? price2num($this->budget_amount) : 'null');
-        $sql.= ", ".$conf->entity;
-        $sql.= ")";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet (";
+        $sql .= "ref";
+        $sql .= ", title";
+        $sql .= ", description";
+        $sql .= ", fk_soc";
+        $sql .= ", fk_user_creat";
+        $sql .= ", fk_statut";
+        $sql .= ", fk_opp_status";
+        $sql .= ", opp_percent";
+        $sql .= ", public";
+        $sql .= ", datec";
+        $sql .= ", dateo";
+        $sql .= ", datee";
+        $sql .= ", opp_amount";
+        $sql .= ", budget_amount";
+        $sql .= ", entity";
+        $sql .= ") VALUES (";
+        $sql .= "'".$this->db->escape($this->ref)."'";
+        $sql .= ", '".$this->db->escape($this->title)."'";
+        $sql .= ", '".$this->db->escape($this->description)."'";
+        $sql .= ", ".($this->socid > 0 ? $this->socid : "null");
+        $sql .= ", ".$user->id;
+        $sql .= ", ".(is_numeric($this->statut) ? $this->statut : '0');
+        $sql .= ", ".(is_numeric($this->opp_status) ? $this->opp_status : 'NULL');
+        $sql .= ", ".(is_numeric($this->opp_percent) ? $this->opp_percent : 'NULL');
+        $sql .= ", ".($this->public ? 1 : 0);
+        $sql .= ", '".$this->db->idate($now)."'";
+        $sql .= ", ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
+        $sql .= ", ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
+        $sql .= ", ".(strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : 'null');
+        $sql .= ", ".(strcmp($this->budget_amount, '') ? price2num($this->budget_amount) : 'null');
+        $sql .= ", ".$conf->entity;
+        $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 . "projet");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet");
             $ret = $this->id;
 
             if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('PROJECT_CREATE',$user);
+                $result = $this->call_trigger('PROJECT_CREATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -223,7 +223,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++;
@@ -256,23 +256,23 @@ 
      * @param  int		$notrigger  1=Disable all triggers
      * @return int                  <=0 if KO, >0 if OK
      */
-    function update($user, $notrigger=0)
+    function update($user, $notrigger = 0)
     {
         global $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
         // Clean parameters
         $this->title = trim($this->title);
         $this->description = trim($this->description);
-		if ($this->opp_amount < 0) $this->opp_amount='';
-		if ($this->opp_percent < 0) $this->opp_percent='';
+		if ($this->opp_amount < 0) $this->opp_amount = '';
+		if ($this->opp_percent < 0) $this->opp_percent = '';
         if ($this->date_end && $this->date_end < $this->date_start)
         {
             $this->error = $langs->trans("ErrorDateEndLowerThanDateStart");
             $this->errors[] = $this->error;
             $this->db->rollback();
-            dol_syslog(get_class($this)."::update error -3 " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::update error -3 ".$this->error, LOG_ERR);
             return -3;
         }
 
@@ -280,32 +280,32 @@ 
         {
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet SET";
-            $sql.= " ref='" . $this->db->escape($this->ref) . "'";
-            $sql.= ", title = '" . $this->db->escape($this->title) . "'";
-            $sql.= ", description = '" . $this->db->escape($this->description) . "'";
-            $sql.= ", fk_soc = " . ($this->socid > 0 ? $this->socid : "null");
-            $sql.= ", fk_statut = " . $this->statut;
-            $sql.= ", fk_opp_status = " . ((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'null');
-			$sql.= ", opp_percent = " . ((is_numeric($this->opp_percent) && $this->opp_percent != '') ? $this->opp_percent : 'null');
-            $sql.= ", public = " . ($this->public ? 1 : 0);
-            $sql.= ", datec=" . ($this->date_c != '' ? "'".$this->db->idate($this->date_c)."'" : '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.= ", date_close=" . ($this->date_close != '' ? "'".$this->db->idate($this->date_close)."'" : 'null');
-            $sql.= ", fk_user_close=" . ($this->fk_user_close > 0 ? $this->fk_user_close : "null");
-            $sql.= ", opp_amount = " . (strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : "null");
-            $sql.= ", budget_amount = " . (strcmp($this->budget_amount, '')  ? price2num($this->budget_amount) : "null");
-            $sql.= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."projet SET";
+            $sql .= " ref='".$this->db->escape($this->ref)."'";
+            $sql .= ", title = '".$this->db->escape($this->title)."'";
+            $sql .= ", description = '".$this->db->escape($this->description)."'";
+            $sql .= ", fk_soc = ".($this->socid > 0 ? $this->socid : "null");
+            $sql .= ", fk_statut = ".$this->statut;
+            $sql .= ", fk_opp_status = ".((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'null');
+			$sql .= ", opp_percent = ".((is_numeric($this->opp_percent) && $this->opp_percent != '') ? $this->opp_percent : 'null');
+            $sql .= ", public = ".($this->public ? 1 : 0);
+            $sql .= ", datec=".($this->date_c != '' ? "'".$this->db->idate($this->date_c)."'" : '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 .= ", date_close=".($this->date_close != '' ? "'".$this->db->idate($this->date_close)."'" : 'null');
+            $sql .= ", fk_user_close=".($this->fk_user_close > 0 ? $this->fk_user_close : "null");
+            $sql .= ", opp_amount = ".(strcmp($this->opp_amount, '') ? price2num($this->opp_amount) : "null");
+            $sql .= ", budget_amount = ".(strcmp($this->budget_amount, '') ? price2num($this->budget_amount) : "null");
+            $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(get_class($this)."::update", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
                 if (!$notrigger)
                 {
                     // Call trigger
-                    $result=$this->call_trigger('PROJECT_MODIFY',$user);
+                    $result = $this->call_trigger('PROJECT_MODIFY', $user);
                     if ($result < 0) { $error++; }
                     // End call triggers
                 }
@@ -314,7 +314,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++;
@@ -322,27 +322,27 @@ 
                 	}
                 }
 
-                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)
                 	{
-                		$olddir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($this->oldcopy->ref);
-                		$newdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($this->ref);
+                		$olddir = $conf->projet->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);
+                		$newdir = $conf->projet->dir_output."/".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++;
                 			}
                 		}
                 	}
                 }
-                if (! $error )
+                if (!$error)
                 {
                     $this->db->commit();
                     $result = 1;
@@ -366,7 +366,7 @@ 
 			    {
 			        $result = -2;
 			    }
-		        dol_syslog(get_class($this)."::update error " . $result . " " . $this->error, LOG_ERR);
+		        dol_syslog(get_class($this)."::update error ".$result." ".$this->error, LOG_ERR);
 			}
         }
         else
@@ -385,21 +385,21 @@ 
      * 	@param		string	$ref		Ref of project
      * 	@return     int      		   	>0 if OK, 0 if not found, <0 if KO
      */
-    function fetch($id, $ref='')
+    function fetch($id, $ref = '')
     {
         if (empty($id) && empty($ref)) return -1;
 
         $sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
-        $sql.= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_close, fk_statut, fk_opp_status, opp_percent, note_private, note_public, model_pdf";
-        $sql.= " FROM " . MAIN_DB_PREFIX . "projet";
-        if (! empty($id))
+        $sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_close, fk_statut, fk_opp_status, opp_percent, note_private, note_public, model_pdf";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet";
+        if (!empty($id))
         {
-        	$sql.= " WHERE rowid=".$id;
+        	$sql .= " WHERE rowid=".$id;
         }
-        else if (! empty($ref))
+        else if (!empty($ref))
         {
-        	$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-        	$sql.= " AND entity IN (".getEntity('project').")";
+        	$sql .= " WHERE ref='".$this->db->escape($ref)."'";
+        	$sql .= " AND entity IN (".getEntity('project').")";
         }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -420,7 +420,7 @@ 
                 $this->date_c = $this->db->jdate($obj->datec);
                 $this->datec = $this->db->jdate($obj->datec); // TODO deprecated
                 $this->date_m = $this->db->jdate($obj->tms);
-                $this->datem = $this->db->jdate($obj->tms);  // TODO deprecated
+                $this->datem = $this->db->jdate($obj->tms); // TODO deprecated
                 $this->date_start = $this->db->jdate($obj->dateo);
                 $this->date_end = $this->db->jdate($obj->datee);
                 $this->date_close = $this->db->jdate($obj->date_close);
@@ -433,9 +433,9 @@ 
                 $this->statut = $obj->fk_statut;
                 $this->opp_status = $obj->fk_opp_status;
                 $this->opp_amount	= $obj->opp_amount;
-                $this->opp_percent	= $obj->opp_percent;
-                $this->budget_amount	= $obj->budget_amount;
-                $this->modelpdf	= $obj->model_pdf;
+                $this->opp_percent = $obj->opp_percent;
+                $this->budget_amount = $obj->budget_amount;
+                $this->modelpdf = $obj->model_pdf;
 
                 $this->db->free($resql);
 
@@ -463,16 +463,16 @@ 
      * 	@param		int		$socid		To filter on a particular third party
      * 	@return		array				List of projects
      */
-    function liste_array($socid='')
+    function liste_array($socid = '')
     {
         global $conf;
 
         $projects = array();
 
         $sql = "SELECT rowid, title";
-        $sql.= " FROM " . MAIN_DB_PREFIX . "projet";
-        $sql.= " WHERE entity = " . $conf->entity;
-        if (! empty($socid)) $sql.= " AND fk_soc = " . $socid;
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet";
+        $sql .= " WHERE entity = ".$conf->entity;
+        if (!empty($socid)) $sql .= " AND fk_soc = ".$socid;
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -508,7 +508,7 @@ 
      *  @param		string		$datee			End date (ex 23:59:59)
      * 	@return		mixed						Array list of object ids linked to project, < 0 or string if error
      */
-    function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='')
+    function get_element_list($type, $tablename, $datefieldname = '', $dates = '', $datee = '')
     {
         $elements = array();
 
@@ -516,42 +516,42 @@ 
 
 		if ($type == 'agenda')
         {
-            $sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project=" . $this->id;
+            $sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project=".$this->id;
         }
         elseif ($type == 'expensereport')
 		{
-            $sql = "SELECT ed.rowid FROM " . MAIN_DB_PREFIX . "expensereport as e, " . MAIN_DB_PREFIX . "expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND ed.fk_projet=" . $this->id;
+            $sql = "SELECT ed.rowid FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND ed.fk_projet=".$this->id;
 		}
         elseif ($type == 'project_task')
 		{
-			$sql = "SELECT DISTINCT pt.rowid FROM " . MAIN_DB_PREFIX . "projet_task as pt, " . MAIN_DB_PREFIX . "projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet=" . $this->id;
+			$sql = "SELECT DISTINCT pt.rowid FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet=".$this->id;
 		}
 		elseif ($type == 'project_task_time')	// Case we want to duplicate line foreach user
 		{
-			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM " . MAIN_DB_PREFIX . "projet_task as pt, " . MAIN_DB_PREFIX . "projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet=" . $this->id;
+			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet=".$this->id;
 		}
 		elseif ($type == 'stock_mouvement')
 		{
-			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM ' . MAIN_DB_PREFIX . 'stock_mouvement as ms WHERE ms.origintype = "project" AND ms.fk_origin = ' . $this->id . ' AND ms.type_mouvement = 1';
+			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX.'stock_mouvement as ms WHERE ms.origintype = "project" AND ms.fk_origin = '.$this->id.' AND ms.type_mouvement = 1';
 		}
         else
 		{
-            $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet=" . $this->id;
+            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE fk_projet=".$this->id;
 		}
 
 		if ($dates > 0)
 		{
-			if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date;
+			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
-			$sql.=" AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
+			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
     	if ($datee > 0)
 		{
-			if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date;
+			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
-			$sql.=" AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
+			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
 		}
-		if (! $sql) return -1;
+		if (!$sql) return -1;
 
         //print $sql;
         dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
@@ -566,7 +566,7 @@ 
                 {
                     $obj = $this->db->fetch_object($result);
 
-                    $elements[$i] = $obj->rowid.(empty($obj->fk_user)?'':'_'.$obj->fk_user);
+                    $elements[$i] = $obj->rowid.(empty($obj->fk_user) ? '' : '_'.$obj->fk_user);
 
                     $i++;
                 }
@@ -589,10 +589,10 @@ 
      *    @param       int		$notrigger       Disable triggers
      *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
      */
-    function delete($user, $notrigger=0)
+    function delete($user, $notrigger = 0)
     {
         global $langs, $conf;
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         $error = 0;
 
@@ -612,14 +612,14 @@ 
         }
 
         // Set fk_projet into elements to null
-        $listoftables=array(
-        		'facture'=>'fk_projet','propal'=>'fk_projet','commande'=>'fk_projet',
-                'facture_fourn'=>'fk_projet','commande_fournisseur'=>'fk_projet','supplier_proposal'=>'fk_projet',
-        		'expensereport_det'=>'fk_projet','contrat'=>'fk_projet','fichinter'=>'fk_projet','don'=>'fk_projet'
+        $listoftables = array(
+        		'facture'=>'fk_projet', 'propal'=>'fk_projet', 'commande'=>'fk_projet',
+                'facture_fourn'=>'fk_projet', 'commande_fournisseur'=>'fk_projet', 'supplier_proposal'=>'fk_projet',
+        		'expensereport_det'=>'fk_projet', 'contrat'=>'fk_projet', 'fichinter'=>'fk_projet', 'don'=>'fk_projet'
         		);
-        foreach($listoftables as $key => $value)
+        foreach ($listoftables as $key => $value)
         {
-   	        $sql = "UPDATE " . MAIN_DB_PREFIX . $key . " SET ".$value." = NULL where ".$value." = ". $this->id;
+   	        $sql = "UPDATE ".MAIN_DB_PREFIX.$key." SET ".$value." = NULL where ".$value." = ".$this->id;
 	        $resql = $this->db->query($sql);
 	        if (!$resql)
 	        {
@@ -630,10 +630,10 @@ 
         }
 
         // Delete tasks
-        if (! $error)
+        if (!$error)
         {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_time";
-	        $sql.= " WHERE fk_task IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
+	        $sql .= " WHERE fk_task IN (SELECT rowid FROM ".MAIN_DB_PREFIX."projet_task WHERE fk_projet=".$this->id.")";
 
 	        $resql = $this->db->query($sql);
 	        if (!$resql)
@@ -643,10 +643,10 @@ 
 	        }
         }
 
-        if (! $error)
+        if (!$error)
         {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields";
-	        $sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields";
+	        $sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."projet_task WHERE fk_projet=".$this->id.")";
 
 	        $resql = $this->db->query($sql);
 	        if (!$resql)
@@ -656,10 +656,10 @@ 
 	        }
         }
 
-        if (! $error)
+        if (!$error)
         {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task";
-	        $sql.= " WHERE fk_projet=" . $this->id;
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
+	        $sql .= " WHERE fk_projet=".$this->id;
 
 	        $resql = $this->db->query($sql);
 	        if (!$resql)
@@ -670,10 +670,10 @@ 
         }
 
         // Delete project
-        if (! $error)
+        if (!$error)
         {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet";
-	        $sql.= " WHERE rowid=" . $this->id;
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet";
+	        $sql .= " WHERE rowid=".$this->id;
 
 	        $resql = $this->db->query($sql);
 	        if (!$resql)
@@ -683,13 +683,13 @@ 
 	        }
         }
 
-        if (! $error)
+        if (!$error)
         {
-	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields";
-	        $sql.= " WHERE fk_object=" . $this->id;
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_extrafields";
+	        $sql .= " WHERE fk_object=".$this->id;
 
 	        $resql = $this->db->query($sql);
-	        if (! $resql)
+	        if (!$resql)
 	        {
 	        	$this->errors[] = $this->db->lasterror();
 	        	$error++;
@@ -702,7 +702,7 @@ 
             $projectref = dol_sanitizeFileName($this->ref);
             if ($conf->projet->dir_output)
             {
-                $dir = $conf->projet->dir_output . "/" . $projectref;
+                $dir = $conf->projet->dir_output."/".$projectref;
                 if (file_exists($dir))
                 {
                     $res = @dol_delete_dir_recursive($dir);
@@ -717,7 +717,7 @@ 
             if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('PROJECT_DELETE',$user);
+                $result = $this->call_trigger('PROJECT_DELETE', $user);
 
                 if ($result < 0) {
                     $error++;
@@ -733,12 +733,12 @@ 
         }
         else
        {
-        	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);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
-            dol_syslog(get_class($this) . "::delete " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -751,27 +751,27 @@ 
      *      @param      int     $notrigger     1=Disable triggers
      * 		@return		int					   <0 if KO, >0 if OK
      */
-    function setValid($user, $notrigger=0)
+    function setValid($user, $notrigger = 0)
     {
         global $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
         if ($this->statut != 1)
         {
             // Check parameters
             if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->title))
             {
-                $this->error=$langs->trans("ErrorFieldFormat",$langs->transnoentities("Label")).'. '.$langs->trans('RemoveString',$langs->transnoentitiesnoconv("CopyOf"));
+                $this->error = $langs->trans("ErrorFieldFormat", $langs->transnoentities("Label")).'. '.$langs->trans('RemoveString', $langs->transnoentitiesnoconv("CopyOf"));
                 return -1;
             }
 
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet";
-            $sql.= " SET fk_statut = 1";
-            $sql.= " WHERE rowid = " . $this->id;
-            $sql.= " AND entity = " . $conf->entity;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."projet";
+            $sql .= " SET fk_statut = 1";
+            $sql .= " WHERE rowid = ".$this->id;
+            $sql .= " AND entity = ".$conf->entity;
 
             dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -780,14 +780,14 @@ 
                 // Call trigger
                 if (empty($notrigger))
                 {
-                    $result=$this->call_trigger('PROJECT_VALIDATE',$user);
+                    $result = $this->call_trigger('PROJECT_VALIDATE', $user);
                     if ($result < 0) { $error++; }
                     // End call triggers
                 }
 
                 if (!$error)
                 {
-                	$this->statut=1;
+                	$this->statut = 1;
                 	$this->db->commit();
                     return 1;
                 }
@@ -795,7 +795,7 @@ 
                 {
                     $this->db->rollback();
                     $this->error = join(',', $this->errors);
-                    dol_syslog(get_class($this)."::setValid " . $this->error, LOG_ERR);
+                    dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
                     return -1;
                 }
             }
@@ -820,19 +820,19 @@ 
 
         $now = dol_now();
 
-		$error=0;
+		$error = 0;
 
         if ($this->statut != 2)
         {
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "projet";
-            $sql.= " SET fk_statut = 2, fk_user_close = ".$user->id.", date_close = '".$this->db->idate($now)."'";
-            $sql.= " WHERE rowid = " . $this->id;
-            $sql.= " AND entity = " . $conf->entity;
-            $sql.= " AND fk_statut = 1";
+            $sql = "UPDATE ".MAIN_DB_PREFIX."projet";
+            $sql .= " SET fk_statut = 2, fk_user_close = ".$user->id.", date_close = '".$this->db->idate($now)."'";
+            $sql .= " WHERE rowid = ".$this->id;
+            $sql .= " AND entity = ".$conf->entity;
+            $sql .= " AND fk_statut = 1";
 
-            if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
             {
             	// TODO What to do if fk_opp_status is not code 'WON' or 'LOST'
             }
@@ -842,7 +842,7 @@ 
             if ($resql)
             {
                 // Call trigger
-                $result=$this->call_trigger('PROJECT_CLOSE',$user);
+                $result = $this->call_trigger('PROJECT_CLOSE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 
@@ -856,7 +856,7 @@ 
                 {
                     $this->db->rollback();
                     $this->error = join(',', $this->errors);
-                    dol_syslog(get_class($this)."::setClose " . $this->error, LOG_ERR);
+                    dol_syslog(get_class($this)."::setClose ".$this->error, LOG_ERR);
                     return -1;
                 }
             }
@@ -877,7 +877,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
      */
-    function getLibStatut($mode=0)
+    function getLibStatut($mode = 0)
     {
         return $this->LibStatut($this->statut, $mode);
     }
@@ -889,7 +889,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
      */
-    function LibStatut($statut, $mode=0)
+    function LibStatut($statut, $mode = 0)
     {
         global $langs;
 
@@ -904,11 +904,11 @@ 
         if ($mode == 2)
         {
             if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0').' '.$langs->trans($this->statuts_short[$statut]);
             if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4').' '.$langs->trans($this->statuts_short[$statut]);
             if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6').' '.$langs->trans($this->statuts_short[$statut]);
         }
         if ($mode == 3)
         {
@@ -922,20 +922,20 @@ 
         if ($mode == 4)
         {
             if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_long[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0').' '.$langs->trans($this->statuts_long[$statut]);
             if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_long[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4').' '.$langs->trans($this->statuts_long[$statut]);
             if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_long[$statut]);
+                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6').' '.$langs->trans($this->statuts_long[$statut]);
         }
         if ($mode == 5)
         {
             if ($statut == 0)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
+                return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
             if ($statut == 1)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
+                return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
             if ($statut == 2)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
+                return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
         }
     }
 
@@ -951,65 +951,65 @@ 
      *  @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
      */
-    function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='', $sep=' - ', $notooltip=0, $save_lastsearch_value=-1)
+    function getNomUrl($withpicto = 0, $option = '', $addlabel = 0, $moreinpopup = '', $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='';
-        if ($option != 'nolink') $label = '<u>' . $langs->trans("ShowProject") . '</u>';
-        $label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
-        $label .= ($label?'<br>':'').'<b>' . $langs->trans('Label') . ': </b>' . $this->title;	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->thirdparty_name))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('ThirdParty') . ': </b>' . $this->thirdparty_name;	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->dateo))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('DateStart') . ': </b>' . dol_print_date($this->dateo, 'day');	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->datee))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('DateEnd') . ': </b>' . dol_print_date($this->datee, 'day');	// The space must be after the : to not being explode when showing the title in img_picto
-        if ($moreinpopup) $label.='<br>'.$moreinpopup;
-
-        $url='';
+        $label = '';
+        if ($option != 'nolink') $label = '<u>'.$langs->trans("ShowProject").'</u>';
+        $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
+        $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
+        if (!empty($this->thirdparty_name))
+            $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('ThirdParty').': </b>'.$this->thirdparty_name; // The space must be after the : to not being explode when showing the title in img_picto
+        if (!empty($this->dateo))
+            $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateStart').': </b>'.dol_print_date($this->dateo, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
+        if (!empty($this->datee))
+            $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
+        if ($moreinpopup) $label .= '<br>'.$moreinpopup;
+
+        $url = '';
         if ($option != 'nolink')
         {
-            if (preg_match('/\.php$/',$option)) {
-                $url = dol_buildpath($option,1) . '?id=' . $this->id;
+            if (preg_match('/\.php$/', $option)) {
+                $url = dol_buildpath($option, 1).'?id='.$this->id;
             }
             else if ($option == 'task')
             {
-                $url = DOL_URL_ROOT . '/projet/tasks.php?id=' . $this->id;
+                $url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
             }
             else
             {
-                $url = DOL_URL_ROOT . '/projet/card.php?id=' . $this->id;
+                $url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
             }
             // 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) && $user->rights->projet->lire)
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowProject");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowProject");
+                $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"';
 
-		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('projectdao'));
-		$parameters=array('id'=>$this->id);
+		$parameters = array('id'=>$this->id);
 		// Note that $action and $object may have been modified by some hooks
-		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);
+		$reshook = $hookmanager->executeHooks('getnomurltooltip', $parameters, $this, $action);
 		if ($reshook > 0)
 			$linkclose = $hookmanager->resPrint;
         }
@@ -1018,12 +1018,12 @@ 
         if (!$this->public) $picto = 'project';
 
         $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.=' ';
-        if ($withpicto != 2) $result.=$linkstart . $this->ref . $linkend . (($addlabel && $this->title) ? $sep . dol_trunc($this->title, ($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->title) ? $sep.dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
         return $result;
     }
 
@@ -1038,7 +1038,7 @@ 
     {
         global $user, $langs, $conf;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Initialise parameters
         $this->id = 0;
@@ -1077,15 +1077,15 @@ 
      * 	@param  string	$mode		Type of permission we want to know: 'read', 'write'
      * 	@return	int					>0 if user has permission, <0 if user has no permission
      */
-    function restrictedProjectArea($user, $mode='read')
+    function restrictedProjectArea($user, $mode = 'read')
     {
         // To verify role of users
         $userAccess = 0;
-        if (($mode == 'read' && ! empty($user->rights->projet->all->lire)) || ($mode == 'write' && ! empty($user->rights->projet->all->creer)) || ($mode == 'delete' && ! empty($user->rights->projet->all->supprimer)))
+        if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer)))
         {
             $userAccess = 1;
         }
-        else if ($this->public && (($mode == 'read' && ! empty($user->rights->projet->lire)) || ($mode == 'write' && ! empty($user->rights->projet->creer)) || ($mode == 'delete' && ! empty($user->rights->projet->supprimer))))
+        else if ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
         {
             $userAccess = 1;
         }
@@ -1101,8 +1101,8 @@ 
                 {
                     if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
                     {
-                        if ($mode == 'read'   && $user->rights->projet->lire)      $userAccess++;
-                        if ($mode == 'write'  && $user->rights->projet->creer)     $userAccess++;
+                        if ($mode == 'read' && $user->rights->projet->lire)      $userAccess++;
+                        if ($mode == 'write' && $user->rights->projet->creer)     $userAccess++;
                         if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
                     }
                     $nblinks++;
@@ -1117,7 +1117,7 @@ 
             //}
         }
 
-        return ($userAccess?$userAccess:-1);
+        return ($userAccess ? $userAccess : -1);
     }
 
     /**
@@ -1130,60 +1130,60 @@ 
      * @param	string		$filter			additionnal filter on project (statut, ref, ...)
      * @return 	array or string			Array of projects id, or string with projects id separated with ","
      */
-    function getProjectsAuthorizedForUser($user, $mode=0, $list=0, $socid=0, $filter='')
+    function getProjectsAuthorizedForUser($user, $mode = 0, $list = 0, $socid = 0, $filter = '')
     {
         $projects = array();
         $temp = array();
 
         $sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
-        $sql.= " FROM " . MAIN_DB_PREFIX . "projet as p";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
         if ($mode == 0 || $mode == 1)
         {
-            $sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
+            $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
         }
-        $sql.= " WHERE p.entity IN (".getEntity('project').")";
+        $sql .= " WHERE p.entity IN (".getEntity('project').")";
         // Internal users must see project he is contact to even if project linked to a third party he can't see.
         //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 > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+        if ($socid > 0) $sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 
         // Get id of types of contacts for projects (This list never contains a lot of elements)
-        $listofprojectcontacttype=array();
+        $listofprojectcontacttype = array();
         $sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-        $sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
-        $sql2.= " AND ctc.source = 'internal'";
+        $sql2 .= " WHERE ctc.element = '".$this->db->escape($this->element)."'";
+        $sql2 .= " AND ctc.source = 'internal'";
         $resql = $this->db->query($sql2);
         if ($resql)
         {
-            while($obj = $this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
-                $listofprojectcontacttype[$obj->rowid]=$obj->code;
+                $listofprojectcontacttype[$obj->rowid] = $obj->code;
             }
         }
         else dol_print_error($this->db);
-        if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
+        if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid syntax error if not found
 
         if ($mode == 0)
         {
-            $sql.= " AND ec.element_id = p.rowid";
-            $sql.= " AND ( p.public = 1";
-            $sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-            $sql.= " AND ec.fk_socpeople = ".$user->id.")";
-            $sql.= " )";
+            $sql .= " AND ec.element_id = p.rowid";
+            $sql .= " AND ( p.public = 1";
+            $sql .= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+            $sql .= " AND ec.fk_socpeople = ".$user->id.")";
+            $sql .= " )";
         }
         if ($mode == 1)
         {
-            $sql.= " AND ec.element_id = p.rowid";
-            $sql.= " AND (";
-            $sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-            $sql.= " AND ec.fk_socpeople = ".$user->id.")";
-            $sql.= " )";
+            $sql .= " AND ec.element_id = p.rowid";
+            $sql .= " AND (";
+            $sql .= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+            $sql .= " AND ec.fk_socpeople = ".$user->id.")";
+            $sql .= " )";
         }
         if ($mode == 2)
         {
             // No filter. Use this if user has permission to see all project
         }
 
-	$sql.= $filter;
+	$sql .= $filter;
         //print $sql;
 
         $resql = $this->db->query($sql);
@@ -1230,19 +1230,19 @@ 
       * @param  int     $newthirdpartyid  New thirdparty id
 	  * @return	int						New id of clone
 	  */
-	function createFromClone($fromid,$clone_contact=false,$clone_task=true,$clone_project_file=false,$clone_task_file=false,$clone_note=true,$move_date=true,$notrigger=0,$newthirdpartyid=0)
+	function createFromClone($fromid, $clone_contact = false, $clone_task = true, $clone_project_file = false, $clone_task_file = false, $clone_note = true, $move_date = true, $notrigger = 0, $newthirdpartyid = 0)
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
-		dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_project_file=".$clone_project_file." clone_note=".$clone_note." move_date=".$move_date,LOG_DEBUG);
+		dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_project_file=".$clone_project_file." clone_note=".$clone_note." move_date=".$move_date, LOG_DEBUG);
 
-		$now = dol_mktime(0,0,0,idate('m',dol_now()),idate('d',dol_now()),idate('Y',dol_now()));
+		$now = dol_mktime(0, 0, 0, idate('m', dol_now()), idate('d', dol_now()), idate('Y', dol_now()));
 
-		$clone_project=new Project($this->db);
+		$clone_project = new Project($this->db);
 
-		$clone_project->context['createfromclone']='createfromclone';
+		$clone_project->context['createfromclone'] = 'createfromclone';
 
 		$this->db->begin();
 
@@ -1252,10 +1252,10 @@ 
 		if ($newthirdpartyid > 0) $clone_project->socid = $newthirdpartyid;
 		$clone_project->fetch_thirdparty();
 
-		$orign_dt_start=$clone_project->date_start;
-		$orign_project_ref=$clone_project->ref;
+		$orign_dt_start = $clone_project->date_start;
+		$orign_project_ref = $clone_project->ref;
 
-		$clone_project->id=0;
+		$clone_project->id = 0;
 		if ($move_date) {
 	        $clone_project->date_start = $now;
 	        if (!(empty($clone_project->date_end)))
@@ -1266,63 +1266,63 @@ 
 
         $clone_project->datec = $now;
 
-        if (! $clone_note)
+        if (!$clone_note)
         {
-        	    $clone_project->note_private='';
-    			$clone_project->note_public='';
+        	    $clone_project->note_private = '';
+    			$clone_project->note_public = '';
         }
 
 		//Generate next ref
-		$defaultref='';
-    	$obj = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON;
+		$defaultref = '';
+    	$obj = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
     	// Search template files
-    	$file=''; $classname=''; $filefound=0;
-    	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-    	foreach($dirmodels as $reldir)
+    	$file = ''; $classname = ''; $filefound = 0;
+    	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+    	foreach ($dirmodels as $reldir)
     	{
-    	    $file=dol_buildpath($reldir."core/modules/project/".$obj.'.php',0);
+    	    $file = dol_buildpath($reldir."core/modules/project/".$obj.'.php', 0);
     	    if (file_exists($file))
     	    {
-    	        $filefound=1;
+    	        $filefound = 1;
     	        dol_include_once($reldir."core/modules/project/".$obj.'.php');
             	$modProject = new $obj;
-            	$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty)?$clone_project->thirdparty:null, $clone_project);
+            	$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty) ? $clone_project->thirdparty : null, $clone_project);
             	break;
     	    }
     	}
-    	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+    	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
 
-		$clone_project->ref=$defaultref;
-		$clone_project->title=$langs->trans("CopyOf").' '.$clone_project->title;
+		$clone_project->ref = $defaultref;
+		$clone_project->title = $langs->trans("CopyOf").' '.$clone_project->title;
 
 		// Create clone
-		$result=$clone_project->create($user,$notrigger);
+		$result = $clone_project->create($user, $notrigger);
 
 		// Other options
 		if ($result < 0)
 		{
-			$this->error.=$clone_project->error;
+			$this->error .= $clone_project->error;
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			//Get the new project id
-			$clone_project_id=$clone_project->id;
+			$clone_project_id = $clone_project->id;
 
 			//Note Update
 			if (!$clone_note)
        		{
-        	    $clone_project->note_private='';
-    			$clone_project->note_public='';
+        	    $clone_project->note_private = '';
+    			$clone_project->note_public = '';
         	}
         	else
         	{
         		$this->db->begin();
-				$res=$clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES),'_public');
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
 				{
-					$this->error.=$clone_project->error;
+					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
 				}
@@ -1332,10 +1332,10 @@ 
 				}
 
 				$this->db->begin();
-				$res=$clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES), '_private');
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES), '_private');
 				if ($res < 0)
 				{
-					$this->error.=$clone_project->error;
+					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
 				}
@@ -1351,24 +1351,24 @@ 
 				$origin_project = new Project($this->db);
 				$origin_project->fetch($fromid);
 
-				foreach(array('internal','external') as $source)
+				foreach (array('internal', 'external') as $source)
 				{
-					$tab = $origin_project->liste_contact(-1,$source);
+					$tab = $origin_project->liste_contact(-1, $source);
 
 					foreach ($tab as $contacttoadd)
 					{
-						$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'],$notrigger);
+						$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
 						if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 						{
 							$langs->load("errors");
-							$this->error.=$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
 						}
 						else
 						{
-							if ($clone_project->error!='')
+							if ($clone_project->error != '')
 							{
-								$this->error.=$clone_project->error;
+								$this->error .= $clone_project->error;
 								$error++;
 							}
 						}
@@ -1381,25 +1381,25 @@ 
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-				$clone_project_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($defaultref);
-				$ori_project_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($orign_project_ref);
+				$clone_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($defaultref);
+				$ori_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($orign_project_ref);
 
 				if (dol_mkdir($clone_project_dir) >= 0)
 				{
-					$filearray=dol_dir_list($ori_project_dir,"files",0,'','(\.meta|_preview.*\.png)$','',SORT_ASC,1);
-					foreach($filearray as $key => $file)
+					$filearray = dol_dir_list($ori_project_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
+					foreach ($filearray as $key => $file)
 					{
-						$rescopy = dol_copy($ori_project_dir . '/' . $file['name'], $clone_project_dir . '/' . $file['name'],0,1);
+						$rescopy = dol_copy($ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name'], 0, 1);
 						if (is_numeric($rescopy) && $rescopy < 0)
 						{
-							$this->error.=$langs->trans("ErrorFailToCopyFile",$ori_project_dir . '/' . $file['name'],$clone_project_dir . '/' . $file['name']);
+							$this->error .= $langs->trans("ErrorFailToCopyFile", $ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name']);
 							$error++;
 						}
 					}
 				}
 				else
 				{
-					$this->error.=$langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
+					$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
 					$error++;
 				}
 			}
@@ -1407,55 +1407,55 @@ 
 			//Duplicate task
 			if ($clone_task)
 			{
-				require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 				$taskstatic = new Task($this->db);
 
 				// Security check
-				$socid=0;
+				$socid = 0;
 				if ($user->societe_id > 0) $socid = $user->societe_id;
 
-				$tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
+				$tasksarray = $taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
 
-				$tab_conv_child_parent=array();
+				$tab_conv_child_parent = array();
 
 				// Loop on each task, to clone it
 			    foreach ($tasksarray as $tasktoclone)
 			    {
-					$result_clone = $taskstatic->createFromClone($tasktoclone->id,$clone_project_id,$tasktoclone->fk_parent,$move_date,true,false,$clone_task_file,true,false);
+					$result_clone = $taskstatic->createFromClone($tasktoclone->id, $clone_project_id, $tasktoclone->fk_parent, $move_date, true, false, $clone_task_file, true, false);
 					if ($result_clone <= 0)
 				    {
-				    	$this->error.=$result_clone->error;
+				    	$this->error .= $result_clone->error;
 						$error++;
 				    }
 				    else
 				    {
-				    	$new_task_id=$result_clone;
+				    	$new_task_id = $result_clone;
 				    	$taskstatic->fetch($tasktoclone->id);
 
 				    	//manage new parent clone task id
 				    	// if the current task has child we store the original task id and the equivalent clone task id
-						if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id,$tab_conv_child_parent))
+						if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id, $tab_conv_child_parent))
 						{
-							$tab_conv_child_parent[$tasktoclone->id] =  $new_task_id;
+							$tab_conv_child_parent[$tasktoclone->id] = $new_task_id;
 						}
 				    }
 
 			    }
 
 			    //Parse all clone node to be sure to update new parent
-			    $tasksarray=$taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0);
+			    $tasksarray = $taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0);
 			    foreach ($tasksarray as $task_cloned)
 			    {
 			    	$taskstatic->fetch($task_cloned->id);
-			    	if ($taskstatic->fk_task_parent!=0)
+			    	if ($taskstatic->fk_task_parent != 0)
 			    	{
-			    		$taskstatic->fk_task_parent=$tab_conv_child_parent[$taskstatic->fk_task_parent];
+			    		$taskstatic->fk_task_parent = $tab_conv_child_parent[$taskstatic->fk_task_parent];
 			    	}
-			    	$res=$taskstatic->update($user,$notrigger);
+			    	$res = $taskstatic->update($user, $notrigger);
 			    	if ($result_clone <= 0)
 				    {
-				    	$this->error.=$taskstatic->error;
+				    	$this->error .= $taskstatic->error;
 						$error++;
 				    }
 			    }
@@ -1464,7 +1464,7 @@ 
 
 		unset($clone_project->context['createfromclone']);
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return $clone_project_id;
@@ -1472,7 +1472,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;
 		}
 	}
@@ -1486,32 +1486,32 @@ 
 	  */
 	function shiftTaskDate($old_project_dt_start)
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
 		$taskstatic = new Task($this->db);
 
 		// Security check
-		$socid=0;
+		$socid = 0;
 		if ($user->societe_id > 0) $socid = $user->societe_id;
 
-		$tasksarray=$taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
+		$tasksarray = $taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
 
 	    foreach ($tasksarray as $tasktoshiftdate)
 	    {
-	    	$to_update=false;
+	    	$to_update = false;
 	    	// Fetch only if update of date will be made
 	    	if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end)))
 	    	{
 	    		//dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG);
-	    		$to_update=true;
+	    		$to_update = true;
 		    	$task = new Task($this->db);
 		    	$result = $task->fetch($tasktoshiftdate->id);
 		    	if (!$result)
 		    	{
 		    		$error++;
-		    		$this->error.=$task->error;
+		    		$this->error .= $task->error;
 		    	}
 	    	}
 			//print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit;
@@ -1519,13 +1519,13 @@ 
 	    	//Calcultate new task start date with difference between old proj start date and origin task start date
 	    	if (!empty($tasktoshiftdate->date_start))
 	    	{
-				$task->date_start			= $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start);
+				$task->date_start = $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start);
 	    	}
 
 	    	//Calcultate new task end date with difference between origin proj end date and origin task end date
 	    	if (!empty($tasktoshiftdate->date_end))
 	    	{
-				$task->date_end		    	= $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start);
+				$task->date_end = $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start);
 	    	}
 
 			if ($to_update)
@@ -1534,11 +1534,11 @@ 
 		    	if (!$result)
 		    	{
 		    		$error++;
-		    		$this->error.=$task->error;
+		    		$this->error .= $task->error;
 		    	}
 			}
 	    }
-	    if ($error!=0)
+	    if ($error != 0)
 	    {
 	    	return -1;
 	    }
@@ -1555,25 +1555,25 @@ 
 	  */
 	function update_element($tableName, $elementSelectId)
 	{
-		$sql="UPDATE ".MAIN_DB_PREFIX.$tableName;
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
 
 		if ($tableName == "actioncomm")
 		{
-			$sql.= " SET fk_project=".$this->id;
-			$sql.= " WHERE id=".$elementSelectId;
+			$sql .= " SET fk_project=".$this->id;
+			$sql .= " WHERE id=".$elementSelectId;
 		}
 		else
 		{
-			$sql.= " SET fk_projet=".$this->id;
-			$sql.= " WHERE rowid=".$elementSelectId;
+			$sql .= " SET fk_projet=".$this->id;
+			$sql .= " WHERE rowid=".$elementSelectId;
 		}
 
 		dol_syslog(get_class($this)."::update_element", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
-		}else {
+		} else {
 			return 1;
 		}
 
@@ -1588,25 +1588,25 @@ 
 	 */
 	function remove_element($tableName, $elementSelectId)
 	{
-		$sql="UPDATE ".MAIN_DB_PREFIX.$tableName;
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
 
-		if ($TableName=="actioncomm")
+		if ($TableName == "actioncomm")
 		{
-			$sql.= " SET fk_project=NULL";
-			$sql.= " WHERE id=".$elementSelectId;
+			$sql .= " SET fk_project=NULL";
+			$sql .= " WHERE id=".$elementSelectId;
 		}
 		else
 		{
-			$sql.= " SET fk_projet=NULL";
-			$sql.= " WHERE rowid=".$elementSelectId;
+			$sql .= " SET fk_projet=NULL";
+			$sql .= " WHERE rowid=".$elementSelectId;
 		}
 
 		dol_syslog(get_class($this)."::remove_element", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
-		}else {
+		} else {
 			return 1;
 		}
 
@@ -1622,19 +1622,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 = 'baleine';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->PROJECT_ADDON_PDF)) {
+			} elseif (!empty($conf->global->PROJECT_ADDON_PDF)) {
 				$modele = $conf->global->PROJECT_ADDON_PDF;
 			}
 		}
@@ -1653,23 +1653,23 @@ 
 	 * @param 	int		$userid			Time spent by a particular user
 	 * @return 	int						<0 if OK, >0 if KO
 	 */
-	public function loadTimeSpent($datestart,$taskid=0,$userid=0)
+	public function loadTimeSpent($datestart, $taskid = 0, $userid = 0)
     {
-        $error=0;
+        $error = 0;
 
-        if (empty($datestart)) dol_print_error('','Error datestart parameter is empty');
+        if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty');
 
         $sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.fk_task";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
-        $sql.= " WHERE ptt.fk_task = pt.rowid";
-        $sql.= " AND pt.fk_projet = ".$this->id;
-        $sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
-        $sql.= " AND ptt.task_date <= '".$this->db->idate($datestart + (7 * 24 * 3600) - 1)."')";
-        if ($task_id) $sql.= " AND ptt.fk_task=".$taskid;
-        if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid;
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
+        $sql .= " WHERE ptt.fk_task = pt.rowid";
+        $sql .= " AND pt.fk_projet = ".$this->id;
+        $sql .= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
+        $sql .= " AND ptt.task_date <= '".$this->db->idate($datestart + (7 * 24 * 3600) - 1)."')";
+        if ($task_id) $sql .= " AND ptt.fk_task=".$taskid;
+        if (is_numeric($userid)) $sql .= " AND ptt.fk_user=".$userid;
 
         //print $sql;
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
 
@@ -1678,9 +1678,9 @@ 
                 // Loop on each record found, so each couple (project id, task id)
                  while ($i < $num)
                 {
-                        $obj=$this->db->fetch_object($resql);
-                        $day=$this->db->jdate($obj->task_date);
-                        $this->weekWorkLoad[$day] +=  $obj->task_duration;
+                        $obj = $this->db->fetch_object($resql);
+                        $day = $this->db->jdate($obj->task_date);
+                        $this->weekWorkLoad[$day] += $obj->task_duration;
                         $this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
                         $i++;
                 }
@@ -1689,7 +1689,7 @@ 
          }
         else
         {
-                $this->error="Error ".$this->db->lasterror();
+                $this->error = "Error ".$this->db->lasterror();
                 dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
                 return -1;
         }
@@ -1706,37 +1706,37 @@ 
     {
         global $conf, $langs;
 
-        $mine=0; $socid=$user->societe_id;
+        $mine = 0; $socid = $user->societe_id;
 
-        $projectsListId = $this->getProjectsAuthorizedForUser($user,$mine?$mine:($user->rights->projet->all->lire?2:0),1,$socid);
+        $projectsListId = $this->getProjectsAuthorizedForUser($user, $mine ? $mine : ($user->rights->projet->all->lire ? 2 : 0), 1, $socid);
 
         $sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
-        $sql.= " FROM (".MAIN_DB_PREFIX."projet as p";
-        $sql.= ")";
-        $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.= " WHERE p.fk_statut = 1";
-        $sql.= " AND p.entity IN (".getEntity('project', 0).')';
-        if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+        $sql .= " FROM (".MAIN_DB_PREFIX."projet as p";
+        $sql .= ")";
+        $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 .= " WHERE p.fk_statut = 1";
+        $sql .= " AND p.entity IN (".getEntity('project', 0).')';
+        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)
         {
             $project_static = new Project($this->db);
 
             $response = new WorkboardResponse();
-            $response->warning_delay = $conf->projet->warning_delay/60/60/24;
+            $response->warning_delay = $conf->projet->warning_delay / 60 / 60 / 24;
             $response->label = $langs->trans("OpenedProjects");
             if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
             else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
-            $response->img = img_object('',"projectpub");
+            $response->img = img_object('', "projectpub");
 
             // 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++;
 
@@ -1753,7 +1753,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -1786,24 +1786,24 @@ 
 	{
 	    global $user;
 
-	    $this->nb=array();
+	    $this->nb = array();
 
 	    $sql = "SELECT count(p.rowid) as nb";
-	    $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-	    $sql.= " WHERE";
-	    $sql.= " p.entity IN (".getEntity('projet').")";
-		if (! $user->rights->projet->all->lire)
+	    $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+	    $sql .= " WHERE";
+	    $sql .= " p.entity IN (".getEntity('projet').")";
+		if (!$user->rights->projet->all->lire)
 		{
-			$projectsListId = $this->getProjectsAuthorizedForUser($user,0,1);
+			$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
 			$sql .= "AND p.rowid IN (".$projectsListId.")";
 		}
 
-	    $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["projects"]=$obj->nb;
+	            $this->nb["projects"] = $obj->nb;
 	        }
 	        $this->db->free($resql);
 	        return 1;
@@ -1811,7 +1811,7 @@ 
 	    else
 	    {
 	        dol_print_error($this->db);
-	        $this->error=$this->db->error();
+	        $this->error = $this->db->error();
 	        return -1;
 	    }
 	}
@@ -1826,8 +1826,8 @@ 
 	{
 	    global $conf;
 
-        if (! ($this->statut == 1)) return false;
-        if (! $this->datee && ! $this->date_end) return false;
+        if (!($this->statut == 1)) return false;
+        if (!$this->datee && !$this->date_end) return false;
 
         $now = dol_now();
 
@@ -1844,11 +1844,11 @@ 
 	function info($id)
 	{
 	    $sql = 'SELECT c.rowid, datec as datec, tms as datem,';
-	    $sql.= ' date_close as datecloture,';
-	    $sql.= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture';
-	    $sql.= ' FROM '.MAIN_DB_PREFIX.'projet as c';
-	    $sql.= ' WHERE c.rowid = '.$id;
-	    $result=$this->db->query($sql);
+	    $sql .= ' date_close as datecloture,';
+	    $sql .= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture';
+	    $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as c';
+	    $sql .= ' WHERE c.rowid = '.$id;
+	    $result = $this->db->query($sql);
 	    if ($result)
 	    {
 	        if ($this->db->num_rows($result))
@@ -1859,14 +1859,14 @@ 
 	            {
 	                $cuser = new User($this->db);
 	                $cuser->fetch($obj->fk_user_author);
-	                $this->user_creation   = $cuser;
+	                $this->user_creation = $cuser;
 	            }
 
 	            if ($obj->fk_user_cloture)
 	            {
 	                $cluser = new User($this->db);
 	                $cluser->fetch($obj->fk_user_cloture);
-	                $this->user_cloture   = $cluser;
+	                $this->user_cloture = $cluser;
 	            }
 
 	            $this->date_creation     = $this->db->jdate($obj->datec);
@@ -1905,7 +1905,7 @@ 
 		}
 
 		// Get current categories
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$c = new Categorie($this->db);
 		$existing = $c->containing($this->id, $type_id, 'id');
 
@@ -1921,20 +1921,20 @@ 
 		// Process
 		foreach ($to_del as $del) {
 			if ($c->fetch($del) > 0) {
-				$result=$c->del_type($this, $type_text);
-				if ($result<0) {
-					$this->errors=$c->errors;
-					$this->error=$c->error;
+				$result = $c->del_type($this, $type_text);
+				if ($result < 0) {
+					$this->errors = $c->errors;
+					$this->error = $c->error;
 					return -1;
 				}
 			}
 		}
 		foreach ($to_add as $add) {
 			if ($c->fetch($add) > 0) {
-				$result=$c->add_type($this, $type_text);
-				if ($result<0) {
-					$this->errors=$c->errors;
-					$this->error=$c->error;
+				$result = $c->add_type($this, $type_text);
+				if ($result < 0) {
+					$this->errors = $c->errors;
+					$this->error = $c->error;
 					return -1;
 				}
 			}

Braces +229 added lines, -155 removed lines

@@ -211,8 +211,7 @@ 
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
-        }
-        else
+        } else
         {
             $this->error = $this->db->lasterror();
             $this->errno = $this->db->lasterrno();
@@ -221,9 +220,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++;
@@ -234,15 +235,16 @@ 
         if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
         {
             $res = $this->setValid($user);
-            if ($res < 0) $error++;
+            if ($res < 0) {
+            	$error++;
+            }
         }
 
         if (!$error)
         {
             $this->db->commit();
             return $ret;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -265,8 +267,12 @@ 
         // Clean parameters
         $this->title = trim($this->title);
         $this->description = trim($this->description);
-		if ($this->opp_amount < 0) $this->opp_amount='';
-		if ($this->opp_percent < 0) $this->opp_percent='';
+		if ($this->opp_amount < 0) {
+			$this->opp_amount='';
+		}
+		if ($this->opp_percent < 0) {
+			$this->opp_percent='';
+		}
         if ($this->date_end && $this->date_end < $this->date_start)
         {
             $this->error = $langs->trans("ErrorDateEndLowerThanDateStart");
@@ -312,9 +318,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++;
@@ -346,14 +354,12 @@ 
                 {
                     $this->db->commit();
                     $result = 1;
-                }
-                else
+                } else
               {
                     $this->db->rollback();
                     $result = -1;
                 }
-            }
-            else
+            } else
 			{
 		        $this->error = $this->db->lasterror();
 		        $this->errors[] = $this->error;
@@ -361,15 +367,13 @@ 
 			    if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			    {
 			        $result = -4;
-			    }
-			    else
+			    } else
 			    {
 			        $result = -2;
 			    }
 		        dol_syslog(get_class($this)."::update error " . $result . " " . $this->error, LOG_ERR);
 			}
-        }
-        else
+        } else
         {
             dol_syslog(get_class($this)."::update ref null");
             $result = -1;
@@ -387,7 +391,9 @@ 
      */
     function fetch($id, $ref='')
     {
-        if (empty($id) && empty($ref)) return -1;
+        if (empty($id) && empty($ref)) {
+        	return -1;
+        }
 
         $sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
         $sql.= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_close, fk_statut, fk_opp_status, opp_percent, note_private, note_public, model_pdf";
@@ -395,8 +401,7 @@ 
         if (! empty($id))
         {
         	$sql.= " WHERE rowid=".$id;
-        }
-        else if (! empty($ref))
+        } else if (! empty($ref))
         {
         	$sql.= " WHERE ref='".$this->db->escape($ref)."'";
         	$sql.= " AND entity IN (".getEntity('project').")";
@@ -447,10 +452,12 @@ 
 
             $this->db->free($resql);
 
-            if ($num_rows) return 1;
-            else return 0;
-        }
-        else
+            if ($num_rows) {
+            	return 1;
+            } else {
+            	return 0;
+            }
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -472,7 +479,9 @@ 
         $sql = "SELECT rowid, title";
         $sql.= " FROM " . MAIN_DB_PREFIX . "projet";
         $sql.= " WHERE entity = " . $conf->entity;
-        if (! empty($socid)) $sql.= " AND fk_soc = " . $socid;
+        if (! empty($socid)) {
+        	$sql.= " AND fk_soc = " . $socid;
+        }
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -491,8 +500,7 @@ 
                 }
             }
             return $projects;
-        }
-        else
+        } else
         {
             print $this->db->lasterror();
         }
@@ -512,46 +520,55 @@ 
     {
         $elements = array();
 
-        if ($this->id <= 0) return $elements;
+        if ($this->id <= 0) {
+        	return $elements;
+        }
 
 		if ($type == 'agenda')
         {
             $sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project=" . $this->id;
-        }
-        elseif ($type == 'expensereport')
+        } elseif ($type == 'expensereport')
 		{
             $sql = "SELECT ed.rowid FROM " . MAIN_DB_PREFIX . "expensereport as e, " . MAIN_DB_PREFIX . "expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND ed.fk_projet=" . $this->id;
-		}
-        elseif ($type == 'project_task')
+		} elseif ($type == 'project_task')
 		{
 			$sql = "SELECT DISTINCT pt.rowid FROM " . MAIN_DB_PREFIX . "projet_task as pt, " . MAIN_DB_PREFIX . "projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet=" . $this->id;
-		}
-		elseif ($type == 'project_task_time')	// Case we want to duplicate line foreach user
+		} elseif ($type == 'project_task_time') {
+			// Case we want to duplicate line foreach user
 		{
 			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM " . MAIN_DB_PREFIX . "projet_task as pt, " . MAIN_DB_PREFIX . "projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet=" . $this->id;
 		}
-		elseif ($type == 'stock_mouvement')
+		} elseif ($type == 'stock_mouvement')
 		{
 			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM ' . MAIN_DB_PREFIX . 'stock_mouvement as ms WHERE ms.origintype = "project" AND ms.fk_origin = ' . $this->id . ' AND ms.type_mouvement = 1';
-		}
-        else
+		} else
 		{
             $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet=" . $this->id;
 		}
 
 		if ($dates > 0)
 		{
-			if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date;
-			if (empty($datefieldname)) return 'Error this object has no date field defined';
+			if (empty($datefieldname) && ! empty($this->table_element_date)) {
+				$datefieldname=$this->table_element_date;
+			}
+			if (empty($datefieldname)) {
+				return 'Error this object has no date field defined';
+			}
 			$sql.=" AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
     	if ($datee > 0)
 		{
-			if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date;
-			if (empty($datefieldname)) return 'Error this object has no date field defined';
+			if (empty($datefieldname) && ! empty($this->table_element_date)) {
+				$datefieldname=$this->table_element_date;
+			}
+			if (empty($datefieldname)) {
+				return 'Error this object has no date field defined';
+			}
 			$sql.=" AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
 		}
-		if (! $sql) return -1;
+		if (! $sql) {
+			return -1;
+		}
 
         //print $sql;
         dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
@@ -575,8 +592,7 @@ 
                 /* Return array */
                 return $elements;
             }
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -730,8 +746,7 @@ 
     	{
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
        {
         	foreach ( $this->errors as $errmsg )
         	{
@@ -790,16 +805,14 @@ 
                 	$this->statut=1;
                 	$this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     $this->error = join(',', $this->errors);
                     dol_syslog(get_class($this)."::setValid " . $this->error, LOG_ERR);
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
@@ -851,16 +864,14 @@ 
                     $this->statut = 2;
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->db->rollback();
                     $this->error = join(',', $this->errors);
                     dol_syslog(get_class($this)."::setClose " . $this->error, LOG_ERR);
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
@@ -903,39 +914,51 @@ 
         }
         if ($mode == 2)
         {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            if ($statut == 0) {
+                            return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            }
+            if ($statut == 1) {
+                            return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            }
+            if ($statut == 2) {
+                            return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            }
         }
         if ($mode == 3)
         {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
-            if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
-            if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
+            if ($statut == 0) {
+                            return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
+            }
+            if ($statut == 1) {
+                            return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
+            }
+            if ($statut == 2) {
+                            return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
+            }
         }
         if ($mode == 4)
         {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_long[$statut]);
-            if ($statut == 1)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_long[$statut]);
-            if ($statut == 2)
-                return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_long[$statut]);
+            if ($statut == 0) {
+                            return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_long[$statut]);
+            }
+            if ($statut == 1) {
+                            return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_long[$statut]);
+            }
+            if ($statut == 2) {
+                            return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_long[$statut]);
+            }
         }
         if ($mode == 5)
         {
-            if ($statut == 0)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
-            if ($statut == 1)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
-            if ($statut == 2)
-                return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
+            if ($statut == 0) {
+                            return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
+            }
+            if ($statut == 1) {
+                            return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
+            }
+            if ($statut == 2) {
+                            return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
+            }
         }
     }
 
@@ -955,40 +978,55 @@ 
     {
         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='';
-        if ($option != 'nolink') $label = '<u>' . $langs->trans("ShowProject") . '</u>';
+        if ($option != 'nolink') {
+        	$label = '<u>' . $langs->trans("ShowProject") . '</u>';
+        }
         $label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
         $label .= ($label?'<br>':'').'<b>' . $langs->trans('Label') . ': </b>' . $this->title;	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->thirdparty_name))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('ThirdParty') . ': </b>' . $this->thirdparty_name;	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->dateo))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('DateStart') . ': </b>' . dol_print_date($this->dateo, 'day');	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->datee))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('DateEnd') . ': </b>' . dol_print_date($this->datee, 'day');	// The space must be after the : to not being explode when showing the title in img_picto
-        if ($moreinpopup) $label.='<br>'.$moreinpopup;
+        if (! empty($this->thirdparty_name)) {
+                    $label .= ($label?'<br>':'').'<b>' . $langs->trans('ThirdParty') . ': </b>' . $this->thirdparty_name;
+        }
+        // The space must be after the : to not being explode when showing the title in img_picto
+        if (! empty($this->dateo)) {
+                    $label .= ($label?'<br>':'').'<b>' . $langs->trans('DateStart') . ': </b>' . dol_print_date($this->dateo, 'day');
+        }
+        // The space must be after the : to not being explode when showing the title in img_picto
+        if (! empty($this->datee)) {
+                    $label .= ($label?'<br>':'').'<b>' . $langs->trans('DateEnd') . ': </b>' . dol_print_date($this->datee, 'day');
+        }
+        // The space must be after the : to not being explode when showing the title in img_picto
+        if ($moreinpopup) {
+        	$label.='<br>'.$moreinpopup;
+        }
 
         $url='';
         if ($option != 'nolink')
         {
             if (preg_match('/\.php$/',$option)) {
                 $url = dol_buildpath($option,1) . '?id=' . $this->id;
-            }
-            else if ($option == 'task')
+            } else if ($option == 'task')
             {
                 $url = DOL_URL_ROOT . '/projet/tasks.php?id=' . $this->id;
-            }
-            else
+            } else
             {
                 $url = DOL_URL_ROOT . '/projet/card.php?id=' . $this->id;
             }
             // 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='';
@@ -1010,20 +1048,29 @@ 
 		$parameters=array('id'=>$this->id);
 		// Note that $action and $object may have been modified by some hooks
 		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);
-		if ($reshook > 0)
-			$linkclose = $hookmanager->resPrint;
+		if ($reshook > 0) {
+					$linkclose = $hookmanager->resPrint;
+		}
         }
 
         $picto = 'projectpub';
-        if (!$this->public) $picto = 'project';
+        if (!$this->public) {
+        	$picto = 'project';
+        }
 
         $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.=' ';
-        if ($withpicto != 2) $result.=$linkstart . $this->ref . $linkend . (($addlabel && $this->title) ? $sep . dol_trunc($this->title, ($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->title) ? $sep . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
+        }
         return $result;
     }
 
@@ -1084,12 +1131,10 @@ 
         if (($mode == 'read' && ! empty($user->rights->projet->all->lire)) || ($mode == 'write' && ! empty($user->rights->projet->all->creer)) || ($mode == 'delete' && ! empty($user->rights->projet->all->supprimer)))
         {
             $userAccess = 1;
-        }
-        else if ($this->public && (($mode == 'read' && ! empty($user->rights->projet->lire)) || ($mode == 'write' && ! empty($user->rights->projet->creer)) || ($mode == 'delete' && ! empty($user->rights->projet->supprimer))))
+        } else if ($this->public && (($mode == 'read' && ! empty($user->rights->projet->lire)) || ($mode == 'write' && ! empty($user->rights->projet->creer)) || ($mode == 'delete' && ! empty($user->rights->projet->supprimer))))
         {
             $userAccess = 1;
-        }
-        else
+        } else
 		{
             foreach (array('internal', 'external') as $source)
             {
@@ -1101,9 +1146,15 @@ 
                 {
                     if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
                     {
-                        if ($mode == 'read'   && $user->rights->projet->lire)      $userAccess++;
-                        if ($mode == 'write'  && $user->rights->projet->creer)     $userAccess++;
-                        if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
+                        if ($mode == 'read'   && $user->rights->projet->lire) {
+                        	$userAccess++;
+                        }
+                        if ($mode == 'write'  && $user->rights->projet->creer) {
+                        	$userAccess++;
+                        }
+                        if ($mode == 'delete' && $user->rights->projet->supprimer) {
+                        	$userAccess++;
+                        }
                     }
                     $nblinks++;
                 }
@@ -1144,7 +1195,9 @@ 
         $sql.= " WHERE p.entity IN (".getEntity('project').")";
         // Internal users must see project he is contact to even if project linked to a third party he can't see.
         //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 > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+        if ($socid > 0) {
+        	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+        }
 
         // Get id of types of contacts for projects (This list never contains a lot of elements)
         $listofprojectcontacttype=array();
@@ -1158,9 +1211,13 @@ 
             {
                 $listofprojectcontacttype[$obj->rowid]=$obj->code;
             }
+        } else {
+        	dol_print_error($this->db);
+        }
+        if (count($listofprojectcontacttype) == 0) {
+        	$listofprojectcontacttype[0]='0';
         }
-        else dol_print_error($this->db);
-        if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
+        // To avoid syntax error if not found
 
         if ($mode == 0)
         {
@@ -1203,12 +1260,13 @@ 
 
             if ($list)
             {
-                if (empty($temp)) return '0';
+                if (empty($temp)) {
+                	return '0';
+                }
                 $result = implode(',', $temp);
                 return $result;
             }
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -1249,7 +1307,9 @@ 
 		// Load source object
 		$clone_project->fetch($fromid);
 		$clone_project->fetch_optionals();
-		if ($newthirdpartyid > 0) $clone_project->socid = $newthirdpartyid;
+		if ($newthirdpartyid > 0) {
+			$clone_project->socid = $newthirdpartyid;
+		}
 		$clone_project->fetch_thirdparty();
 
 		$orign_dt_start=$clone_project->date_start;
@@ -1290,7 +1350,9 @@ 
             	break;
     	    }
     	}
-    	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+    	if (is_numeric($defaultref) && $defaultref <= 0) {
+    		$defaultref='';
+    	}
 
 		$clone_project->ref=$defaultref;
 		$clone_project->title=$langs->trans("CopyOf").' '.$clone_project->title;
@@ -1315,8 +1377,7 @@ 
        		{
         	    $clone_project->note_private='';
     			$clone_project->note_public='';
-        	}
-        	else
+        	} else
         	{
         		$this->db->begin();
 				$res=$clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES),'_public');
@@ -1325,8 +1386,7 @@ 
 					$this->error.=$clone_project->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 				}
@@ -1338,8 +1398,7 @@ 
 					$this->error.=$clone_project->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 				}
@@ -1363,8 +1422,7 @@ 
 							$langs->load("errors");
 							$this->error.=$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
-						}
-						else
+						} else
 						{
 							if ($clone_project->error!='')
 							{
@@ -1396,8 +1454,7 @@ 
 							$error++;
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error.=$langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
 					$error++;
@@ -1413,7 +1470,9 @@ 
 
 				// Security check
 				$socid=0;
-				if ($user->societe_id > 0) $socid = $user->societe_id;
+				if ($user->societe_id > 0) {
+					$socid = $user->societe_id;
+				}
 
 				$tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
 
@@ -1427,8 +1486,7 @@ 
 				    {
 				    	$this->error.=$result_clone->error;
 						$error++;
-				    }
-				    else
+				    } else
 				    {
 				    	$new_task_id=$result_clone;
 				    	$taskstatic->fetch($tasktoclone->id);
@@ -1468,8 +1526,7 @@ 
 		{
 			$this->db->commit();
 			return $clone_project_id;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : " . $this->error, LOG_ERR);
@@ -1494,7 +1551,9 @@ 
 
 		// Security check
 		$socid=0;
-		if ($user->societe_id > 0) $socid = $user->societe_id;
+		if ($user->societe_id > 0) {
+			$socid = $user->societe_id;
+		}
 
 		$tasksarray=$taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
 
@@ -1561,8 +1620,7 @@ 
 		{
 			$sql.= " SET fk_project=".$this->id;
 			$sql.= " WHERE id=".$elementSelectId;
-		}
-		else
+		} else
 		{
 			$sql.= " SET fk_projet=".$this->id;
 			$sql.= " WHERE rowid=".$elementSelectId;
@@ -1573,7 +1631,7 @@ 
 		if (!$resql) {
 			$this->error=$this->db->lasterror();
 			return -1;
-		}else {
+		} else {
 			return 1;
 		}
 
@@ -1594,8 +1652,7 @@ 
 		{
 			$sql.= " SET fk_project=NULL";
 			$sql.= " WHERE id=".$elementSelectId;
-		}
-		else
+		} else
 		{
 			$sql.= " SET fk_projet=NULL";
 			$sql.= " WHERE rowid=".$elementSelectId;
@@ -1606,7 +1663,7 @@ 
 		if (!$resql) {
 			$this->error=$this->db->lasterror();
 			return -1;
-		}else {
+		} else {
 			return 1;
 		}
 
@@ -1657,7 +1714,9 @@ 
     {
         $error=0;
 
-        if (empty($datestart)) dol_print_error('','Error datestart parameter is empty');
+        if (empty($datestart)) {
+        	dol_print_error('','Error datestart parameter is empty');
+        }
 
         $sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.fk_task";
         $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
@@ -1665,8 +1724,12 @@ 
         $sql.= " AND pt.fk_projet = ".$this->id;
         $sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
         $sql.= " AND ptt.task_date <= '".$this->db->idate($datestart + (7 * 24 * 3600) - 1)."')";
-        if ($task_id) $sql.= " AND ptt.fk_task=".$taskid;
-        if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid;
+        if ($task_id) {
+        	$sql.= " AND ptt.fk_task=".$taskid;
+        }
+        if (is_numeric($userid)) {
+        	$sql.= " AND ptt.fk_user=".$userid;
+        }
 
         //print $sql;
         $resql=$this->db->query($sql);
@@ -1686,8 +1749,7 @@ 
                 }
                 $this->db->free($resql);
                 return 1;
-         }
-        else
+         } else
         {
                 $this->error="Error ".$this->db->lasterror();
                 dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
@@ -1714,14 +1776,22 @@ 
         $sql.= " FROM (".MAIN_DB_PREFIX."projet as p";
         $sql.= ")";
         $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.= " WHERE p.fk_statut = 1";
         $sql.= " AND p.entity IN (".getEntity('project', 0).')';
-        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)
@@ -1731,8 +1801,11 @@ 
             $response = new WorkboardResponse();
             $response->warning_delay = $conf->projet->warning_delay/60/60/24;
             $response->label = $langs->trans("OpenedProjects");
-            if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
-            else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
+            if ($user->rights->projet->all->lire) {
+            	$response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
+            } else {
+            	$response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
+            }
             $response->img = img_object('',"projectpub");
 
             // This assignment in condition is not a bug. It allows walking the results.
@@ -1750,8 +1823,7 @@ 
             }
 
             return $response;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -1807,8 +1879,7 @@ 
 	        }
 	        $this->db->free($resql);
 	        return 1;
-	    }
-	    else
+	    } else
 	    {
 	        dol_print_error($this->db);
 	        $this->error=$this->db->error();
@@ -1826,8 +1897,12 @@ 
 	{
 	    global $conf;
 
-        if (! ($this->statut == 1)) return false;
-        if (! $this->datee && ! $this->date_end) return false;
+        if (! ($this->statut == 1)) {
+        	return false;
+        }
+        if (! $this->datee && ! $this->date_end) {
+        	return false;
+        }
 
         $now = dol_now();
 
@@ -1876,8 +1951,7 @@ 
 
 	        $this->db->free($result);
 
-	    }
-	    else
+	    } else
 	    {
 	        dol_print_error($this->db);
 	    }

htdocs/index.php

Indentation +381 added lines, -381 removed lines

@@ -44,13 +44,13 @@ 
 // Check if company name is defined (first install)
 if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM))
 {
-    header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
-    exit;
+	header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
+	exit;
 }
 if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
 {
-    header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
-    exit;
+	header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
+	exit;
 }
 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
 {
@@ -85,19 +85,19 @@ 
 
 if (! empty($conf->global->MAIN_MOTD))
 {
-    $conf->global->MAIN_MOTD=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$conf->global->MAIN_MOTD);
-    if (! empty($conf->global->MAIN_MOTD))
-    {
-        $substitutionarray=getCommonSubstitutionArray($langs);
-        complete_substitutions_array($substitutionarray, $langs);
-        $texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);
-
-        print "\n<!-- Start of welcome text -->\n";
-        print '<table width="100%" class="notopnoleftnoright"><tr><td>';
-        print dol_htmlentitiesbr($texttoshow);
-        print '</td></tr></table><br>';
-        print "\n<!-- End of welcome text -->\n";
-    }
+	$conf->global->MAIN_MOTD=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$conf->global->MAIN_MOTD);
+	if (! empty($conf->global->MAIN_MOTD))
+	{
+		$substitutionarray=getCommonSubstitutionArray($langs);
+		complete_substitutions_array($substitutionarray, $langs);
+		$texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);
+
+		print "\n<!-- Start of welcome text -->\n";
+		print '<table width="100%" class="notopnoleftnoright"><tr><td>';
+		print dol_htmlentitiesbr($texttoshow);
+		print '</td></tr></table><br>';
+		print "\n<!-- End of welcome text -->\n";
+	}
 }
 
 
@@ -117,241 +117,241 @@ 
 
 if (empty($user->societe_id))
 {
-    $boxstat.='<div class="box">';
-    $boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
-    $boxstat.='<tr class="liste_titre">';
-    $boxstat.='<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
-    $boxstat.='</tr>';
-    $boxstat.='<tr class="impair"><td class="tdboxstats nohover flexcontainer">';
-
-    $var=true;
-
-    $object=new stdClass();
-    $parameters=array();
-    $action='';
-    $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-    $boxstat.=$hookmanager->resPrint;
-
-    if (empty($reshook))
-    {
-	    // Condition to be checked for each display line dashboard
-	    $conditions=array(
-	    $user->rights->user->user->lire,
-	    ! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
-	    ! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
-	    ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
-	    ! empty($conf->societe->enabled) && $user->rights->societe->contact->lire,
-	    ! empty($conf->adherent->enabled) && $user->rights->adherent->lire,
-	    ! empty($conf->product->enabled) && $user->rights->produit->lire,
-	    ! empty($conf->service->enabled) && $user->rights->service->lire,
-	    ! empty($conf->propal->enabled) && $user->rights->propale->lire,
-	    ! empty($conf->commande->enabled) && $user->rights->commande->lire,
-	    ! empty($conf->facture->enabled) && $user->rights->facture->lire,
-	    ! empty($conf->contrat->enabled) && $user->rights->contrat->lire,
-	    ! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,
+	$boxstat.='<div class="box">';
+	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
+	$boxstat.='<tr class="liste_titre">';
+	$boxstat.='<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
+	$boxstat.='</tr>';
+	$boxstat.='<tr class="impair"><td class="tdboxstats nohover flexcontainer">';
+
+	$var=true;
+
+	$object=new stdClass();
+	$parameters=array();
+	$action='';
+	$reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+	$boxstat.=$hookmanager->resPrint;
+
+	if (empty($reshook))
+	{
+		// Condition to be checked for each display line dashboard
+		$conditions=array(
+		$user->rights->user->user->lire,
+		! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
+		! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
+		! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
+		! empty($conf->societe->enabled) && $user->rights->societe->contact->lire,
+		! empty($conf->adherent->enabled) && $user->rights->adherent->lire,
+		! empty($conf->product->enabled) && $user->rights->produit->lire,
+		! empty($conf->service->enabled) && $user->rights->service->lire,
+		! empty($conf->propal->enabled) && $user->rights->propale->lire,
+		! empty($conf->commande->enabled) && $user->rights->commande->lire,
+		! empty($conf->facture->enabled) && $user->rights->facture->lire,
+		! empty($conf->contrat->enabled) && $user->rights->contrat->lire,
+		! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,
 		! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
 		! empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
 		! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
-	    ! empty($conf->projet->enabled) && $user->rights->projet->lire,
-	    ! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
+		! empty($conf->projet->enabled) && $user->rights->projet->lire,
+		! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
 		! empty($conf->don->enabled) && $user->rights->don->lire
-	    );
-	    // Class file containing the method load_state_board for each line
-	    $includes=array(
-	        DOL_DOCUMENT_ROOT."/user/class/user.class.php",
-	        DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
-	        DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
-    	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
-    	    DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
-    	    DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
-    	    DOL_DOCUMENT_ROOT."/product/class/product.class.php",
-    	    DOL_DOCUMENT_ROOT."/product/class/product.class.php",
-    	    DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
-    	    DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
-    	    DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
-    	    DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
-    	    DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
-    	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
-    	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
-    	    DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
-            DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
-	        DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
+		);
+		// Class file containing the method load_state_board for each line
+		$includes=array(
+			DOL_DOCUMENT_ROOT."/user/class/user.class.php",
+			DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+			DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+			DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
+			DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
+			DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
+			DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+			DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+			DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
+			DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
+			DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
+			DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+			DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
+			DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
+			DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
+			DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
+			DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
+			DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
 			DOL_DOCUMENT_ROOT."/don/class/don.class.php"
-	    );
-	    // Name class containing the method load_state_board for each line
-	    $classes=array('User',
-	                   'Client',
-	                   'Client',
-	                   'Fournisseur',
-	                   'Contact',
-	                   'Adherent',
-	                   'Product',
-	                   'Product',
-	                   'Propal',
-	                   'Commande',
-	                   'Facture',
-	                   'Contrat',
-	                   'Fichinter',
-	                   'CommandeFournisseur',
-	                   'FactureFournisseur',
-            	       'SupplierProposal',
-	                   'Project',
-	                   'ExpenseReport',
+		);
+		// Name class containing the method load_state_board for each line
+		$classes=array('User',
+					   'Client',
+					   'Client',
+					   'Fournisseur',
+					   'Contact',
+					   'Adherent',
+					   'Product',
+					   'Product',
+					   'Propal',
+					   'Commande',
+					   'Facture',
+					   'Contrat',
+					   'Fichinter',
+					   'CommandeFournisseur',
+					   'FactureFournisseur',
+					   'SupplierProposal',
+					   'Project',
+					   'ExpenseReport',
 					   'Don'
-	    );
-	    // Cle array returned by the method load_state_board for each line
-	    $keys=array('users',
-	                'customers',
-	                'prospects',
-	                'suppliers',
-	                'contacts',
-	                'members',
-	                'products',
-	                'services',
-	                'proposals',
-	                'orders',
-	                'invoices',
-	                'Contracts',
-	                'fichinters',
-	                'supplier_orders',
-	                'supplier_invoices',
-	                'askprice',
-	                'projects',
-	                'expensereports',
+		);
+		// Cle array returned by the method load_state_board for each line
+		$keys=array('users',
+					'customers',
+					'prospects',
+					'suppliers',
+					'contacts',
+					'members',
+					'products',
+					'services',
+					'proposals',
+					'orders',
+					'invoices',
+					'Contracts',
+					'fichinters',
+					'supplier_orders',
+					'supplier_invoices',
+					'askprice',
+					'projects',
+					'expensereports',
 					'donations'
-	    );
-	    // Dashboard Icon lines
-	    $icons=array('user',
-	                 'company',
-	                 'company',
-	                 'company',
-	                 'contact',
-	                 'user',
-	                 'product',
-	                 'service',
-	                 'propal',
-	                 'order',
-	                 'bill',
-	                 'order',
-	                 'order',
-	                 'order',
-	                 'bill',
-	                 'propal',
-	                 'projectpub',
+		);
+		// Dashboard Icon lines
+		$icons=array('user',
+					 'company',
+					 'company',
+					 'company',
+					 'contact',
+					 'user',
+					 'product',
+					 'service',
+					 'propal',
+					 'order',
+					 'bill',
+					 'order',
+					 'order',
+					 'order',
+					 'bill',
+					 'propal',
+					 'projectpub',
 					 'trip',
 					 'generic'
-	    );
-	    // Translation keyword
-	    $titres=array("Users",
-	                  "ThirdPartyCustomersStats",
-	                  "ThirdPartyProspectsStats",
-	                  "Suppliers",
-	                  "Contacts",
-	                  "Members",
-	                  "Products",
-	                  "Services",
-	                  "CommercialProposalsShort",
-	                  "CustomersOrders",
-	                  "BillsCustomers",
-	                  "Contracts",
-	                  "Interventions",
-	                  "SuppliersOrders",
-                      "SuppliersInvoices",
-	                  "SupplierProposalShort",
-	                  "Projects",
+		);
+		// Translation keyword
+		$titres=array("Users",
+					  "ThirdPartyCustomersStats",
+					  "ThirdPartyProspectsStats",
+					  "Suppliers",
+					  "Contacts",
+					  "Members",
+					  "Products",
+					  "Services",
+					  "CommercialProposalsShort",
+					  "CustomersOrders",
+					  "BillsCustomers",
+					  "Contracts",
+					  "Interventions",
+					  "SuppliersOrders",
+					  "SuppliersInvoices",
+					  "SupplierProposalShort",
+					  "Projects",
 					  "ExpenseReports",
 					  "Donations"
-	    );
-	    // Dashboard Link lines
-	    $links=array(
-	        DOL_URL_ROOT.'/user/index.php',
-    	    DOL_URL_ROOT.'/societe/list.php?type=c',
-    	    DOL_URL_ROOT.'/societe/list.php?type=p',
-    	    DOL_URL_ROOT.'/societe/list.php?type=f',
-    	    DOL_URL_ROOT.'/contact/list.php',
-    	    DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
-    	    DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
-    	    DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
-    	    DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial',
-    	    DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial',
-    	    DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=accountancy',
-    	    DOL_URL_ROOT.'/contrat/list.php',
-    	    DOL_URL_ROOT.'/fichinter/list.php',
-    	    DOL_URL_ROOT.'/fourn/commande/list.php',
-	        DOL_URL_ROOT.'/fourn/facture/list.php',
-	        DOL_URL_ROOT.'/supplier_proposal/list.php',
-	        DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
-    		DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm',
+		);
+		// Dashboard Link lines
+		$links=array(
+			DOL_URL_ROOT.'/user/index.php',
+			DOL_URL_ROOT.'/societe/list.php?type=c',
+			DOL_URL_ROOT.'/societe/list.php?type=p',
+			DOL_URL_ROOT.'/societe/list.php?type=f',
+			DOL_URL_ROOT.'/contact/list.php',
+			DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
+			DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
+			DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
+			DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial',
+			DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial',
+			DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=accountancy',
+			DOL_URL_ROOT.'/contrat/list.php',
+			DOL_URL_ROOT.'/fichinter/list.php',
+			DOL_URL_ROOT.'/fourn/commande/list.php',
+			DOL_URL_ROOT.'/fourn/facture/list.php',
+			DOL_URL_ROOT.'/supplier_proposal/list.php',
+			DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
+			DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm',
 			DOL_URL_ROOT.'/don/list.php?leftmenu=donations'
-	    );
-	    // Translation lang files
-	    $langfile=array("users",
-	                    "companies",
-	                    "prospects",
-	                    "suppliers",
-	                    "companies",
-	                    "members",
-	                    "products",
-	                    "products",
-	                    "propal",
-	                    "orders",
-            	        "bills",
+		);
+		// Translation lang files
+		$langfile=array("users",
+						"companies",
+						"prospects",
+						"suppliers",
+						"companies",
+						"members",
+						"products",
+						"products",
+						"propal",
+						"orders",
+						"bills",
 						"contracts",
 						"interventions",
-	                    "bills",
-	                    "bills",
-	                    "supplier_proposal",
-	                    "projects",
+						"bills",
+						"bills",
+						"supplier_proposal",
+						"projects",
 						"trips",
 						"donations"
-	    );
-
-
-	    // Loop and displays each line of table
-	    foreach ($keys as $key=>$val)
-	    {
-	        if ($conditions[$key])
-	        {
-	            $classe=$classes[$key];
-	            // Search in cache if load_state_board is already realized
-	            if (! isset($boardloaded[$classe]) || ! is_object($boardloaded[$classe]))
-	            {
-	            	include_once $includes[$key];	// Loading a class cost around 1Mb
-
-	                $board=new $classe($db);
-	                $board->load_state_board($user);
-	                $boardloaded[$classe]=$board;
-	            }
-	            else
-	            {
-	                $board=$boardloaded[$classe];
-	            }
-
-
-	            if (!empty($langfile[$key])) $langs->load($langfile[$key]);
-	            $text=$langs->trans($titres[$key]);
-	            $boxstat.='<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
-	            $boxstat.='<div class="boxstats">';
-	            $boxstat.='<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.img_object("",$icons[$key]).' '.$text.'</span><br>';
-	            $boxstat.='<span class="boxstatsindicator">'.($board->nb[$val]?$board->nb[$val]:0).'</span>';
-	            $boxstat.='</div>';
-	            $boxstat.='</a>';
-	        }
-	    }
-    }
-
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-
-    $boxstat.='</td></tr>';
-    $boxstat.='</table>';
-    $boxstat.='</div>';
+		);
+
+
+		// Loop and displays each line of table
+		foreach ($keys as $key=>$val)
+		{
+			if ($conditions[$key])
+			{
+				$classe=$classes[$key];
+				// Search in cache if load_state_board is already realized
+				if (! isset($boardloaded[$classe]) || ! is_object($boardloaded[$classe]))
+				{
+					include_once $includes[$key];	// Loading a class cost around 1Mb
+
+					$board=new $classe($db);
+					$board->load_state_board($user);
+					$boardloaded[$classe]=$board;
+				}
+				else
+				{
+					$board=$boardloaded[$classe];
+				}
+
+
+				if (!empty($langfile[$key])) $langs->load($langfile[$key]);
+				$text=$langs->trans($titres[$key]);
+				$boxstat.='<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
+				$boxstat.='<div class="boxstats">';
+				$boxstat.='<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.img_object("",$icons[$key]).' '.$text.'</span><br>';
+				$boxstat.='<span class="boxstatsindicator">'.($board->nb[$val]?$board->nb[$val]:0).'</span>';
+				$boxstat.='</div>';
+				$boxstat.='</a>';
+			}
+		}
+	}
+
+	$boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+	$boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+	$boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+	$boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+	$boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+	$boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+	$boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+	$boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+
+	$boxstat.='</td></tr>';
+	$boxstat.='</table>';
+	$boxstat.='</div>';
 }
 //print $boxstat;
 
@@ -372,130 +372,130 @@ 
 // Number of actions to do (late)
 if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
 {
-    include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-    $board=new ActionComm($db);
+	include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+	$board=new ActionComm($db);
 
-    $dashboardlines[] = $board->load_board($user);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of project opened
 if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    $board=new Project($db);
-    $dashboardlines[] = $board->load_board($user);
+	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	$board=new Project($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of tasks to do (late)
 if (! empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-    $board=new Task($db);
-    $dashboardlines[] = $board->load_board($user);
+	include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+	$board=new Task($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of commercial proposals opened (expired)
 if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-    $board=new Propal($db);
-    $dashboardlines[] = $board->load_board($user,"opened");
-    // Number of commercial proposals CLOSED signed (billed)
-    $dashboardlines[] = $board->load_board($user,"signed");
+	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+	$board=new Propal($db);
+	$dashboardlines[] = $board->load_board($user,"opened");
+	// Number of commercial proposals CLOSED signed (billed)
+	$dashboardlines[] = $board->load_board($user,"signed");
 }
 
 // Number of commercial proposals opened (expired)
 if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-    $board=new SupplierProposal($db);
-    $dashboardlines[] = $board->load_board($user,"opened");
-    // Number of commercial proposals CLOSED signed (billed)
-    $dashboardlines[] = $board->load_board($user,"signed");
+	include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+	$board=new SupplierProposal($db);
+	$dashboardlines[] = $board->load_board($user,"opened");
+	// Number of commercial proposals CLOSED signed (billed)
+	$dashboardlines[] = $board->load_board($user,"signed");
 }
 
 // Number of customer orders a deal
 if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-    $board=new Commande($db);
+	include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+	$board=new Commande($db);
 	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of suppliers orders a deal
 if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-    $board=new CommandeFournisseur($db);
+	include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+	$board=new CommandeFournisseur($db);
 	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of services enabled (delayed)
 if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-    $board=new Contrat($db);
-    $dashboardlines[] = $board->load_board($user,"inactives");
+	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+	$board=new Contrat($db);
+	$dashboardlines[] = $board->load_board($user,"inactives");
 	// Number of active services (expired)
-    $dashboardlines[] = $board->load_board($user,"expired");
+	$dashboardlines[] = $board->load_board($user,"expired");
 }
 // Number of invoices customers (has paid)
 if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-    $board=new Facture($db);
-    $dashboardlines[] = $board->load_board($user);
+	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	$board=new Facture($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of supplier invoices (has paid)
 if (! empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-    $board=new FactureFournisseur($db);
-    $dashboardlines[] = $board->load_board($user);
+	include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+	$board=new FactureFournisseur($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of transactions to conciliate
 if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id)
 {
-    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-    $board=new Account($db);
-    $nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
-    if ($nb > 0)
-    {
-        $dashboardlines[] = $board->load_board($user);
-    }
+	include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+	$board=new Account($db);
+	$nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
+	if ($nb > 0)
+	{
+		$dashboardlines[] = $board->load_board($user);
+	}
 }
 
 // Number of cheque to send
 if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT))
 {
-    include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
-    $board=new RemiseCheque($db);
-    $dashboardlines[] = $board->load_board($user);
+	include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+	$board=new RemiseCheque($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of foundation members
 if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $user->societe_id)
 {
-    include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-    $board=new Adherent($db);
-    $dashboardlines[] = $board->load_board($user);
+	include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	$board=new Adherent($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of expense reports to approve
 if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->approve)
 {
-    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-    $board=new ExpenseReport($db);
+	include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+	$board=new ExpenseReport($db);
 	$dashboardlines[] = $board->load_board($user,'toapprove');
 }
 
 // Number of expense reports to pay
 if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid)
 {
-    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-    $board=new ExpenseReport($db);
+	include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+	$board=new ExpenseReport($db);
 	$dashboardlines[] = $board->load_board($user,'topay');
 }
 
@@ -514,9 +514,9 @@ 
 // We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
 foreach($valid_dashboardlines as $board)
 {
-    if ($board->nbtodolate > 0) {
-	    $totallate += $board->nbtodolate;
-    }
+	if ($board->nbtodolate > 0) {
+		$totallate += $board->nbtodolate;
+	}
 }
 
 
@@ -529,16 +529,16 @@ 
 
 if ($showweather)
 {
-    $boxwork.='<tr class="nohover">';
-    $boxwork.='<td class="nohover hideonsmartphone center valignmiddle">';
-    $text='';
-    if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
-    $text.='. '.$langs->trans("LateDesc");
-    //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
-    $options='height="64px"';
-    $boxwork.=showWeather($totallate,$text,$options);
-    $boxwork.='</td>';
-    $boxwork.='</tr>';
+	$boxwork.='<tr class="nohover">';
+	$boxwork.='<td class="nohover hideonsmartphone center valignmiddle">';
+	$text='';
+	if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
+	$text.='. '.$langs->trans("LateDesc");
+	//$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
+	$options='height="64px"';
+	$boxwork.=showWeather($totallate,$text,$options);
+	$boxwork.='</td>';
+	$boxwork.='</tr>';
 }
 
 $boxwork.='<tr class="nohover"><td class="tdboxstats nohover flexcontainer">';
@@ -547,48 +547,48 @@ 
 $nbworkboardempty=0;
 if (! empty($valid_dashboardlines))
 {
-    foreach($valid_dashboardlines as $board)
-    {
-        if (empty($boad->nbtodo)) $nbworkboardempty++;
-
-        $textlate = $langs->trans("NActionsLate",$board->nbtodolate);
-        $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-
-        $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
-        $boxwork .= '<div class="boxstatscontent">';
-        $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
-        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.$board->nbtodo.'</span></a>';
-        $boxwork .= '</div>';
-        if ($board->nbtodolate > 0)
-        {
-            $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
-            $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
-            //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
-            $boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
-            $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
-            $boxwork .= $board->nbtodolate;
-            $boxwork .= '</span>';
-            $boxwork .= '</a>';
-            $boxwork .= '</div>';
-        }
-        $boxwork.='</div></div>';
-        $boxwork .="\n";
-    }
-
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+	foreach($valid_dashboardlines as $board)
+	{
+		if (empty($boad->nbtodo)) $nbworkboardempty++;
+
+		$textlate = $langs->trans("NActionsLate",$board->nbtodolate);
+		$textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+
+		$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
+		$boxwork .= '<div class="boxstatscontent">';
+		$boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
+		$boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.$board->nbtodo.'</span></a>';
+		$boxwork .= '</div>';
+		if ($board->nbtodolate > 0)
+		{
+			$boxwork .= '<div class="dashboardlinelatecoin nowrap">';
+			$boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
+			//$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
+			$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
+			$boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
+			$boxwork .= $board->nbtodolate;
+			$boxwork .= '</span>';
+			$boxwork .= '</a>';
+			$boxwork .= '</div>';
+		}
+		$boxwork.='</div></div>';
+		$boxwork .="\n";
+	}
+
+	$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+	$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+	$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+	$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+	$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+	$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
 }
 else
 {
-    $boxwork.='<tr class="nohover">';
-    $boxwork.='<td colspan="4" class="nohover valignmiddle opacitymedium">';
-    $boxwork.=$langs->trans("NoOpenedElementToProcess");
-    $boxwork.='</td>';
-    $boxwork.='</tr>';
+	$boxwork.='<tr class="nohover">';
+	$boxwork.='<td colspan="4" class="nohover valignmiddle opacitymedium">';
+	$boxwork.=$langs->trans("NoOpenedElementToProcess");
+	$boxwork.='</td>';
+	$boxwork.='</tr>';
 }
 
 $boxwork.='</td></tr>';
@@ -637,32 +637,32 @@ 
 // Security warning repertoire install existe (si utilisateur admin)
 if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
 {
-    $message='';
-
-    // Check if install lock file is present
-    $lockfile=DOL_DATA_ROOT.'/install.lock';
-    if (! empty($lockfile) && ! file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install"))
-    {
-        $langs->load("errors");
-        //if (! empty($message)) $message.='<br>';
-        $message.=info_admin($langs->trans("WarningLockFileDoesNotExists",DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
-    }
-
-    // Conf files must be in read only mode
-    if (is_writable($conffile))
-    {
-        $langs->load("errors");
-        //$langs->load("other");
-        //if (! empty($message)) $message.='<br>';
-        $message.=info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
-    }
-
-    if ($message)
-    {
-        print $message;
-        //$message.='<br>';
-        //print info_admin($langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
-    }
+	$message='';
+
+	// Check if install lock file is present
+	$lockfile=DOL_DATA_ROOT.'/install.lock';
+	if (! empty($lockfile) && ! file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install"))
+	{
+		$langs->load("errors");
+		//if (! empty($message)) $message.='<br>';
+		$message.=info_admin($langs->trans("WarningLockFileDoesNotExists",DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
+	}
+
+	// Conf files must be in read only mode
+	if (is_writable($conffile))
+	{
+		$langs->load("errors");
+		//$langs->load("other");
+		//if (! empty($message)) $message.='<br>';
+		$message.=info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
+	}
+
+	if ($message)
+	{
+		print $message;
+		//$message.='<br>';
+		//print info_admin($langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
+	}
 }
 
 //print 'mem='.memory_get_usage().' - '.memory_get_peak_usage();
@@ -683,21 +683,21 @@ 
  */
 function showWeather($totallate,$text,$options)
 {
-    global $conf;
-
-    $out='';
-    $offset=0;
-    $factor=10; // By default
-
-    $level0=$offset;           if (! empty($conf->global->MAIN_METEO_LEVEL0)) $level0=$conf->global->MAIN_METEO_LEVEL0;
-    $level1=$offset+1*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
-    $level2=$offset+2*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
-    $level3=$offset+3*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
-
-    if ($totallate <= $level0) $out.=img_weather($text,'weather-clear.png',$options);
-    if ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text,'weather-few-clouds.png',$options);
-    if ($totallate > $level1 && $totallate <= $level2) $out.=img_weather($text,'weather-clouds.png',$options);
-    if ($totallate > $level2 && $totallate <= $level3) $out.=img_weather($text,'weather-many-clouds.png',$options);
-    if ($totallate > $level3) $out.=img_weather($text,'weather-storm.png',$options);
-    return $out;
+	global $conf;
+
+	$out='';
+	$offset=0;
+	$factor=10; // By default
+
+	$level0=$offset;           if (! empty($conf->global->MAIN_METEO_LEVEL0)) $level0=$conf->global->MAIN_METEO_LEVEL0;
+	$level1=$offset+1*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
+	$level2=$offset+2*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
+	$level3=$offset+3*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
+
+	if ($totallate <= $level0) $out.=img_weather($text,'weather-clear.png',$options);
+	if ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text,'weather-few-clouds.png',$options);
+	if ($totallate > $level1 && $totallate <= $level2) $out.=img_weather($text,'weather-clouds.png',$options);
+	if ($totallate > $level2 && $totallate <= $level3) $out.=img_weather($text,'weather-many-clouds.png',$options);
+	if ($totallate > $level3) $out.=img_weather($text,'weather-storm.png',$options);
+	return $out;
 }

Spacing +200 added lines, -200 removed lines

@@ -24,14 +24,14 @@ 
  *	\brief      Dolibarr home page
  */
 
-define('NOCSRFCHECK',1);	// This is main home and login page. We must be able to go on it from another web site.
+define('NOCSRFCHECK', 1); // This is main home and login page. We must be able to go on it from another web site.
 
 require 'main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // If not defined, we select menu "home"
-$_GET['mainmenu']=GETPOST('mainmenu', 'aZ09')?GETPOST('mainmenu', 'aZ09'):'home';
-$action=GETPOST('action','aZ09');
+$_GET['mainmenu'] = GETPOST('mainmenu', 'aZ09') ? GETPOST('mainmenu', 'aZ09') : 'home';
+$action = GETPOST('action', 'aZ09');
 
 $hookmanager->initHooks(array('index'));
 
@@ -47,7 +47,7 @@ 
     header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
     exit;
 }
-if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
+if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
 {
     header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
     exit;
@@ -55,12 +55,12 @@ 
 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone=GETPOST('areacode', 'aZ09');
-	$userid=GETPOST('userid', 'int');
-	$boxorder=GETPOST('boxorder', 'aZ09');
-	$boxorder.=GETPOST('boxcombo', 'aZ09');
+	$zone = GETPOST('areacode', 'aZ09');
+	$userid = GETPOST('userid', 'int');
+	$boxorder = GETPOST('boxorder', 'aZ09');
+	$boxorder .= GETPOST('boxcombo', 'aZ09');
 
-	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
 	if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
 }
 
@@ -69,26 +69,26 @@ 
  * View
  */
 
-if (! is_object($form)) $form=new Form($db);
+if (!is_object($form)) $form = new Form($db);
 
 // Title
-$title=$langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
-if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$langs->trans("HomeArea").' - '.$conf->global->MAIN_APPLICATION_TITLE;
+$title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = $langs->trans("HomeArea").' - '.$conf->global->MAIN_APPLICATION_TITLE;
 
-llxHeader('',$title);
+llxHeader('', $title);
 
 
-$resultboxes=FormOther::getBoxesArea($user,"0");    // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
+$resultboxes = FormOther::getBoxesArea($user, "0"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 
-print load_fiche_titre($langs->trans("HomeArea"),$resultboxes['selectboxlist'],'title_home');
+print load_fiche_titre($langs->trans("HomeArea"), $resultboxes['selectboxlist'], 'title_home');
 
-if (! empty($conf->global->MAIN_MOTD))
+if (!empty($conf->global->MAIN_MOTD))
 {
-    $conf->global->MAIN_MOTD=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$conf->global->MAIN_MOTD);
-    if (! empty($conf->global->MAIN_MOTD))
+    $conf->global->MAIN_MOTD = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD);
+    if (!empty($conf->global->MAIN_MOTD))
     {
-        $substitutionarray=getCommonSubstitutionArray($langs);
+        $substitutionarray = getCommonSubstitutionArray($langs);
         complete_substitutions_array($substitutionarray, $langs);
         $texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);
 
@@ -108,7 +108,7 @@ 
  * Dashboard Dolibarr states (statistics)
  * Hidden for external users
  */
-$boxstat='';
+$boxstat = '';
 
 $langs->load("commercial");
 $langs->load("bills");
@@ -117,47 +117,47 @@ 
 
 if (empty($user->societe_id))
 {
-    $boxstat.='<div class="box">';
-    $boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
-    $boxstat.='<tr class="liste_titre">';
-    $boxstat.='<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
-    $boxstat.='</tr>';
-    $boxstat.='<tr class="impair"><td class="tdboxstats nohover flexcontainer">';
+    $boxstat .= '<div class="box">';
+    $boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
+    $boxstat .= '<tr class="liste_titre">';
+    $boxstat .= '<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
+    $boxstat .= '</tr>';
+    $boxstat .= '<tr class="impair"><td class="tdboxstats nohover flexcontainer">';
 
-    $var=true;
+    $var = true;
 
-    $object=new stdClass();
-    $parameters=array();
-    $action='';
-    $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-    $boxstat.=$hookmanager->resPrint;
+    $object = new stdClass();
+    $parameters = array();
+    $action = '';
+    $reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+    $boxstat .= $hookmanager->resPrint;
 
     if (empty($reshook))
     {
 	    // Condition to be checked for each display line dashboard
-	    $conditions=array(
+	    $conditions = array(
 	    $user->rights->user->user->lire,
-	    ! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
-	    ! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
-	    ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
-	    ! empty($conf->societe->enabled) && $user->rights->societe->contact->lire,
-	    ! empty($conf->adherent->enabled) && $user->rights->adherent->lire,
-	    ! empty($conf->product->enabled) && $user->rights->produit->lire,
-	    ! empty($conf->service->enabled) && $user->rights->service->lire,
-	    ! empty($conf->propal->enabled) && $user->rights->propale->lire,
-	    ! empty($conf->commande->enabled) && $user->rights->commande->lire,
-	    ! empty($conf->facture->enabled) && $user->rights->facture->lire,
-	    ! empty($conf->contrat->enabled) && $user->rights->contrat->lire,
-	    ! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,
-		! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
-		! empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
-		! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
-	    ! empty($conf->projet->enabled) && $user->rights->projet->lire,
-	    ! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
-		! empty($conf->don->enabled) && $user->rights->don->lire
+	    !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
+	    !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
+	    !empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
+	    !empty($conf->societe->enabled) && $user->rights->societe->contact->lire,
+	    !empty($conf->adherent->enabled) && $user->rights->adherent->lire,
+	    !empty($conf->product->enabled) && $user->rights->produit->lire,
+	    !empty($conf->service->enabled) && $user->rights->service->lire,
+	    !empty($conf->propal->enabled) && $user->rights->propale->lire,
+	    !empty($conf->commande->enabled) && $user->rights->commande->lire,
+	    !empty($conf->facture->enabled) && $user->rights->facture->lire,
+	    !empty($conf->contrat->enabled) && $user->rights->contrat->lire,
+	    !empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,
+		!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
+		!empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
+		!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
+	    !empty($conf->projet->enabled) && $user->rights->projet->lire,
+	    !empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
+		!empty($conf->don->enabled) && $user->rights->don->lire
 	    );
 	    // Class file containing the method load_state_board for each line
-	    $includes=array(
+	    $includes = array(
 	        DOL_DOCUMENT_ROOT."/user/class/user.class.php",
 	        DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
 	        DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
@@ -179,7 +179,7 @@ 
 			DOL_DOCUMENT_ROOT."/don/class/don.class.php"
 	    );
 	    // Name class containing the method load_state_board for each line
-	    $classes=array('User',
+	    $classes = array('User',
 	                   'Client',
 	                   'Client',
 	                   'Fournisseur',
@@ -200,7 +200,7 @@ 
 					   'Don'
 	    );
 	    // Cle array returned by the method load_state_board for each line
-	    $keys=array('users',
+	    $keys = array('users',
 	                'customers',
 	                'prospects',
 	                'suppliers',
@@ -221,7 +221,7 @@ 
 					'donations'
 	    );
 	    // Dashboard Icon lines
-	    $icons=array('user',
+	    $icons = array('user',
 	                 'company',
 	                 'company',
 	                 'company',
@@ -242,7 +242,7 @@ 
 					 'generic'
 	    );
 	    // Translation keyword
-	    $titres=array("Users",
+	    $titres = array("Users",
 	                  "ThirdPartyCustomersStats",
 	                  "ThirdPartyProspectsStats",
 	                  "Suppliers",
@@ -263,7 +263,7 @@ 
 					  "Donations"
 	    );
 	    // Dashboard Link lines
-	    $links=array(
+	    $links = array(
 	        DOL_URL_ROOT.'/user/index.php',
     	    DOL_URL_ROOT.'/societe/list.php?type=c',
     	    DOL_URL_ROOT.'/societe/list.php?type=p',
@@ -285,7 +285,7 @@ 
 			DOL_URL_ROOT.'/don/list.php?leftmenu=donations'
 	    );
 	    // Translation lang files
-	    $langfile=array("users",
+	    $langfile = array("users",
 	                    "companies",
 	                    "prospects",
 	                    "suppliers",
@@ -312,46 +312,46 @@ 
 	    {
 	        if ($conditions[$key])
 	        {
-	            $classe=$classes[$key];
+	            $classe = $classes[$key];
 	            // Search in cache if load_state_board is already realized
-	            if (! isset($boardloaded[$classe]) || ! is_object($boardloaded[$classe]))
+	            if (!isset($boardloaded[$classe]) || !is_object($boardloaded[$classe]))
 	            {
-	            	include_once $includes[$key];	// Loading a class cost around 1Mb
+	            	include_once $includes[$key]; // Loading a class cost around 1Mb
 
-	                $board=new $classe($db);
+	                $board = new $classe($db);
 	                $board->load_state_board($user);
-	                $boardloaded[$classe]=$board;
+	                $boardloaded[$classe] = $board;
 	            }
 	            else
 	            {
-	                $board=$boardloaded[$classe];
+	                $board = $boardloaded[$classe];
 	            }
 
 
 	            if (!empty($langfile[$key])) $langs->load($langfile[$key]);
-	            $text=$langs->trans($titres[$key]);
-	            $boxstat.='<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
-	            $boxstat.='<div class="boxstats">';
-	            $boxstat.='<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.img_object("",$icons[$key]).' '.$text.'</span><br>';
-	            $boxstat.='<span class="boxstatsindicator">'.($board->nb[$val]?$board->nb[$val]:0).'</span>';
-	            $boxstat.='</div>';
-	            $boxstat.='</a>';
+	            $text = $langs->trans($titres[$key]);
+	            $boxstat .= '<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
+	            $boxstat .= '<div class="boxstats">';
+	            $boxstat .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.img_object("", $icons[$key]).' '.$text.'</span><br>';
+	            $boxstat .= '<span class="boxstatsindicator">'.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';
+	            $boxstat .= '</div>';
+	            $boxstat .= '</a>';
 	        }
 	    }
     }
 
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-
-    $boxstat.='</td></tr>';
-    $boxstat.='</table>';
-    $boxstat.='</div>';
+    $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+
+    $boxstat .= '</td></tr>';
+    $boxstat .= '</table>';
+    $boxstat .= '</div>';
 }
 //print $boxstat;
 
@@ -361,106 +361,106 @@ 
 /*
  * Dolibarr Working Board with weather
  */
-$showweather=empty($conf->global->MAIN_DISABLE_METEO)?1:0;
+$showweather = empty($conf->global->MAIN_DISABLE_METEO) ? 1 : 0;
 
 //Array that contains all WorkboardResponse classes to process them
-$dashboardlines=array();
+$dashboardlines = array();
 
 // Do not include sections without management permission
 require DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
 // Number of actions to do (late)
-if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
+if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
 {
     include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-    $board=new ActionComm($db);
+    $board = new ActionComm($db);
 
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of project opened
-if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    $board=new Project($db);
+    $board = new Project($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of tasks to do (late)
-if (! empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire)
+if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-    $board=new Task($db);
+    $board = new Task($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of commercial proposals opened (expired)
-if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-    $board=new Propal($db);
-    $dashboardlines[] = $board->load_board($user,"opened");
+    $board = new Propal($db);
+    $dashboardlines[] = $board->load_board($user, "opened");
     // Number of commercial proposals CLOSED signed (billed)
-    $dashboardlines[] = $board->load_board($user,"signed");
+    $dashboardlines[] = $board->load_board($user, "signed");
 }
 
 // Number of commercial proposals opened (expired)
-if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-    $board=new SupplierProposal($db);
-    $dashboardlines[] = $board->load_board($user,"opened");
+    $board = new SupplierProposal($db);
+    $dashboardlines[] = $board->load_board($user, "opened");
     // Number of commercial proposals CLOSED signed (billed)
-    $dashboardlines[] = $board->load_board($user,"signed");
+    $dashboardlines[] = $board->load_board($user, "signed");
 }
 
 // Number of customer orders a deal
-if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-    $board=new Commande($db);
+    $board = new Commande($db);
 	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of suppliers orders a deal
-if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire)
+if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-    $board=new CommandeFournisseur($db);
+    $board = new CommandeFournisseur($db);
 	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of services enabled (delayed)
-if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-    $board=new Contrat($db);
-    $dashboardlines[] = $board->load_board($user,"inactives");
+    $board = new Contrat($db);
+    $dashboardlines[] = $board->load_board($user, "inactives");
 	// Number of active services (expired)
-    $dashboardlines[] = $board->load_board($user,"expired");
+    $dashboardlines[] = $board->load_board($user, "expired");
 }
 // Number of invoices customers (has paid)
-if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-    $board=new Facture($db);
+    $board = new Facture($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of supplier invoices (has paid)
-if (! empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire)
+if (!empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-    $board=new FactureFournisseur($db);
+    $board = new FactureFournisseur($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of transactions to conciliate
-if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id)
+if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id)
 {
     include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-    $board=new Account($db);
-    $nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
+    $board = new Account($db);
+    $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate
     if ($nb > 0)
     {
         $dashboardlines[] = $board->load_board($user);
@@ -468,51 +468,51 @@ 
 }
 
 // Number of cheque to send
-if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT))
+if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT))
 {
     include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
-    $board=new RemiseCheque($db);
+    $board = new RemiseCheque($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of foundation members
-if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $user->societe_id)
+if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->societe_id)
 {
     include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-    $board=new Adherent($db);
+    $board = new Adherent($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of expense reports to approve
-if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->approve)
+if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve)
 {
     include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-    $board=new ExpenseReport($db);
-	$dashboardlines[] = $board->load_board($user,'toapprove');
+    $board = new ExpenseReport($db);
+	$dashboardlines[] = $board->load_board($user, 'toapprove');
 }
 
 // Number of expense reports to pay
-if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid)
+if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid)
 {
     include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-    $board=new ExpenseReport($db);
-	$dashboardlines[] = $board->load_board($user,'topay');
+    $board = new ExpenseReport($db);
+	$dashboardlines[] = $board->load_board($user, 'topay');
 }
 
 // Calculate total nb of late
-$totallate=0;
-$var=true;
+$totallate = 0;
+$var = true;
 
 //Remove any invalid response
 //load_board can return an integer if failed or WorkboardResponse if OK
-$valid_dashboardlines=array();
-foreach($dashboardlines as $tmp)
+$valid_dashboardlines = array();
+foreach ($dashboardlines as $tmp)
 {
 	if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[] = $tmp;
 }
 
 // We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
-foreach($valid_dashboardlines as $board)
+foreach ($valid_dashboardlines as $board)
 {
     if ($board->nbtodolate > 0) {
 	    $totallate += $board->nbtodolate;
@@ -520,81 +520,81 @@ 
 }
 
 
-$boxwork='';
-$boxwork.='<div class="box">';
-$boxwork.='<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable" width="100%">'."\n";
-$boxwork.='<tr class="liste_titre">';
-$boxwork.='<th class="liste_titre">'.$langs->trans("DolibarrWorkBoard").'</th>';
-$boxwork.='</tr>'."\n";
+$boxwork = '';
+$boxwork .= '<div class="box">';
+$boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable" width="100%">'."\n";
+$boxwork .= '<tr class="liste_titre">';
+$boxwork .= '<th class="liste_titre">'.$langs->trans("DolibarrWorkBoard").'</th>';
+$boxwork .= '</tr>'."\n";
 
 if ($showweather)
 {
-    $boxwork.='<tr class="nohover">';
-    $boxwork.='<td class="nohover hideonsmartphone center valignmiddle">';
-    $text='';
-    if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
-    $text.='. '.$langs->trans("LateDesc");
+    $boxwork .= '<tr class="nohover">';
+    $boxwork .= '<td class="nohover hideonsmartphone center valignmiddle">';
+    $text = '';
+    if ($totallate > 0) $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate).')';
+    $text .= '. '.$langs->trans("LateDesc");
     //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
-    $options='height="64px"';
-    $boxwork.=showWeather($totallate,$text,$options);
-    $boxwork.='</td>';
-    $boxwork.='</tr>';
+    $options = 'height="64px"';
+    $boxwork .= showWeather($totallate, $text, $options);
+    $boxwork .= '</td>';
+    $boxwork .= '</tr>';
 }
 
-$boxwork.='<tr class="nohover"><td class="tdboxstats nohover flexcontainer">';
+$boxwork .= '<tr class="nohover"><td class="tdboxstats nohover flexcontainer">';
 
 // Show dashboard
-$nbworkboardempty=0;
-if (! empty($valid_dashboardlines))
+$nbworkboardempty = 0;
+if (!empty($valid_dashboardlines))
 {
-    foreach($valid_dashboardlines as $board)
+    foreach ($valid_dashboardlines as $board)
     {
         if (empty($boad->nbtodo)) $nbworkboardempty++;
 
-        $textlate = $langs->trans("NActionsLate",$board->nbtodolate);
-        $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+        $textlate = $langs->trans("NActionsLate", $board->nbtodolate);
+        $textlate .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
 
-        $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
+        $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
         $boxwork .= '<div class="boxstatscontent">';
         $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
-        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.$board->nbtodo.'</span></a>';
+        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>';
         $boxwork .= '</div>';
         if ($board->nbtodolate > 0)
         {
             $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
-            $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
+            $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late).'">';
             //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
             $boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
-            $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
+            $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'">';
             $boxwork .= $board->nbtodolate;
             $boxwork .= '</span>';
             $boxwork .= '</a>';
             $boxwork .= '</div>';
         }
-        $boxwork.='</div></div>';
-        $boxwork .="\n";
+        $boxwork .= '</div></div>';
+        $boxwork .= "\n";
     }
 
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
-    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
 }
 else
 {
-    $boxwork.='<tr class="nohover">';
-    $boxwork.='<td colspan="4" class="nohover valignmiddle opacitymedium">';
-    $boxwork.=$langs->trans("NoOpenedElementToProcess");
-    $boxwork.='</td>';
-    $boxwork.='</tr>';
+    $boxwork .= '<tr class="nohover">';
+    $boxwork .= '<td colspan="4" class="nohover valignmiddle opacitymedium">';
+    $boxwork .= $langs->trans("NoOpenedElementToProcess");
+    $boxwork .= '</td>';
+    $boxwork .= '</tr>';
 }
 
-$boxwork.='</td></tr>';
+$boxwork .= '</td></tr>';
 
-$boxwork.='</table>';   // End table array of working board
-$boxwork.='</div>';
+$boxwork .= '</table>'; // End table array of working board
+$boxwork .= '</div>';
 
 print '</div></div></div><div class="clearboth"></div>';
 
@@ -605,25 +605,25 @@ 
  * Show boxes
  */
 
-$boxlist.='<table width="100%" class="notopnoleftnoright">';
-$boxlist.='<tr><td class="notopnoleftnoright">'."\n";
+$boxlist .= '<table width="100%" class="notopnoleftnoright">';
+$boxlist .= '<tr><td class="notopnoleftnoright">'."\n";
 
-$boxlist.='<div class="fichehalfleft">';
+$boxlist .= '<div class="fichehalfleft">';
 
 //$boxlist.=$boxinfo;
-$boxlist.=$boxstat;
-$boxlist.=$resultboxes['boxlista'];
+$boxlist .= $boxstat;
+$boxlist .= $resultboxes['boxlista'];
 
-$boxlist.= '</div><div class="fichehalfright"><div class="ficheaddleft">';
+$boxlist .= '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-$boxlist.=$boxwork;
-$boxlist.=$resultboxes['boxlistb'];
+$boxlist .= $boxwork;
+$boxlist .= $resultboxes['boxlistb'];
 
-$boxlist.= '</div></div>';
-$boxlist.= "\n";
+$boxlist .= '</div></div>';
+$boxlist .= "\n";
 
-$boxlist.= "</td></tr>";
-$boxlist.= "</table>";
+$boxlist .= "</td></tr>";
+$boxlist .= "</table>";
 
 print $boxlist;
 
@@ -637,15 +637,15 @@ 
 // Security warning repertoire install existe (si utilisateur admin)
 if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
 {
-    $message='';
+    $message = '';
 
     // Check if install lock file is present
-    $lockfile=DOL_DATA_ROOT.'/install.lock';
-    if (! empty($lockfile) && ! file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install"))
+    $lockfile = DOL_DATA_ROOT.'/install.lock';
+    if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install"))
     {
         $langs->load("errors");
         //if (! empty($message)) $message.='<br>';
-        $message.=info_admin($langs->trans("WarningLockFileDoesNotExists",DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
+        $message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"));
     }
 
     // Conf files must be in read only mode
@@ -654,7 +654,7 @@ 
         $langs->load("errors");
         //$langs->load("other");
         //if (! empty($message)) $message.='<br>';
-        $message.=info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
+        $message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"));
     }
 
     if ($message)
@@ -681,23 +681,23 @@ 
  *  @param      string  $options        More parameters on img tag
  *  @return     string                  Return img tag of weather
  */
-function showWeather($totallate,$text,$options)
+function showWeather($totallate, $text, $options)
 {
     global $conf;
 
-    $out='';
-    $offset=0;
-    $factor=10; // By default
+    $out = '';
+    $offset = 0;
+    $factor = 10; // By default
 
-    $level0=$offset;           if (! empty($conf->global->MAIN_METEO_LEVEL0)) $level0=$conf->global->MAIN_METEO_LEVEL0;
-    $level1=$offset+1*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
-    $level2=$offset+2*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
-    $level3=$offset+3*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
+    $level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) $level0 = $conf->global->MAIN_METEO_LEVEL0;
+    $level1 = $offset + 1 * $factor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
+    $level2 = $offset + 2 * $factor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
+    $level3 = $offset + 3 * $factor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
 
-    if ($totallate <= $level0) $out.=img_weather($text,'weather-clear.png',$options);
-    if ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text,'weather-few-clouds.png',$options);
-    if ($totallate > $level1 && $totallate <= $level2) $out.=img_weather($text,'weather-clouds.png',$options);
-    if ($totallate > $level2 && $totallate <= $level3) $out.=img_weather($text,'weather-many-clouds.png',$options);
-    if ($totallate > $level3) $out.=img_weather($text,'weather-storm.png',$options);
+    if ($totallate <= $level0) $out .= img_weather($text, 'weather-clear.png', $options);
+    if ($totallate > $level0 && $totallate <= $level1) $out .= img_weather($text, 'weather-few-clouds.png', $options);
+    if ($totallate > $level1 && $totallate <= $level2) $out .= img_weather($text, 'weather-clouds.png', $options);
+    if ($totallate > $level2 && $totallate <= $level3) $out .= img_weather($text, 'weather-many-clouds.png', $options);
+    if ($totallate > $level3) $out .= img_weather($text, 'weather-storm.png', $options);
     return $out;
 }

htdocs/product/card.php

Indentation +1484 added lines, -1484 removed lines

@@ -84,16 +84,16 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-    $result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref);
 
-    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+	if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+	elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
 
-    if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
-    {
-        if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-        else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-    }
+	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+	{
+		if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+		else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+	}
 }
 
 $modulepart='product';
@@ -103,9 +103,9 @@ 
 $objcanvas=null;
 if (! empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db,$action);
-    $objcanvas->getCanvas('product','card',$canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db,$action);
+	$objcanvas->getCanvas('product','card',$canvas);
 }
 
 // Security check
@@ -133,177 +133,177 @@ 
 
 if (empty($reshook))
 {
-    // Type
-    if ($action ==	'setfk_product_type' && $user->rights->produit->creer)
-    {
-    	$result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
-    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-    	exit;
-    }
-
-    // Actions to build doc
-    $upload_dir = $conf->produit->dir_output;
-    $permissioncreate = $user->rights->produit->creer;
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-
-    // Barcode type
-    if ($action ==	'setfk_barcode_type' && $createbarcode)
-    {
-        $result = $object->setValueFrom('fk_barcode_type', GETPOST('fk_barcode_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
-    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-    	exit;
-    }
-
-    // Barcode value
-    if ($action ==	'setbarcode' && $createbarcode)
-    {
-    	$result=$object->check_barcode(GETPOST('barcode'),GETPOST('barcode_type_code'));
+	// Type
+	if ($action ==	'setfk_product_type' && $user->rights->produit->creer)
+	{
+		$result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+
+	// Actions to build doc
+	$upload_dir = $conf->produit->dir_output;
+	$permissioncreate = $user->rights->produit->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+	// Barcode type
+	if ($action ==	'setfk_barcode_type' && $createbarcode)
+	{
+		$result = $object->setValueFrom('fk_barcode_type', GETPOST('fk_barcode_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+
+	// Barcode value
+	if ($action ==	'setbarcode' && $createbarcode)
+	{
+		$result=$object->check_barcode(GETPOST('barcode'),GETPOST('barcode_type_code'));
 
 		if ($result >= 0)
 		{
-	    	$result = $object->setValueFrom('barcode', GETPOST('barcode'));
-	    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-	    	exit;
+			$result = $object->setValueFrom('barcode', GETPOST('barcode'));
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
 		}
 		else
 		{
 			$langs->load("errors");
-        	if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
-        	else if ($result == -2) $errors[] = 'ErrorBarCodeRequired';
-        	else if ($result == -3) $errors[] = 'ErrorBarCodeAlreadyUsed';
-        	else $errors[] = 'FailedToValidateBarCode';
+			if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
+			else if ($result == -2) $errors[] = 'ErrorBarCodeRequired';
+			else if ($result == -3) $errors[] = 'ErrorBarCodeAlreadyUsed';
+			else $errors[] = 'FailedToValidateBarCode';
 
 			$error++;
 			setEventMessages($errors, null, 'errors');
 		}
-    }
-
-    // Add a product or service
-    if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer))
-    {
-        $error=0;
-
-        if (! GETPOST('label'))
-        {
-            setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')), null, 'errors');
-            $action = "create";
-            $error++;
-        }
-        if (empty($ref))
-        {
-            setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Ref')), null, 'errors');
-            $action = "create";
-            $error++;
-        }
-        if (! empty($duration_value) && empty($duration_unit))
-        {
-            setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), null, 'errors');
-            $action = "create";
-            $error++;
-        }
-
-        if (! $error)
-        {
-	        $units = GETPOST('units', 'int');
-
-            $object->ref                   = $ref;
-            $object->label                 = GETPOST('label');
-            $object->price_base_type       = GETPOST('price_base_type');
-
-            if ($object->price_base_type == 'TTC')
-            	$object->price_ttc = GETPOST('price');
-            else
-            	$object->price = GETPOST('price');
-            if ($object->price_base_type == 'TTC')
-            	$object->price_min_ttc = GETPOST('price_min');
-            else
-            	$object->price_min = GETPOST('price_min');
-
-	        $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
-
-	        // We must define tva_tx, npr and local taxes
-	        $vatratecode = '';
-	        $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
-	        $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-	        $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-	        // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
-	        if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	        {
-	            // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
-	            $vatratecode=$reg[1];
-	            // Get record from code
-	            $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	            $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	            $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-	            $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-	            $sql.= " AND t.code ='".$vatratecode."'";
-	            $resql=$db->query($sql);
-	            if ($resql)
-	            {
-	                $obj = $db->fetch_object($resql);
-	                $npr = $obj->recuperableonly;
-	                $localtax1 = $obj->localtax1;
-	                $localtax2 = $obj->localtax2;
-	                $localtax1_type = $obj->localtax1_type;
-	                $localtax2_type = $obj->localtax2_type;
-	            }
-	        }
-
-	        $object->default_vat_code = $vatratecode;
-	        $object->tva_tx = $tva_tx;
-	        $object->tva_npr = $npr;
-	        $object->localtax1_tx = $localtax1;
-	        $object->localtax2_tx = $localtax2;
-	        $object->localtax1_type = $localtax1_type;
-	        $object->localtax2_type = $localtax2_type;
-
-            $object->type               	 = $type;
-            $object->status             	 = GETPOST('statut');
-            $object->status_buy            = GETPOST('statut_buy');
+	}
+
+	// Add a product or service
+	if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer))
+	{
+		$error=0;
+
+		if (! GETPOST('label'))
+		{
+			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+		if (empty($ref))
+		{
+			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Ref')), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+		if (! empty($duration_value) && empty($duration_unit))
+		{
+			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+
+		if (! $error)
+		{
+			$units = GETPOST('units', 'int');
+
+			$object->ref                   = $ref;
+			$object->label                 = GETPOST('label');
+			$object->price_base_type       = GETPOST('price_base_type');
+
+			if ($object->price_base_type == 'TTC')
+				$object->price_ttc = GETPOST('price');
+			else
+				$object->price = GETPOST('price');
+			if ($object->price_base_type == 'TTC')
+				$object->price_min_ttc = GETPOST('price_min');
+			else
+				$object->price_min = GETPOST('price_min');
+
+			$tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+
+			// We must define tva_tx, npr and local taxes
+			$vatratecode = '';
+			$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
+			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+			// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+			{
+				// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
+				$vatratecode=$reg[1];
+				// Get record from code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
+				$sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+				$sql.= " AND t.code ='".$vatratecode."'";
+				$resql=$db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+			}
+
+			$object->default_vat_code = $vatratecode;
+			$object->tva_tx = $tva_tx;
+			$object->tva_npr = $npr;
+			$object->localtax1_tx = $localtax1;
+			$object->localtax2_tx = $localtax2;
+			$object->localtax1_type = $localtax1_type;
+			$object->localtax2_type = $localtax2_type;
+
+			$object->type               	 = $type;
+			$object->status             	 = GETPOST('statut');
+			$object->status_buy            = GETPOST('statut_buy');
 			$object->status_batch          	= GETPOST('status_batch');
 
-            $object->barcode_type          = GETPOST('fk_barcode_type');
-            $object->barcode		           = GETPOST('barcode');
-            // Set barcode_type_xxx from barcode_type id
-            $stdobject=new GenericObject($db);
-    	    $stdobject->element='product';
-            $stdobject->barcode_type=GETPOST('fk_barcode_type');
-            $result=$stdobject->fetch_barcode();
-            if ($result < 0)
-            {
-            	$error++;
-            	$mesg='Failed to get bar code type information ';
-            	setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
-            }
-            $object->barcode_type_code      = $stdobject->barcode_type_code;
-            $object->barcode_type_coder     = $stdobject->barcode_type_coder;
-            $object->barcode_type_label     = $stdobject->barcode_type_label;
-
-            $object->description        	 = dol_htmlcleanlastbr(GETPOST('desc'));
-            $object->url					 = GETPOST('url');
-            $object->note_private          	 = dol_htmlcleanlastbr(GETPOST('note_private'));
-            $object->note               	 = $object->note_private;   // deprecated
-            $object->customcode              = GETPOST('customcode');
-            $object->country_id              = GETPOST('country_id');
-            $object->duration_value     	 = $duration_value;
-            $object->duration_unit      	 = $duration_unit;
-            $object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte')?GETPOST('seuil_stock_alerte'):0;
-            $object->desiredstock            = GETPOST('desiredstock')?GETPOST('desiredstock'):0;
-            $object->canvas             	 = GETPOST('canvas');
-            $object->weight             	 = GETPOST('weight');
-            $object->weight_units       	 = GETPOST('weight_units');
-            $object->length             	 = GETPOST('size');
-            $object->length_units       	 = GETPOST('size_units');
-            $object->width               	 = GETPOST('sizewidth');
-            $object->height             	 = GETPOST('sizeheight');
-	        $object->surface            	 = GETPOST('surface');
-            $object->surface_units      	 = GETPOST('surface_units');
-            $object->volume             	 = GETPOST('volume');
-            $object->volume_units       	 = GETPOST('volume_units');
-            $object->finished           	 = GETPOST('finished');
-	        $object->fk_unit                 = GETPOST('units');
+			$object->barcode_type          = GETPOST('fk_barcode_type');
+			$object->barcode		           = GETPOST('barcode');
+			// Set barcode_type_xxx from barcode_type id
+			$stdobject=new GenericObject($db);
+			$stdobject->element='product';
+			$stdobject->barcode_type=GETPOST('fk_barcode_type');
+			$result=$stdobject->fetch_barcode();
+			if ($result < 0)
+			{
+				$error++;
+				$mesg='Failed to get bar code type information ';
+				setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
+			}
+			$object->barcode_type_code      = $stdobject->barcode_type_code;
+			$object->barcode_type_coder     = $stdobject->barcode_type_coder;
+			$object->barcode_type_label     = $stdobject->barcode_type_label;
+
+			$object->description        	 = dol_htmlcleanlastbr(GETPOST('desc'));
+			$object->url					 = GETPOST('url');
+			$object->note_private          	 = dol_htmlcleanlastbr(GETPOST('note_private'));
+			$object->note               	 = $object->note_private;   // deprecated
+			$object->customcode              = GETPOST('customcode');
+			$object->country_id              = GETPOST('country_id');
+			$object->duration_value     	 = $duration_value;
+			$object->duration_unit      	 = $duration_unit;
+			$object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte')?GETPOST('seuil_stock_alerte'):0;
+			$object->desiredstock            = GETPOST('desiredstock')?GETPOST('desiredstock'):0;
+			$object->canvas             	 = GETPOST('canvas');
+			$object->weight             	 = GETPOST('weight');
+			$object->weight_units       	 = GETPOST('weight_units');
+			$object->length             	 = GETPOST('size');
+			$object->length_units       	 = GETPOST('size_units');
+			$object->width               	 = GETPOST('sizewidth');
+			$object->height             	 = GETPOST('sizeheight');
+			$object->surface            	 = GETPOST('surface');
+			$object->surface_units      	 = GETPOST('surface_units');
+			$object->volume             	 = GETPOST('volume');
+			$object->volume_units       	 = GETPOST('volume_units');
+			$object->finished           	 = GETPOST('finished');
+			$object->fk_unit                 = GETPOST('units');
 
 			$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
 			$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
@@ -311,123 +311,123 @@ 
 			if ($accountancy_code_sell <= 0) { $object->accountancy_code_sell = ''; } else { $object->accountancy_code_sell = $accountancy_code_sell; }
 			if ($accountancy_code_buy <= 0) { $object->accountancy_code_buy = ''; } else { $object->accountancy_code_buy = $accountancy_code_buy; }
 
-            // MultiPrix
-            if (! empty($conf->global->PRODUIT_MULTIPRICES))
-            {
-                for($i=2;$i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT;$i++)
-                {
-                    if (isset($_POST["price_".$i]))
-                    {
-                        $object->multiprices["$i"] = price2num($_POST["price_".$i],'MU');
-                        $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
-                    }
-                    else
-                    {
-                        $object->multiprices["$i"] = "";
-                    }
-                }
-            }
+			// MultiPrix
+			if (! empty($conf->global->PRODUIT_MULTIPRICES))
+			{
+				for($i=2;$i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT;$i++)
+				{
+					if (isset($_POST["price_".$i]))
+					{
+						$object->multiprices["$i"] = price2num($_POST["price_".$i],'MU');
+						$object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
+					}
+					else
+					{
+						$object->multiprices["$i"] = "";
+					}
+				}
+			}
 
-            // Fill array 'array_options' with data from add form
-        	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 			if ($ret < 0) $error++;
 
 			if (! $error)
 			{
-            	$id = $object->create($user);
+				$id = $object->create($user);
 			}
 
-            if ($id > 0)
-            {
+			if ($id > 0)
+			{
 				// Category association
 				$categories = GETPOST('categories');
 				$object->setCategories($categories);
 
-                header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-                exit;
-            }
-            else
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+				exit;
+			}
+			else
 			{
-            	if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
+				if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
 				else setEventMessages($langs->trans($object->error), null, 'errors');
-                $action = "create";
-            }
-        }
-    }
-
-    // Update a product or service
-    if ($action == 'update' && ($user->rights->produit->creer || $user->rights->service->creer))
-    {
-    	if (GETPOST('cancel'))
-        {
-            $action = '';
-        }
-        else
-        {
-            if ($object->id > 0)
-            {
+				$action = "create";
+			}
+		}
+	}
+
+	// Update a product or service
+	if ($action == 'update' && ($user->rights->produit->creer || $user->rights->service->creer))
+	{
+		if (GETPOST('cancel'))
+		{
+			$action = '';
+		}
+		else
+		{
+			if ($object->id > 0)
+			{
 				$object->oldcopy= clone $object;
 
-                $object->ref                    = $ref;
-                $object->label                  = GETPOST('label');
-                $object->description            = dol_htmlcleanlastbr(GETPOST('desc'));
-            	$object->url					= GETPOST('url');
-    			if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    			{
-                	$object->note_private           = dol_htmlcleanlastbr(GETPOST('note_private'));
-                    $object->note                   = $object->note_private;
-    			}
-                $object->customcode             = GETPOST('customcode');
-                $object->country_id             = GETPOST('country_id');
-                $object->status                 = GETPOST('statut');
-                $object->status_buy             = GETPOST('statut_buy');
-                $object->status_batch	        = GETPOST('status_batch');
-                // removed from update view so GETPOST always empty
-                /*
+				$object->ref                    = $ref;
+				$object->label                  = GETPOST('label');
+				$object->description            = dol_htmlcleanlastbr(GETPOST('desc'));
+				$object->url					= GETPOST('url');
+				if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+				{
+					$object->note_private           = dol_htmlcleanlastbr(GETPOST('note_private'));
+					$object->note                   = $object->note_private;
+				}
+				$object->customcode             = GETPOST('customcode');
+				$object->country_id             = GETPOST('country_id');
+				$object->status                 = GETPOST('statut');
+				$object->status_buy             = GETPOST('statut_buy');
+				$object->status_batch	        = GETPOST('status_batch');
+				// removed from update view so GETPOST always empty
+				/*
                 $object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
                 $object->desiredstock           = GETPOST('desiredstock');
                 */
-                $object->duration_value         = GETPOST('duration_value');
-                $object->duration_unit          = GETPOST('duration_unit');
-
-                $object->canvas                 = GETPOST('canvas');
-                $object->weight                 = GETPOST('weight');
-                $object->weight_units           = GETPOST('weight_units');
-                $object->length                 = GETPOST('size');
-                $object->length_units           = GETPOST('size_units');
-                $object->width               	 = GETPOST('sizewidth');
-                $object->height             	 = GETPOST('sizeheight');
-
-                $object->surface                = GETPOST('surface');
-                $object->surface_units          = GETPOST('surface_units');
-                $object->volume                 = GETPOST('volume');
-                $object->volume_units           = GETPOST('volume_units');
-                $object->finished               = GETPOST('finished');
-
-	            $units = GETPOST('units', 'int');
-
-	            if ($units > 0) {
-		            $object->fk_unit = $units;
-	            } else {
-		            $object->fk_unit = null;
-	            }
-
-	            $object->barcode_type           = GETPOST('fk_barcode_type');
-    	        $object->barcode		        = GETPOST('barcode');
-    	        // Set barcode_type_xxx from barcode_type id
-    	        $stdobject=new GenericObject($db);
-    	        $stdobject->element='product';
-    	        $stdobject->barcode_type=GETPOST('fk_barcode_type');
-    	        $result=$stdobject->fetch_barcode();
-    	        if ($result < 0)
-    	        {
-    	        	$error++;
-    	        	$mesg='Failed to get bar code type information ';
-            		setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
-    	        }
-    	        $object->barcode_type_code      = $stdobject->barcode_type_code;
-    	        $object->barcode_type_coder     = $stdobject->barcode_type_coder;
-    	        $object->barcode_type_label     = $stdobject->barcode_type_label;
+				$object->duration_value         = GETPOST('duration_value');
+				$object->duration_unit          = GETPOST('duration_unit');
+
+				$object->canvas                 = GETPOST('canvas');
+				$object->weight                 = GETPOST('weight');
+				$object->weight_units           = GETPOST('weight_units');
+				$object->length                 = GETPOST('size');
+				$object->length_units           = GETPOST('size_units');
+				$object->width               	 = GETPOST('sizewidth');
+				$object->height             	 = GETPOST('sizeheight');
+
+				$object->surface                = GETPOST('surface');
+				$object->surface_units          = GETPOST('surface_units');
+				$object->volume                 = GETPOST('volume');
+				$object->volume_units           = GETPOST('volume_units');
+				$object->finished               = GETPOST('finished');
+
+				$units = GETPOST('units', 'int');
+
+				if ($units > 0) {
+					$object->fk_unit = $units;
+				} else {
+					$object->fk_unit = null;
+				}
+
+				$object->barcode_type           = GETPOST('fk_barcode_type');
+				$object->barcode		        = GETPOST('barcode');
+				// Set barcode_type_xxx from barcode_type id
+				$stdobject=new GenericObject($db);
+				$stdobject->element='product';
+				$stdobject->barcode_type=GETPOST('fk_barcode_type');
+				$result=$stdobject->fetch_barcode();
+				if ($result < 0)
+				{
+					$error++;
+					$mesg='Failed to get bar code type information ';
+					setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
+				}
+				$object->barcode_type_code      = $stdobject->barcode_type_code;
+				$object->barcode_type_coder     = $stdobject->barcode_type_coder;
+				$object->barcode_type_label     = $stdobject->barcode_type_label;
 
 				$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
 				$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
@@ -435,384 +435,384 @@ 
 				if ($accountancy_code_sell <= 0) { $object->accountancy_code_sell = ''; } else { $object->accountancy_code_sell = $accountancy_code_sell; }
 				if ($accountancy_code_buy <= 0) { $object->accountancy_code_buy = ''; } else { $object->accountancy_code_buy = $accountancy_code_buy; }
 
-                // Fill array 'array_options' with data from add form
-        		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+				// Fill array 'array_options' with data from add form
+				$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 				if ($ret < 0) $error++;
 
-                if (! $error && $object->check())
-                {
-                    if ($object->update($object->id, $user) > 0)
-                    {
+				if (! $error && $object->check())
+				{
+					if ($object->update($object->id, $user) > 0)
+					{
 						// Category association
 						$categories = GETPOST('categories');
 						$object->setCategories($categories);
 
-                        $action = 'view';
-                    }
-                    else
+						$action = 'view';
+					}
+					else
 					{
 						if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
-                    	else setEventMessages($langs->trans($object->error), null, 'errors');
-                        $action = 'edit';
-                    }
-                }
-                else
+						else setEventMessages($langs->trans($object->error), null, 'errors');
+						$action = 'edit';
+					}
+				}
+				else
 				{
 					if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
-                	else setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
-                    $action = 'edit';
-                }
-            }
+					else setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
+					$action = 'edit';
+				}
+			}
 
-        }
-    }
-
-    // Action clone object
-    if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; }
-    if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->produit->creer || $user->rights->service->creer))
-    {
-        if (! GETPOST('clone_content') && ! GETPOST('clone_prices') )
-        {
-        	setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-        }
-        else
-        {
-            $db->begin();
-
-            $originalId = $id;
-            if ($object->id > 0)
-            {
-                $object->ref = GETPOST('clone_ref');
-                $object->status = 0;
-                $object->status_buy = 0;
-                $object->id = null;
-                $object->barcode = -1;
-
-                if ($object->check())
-                {
-                    $id = $object->create($user);
-                    if ($id > 0)
-                    {
-                        if (GETPOST('clone_composition'))
-                        {
-                            $result = $object->clone_associations($originalId, $id);
-
-                            if ($result < 1)
-                            {
-                                $db->rollback();
-                                setEventMessages($langs->trans('ErrorProductClone'), null, 'errors');
-                                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$originalId);
-                                exit;
-                            }
-                        }
-
-                        // $object->clone_fournisseurs($originalId, $id);
-
-                        $db->commit();
-                        $db->close();
-
-                        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-                        exit;
-                    }
-                    else
-                    {
-                        $id=$originalId;
-
-                        if ($object->error == 'ErrorProductAlreadyExists')
-                        {
-                            $db->rollback();
-
-                            $refalreadyexists++;
-                            $action = "";
-
-                            $mesg=$langs->trans("ErrorProductAlreadyExists",$object->ref);
-                            $mesg.=' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
-                            setEventMessages($mesg, null, 'errors');
-                            $object->fetch($id);
-                        }
-                        else
-                     {
-                            $db->rollback();
-                            if (count($object->errors))
-                            {
-                            	setEventMessages($object->error, $object->errors, 'errors');
-                            	dol_print_error($db,$object->errors);
-                            }
-                            else
-                            {
-                            	setEventMessages($langs->trans($object->error), null, 'errors');
-                            	dol_print_error($db,$object->error);
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                $db->rollback();
-                dol_print_error($db,$object->error);
-            }
-        }
-    }
-
-    // Delete a product
-    if ($action == 'confirm_delete' && $confirm != 'yes') { $action=''; }
-    if ($action == 'confirm_delete' && $confirm == 'yes')
-    {
-        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
-        {
-            $result = $object->delete($user);
-        }
-
-        if ($result > 0)
-        {
-            header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));
-            exit;
-        }
-        else
-        {
-        	setEventMessages($langs->trans($object->error), null, 'errors');
-            $reload = 0;
-            $action='';
-        }
-    }
-
-
-    // Add product into object
-    if ($object->id > 0 && $action == 'addin')
-    {
-        $thirpdartyid =0 ;
-        if (GETPOST('propalid') > 0)
-        {
-        	$propal = new Propal($db);
-	        $result=$propal->fetch(GETPOST('propalid'));
-	        if ($result <= 0)
-	        {
-	            dol_print_error($db,$propal->error);
-	            exit;
-	        }
-	        $thirpdartyid = $propal->socid;
-        }
-        elseif (GETPOST('commandeid') > 0)
-        {
-            $commande = new Commande($db);
-	        $result=$commande->fetch(GETPOST('commandeid'));
-	        if ($result <= 0)
-	        {
-	            dol_print_error($db,$commande->error);
-	            exit;
-	        }
-	        $thirpdartyid = $commande->socid;
-        }
-        elseif (GETPOST('factureid') > 0)
-        {
-    	    $facture = new Facture($db);
-	        $result=$facture->fetch(GETPOST('factureid'));
-	        if ($result <= 0)
-	        {
-	            dol_print_error($db,$facture->error);
-	            exit;
-	        }
-	        $thirpdartyid = $facture->socid;
-        }
-
-        if ( $thirpdartyid > 0)  {
-            $soc = new Societe($db);
-            $result = $soc->fetch($thirpdartyid);
-            if ($result <= 0) {
-                dol_print_error($db, $soc->error);
-                exit;
-            }
+		}
+	}
 
-            $desc = $object->description;
-
-            $tva_tx = get_default_tva($mysoc, $soc, $object->id);
-            $tva_npr = get_default_npr($mysoc, $soc, $object->id);
-            if (empty($tva_tx)) $tva_npr=0;
-            $localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);
-            $localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);
-
-            $pu_ht = $object->price;
-            $pu_ttc = $object->price_ttc;
-            $price_base_type = $object->price_base_type;
-
-            // If multiprice
-            if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level) {
-                $pu_ht = $object->multiprices[$soc->price_level];
-                $pu_ttc = $object->multiprices_ttc[$soc->price_level];
-                $price_base_type = $object->multiprices_base_type[$soc->price_level];
-            } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-                require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-
-                $prodcustprice = new Productcustomerprice($db);
-
-                $filter = array('t.fk_product' => $object->id, 't.fk_soc' => $soc->id);
-
-                $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-                if ($result) {
-                    if (count($prodcustprice->lines) > 0) {
-                        $pu_ht = price($prodcustprice->lines [0]->price);
-                        $pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-                        $price_base_type = $prodcustprice->lines [0]->price_base_type;
-                        $tva_tx = $prodcustprice->lines [0]->tva_tx;
-                    }
-                }
-            }
+	// Action clone object
+	if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; }
+	if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->produit->creer || $user->rights->service->creer))
+	{
+		if (! GETPOST('clone_content') && ! GETPOST('clone_prices') )
+		{
+			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+		}
+		else
+		{
+			$db->begin();
+
+			$originalId = $id;
+			if ($object->id > 0)
+			{
+				$object->ref = GETPOST('clone_ref');
+				$object->status = 0;
+				$object->status_buy = 0;
+				$object->id = null;
+				$object->barcode = -1;
+
+				if ($object->check())
+				{
+					$id = $object->create($user);
+					if ($id > 0)
+					{
+						if (GETPOST('clone_composition'))
+						{
+							$result = $object->clone_associations($originalId, $id);
+
+							if ($result < 1)
+							{
+								$db->rollback();
+								setEventMessages($langs->trans('ErrorProductClone'), null, 'errors');
+								header("Location: ".$_SERVER["PHP_SELF"]."?id=".$originalId);
+								exit;
+							}
+						}
+
+						// $object->clone_fournisseurs($originalId, $id);
+
+						$db->commit();
+						$db->close();
+
+						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+						exit;
+					}
+					else
+					{
+						$id=$originalId;
+
+						if ($object->error == 'ErrorProductAlreadyExists')
+						{
+							$db->rollback();
+
+							$refalreadyexists++;
+							$action = "";
+
+							$mesg=$langs->trans("ErrorProductAlreadyExists",$object->ref);
+							$mesg.=' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
+							setEventMessages($mesg, null, 'errors');
+							$object->fetch($id);
+						}
+						else
+					 {
+							$db->rollback();
+							if (count($object->errors))
+							{
+								setEventMessages($object->error, $object->errors, 'errors');
+								dol_print_error($db,$object->errors);
+							}
+							else
+							{
+								setEventMessages($langs->trans($object->error), null, 'errors');
+								dol_print_error($db,$object->error);
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+				$db->rollback();
+				dol_print_error($db,$object->error);
+			}
+		}
+	}
+
+	// Delete a product
+	if ($action == 'confirm_delete' && $confirm != 'yes') { $action=''; }
+	if ($action == 'confirm_delete' && $confirm == 'yes')
+	{
+		if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
+		{
+			$result = $object->delete($user);
+		}
+
+		if ($result > 0)
+		{
+			header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));
+			exit;
+		}
+		else
+		{
+			setEventMessages($langs->trans($object->error), null, 'errors');
+			$reload = 0;
+			$action='';
+		}
+	}
+
+
+	// Add product into object
+	if ($object->id > 0 && $action == 'addin')
+	{
+		$thirpdartyid =0 ;
+		if (GETPOST('propalid') > 0)
+		{
+			$propal = new Propal($db);
+			$result=$propal->fetch(GETPOST('propalid'));
+			if ($result <= 0)
+			{
+				dol_print_error($db,$propal->error);
+				exit;
+			}
+			$thirpdartyid = $propal->socid;
+		}
+		elseif (GETPOST('commandeid') > 0)
+		{
+			$commande = new Commande($db);
+			$result=$commande->fetch(GETPOST('commandeid'));
+			if ($result <= 0)
+			{
+				dol_print_error($db,$commande->error);
+				exit;
+			}
+			$thirpdartyid = $commande->socid;
+		}
+		elseif (GETPOST('factureid') > 0)
+		{
+			$facture = new Facture($db);
+			$result=$facture->fetch(GETPOST('factureid'));
+			if ($result <= 0)
+			{
+				dol_print_error($db,$facture->error);
+				exit;
+			}
+			$thirpdartyid = $facture->socid;
+		}
+
+		if ( $thirpdartyid > 0)  {
+			$soc = new Societe($db);
+			$result = $soc->fetch($thirpdartyid);
+			if ($result <= 0) {
+				dol_print_error($db, $soc->error);
+				exit;
+			}
+
+			$desc = $object->description;
+
+			$tva_tx = get_default_tva($mysoc, $soc, $object->id);
+			$tva_npr = get_default_npr($mysoc, $soc, $object->id);
+			if (empty($tva_tx)) $tva_npr=0;
+			$localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);
+
+			$pu_ht = $object->price;
+			$pu_ttc = $object->price_ttc;
+			$price_base_type = $object->price_base_type;
+
+			// If multiprice
+			if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level) {
+				$pu_ht = $object->multiprices[$soc->price_level];
+				$pu_ttc = $object->multiprices_ttc[$soc->price_level];
+				$price_base_type = $object->multiprices_base_type[$soc->price_level];
+			} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+				require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+
+				$prodcustprice = new Productcustomerprice($db);
+
+				$filter = array('t.fk_product' => $object->id, 't.fk_soc' => $soc->id);
+
+				$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+				if ($result) {
+					if (count($prodcustprice->lines) > 0) {
+						$pu_ht = price($prodcustprice->lines [0]->price);
+						$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+						$price_base_type = $prodcustprice->lines [0]->price_base_type;
+						$tva_tx = $prodcustprice->lines [0]->tva_tx;
+					}
+				}
+			}
 
 			$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 			$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
-            // On reevalue prix selon taux tva car taux tva transaction peut etre different
-            // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-            if ($tmpvat != $tmpprodvat) {
-                if ($price_base_type != 'HT') {
-                    $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-                } else {
-                    $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-                }
-            }
+			// On reevalue prix selon taux tva car taux tva transaction peut etre different
+			// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+			if ($tmpvat != $tmpprodvat) {
+				if ($price_base_type != 'HT') {
+					$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
+				} else {
+					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+				}
+			}
 
-            if (GETPOST('propalid') > 0) {
-                // Define cost price for margin calculation
-                $buyprice=0;
-                if (($result = $propal->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
-                {
-                    dol_syslog($langs->trans('FailedToGetCostPrice'));
-                    setEventMessage($langs->trans('FailedToGetCostPrice'), 'errors');
-                }
-                else
-                {
-                    $buyprice = $result;
-                }
-
-                $result = $propal->addline(
-                    $desc,
-                    $pu_ht,
-                    GETPOST('qty'),
-                    $tva_tx,
-                    $localtax1_tx, // localtax1
-                    $localtax2_tx, // localtax2
-                    $object->id,
-                    GETPOST('remise_percent'),
-                    $price_base_type,
-                    $pu_ttc,
-                    0,
-                    0,
-                    -1,
-                    0,
-                    0,
-                    0,
-                    $buyprice,
-                    '',
-                    '',
-                    '',
-                    0,
-                    $object->fk_unit
-                );
-                if ($result > 0) {
-                    header("Location: " . DOL_URL_ROOT . "/comm/propal/card.php?id=" . $propal->id);
-                    return;
-                }
-
-                setEventMessages($langs->trans("ErrorUnknown") . ": $result", null, 'errors');
-            } elseif (GETPOST('commandeid') > 0) {
-                // Define cost price for margin calculation
-                $buyprice=0;
-                if (($result = $commande->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
-                {
-                    dol_syslog($langs->trans('FailedToGetCostPrice'));
-                    setEventMessage($langs->trans('FailedToGetCostPrice'), 'errors');
-                }
-                else
-                {
-                    $buyprice = $result;
-                }
-
-                $result = $commande->addline(
-                    $desc,
-                    $pu_ht,
-                    GETPOST('qty'),
-                    $tva_tx,
-                    $localtax1_tx, // localtax1
-                    $localtax2_tx, // localtax2
-                    $object->id,
-                    GETPOST('remise_percent'),
-                    '',
-                    '',
-                    $price_base_type,
-                    $pu_ttc,
-                    '',
-                    '',
-                    0,
-                    -1,
-                    0,
-                    0,
-                    null,
-                    $buyprice,
-                    '',
-                    0,
-                    $object->fk_unit
-                );
-
-                if ($result > 0) {
-                    header("Location: " . DOL_URL_ROOT . "/commande/card.php?id=" . $commande->id);
-                    exit;
-                }
-            } elseif (GETPOST('factureid') > 0) {
-                // Define cost price for margin calculation
-                $buyprice=0;
-                if (($result = $facture->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
-                {
-                    dol_syslog($langs->trans('FailedToGetCostPrice'));
-                    setEventMessage($langs->trans('FailedToGetCostPrice'), 'errors');
-                }
-                else
-                {
-                    $buyprice = $result;
-                }
-
-                $result = $facture->addline(
-                    $desc,
-                    $pu_ht,
-                    GETPOST('qty'),
-                    $tva_tx,
-                    $localtax1_tx,
-                    $localtax2_tx,
-                    $object->id,
-                    GETPOST('remise_percent'),
-                    '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    $price_base_type,
-                    $pu_ttc,
-                    Facture::TYPE_STANDARD,
-                    -1,
-                    0,
-                    '',
-                    0,
-                    0,
-                    null,
-                    $buyprice,
-                    '',
-                    0,
-                    100,
-                    '',
-                    $object->fk_unit
-                );
-
-                if ($result > 0) {
-                    header("Location: " . DOL_URL_ROOT . "/compta/facture/card.php?facid=" . $facture->id);
-                    exit;
-                }
-            }
-        }
-        else {
-            $action="";
-            setEventMessages($langs->trans("WarningSelectOneDocument"), null, 'warnings');
-        }
-    }
+			if (GETPOST('propalid') > 0) {
+				// Define cost price for margin calculation
+				$buyprice=0;
+				if (($result = $propal->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
+				{
+					dol_syslog($langs->trans('FailedToGetCostPrice'));
+					setEventMessage($langs->trans('FailedToGetCostPrice'), 'errors');
+				}
+				else
+				{
+					$buyprice = $result;
+				}
+
+				$result = $propal->addline(
+					$desc,
+					$pu_ht,
+					GETPOST('qty'),
+					$tva_tx,
+					$localtax1_tx, // localtax1
+					$localtax2_tx, // localtax2
+					$object->id,
+					GETPOST('remise_percent'),
+					$price_base_type,
+					$pu_ttc,
+					0,
+					0,
+					-1,
+					0,
+					0,
+					0,
+					$buyprice,
+					'',
+					'',
+					'',
+					0,
+					$object->fk_unit
+				);
+				if ($result > 0) {
+					header("Location: " . DOL_URL_ROOT . "/comm/propal/card.php?id=" . $propal->id);
+					return;
+				}
+
+				setEventMessages($langs->trans("ErrorUnknown") . ": $result", null, 'errors');
+			} elseif (GETPOST('commandeid') > 0) {
+				// Define cost price for margin calculation
+				$buyprice=0;
+				if (($result = $commande->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
+				{
+					dol_syslog($langs->trans('FailedToGetCostPrice'));
+					setEventMessage($langs->trans('FailedToGetCostPrice'), 'errors');
+				}
+				else
+				{
+					$buyprice = $result;
+				}
+
+				$result = $commande->addline(
+					$desc,
+					$pu_ht,
+					GETPOST('qty'),
+					$tva_tx,
+					$localtax1_tx, // localtax1
+					$localtax2_tx, // localtax2
+					$object->id,
+					GETPOST('remise_percent'),
+					'',
+					'',
+					$price_base_type,
+					$pu_ttc,
+					'',
+					'',
+					0,
+					-1,
+					0,
+					0,
+					null,
+					$buyprice,
+					'',
+					0,
+					$object->fk_unit
+				);
+
+				if ($result > 0) {
+					header("Location: " . DOL_URL_ROOT . "/commande/card.php?id=" . $commande->id);
+					exit;
+				}
+			} elseif (GETPOST('factureid') > 0) {
+				// Define cost price for margin calculation
+				$buyprice=0;
+				if (($result = $facture->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
+				{
+					dol_syslog($langs->trans('FailedToGetCostPrice'));
+					setEventMessage($langs->trans('FailedToGetCostPrice'), 'errors');
+				}
+				else
+				{
+					$buyprice = $result;
+				}
+
+				$result = $facture->addline(
+					$desc,
+					$pu_ht,
+					GETPOST('qty'),
+					$tva_tx,
+					$localtax1_tx,
+					$localtax2_tx,
+					$object->id,
+					GETPOST('remise_percent'),
+					'',
+					'',
+					'',
+					'',
+					'',
+					$price_base_type,
+					$pu_ttc,
+					Facture::TYPE_STANDARD,
+					-1,
+					0,
+					'',
+					0,
+					0,
+					null,
+					$buyprice,
+					'',
+					0,
+					100,
+					'',
+					$object->fk_unit
+				);
+
+				if ($result > 0) {
+					header("Location: " . DOL_URL_ROOT . "/compta/facture/card.php?facid=" . $facture->id);
+					exit;
+				}
+			}
+		}
+		else {
+			$action="";
+			setEventMessages($langs->trans("WarningSelectOneDocument"), null, 'warnings');
+		}
+	}
 }
 
 
@@ -876,72 +876,72 @@ 
 }
 else
 {
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
-    if ($action == 'create' && ($user->rights->produit->creer || $user->rights->service->creer))
-    {
-        //WYSIWYG Editor
-        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
+	if ($action == 'create' && ($user->rights->produit->creer || $user->rights->service->creer))
+	{
+		//WYSIWYG Editor
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
 		// Load object modCodeProduct
-        $module=(! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON)?$conf->global->PRODUCT_CODEPRODUCT_ADDON:'mod_codeproduct_leopard');
-        if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module)-4);
-        }
-        $result=dol_include_once('/core/modules/product/'.$module.'.php');
-        if ($result > 0)
-        {
-        	$modCodeProduct = new $module();
-        }
-
-        dol_set_focus('input[name="ref"]');
-
-        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="add">';
-        print '<input type="hidden" name="type" value="'.$type.'">'."\n";
+		$module=(! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON)?$conf->global->PRODUCT_CODEPRODUCT_ADDON:'mod_codeproduct_leopard');
+		if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module)-4);
+		}
+		$result=dol_include_once('/core/modules/product/'.$module.'.php');
+		if ($result > 0)
+		{
+			$modCodeProduct = new $module();
+		}
+
+		dol_set_focus('input[name="ref"]');
+
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="add">';
+		print '<input type="hidden" name="type" value="'.$type.'">'."\n";
 		if (! empty($modCodeProduct->code_auto))
 			print '<input type="hidden" name="code_auto" value="1">';
 		if (! empty($modBarCodeProduct->code_auto))
 			print '<input type="hidden" name="barcode_auto" value="1">';
 
-        if ($type==1) $title=$langs->trans("NewService");
-        else $title=$langs->trans("NewProduct");
-        $linkback="";
-        print load_fiche_titre($title,$linkback,'title_products.png');
+		if ($type==1) $title=$langs->trans("NewService");
+		else $title=$langs->trans("NewProduct");
+		$linkback="";
+		print load_fiche_titre($title,$linkback,'title_products.png');
 
-        dol_fiche_head('');
+		dol_fiche_head('');
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
-        print '<tr>';
-        $tmpcode='';
+		print '<tr>';
+		$tmpcode='';
 		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
-        print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
-        if ($refalreadyexists)
-        {
-            print $langs->trans("RefAlreadyExists");
-        }
-        print '</td></tr>';
-
-        // Label
-        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>';
-
-        // On sell
-        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-        $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
-        print $form->selectarray('statut',$statutarray,GETPOST('statut'));
-        print '</td></tr>';
-
-        // To buy
-        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-        $statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
-        print $form->selectarray('statut_buy',$statutarray,GETPOST('statut_buy'));
-        print '</td></tr>';
-
-	    // Batch number management
+		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+		if ($refalreadyexists)
+		{
+			print $langs->trans("RefAlreadyExists");
+		}
+		print '</td></tr>';
+
+		// Label
+		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>';
+
+		// On sell
+		print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
+		$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
+		print $form->selectarray('statut',$statutarray,GETPOST('statut'));
+		print '</td></tr>';
+
+		// To buy
+		print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
+		$statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
+		print $form->selectarray('statut_buy',$statutarray,GETPOST('statut_buy'));
+		print '</td></tr>';
+
+		// Batch number management
 		if (! empty($conf->productbatch->enabled))
 		{
 			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
@@ -950,153 +950,153 @@ 
 			print '</td></tr>';
 		}
 
-        $showbarcode=empty($conf->barcode->enabled)?0:1;
-        if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
-
-        if ($showbarcode)
-        {
- 	        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
- 	        if (isset($_POST['fk_barcode_type']))
-	        {
-	         	$fk_barcode_type=GETPOST('fk_barcode_type');
-	        }
-	        else
-	        {
-	        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-	        }
-	        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
-            $formbarcode = new FormBarCode($db);
-	        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
-	        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
-	        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-	        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
-	        print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
-	        print '</td></tr>';
-        }
-
-        // Description (used in invoice, propal...)
-        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
-
-        $doleditor = new DolEditor('desc', GETPOST('desc'), '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
-        $doleditor->Create();
-
-        print "</td></tr>";
-
-        // Public URL
-        print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+		$showbarcode=empty($conf->barcode->enabled)?0:1;
+		if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+
+		if ($showbarcode)
+		{
+ 			print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
+ 			if (isset($_POST['fk_barcode_type']))
+			{
+			 	$fk_barcode_type=GETPOST('fk_barcode_type');
+			}
+			else
+			{
+				if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+			}
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
+			$formbarcode = new FormBarCode($db);
+			print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
+			print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
+			$tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
+			if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+			print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
+			print '</td></tr>';
+		}
+
+		// Description (used in invoice, propal...)
+		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+
+		$doleditor = new DolEditor('desc', GETPOST('desc'), '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+		$doleditor->Create();
+
+		print "</td></tr>";
+
+		// Public URL
+		print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
 		print '<input type="text" name="url" class="quatrevingtpercent" value="'.GETPOST('url').'">';
-        print '</td></tr>';
-
-        // Stock min level
-        if ($type != 1 && ! empty($conf->stock->enabled))
-        {
-            print '<tr><td>'.$form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1).'</td><td>';
-            print '<input name="seuil_stock_alerte" class="maxwidth50" value="'.GETPOST('seuil_stock_alerte').'">';
-            print '</td>';
-            // Stock desired level
-            print '<td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
-            print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
-            print '</td></tr>';
-        }
-        else
-        {
-            print '<input name="seuil_stock_alerte" type="hidden" value="0">';
-            print '<input name="desiredstock" type="hidden" value="0">';
-        }
-
-        // Nature
-        if ($type != 1)
-        {
-            print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
-            $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-            print $form->selectarray('finished',$statutarray,GETPOST('finished'),1);
-            print '</td></tr>';
-        }
-
-        // Duration
-        if ($type == 1)
-        {
-            print '<tr><td>' . $langs->trans("Duration") . '</td><td colspan="3"><input name="duration_value" size="6" maxlength="5" value="' . $duration_value . '"> &nbsp;';
-            print '<input name="duration_unit" type="radio" value="h">'.$langs->trans("Hour").'&nbsp;';
-            print '<input name="duration_unit" type="radio" value="d">'.$langs->trans("Day").'&nbsp;';
-            print '<input name="duration_unit" type="radio" value="w">'.$langs->trans("Week").'&nbsp;';
-            print '<input name="duration_unit" type="radio" value="m">'.$langs->trans("Month").'&nbsp;';
-            print '<input name="duration_unit" type="radio" value="y">'.$langs->trans("Year").'&nbsp;';
-            print '</td></tr>';
-        }
-
-        if ($type != 1)	// Le poids et le volume ne concerne que les produits et pas les services
-        {
-            // Weight
-            print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
-            print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
-            print $formproduct->select_measuring_units("weight_units","weight");
-            print '</td></tr>';
-            // Length
-            if (empty($conf->global->PRODUCT_DISABLE_SIZE))
-            {
-                print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
-                print '<input name="size" size="4" value="'.GETPOST('size').'"> x ';
-                print '<input name="sizewidth" size="4" value="'.GETPOST('sizewidth').'"> x ';
-                print '<input name="sizeheight" size="4" value="'.GETPOST('sizeheight').'">';
-                print $formproduct->select_measuring_units("size_units","size");
-                print '</td></tr>';
-            }
-            if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
-            {
-                // Surface
-                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
-                print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
-                print $formproduct->select_measuring_units("surface_units","surface");
-                print '</td></tr>';
-            }
-            // Volume
-            print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
-            print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
-            print $formproduct->select_measuring_units("volume_units","volume");
-            print '</td></tr>';
-        }
-
-        // Units
-	    if($conf->global->PRODUCT_USE_UNITS)
-	    {
-		    print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
-		    print '<td colspan="3">';
-		    print $form->selectUnits('','units');
-		    print '</td></tr>';
-	    }
-
-        // Custom code
-        if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO) && empty($type))
-        {
-	        print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td>';
-	        // Origin country
-	        print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
-	        print $form->select_country(GETPOST('country_id','int'),'country_id');
-	        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	        print '</td></tr>';
-        }
-
-        // Other attributes
-        $parameters=array('cols' => 3);
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields,'edit',$parameters);
-        }
-
-        // Note (private, no output on invoices, propales...)
-        //if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
-        //{
-            print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-
-            // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
-            $doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
-    	    $doleditor->Create();
-
-            print "</td></tr>";
-        //}
+		print '</td></tr>';
+
+		// Stock min level
+		if ($type != 1 && ! empty($conf->stock->enabled))
+		{
+			print '<tr><td>'.$form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1).'</td><td>';
+			print '<input name="seuil_stock_alerte" class="maxwidth50" value="'.GETPOST('seuil_stock_alerte').'">';
+			print '</td>';
+			// Stock desired level
+			print '<td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
+			print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
+			print '</td></tr>';
+		}
+		else
+		{
+			print '<input name="seuil_stock_alerte" type="hidden" value="0">';
+			print '<input name="desiredstock" type="hidden" value="0">';
+		}
+
+		// Nature
+		if ($type != 1)
+		{
+			print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
+			$statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+			print $form->selectarray('finished',$statutarray,GETPOST('finished'),1);
+			print '</td></tr>';
+		}
+
+		// Duration
+		if ($type == 1)
+		{
+			print '<tr><td>' . $langs->trans("Duration") . '</td><td colspan="3"><input name="duration_value" size="6" maxlength="5" value="' . $duration_value . '"> &nbsp;';
+			print '<input name="duration_unit" type="radio" value="h">'.$langs->trans("Hour").'&nbsp;';
+			print '<input name="duration_unit" type="radio" value="d">'.$langs->trans("Day").'&nbsp;';
+			print '<input name="duration_unit" type="radio" value="w">'.$langs->trans("Week").'&nbsp;';
+			print '<input name="duration_unit" type="radio" value="m">'.$langs->trans("Month").'&nbsp;';
+			print '<input name="duration_unit" type="radio" value="y">'.$langs->trans("Year").'&nbsp;';
+			print '</td></tr>';
+		}
+
+		if ($type != 1)	// Le poids et le volume ne concerne que les produits et pas les services
+		{
+			// Weight
+			print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
+			print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
+			print $formproduct->select_measuring_units("weight_units","weight");
+			print '</td></tr>';
+			// Length
+			if (empty($conf->global->PRODUCT_DISABLE_SIZE))
+			{
+				print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
+				print '<input name="size" size="4" value="'.GETPOST('size').'"> x ';
+				print '<input name="sizewidth" size="4" value="'.GETPOST('sizewidth').'"> x ';
+				print '<input name="sizeheight" size="4" value="'.GETPOST('sizeheight').'">';
+				print $formproduct->select_measuring_units("size_units","size");
+				print '</td></tr>';
+			}
+			if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
+			{
+				// Surface
+				print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+				print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
+				print $formproduct->select_measuring_units("surface_units","surface");
+				print '</td></tr>';
+			}
+			// Volume
+			print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
+			print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
+			print $formproduct->select_measuring_units("volume_units","volume");
+			print '</td></tr>';
+		}
+
+		// Units
+		if($conf->global->PRODUCT_USE_UNITS)
+		{
+			print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
+			print '<td colspan="3">';
+			print $form->selectUnits('','units');
+			print '</td></tr>';
+		}
+
+		// Custom code
+		if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO) && empty($type))
+		{
+			print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td>';
+			// Origin country
+			print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
+			print $form->select_country(GETPOST('country_id','int'),'country_id');
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			print '</td></tr>';
+		}
+
+		// Other attributes
+		$parameters=array('cols' => 3);
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields,'edit',$parameters);
+		}
+
+		// Note (private, no output on invoices, propales...)
+		//if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
+		//{
+			print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+
+			// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
+			$doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
+			$doleditor->Create();
+
+			print "</td></tr>";
+		//}
 
 		if($conf->categorie->enabled) {
 			// Categories
@@ -1106,150 +1106,150 @@ 
 			print "</td></tr>";
 		}
 
-        print '</table>';
+		print '</table>';
 
-        print '<br>';
+		print '<br>';
 
-        if (! empty($conf->global->PRODUIT_MULTIPRICES))
-        {
-            // We do no show price array on create when multiprices enabled.
-            // We must set them on prices tab.
-        }
-        else
+		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+			// We do no show price array on create when multiprices enabled.
+			// We must set them on prices tab.
+		}
+		else
 		{
-            print '<table class="border" width="100%">';
+			print '<table class="border" width="100%">';
 
-            // Price
-            print '<tr><td class="titlefieldcreate">'.$langs->trans("SellingPrice").'</td>';
-            print '<td><input name="price" class="maxwidth50" value="'.$object->price.'">';
-            print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
-            print '</td></tr>';
+			// Price
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("SellingPrice").'</td>';
+			print '<td><input name="price" class="maxwidth50" value="'.$object->price.'">';
+			print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
+			print '</td></tr>';
 
-            // Min price
-            print '<tr><td>'.$langs->trans("MinPrice").'</td>';
-            print '<td><input name="price_min" class="maxwidth50" value="'.$object->price_min.'">';
-            print '</td></tr>';
+			// Min price
+			print '<tr><td>'.$langs->trans("MinPrice").'</td>';
+			print '<td><input name="price_min" class="maxwidth50" value="'.$object->price_min.'">';
+			print '</td></tr>';
 
-            // VAT
-            print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
-            $defaultva=get_default_tva($mysoc, $mysoc);
-            print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
-            print '</td></tr>';
+			// VAT
+			print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
+			$defaultva=get_default_tva($mysoc, $mysoc);
+			print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
+			print '</td></tr>';
 
-            print '</table>';
+			print '</table>';
 
-            print '<br>';
-        }
+			print '<br>';
+		}
 
-        // Accountancy codes
-        print '<table class="border" width="100%">';
+		// Accountancy codes
+		print '<table class="border" width="100%">';
 
 		if (! empty($conf->accounting->enabled))
 		{
-            // Accountancy_code_sell
-            print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
-            print '<td>';
-		    print $formaccounting->select_account(GETPOST('accountancy_code_sell'), 'accountancy_code_sell', 1, null, 1, 1, '');
-            print '</td></tr>';
+			// Accountancy_code_sell
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
+			print '<td>';
+			print $formaccounting->select_account(GETPOST('accountancy_code_sell'), 'accountancy_code_sell', 1, null, 1, 1, '');
+			print '</td></tr>';
 
-            // Accountancy_code_buy
-            print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-            print '<td>';
+			// Accountancy_code_buy
+			print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+			print '<td>';
 			print $formaccounting->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
-            print '</td></tr>';
+			print '</td></tr>';
 		}
 		else // For external software
 		{
-            // Accountancy_code_sell
-            print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
-            print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';
-            print '</td></tr>';
+			// Accountancy_code_sell
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
+			print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';
+			print '</td></tr>';
 
-            // Accountancy_code_buy
-            print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-            print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_buy" value="'.$object->accountancy_code_buy.'">';
-            print '</td></tr>';
-        }
+			// Accountancy_code_buy
+			print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+			print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_buy" value="'.$object->accountancy_code_buy.'">';
+			print '</td></tr>';
+		}
 		print '</table>';
 
-        dol_fiche_end();
+		dol_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="' . $langs->trans("Create") . '">';
-        print ' &nbsp; &nbsp; ';
+		print ' &nbsp; &nbsp; ';
 		print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
-        print '</form>';
-    }
+		print '</form>';
+	}
 
-    /*
+	/*
      * Product card
      */
 
-    else if ($object->id > 0)
-    {
-        // Fiche en mode edition
-        if ($action == 'edit' &&  ((($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) ||  ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))))
-        {
-            //WYSIWYG Editor
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-
-            $type = $langs->trans('Product');
-            if ($object->isService()) $type = $langs->trans('Service');
-            //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
-
-            // Main official, simple, and not duplicated code
-            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="id" value="'.$object->id.'">';
-            print '<input type="hidden" name="canvas" value="'.$object->canvas.'">';
-
-            $head=product_prepare_head($object);
-            $titre=$langs->trans("CardProduct".$object->type);
-            $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-            dol_fiche_head($head, 'card', $titre, 0, $picto);
-
-            print '<table class="border allwidth">';
-
-            // Ref
-            print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
-
-            // Label
-            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
-
-            // Status To sell
-            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-            print '<select class="flat" name="statut">';
-            if ($object->status)
-            {
-                print '<option value="1" selected>'.$langs->trans("OnSell").'</option>';
-                print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
-            }
-            else
-            {
-                print '<option value="1">'.$langs->trans("OnSell").'</option>';
-                print '<option value="0" selected>'.$langs->trans("NotOnSell").'</option>';
-            }
-            print '</select>';
-            print '</td></tr>';
+	else if ($object->id > 0)
+	{
+		// Fiche en mode edition
+		if ($action == 'edit' &&  ((($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) ||  ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))))
+		{
+			//WYSIWYG Editor
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-            // Status To Buy
-            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-            print '<select class="flat" name="statut_buy">';
-            if ($object->status_buy)
-            {
-                print '<option value="1" selected>'.$langs->trans("ProductStatusOnBuy").'</option>';
-                print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
-            }
-            else
-            {
-                print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
-                print '<option value="0" selected>'.$langs->trans("ProductStatusNotOnBuy").'</option>';
-            }
-            print '</select>';
-            print '</td></tr>';
+			$type = $langs->trans('Product');
+			if ($object->isService()) $type = $langs->trans('Service');
+			//print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
+
+			// Main official, simple, and not duplicated code
+			print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="canvas" value="'.$object->canvas.'">';
+
+			$head=product_prepare_head($object);
+			$titre=$langs->trans("CardProduct".$object->type);
+			$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
+			dol_fiche_head($head, 'card', $titre, 0, $picto);
+
+			print '<table class="border allwidth">';
+
+			// Ref
+			print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
+
+			// Label
+			print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
+
+			// Status To sell
+			print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
+			print '<select class="flat" name="statut">';
+			if ($object->status)
+			{
+				print '<option value="1" selected>'.$langs->trans("OnSell").'</option>';
+				print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
+			}
+			else
+			{
+				print '<option value="1">'.$langs->trans("OnSell").'</option>';
+				print '<option value="0" selected>'.$langs->trans("NotOnSell").'</option>';
+			}
+			print '</select>';
+			print '</td></tr>';
+
+			// Status To Buy
+			print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
+			print '<select class="flat" name="statut_buy">';
+			if ($object->status_buy)
+			{
+				print '<option value="1" selected>'.$langs->trans("ProductStatusOnBuy").'</option>';
+				print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
+			}
+			else
+			{
+				print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
+				print '<option value="0" selected>'.$langs->trans("ProductStatusNotOnBuy").'</option>';
+			}
+			print '</select>';
+			print '</td></tr>';
 
 			// Batch number managment
 			if ($conf->productbatch->enabled) {
@@ -1259,49 +1259,49 @@ 
 				print '</td></tr>';
 			}
 
-            // Barcode
-            $showbarcode=empty($conf->barcode->enabled)?0:1;
-            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
-
-	        if ($showbarcode)
-	        {
-		        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
-		        if (isset($_POST['fk_barcode_type']))
-		        {
-		         	$fk_barcode_type=GETPOST('fk_barcode_type');
-		        }
-		        else
-		        {
-	        		$fk_barcode_type=$object->barcode_type;
-		        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-		        }
-		        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
-	            $formbarcode = new FormBarCode($db);
-		        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
-		        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
-		        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-		        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
-		        print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
-		        print '</td></tr>';
-	        }
-
-            // Description (used in invoice, propal...)
-            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
-
-            // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
-            $doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
-            $doleditor->Create();
-
-            print "</td></tr>";
-            print "\n";
-
-            // Public Url
-            print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+			// Barcode
+			$showbarcode=empty($conf->barcode->enabled)?0:1;
+			if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+
+			if ($showbarcode)
+			{
+				print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
+				if (isset($_POST['fk_barcode_type']))
+				{
+				 	$fk_barcode_type=GETPOST('fk_barcode_type');
+				}
+				else
+				{
+					$fk_barcode_type=$object->barcode_type;
+					if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+				}
+				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
+				$formbarcode = new FormBarCode($db);
+				print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
+				print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
+				$tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
+				if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+				print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
+				print '</td></tr>';
+			}
+
+			// Description (used in invoice, propal...)
+			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+
+			// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
+			$doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+			$doleditor->Create();
+
+			print "</td></tr>";
+			print "\n";
+
+			// Public Url
+			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
 			print '<input type="text" name="url" class="quatrevingtpercent" value="'.$object->url.'">';
-            print '</td></tr>';
+			print '</td></tr>';
 
-            // Stock
-            /*
+			// Stock
+			/*
             if ($object->isProduct() && ! empty($conf->stock->enabled))
             {
                 print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';
@@ -1318,97 +1318,97 @@ 
                 print '<input name="desiredstock" type="hidden" value="'.$object->desiredstock.'">';
             }*/
 
-            // Nature
-            if($object->type!= Product::TYPE_SERVICE)
-            {
-                print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
-                $statutarray=array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-                print $form->selectarray('finished',$statutarray,$object->finished);
-                print '</td></tr>';
-            }
+			// Nature
+			if($object->type!= Product::TYPE_SERVICE)
+			{
+				print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
+				$statutarray=array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+				print $form->selectarray('finished',$statutarray,$object->finished);
+				print '</td></tr>';
+			}
 
-            if ($object->isService())
-            {
-                // Duration
-                print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="3" maxlength="5" value="'.$object->duration_value.'">';
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="h"'.($object->duration_unit=='h'?' checked':'').'>'.$langs->trans("Hour");
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="d"'.($object->duration_unit=='d'?' checked':'').'>'.$langs->trans("Day");
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="w"'.($object->duration_unit=='w'?' checked':'').'>'.$langs->trans("Week");
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="m"'.($object->duration_unit=='m'?' checked':'').'>'.$langs->trans("Month");
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="y"'.($object->duration_unit=='y'?' checked':'').'>'.$langs->trans("Year");
+			if ($object->isService())
+			{
+				// Duration
+				print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="3" maxlength="5" value="'.$object->duration_value.'">';
+				print '&nbsp; ';
+				print '<input name="duration_unit" type="radio" value="h"'.($object->duration_unit=='h'?' checked':'').'>'.$langs->trans("Hour");
+				print '&nbsp; ';
+				print '<input name="duration_unit" type="radio" value="d"'.($object->duration_unit=='d'?' checked':'').'>'.$langs->trans("Day");
+				print '&nbsp; ';
+				print '<input name="duration_unit" type="radio" value="w"'.($object->duration_unit=='w'?' checked':'').'>'.$langs->trans("Week");
+				print '&nbsp; ';
+				print '<input name="duration_unit" type="radio" value="m"'.($object->duration_unit=='m'?' checked':'').'>'.$langs->trans("Month");
+				print '&nbsp; ';
+				print '<input name="duration_unit" type="radio" value="y"'.($object->duration_unit=='y'?' checked':'').'>'.$langs->trans("Year");
 
-                print '</td></tr>';
-            }
-            else
+				print '</td></tr>';
+			}
+			else
 			{
-                // Weight
-                print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
-                print '<input name="weight" size="5" value="'.$object->weight.'"> ';
-                print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);
-                print '</td></tr>';
-                if (empty($conf->global->PRODUCT_DISABLE_SIZE))
-                {
-        			// Length
-        			print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
-        			print '<input name="size" size="5" value="'.$object->length.'">x';
-        			print '<input name="sizewidth" size="5" value="'.$object->width.'">x';
-        			print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';
-        			print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
-        			print '</td></tr>';
-                }
-                if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
-                {
-                    // Surface
-                    print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
-                    print '<input name="surface" size="5" value="'.$object->surface.'"> ';
-                    print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units);
-                    print '</td></tr>';
-                }
-                if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
-                {
-                    // Volume
-                    print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
-                    print '<input name="volume" size="5" value="'.$object->volume.'"> ';
-                    print $formproduct->select_measuring_units("volume_units", "volume", $object->volume_units);
-                    print '</td></tr>';
-                }
-            }
-        	// Units
-	        if($conf->global->PRODUCT_USE_UNITS)
-	        {
-		        print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
-		        print '<td colspan="3">';
-		        print $form->selectUnits($object->fk_unit, 'units');
-		        print '</td></tr>';
-	        }
-
-	        // Custom code
-    	    if (! $object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
-        	{
-	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.$object->customcode.'"></td>';
-	            // Origin country
-	            print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
-	            print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
-	            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	            print '</td></tr>';
-        	}
-
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields,'edit');
-            }
+				// Weight
+				print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
+				print '<input name="weight" size="5" value="'.$object->weight.'"> ';
+				print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);
+				print '</td></tr>';
+				if (empty($conf->global->PRODUCT_DISABLE_SIZE))
+				{
+					// Length
+					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
+					print '<input name="size" size="5" value="'.$object->length.'">x';
+					print '<input name="sizewidth" size="5" value="'.$object->width.'">x';
+					print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';
+					print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
+					print '</td></tr>';
+				}
+				if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
+				{
+					// Surface
+					print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+					print '<input name="surface" size="5" value="'.$object->surface.'"> ';
+					print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units);
+					print '</td></tr>';
+				}
+				if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
+				{
+					// Volume
+					print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
+					print '<input name="volume" size="5" value="'.$object->volume.'"> ';
+					print $formproduct->select_measuring_units("volume_units", "volume", $object->volume_units);
+					print '</td></tr>';
+				}
+			}
+			// Units
+			if($conf->global->PRODUCT_USE_UNITS)
+			{
+				print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
+				print '<td colspan="3">';
+				print $form->selectUnits($object->fk_unit, 'units');
+				print '</td></tr>';
+			}
+
+			// Custom code
+			if (! $object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
+			{
+				print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.$object->customcode.'"></td>';
+				// Origin country
+				print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
+				print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
+				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+				print '</td></tr>';
+			}
+
+			// Other attributes
+			$parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
+			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			if (empty($reshook) && ! empty($extrafields->attribute_label))
+			{
+				print $object->showOptionals($extrafields,'edit');
+			}
 
 			// Tags-Categories
-            if ($conf->categorie->enabled)
+			if ($conf->categorie->enabled)
 			{
 				print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
@@ -1421,134 +1421,134 @@ 
 				print "</td></tr>";
 			}
 
-            // Note private
+			// Note private
 			if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 			{
-                print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+				print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
 
-                $doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
-                $doleditor->Create();
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+				$doleditor->Create();
 
-                print "</td></tr>";
+				print "</td></tr>";
 			}
 
-            print '</table>';
+			print '</table>';
 
-            print '<br>';
+			print '<br>';
 
-            print '<table class="border" width="100%">';
+			print '<table class="border" width="100%">';
 
 			if (! empty($conf->accounting->enabled))
 			{
-                // Accountancy_code_sell
-                print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
-                print '<td>';
+				// Accountancy_code_sell
+				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
+				print '<td>';
 				print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
-                print '</td></tr>';
+				print '</td></tr>';
 
-                // Accountancy_code_buy
-                print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-                print '<td>';
+				// Accountancy_code_buy
+				print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+				print '<td>';
 				print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
-                print '</td></tr>';
+				print '</td></tr>';
 			}
 			else // For external software
 			{
-                // Accountancy_code_sell
-                print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
-                print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
-                print '</td></tr>';
+				// Accountancy_code_sell
+				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
+				print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
+				print '</td></tr>';
 
-                // Accountancy_code_buy
-                print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-                print '<td><input name="accountancy_code_buy" class="maxwidth200" value="'.$object->accountancy_code_buy.'">';
-                print '</td></tr>';
-            }
+				// Accountancy_code_buy
+				print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+				print '<td><input name="accountancy_code_buy" class="maxwidth200" value="'.$object->accountancy_code_buy.'">';
+				print '</td></tr>';
+			}
 			print '</table>';
 
-            dol_fiche_end();
+			dol_fiche_end();
 
-            print '<div class="center">';
+			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
-            print '</form>';
-        }
-        // Fiche en mode visu
-        else
+			print '</form>';
+		}
+		// Fiche en mode visu
+		else
 		{
-            $showbarcode=empty($conf->barcode->enabled)?0:1;
-            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+			$showbarcode=empty($conf->barcode->enabled)?0:1;
+			if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
 
-		    $head=product_prepare_head($object);
-            $titre=$langs->trans("CardProduct".$object->type);
-            $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
+			$head=product_prepare_head($object);
+			$titre=$langs->trans("CardProduct".$object->type);
+			$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
 
-            dol_fiche_head($head, 'card', $titre, -1, $picto);
+			dol_fiche_head($head, 'card', $titre, -1, $picto);
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-            $object->next_prev_filter=" fk_product_type = ".$object->type;
+			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
+			$object->next_prev_filter=" fk_product_type = ".$object->type;
 
-            $shownav = 1;
-            if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+			$shownav = 1;
+			if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
 
-            dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+			dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
 
-            print '<div class="fichecenter">';
-            print '<div class="fichehalfleft">';
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
 
-            print '<div class="underbanner clearboth"></div>';
-            print '<table class="border tableforfield" width="100%">';
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="border tableforfield" width="100%">';
 
-            // Type
-            if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled))
-            {
-            	// TODO change for compatibility with edit in place
-            	$typeformat='select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
-                print '<tr><td class="titlefield">'.$form->editfieldkey("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat).'</td><td colspan="2">';
-                print $form->editfieldval("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat);
-                print '</td></tr>';
-            }
+			// Type
+			if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled))
+			{
+				// TODO change for compatibility with edit in place
+				$typeformat='select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+				print '<tr><td class="titlefield">'.$form->editfieldkey("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat).'</td><td colspan="2">';
+				print $form->editfieldval("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat);
+				print '</td></tr>';
+			}
 
-            if ($showbarcode)
-            {
-                // Barcode type
-                print '<tr><td class="nowrap">';
-                print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-                print $langs->trans("BarcodeType");
-                print '</td>';
-                if (($action != 'editbarcodetype') && ! empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
-                print '</tr></table>';
-                print '</td><td colspan="2">';
-                if ($action == 'editbarcodetype' || $action == 'editbarcode')
-                {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
-                    $formbarcode = new FormBarCode($db);
+			if ($showbarcode)
+			{
+				// Barcode type
+				print '<tr><td class="nowrap">';
+				print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+				print $langs->trans("BarcodeType");
+				print '</td>';
+				if (($action != 'editbarcodetype') && ! empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+				print '</tr></table>';
+				print '</td><td colspan="2">';
+				if ($action == 'editbarcodetype' || $action == 'editbarcode')
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
+					$formbarcode = new FormBarCode($db);
 		}
-                if ($action == 'editbarcodetype')
-                {
-                    $formbarcode->form_barcode_type($_SERVER['PHP_SELF'].'?id='.$object->id,$object->barcode_type,'fk_barcode_type');
-                }
-                else
-                {
-                    $object->fetch_barcode();
-                    print $object->barcode_type_label?$object->barcode_type_label:($object->barcode?'<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>':'');
-                }
-                print '</td></tr>'."\n";
-
-                // Barcode value
-                print '<tr><td class="nowrap">';
-                print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-                print $langs->trans("BarcodeValue");
-                print '</td>';
-                if (($action != 'editbarcode') && ! empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
-                print '</tr></table>';
-                print '</td><td colspan="2">';
-                if ($action == 'editbarcode')
-                {
+				if ($action == 'editbarcodetype')
+				{
+					$formbarcode->form_barcode_type($_SERVER['PHP_SELF'].'?id='.$object->id,$object->barcode_type,'fk_barcode_type');
+				}
+				else
+				{
+					$object->fetch_barcode();
+					print $object->barcode_type_label?$object->barcode_type_label:($object->barcode?'<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>':'');
+				}
+				print '</td></tr>'."\n";
+
+				// Barcode value
+				print '<tr><td class="nowrap">';
+				print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+				print $langs->trans("BarcodeValue");
+				print '</td>';
+				if (($action != 'editbarcode') && ! empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+				print '</tr></table>';
+				print '</td><td colspan="2">';
+				if ($action == 'editbarcode')
+				{
 			$tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
 			if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
 
@@ -1559,46 +1559,46 @@ 
 			print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">';
 			print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-                }
-                else
-                {
-                    print $object->barcode;
-                }
-                print '</td></tr>'."\n";
-            }
+				}
+				else
+				{
+					print $object->barcode;
+				}
+				print '</td></tr>'."\n";
+			}
 
-            // Accountancy sell code
+			// Accountancy sell code
 			print '<tr><td class="nowrap">';
-            print $langs->trans("ProductAccountancySellCode");
-            print '</td><td colspan="2">';
+			print $langs->trans("ProductAccountancySellCode");
+			print '</td><td colspan="2">';
 			if (! empty($conf->accounting->enabled))
 			{
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch('',$object->accountancy_code_sell);
 
 				print $accountingaccount->getNomUrl(0,1,1,'',1);
-            } else {
+			} else {
 				print $object->accountancy_code_sell;
 			}
 			print '</td></tr>';
 
-            // Accountancy buy code
+			// Accountancy buy code
 			print '<tr><td class="nowrap">';
-            print $langs->trans("ProductAccountancyBuyCode");
-            print '</td><td colspan="2">';
+			print $langs->trans("ProductAccountancyBuyCode");
+			print '</td><td colspan="2">';
 			if (! empty($conf->accounting->enabled))
 			{
 				$accountingaccount2 = new AccountingAccount($db);
 				$accountingaccount2->fetch('',$object->accountancy_code_buy);
 
 				print $accountingaccount2->getNomUrl(0,1,1,'',1);
-            } else {
+			} else {
 				print $object->accountancy_code_buy;
 			}
-            print '</td></tr>';
+			print '</td></tr>';
 
-            // Status (to sell)
-            /*
+			// Status (to sell)
+			/*
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
                 print ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
@@ -1617,131 +1617,131 @@ 
             print '</td></tr>';
             */
 
-            // Batch number management (to batch)
-            if (! empty($conf->productbatch->enabled)) {
-                print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
-                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-                    print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');
-                } else {
-                    print $object->getLibStatut(0,2);
-                }
-                print '</td></tr>';
-            }
+			// Batch number management (to batch)
+			if (! empty($conf->productbatch->enabled)) {
+				print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
+				if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+					print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');
+				} else {
+					print $object->getLibStatut(0,2);
+				}
+				print '</td></tr>';
+			}
 
-            // Description
-            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).'</td></tr>';
+			// Description
+			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).'</td></tr>';
 
-            // Public URL
-            print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="2">';
+			// Public URL
+			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="2">';
 			print dol_print_url($object->url);
-            print '</td></tr>';
+			print '</td></tr>';
 
-            //Parent product.
-            if (!empty($conf->variants->enabled) && $object->isProduct()) {
+			//Parent product.
+			if (!empty($conf->variants->enabled) && $object->isProduct()) {
 
-                $combination = new ProductCombination($db);
+				$combination = new ProductCombination($db);
 
-                if ($combination->fetchByFkProductChild($object->id) > 0) {
-                    $prodstatic = new Product($db);
-                    $prodstatic->fetch($combination->fk_product_parent);
+				if ($combination->fetchByFkProductChild($object->id) > 0) {
+					$prodstatic = new Product($db);
+					$prodstatic->fetch($combination->fk_product_parent);
 
-                    // Parent product
-                    print '<tr><td>'.$langs->trans("ParentProduct").'</td><td colspan="2">';
-                    print $prodstatic->getNomUrl(1);
-                    print '</td></tr>';
-                }
-            }
+					// Parent product
+					print '<tr><td>'.$langs->trans("ParentProduct").'</td><td colspan="2">';
+					print $prodstatic->getNomUrl(1);
+					print '</td></tr>';
+				}
+			}
 
-            print '</table>';
-            print '</div>';
-            print '<div class="fichehalfright"><div class="ficheaddleft">';
+			print '</table>';
+			print '</div>';
+			print '<div class="fichehalfright"><div class="ficheaddleft">';
 
-            print '<div class="underbanner clearboth"></div>';
-            print '<table class="border tableforfield" width="100%">';
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="border tableforfield" width="100%">';
 
-            // Nature
-            if($object->type!= Product::TYPE_SERVICE)
-            {
-                print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
-                print $object->getLibFinished();
-                print '</td></tr>';
-            }
+			// Nature
+			if($object->type!= Product::TYPE_SERVICE)
+			{
+				print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
+				print $object->getLibFinished();
+				print '</td></tr>';
+			}
 
-            if ($object->isService())
-            {
-                // Duration
-                print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
-                if ($object->duration_value > 1)
-                {
-                    $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
-                }
-                else if ($object->duration_value > 0)
-                {
-                    $dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
-                }
-                print (! empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
+			if ($object->isService())
+			{
+				// Duration
+				print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
+				if ($object->duration_value > 1)
+				{
+					$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
+				}
+				else if ($object->duration_value > 0)
+				{
+					$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
+				}
+				print (! empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
 
-                print '</td></tr>';
-            }
-            else
-            {
-                // Weight
-                print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
-                if ($object->weight != '')
-                {
-                    print $object->weight." ".measuring_units_string($object->weight_units,"weight");
-                }
-                else
-                {
-                    print '&nbsp;';
-                }
-                print "</td></tr>\n";
-                if (empty($conf->global->PRODUCT_DISABLE_SIZE))
-                {
-                    // Length
-                    print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="2">';
-                    if ($object->length != '' || $object->width != '' || $object->height != '')
-                    {
-                        print $object->length;
-                        if ($object->width) print " x ".$object->width;
-                        if ($object->height) print " x ".$object->height;
-                        print ' '.measuring_units_string($object->length_units,"size");
-                    }
-                    else
-                    {
-                        print '&nbsp;';
-                    }
-                    print "</td></tr>\n";
-                }
-                if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
-                {
-                    // Surface
-                    print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
-                    if ($object->surface != '')
-                    {
-                        print $object->surface." ".measuring_units_string($object->surface_units,"surface");
-                    }
-                    else
-                    {
-                        print '&nbsp;';
-                    }
-                    print "</td></tr>\n";
-                }
-                if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
-                {
-                    // Volume
-                    print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
-                    if ($object->volume != '')
-                    {
-                        print $object->volume." ".measuring_units_string($object->volume_units,"volume");
-                    }
-                    else
-                    {
-                        print '&nbsp;';
-                    }
-                    print "</td></tr>\n";
-                }
-            }
+				print '</td></tr>';
+			}
+			else
+			{
+				// Weight
+				print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
+				if ($object->weight != '')
+				{
+					print $object->weight." ".measuring_units_string($object->weight_units,"weight");
+				}
+				else
+				{
+					print '&nbsp;';
+				}
+				print "</td></tr>\n";
+				if (empty($conf->global->PRODUCT_DISABLE_SIZE))
+				{
+					// Length
+					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="2">';
+					if ($object->length != '' || $object->width != '' || $object->height != '')
+					{
+						print $object->length;
+						if ($object->width) print " x ".$object->width;
+						if ($object->height) print " x ".$object->height;
+						print ' '.measuring_units_string($object->length_units,"size");
+					}
+					else
+					{
+						print '&nbsp;';
+					}
+					print "</td></tr>\n";
+				}
+				if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
+				{
+					// Surface
+					print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
+					if ($object->surface != '')
+					{
+						print $object->surface." ".measuring_units_string($object->surface_units,"surface");
+					}
+					else
+					{
+						print '&nbsp;';
+					}
+					print "</td></tr>\n";
+				}
+				if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
+				{
+					// Volume
+					print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
+					if ($object->volume != '')
+					{
+						print $object->volume." ".measuring_units_string($object->volume_units,"volume");
+					}
+					else
+					{
+						print '&nbsp;';
+					}
+					print "</td></tr>\n";
+				}
+			}
 
 			// Unit
 			if (! empty($conf->global->PRODUCT_USE_UNITS))
@@ -1755,18 +1755,18 @@ 
 				print '</td></tr>';
 			}
 
-        	// Custom code
-        	if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
-        	{
-	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';
+			// Custom code
+			if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
+			{
+				print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';
 
-            	// Origin country code
-            	print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td colspan="2">'.getCountry($object->country_id,0,$db).'</td>';
-        	}
+				// Origin country code
+				print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td colspan="2">'.getCountry($object->country_id,0,$db).'</td>';
+			}
 
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'"');
-            include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$parameters=array('colspan' => ' colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'"');
+			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
 			if($conf->categorie->enabled) {
@@ -1775,35 +1775,35 @@ 
 				print "</td></tr>";
 			}
 
-            // Note private
+			// Note private
 			if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 			{
-    			print '<!-- show Note --> '."\n";
-                print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note_private)?$object->note_private:dol_nl2br($object->note_private,1,true)).'</td></tr>'."\n";
-                print '<!-- End show Note --> '."\n";
+				print '<!-- show Note --> '."\n";
+				print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note_private)?$object->note_private:dol_nl2br($object->note_private,1,true)).'</td></tr>'."\n";
+				print '<!-- End show Note --> '."\n";
 			}
 
-            print "</table>\n";
-    		print '</div>';
+			print "</table>\n";
+			print '</div>';
 
-            print '</div></div>';
-            print '<div style="clear:both"></div>';
+			print '</div></div>';
+			print '<div style="clear:both"></div>';
 
-            dol_fiche_end();
-        }
+			dol_fiche_end();
+		}
 
-    }
-    else if ($action != 'create')
-    {
-        exit;
-    }
+	}
+	else if ($action != 'create')
+	{
+		exit;
+	}
 }
 
 // Load object modCodeProduct
 $module=(! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON)?$conf->global->PRODUCT_CODEPRODUCT_ADDON:'mod_codeproduct_leopard');
 if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
 {
-    $module = substr($module, 0, dol_strlen($module)-4);
+	$module = substr($module, 0, dol_strlen($module)-4);
 }
 $result=dol_include_once('/core/modules/product/'.$module.'.php');
 if ($result > 0)
@@ -1817,27 +1817,27 @@ 
 // Define confirmation messages
 $formquestionclone=array(
 	'text' => $langs->trans("ConfirmClone"),
-    array('type' => 'text', 'name' => 'clone_ref','label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'size'=>24),
-    array('type' => 'checkbox', 'name' => 'clone_content','label' => $langs->trans("CloneContentProduct"), 'value' => 1),
-    array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true),
+	array('type' => 'text', 'name' => 'clone_ref','label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'size'=>24),
+	array('type' => 'checkbox', 'name' => 'clone_content','label' => $langs->trans("CloneContentProduct"), 'value' => 1),
+	array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true),
 );
 if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
 {
-    $formquestionclone[]=array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1);
+	$formquestionclone[]=array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1);
 }
 
 // Confirm delete product
 if (($action == 'delete' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))	// Output when action = clone if jmobile or no js
 	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
 {
-    print $form->formconfirm("card.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete");
+	print $form->formconfirm("card.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete");
 }
 
 // Clone confirmation
 if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))		// Output when action = clone if jmobile or no js
 	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestionclone,'yes','action-clone',250,600);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestionclone,'yes','action-clone',250,600);
 }
 
 
@@ -1848,57 +1848,57 @@ 
 /* ************************************************************************** */
 if ($action != 'create' && $action != 'edit')
 {
-    print "\n".'<div class="tabsAction">'."\n";
-
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    if (empty($reshook))
-    {
-        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) ||
-           ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
-        {
-            if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-
-            if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
-            {
-                if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
-                {
-                    print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
-                }
-                else
-    			{
-                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
-                }
-            }
-        }
-        $object_is_used = $object->isObjectUsed($object->id);
+	print "\n".'<div class="tabsAction">'."\n";
 
-        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
-        || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
-        {
-            if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
-            {
-                if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
-                {
-                    print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
-                }
-                else
-    			{
-                    print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
-                }
-            }
-            else
-    		{
-                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
-            }
-        }
-        else
-    	{
-            print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
-        }
-    }
-
-    print "\n</div>\n";
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if (empty($reshook))
+	{
+		if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) ||
+		   ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
+		{
+			if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+
+			if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
+			{
+				if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+				{
+					print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
+				}
+			}
+		}
+		$object_is_used = $object->isObjectUsed($object->id);
+
+		if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
+		|| ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
+		{
+			if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
+			{
+				if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+				{
+					print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
+				}
+			}
+			else
+			{
+				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
+			}
+		}
+		else
+		{
+			print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
+		}
+	}
+
+	print "\n</div>\n";
 }
 
 /*
@@ -1907,112 +1907,112 @@ 
 
 if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action == '' || $action == 'view') && $object->status)
 {
-    //Variable used to check if any text is going to be printed
-    $html = '';
+	//Variable used to check if any text is going to be printed
+	$html = '';
 	//print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    // Propals
-    if (! empty($conf->propal->enabled) && $user->rights->propale->creer)
-    {
-        $propal = new Propal($db);
-
-        $langs->load("propal");
-
-        $otherprop = $propal->liste_array(2,1,0);
-
-        if (is_array($otherprop) && count($otherprop))
-        {
-        	$html .= '<tr><td style="width: 200px;">';
-        	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
-        	$html .= $form->selectarray("propalid", $otherprop, 0, 1);
-        	$html .= '</td></tr>';
-        }
-        else
-       {
-        	$html .= '<tr><td style="width: 200px;">';
-        	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
-        	$html .= $langs->trans("NoDraftProposals");
-        	$html .= '</td></tr>';
-        }
-    }
-
-    // Commande
-    if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
-    {
-        $commande = new Commande($db);
-
-        $langs->load("orders");
-
-        $othercom = $commande->liste_array(2, 1, null);
-        if (is_array($othercom) && count($othercom))
-        {
-        	$html .= '<tr><td style="width: 200px;">';
-        	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
-        	$html .= $form->selectarray("commandeid", $othercom, 0, 1);
-        	$html .= '</td></tr>';
-        }
-        else
+	// Propals
+	if (! empty($conf->propal->enabled) && $user->rights->propale->creer)
+	{
+		$propal = new Propal($db);
+
+		$langs->load("propal");
+
+		$otherprop = $propal->liste_array(2,1,0);
+
+		if (is_array($otherprop) && count($otherprop))
 		{
-        	$html .= '<tr><td style="width: 200px;">';
-        	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
-        	$html .= $langs->trans("NoDraftOrders");
-        	$html .= '</td></tr>';
-        }
-    }
-
-    // Factures
-    if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
-    {
-    	$invoice = new Facture($db);
-
-    	$langs->load("bills");
-
-    	$otherinvoice = $invoice->liste_array(2, 1, null);
-    	if (is_array($otherinvoice) && count($otherinvoice))
-    	{
-    		$html .= '<tr><td style="width: 200px;">';
-    		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
-    		$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
-    		$html .= '</td></tr>';
-    	}
-    	else
-    	{
-    		$html .= '<tr><td style="width: 200px;">';
-    		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
-    		$html .= $langs->trans("NoDraftInvoices");
-    		$html .= '</td></tr>';
-    	}
-    }
-
-    //If any text is going to be printed, then we show the table
-    if (!empty($html))
-    {
-	    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    	print '<input type="hidden" name="action" value="addin">';
-
-	    print load_fiche_titre($langs->trans("AddToDraft"),'','');
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftProposals").'</td><td>';
+			$html .= $form->selectarray("propalid", $otherprop, 0, 1);
+			$html .= '</td></tr>';
+		}
+		else
+	   {
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftProposals").'</td><td>';
+			$html .= $langs->trans("NoDraftProposals");
+			$html .= '</td></tr>';
+		}
+	}
+
+	// Commande
+	if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
+	{
+		$commande = new Commande($db);
+
+		$langs->load("orders");
+
+		$othercom = $commande->liste_array(2, 1, null);
+		if (is_array($othercom) && count($othercom))
+		{
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftOrders").'</td><td>';
+			$html .= $form->selectarray("commandeid", $othercom, 0, 1);
+			$html .= '</td></tr>';
+		}
+		else
+		{
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftOrders").'</td><td>';
+			$html .= $langs->trans("NoDraftOrders");
+			$html .= '</td></tr>';
+		}
+	}
+
+	// Factures
+	if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
+	{
+		$invoice = new Facture($db);
+
+		$langs->load("bills");
+
+		$otherinvoice = $invoice->liste_array(2, 1, null);
+		if (is_array($otherinvoice) && count($otherinvoice))
+		{
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
+			$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
+			$html .= '</td></tr>';
+		}
+		else
+		{
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
+			$html .= $langs->trans("NoDraftInvoices");
+			$html .= '</td></tr>';
+		}
+	}
+
+	//If any text is going to be printed, then we show the table
+	if (!empty($html))
+	{
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="addin">';
+
+		print load_fiche_titre($langs->trans("AddToDraft"),'','');
 
 		dol_fiche_head('');
 
-    	$html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';
-    	$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td>';
-        $html .= '<td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
-    	$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
-    	$html .= '</td></tr>';
+		$html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';
+		$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td>';
+		$html .= '<td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
+		$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
+		$html .= '</td></tr>';
 
-    	print '<table width="100%" class="border">';
-        print $html;
-        print '</table>';
+		print '<table width="100%" class="border">';
+		print $html;
+		print '</table>';
 
-        print '<div class="center">';
-        print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-        print '</div>';
+		print '<div class="center">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+		print '</div>';
 
-        dol_fiche_end();
+		dol_fiche_end();
 
-        print '</form>';
-    }
+		print '</form>';
+	}
 }
 
 
@@ -2022,25 +2022,25 @@ 
 
 if ($action != 'create' && $action != 'edit' && $action != 'delete')
 {
-    print '<div class="fichecenter"><div class="fichehalfleft">';
-    print '<a name="builddoc"></a>'; // ancre
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
 
-    // Documents
-    $objectref = dol_sanitizeFileName($object->ref);
-    $relativepath = $comref . '/' . $objectref . '.pdf';
-    $filedir = $conf->produit->dir_output . '/' . $objectref;
-    $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-    $genallowed=$user->rights->produit->creer;
-    $delallowed=$user->rights->produit->supprimer;
+	// Documents
+	$objectref = dol_sanitizeFileName($object->ref);
+	$relativepath = $comref . '/' . $objectref . '.pdf';
+	$filedir = $conf->produit->dir_output . '/' . $objectref;
+	$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+	$genallowed=$user->rights->produit->creer;
+	$delallowed=$user->rights->produit->supprimer;
 
-    $var=true;
+	$var=true;
 
-    print $formfile->showdocuments($modulepart,$object->ref,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang, '', $object);
-    $somethingshown=$formfile->numoffiles;
+	print $formfile->showdocuments($modulepart,$object->ref,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang, '', $object);
+	$somethingshown=$formfile->numoffiles;
 
-    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-    print '</div></div></div>';
+	print '</div></div></div>';
 }
 
 

Spacing +302 added lines, -302 removed lines

@@ -48,73 +48,73 @@ 
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.php';
 
-if (! empty($conf->propal->enabled))     require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->facture->enabled))    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->commande->enabled))   require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->propal->enabled))     require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->facture->enabled))    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+if (!empty($conf->commande->enabled))   require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 $langs->load("products");
 $langs->load("other");
-if (! empty($conf->stock->enabled)) $langs->load("stocks");
-if (! empty($conf->facture->enabled)) $langs->load("bills");
-if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
+if (!empty($conf->stock->enabled)) $langs->load("stocks");
+if (!empty($conf->facture->enabled)) $langs->load("bills");
+if (!empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
-$mesg=''; $error=0; $errors=array();
+$mesg = ''; $error = 0; $errors = array();
 
-$refalreadyexists=0;
+$refalreadyexists = 0;
 
-$id=GETPOST('id', 'int');
-$ref=GETPOST('ref', 'alpha');
-$type=GETPOST('type','int');
-$action=(GETPOST('action','alpha') ? GETPOST('action','alpha') : 'view');
-$cancel=GETPOST('cancel');
-$confirm=GETPOST('confirm','alpha');
-$socid=GETPOST('socid','int');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$type = GETPOST('type', 'int');
+$action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
+$cancel = GETPOST('cancel');
+$confirm = GETPOST('confirm', 'alpha');
+$socid = GETPOST('socid', 'int');
 $duration_value = GETPOST('duration_value');
 $duration_unit = GETPOST('duration_unit');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (!empty($user->societe_id)) $socid = $user->societe_id;
 
 $object = new Product($db);
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
     $result = $object->fetch($id, $ref);
 
-    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+    if (!empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+    elseif (!empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
 
-    if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
     {
-        if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-        else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+        if (!empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
+        else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
     }
 }
 
-$modulepart='product';
+$modulepart = 'product';
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$canvas = !empty($object->canvas)?$object->canvas:GETPOST("canvas");
-$objcanvas=null;
-if (! empty($canvas))
+$canvas = !empty($object->canvas) ? $object->canvas : GETPOST("canvas");
+$objcanvas = null;
+if (!empty($canvas))
 {
     require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db,$action);
-    $objcanvas->getCanvas('product','card',$canvas);
+    $objcanvas = new Canvas($db, $action);
+    $objcanvas->getCanvas('product', 'card', $canvas);
 }
 
 // Security check
-$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
-$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas);
+$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
+$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype, $objcanvas);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('productcard','globalcard'));
+$hookmanager->initHooks(array('productcard', 'globalcard'));
 
 
 
@@ -124,17 +124,17 @@ 
 
 if ($cancel) $action = '';
 
-$createbarcode=empty($conf->barcode->enabled)?0:1;
-if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) $createbarcode=0;
+$createbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) $createbarcode = 0;
 
-$parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
     // Type
-    if ($action ==	'setfk_product_type' && $user->rights->produit->creer)
+    if ($action == 'setfk_product_type' && $user->rights->produit->creer)
     {
     	$result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
     	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -149,7 +149,7 @@ 
     include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
     // Barcode type
-    if ($action ==	'setfk_barcode_type' && $createbarcode)
+    if ($action == 'setfk_barcode_type' && $createbarcode)
     {
         $result = $object->setValueFrom('fk_barcode_type', GETPOST('fk_barcode_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
     	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -157,9 +157,9 @@ 
     }
 
     // Barcode value
-    if ($action ==	'setbarcode' && $createbarcode)
+    if ($action == 'setbarcode' && $createbarcode)
     {
-    	$result=$object->check_barcode(GETPOST('barcode'),GETPOST('barcode_type_code'));
+    	$result = $object->check_barcode(GETPOST('barcode'), GETPOST('barcode_type_code'));
 
 		if ($result >= 0)
 		{
@@ -183,28 +183,28 @@ 
     // Add a product or service
     if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer))
     {
-        $error=0;
+        $error = 0;
 
-        if (! GETPOST('label'))
+        if (!GETPOST('label'))
         {
-            setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')), null, 'errors');
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Label')), null, 'errors');
             $action = "create";
             $error++;
         }
         if (empty($ref))
         {
-            setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Ref')), null, 'errors');
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Ref')), null, 'errors');
             $action = "create";
             $error++;
         }
-        if (! empty($duration_value) && empty($duration_unit))
+        if (!empty($duration_value) && empty($duration_unit))
         {
-            setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), null, 'errors');
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Unit')), null, 'errors');
             $action = "create";
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
 	        $units = GETPOST('units', 'int');
 
@@ -221,25 +221,25 @@ 
             else
             	$object->price_min = GETPOST('price_min');
 
-	        $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+	        $tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
 	        // We must define tva_tx, npr and local taxes
 	        $vatratecode = '';
-	        $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
+	        $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
 	        $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
 	        $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
 	        // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
 	        if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 	        {
 	            // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
-	            $vatratecode=$reg[1];
+	            $vatratecode = $reg[1];
 	            // Get record from code
 	            $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	            $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	            $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-	            $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-	            $sql.= " AND t.code ='".$vatratecode."'";
-	            $resql=$db->query($sql);
+	            $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+	            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
+	            $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+	            $sql .= " AND t.code ='".$vatratecode."'";
+	            $resql = $db->query($sql);
 	            if ($resql)
 	            {
 	                $obj = $db->fetch_object($resql);
@@ -262,19 +262,19 @@ 
             $object->type               	 = $type;
             $object->status             	 = GETPOST('statut');
             $object->status_buy            = GETPOST('statut_buy');
-			$object->status_batch          	= GETPOST('status_batch');
+			$object->status_batch = GETPOST('status_batch');
 
             $object->barcode_type          = GETPOST('fk_barcode_type');
-            $object->barcode		           = GETPOST('barcode');
+            $object->barcode = GETPOST('barcode');
             // Set barcode_type_xxx from barcode_type id
-            $stdobject=new GenericObject($db);
-    	    $stdobject->element='product';
-            $stdobject->barcode_type=GETPOST('fk_barcode_type');
-            $result=$stdobject->fetch_barcode();
+            $stdobject = new GenericObject($db);
+    	    $stdobject->element = 'product';
+            $stdobject->barcode_type = GETPOST('fk_barcode_type');
+            $result = $stdobject->fetch_barcode();
             if ($result < 0)
             {
             	$error++;
-            	$mesg='Failed to get bar code type information ';
+            	$mesg = 'Failed to get bar code type information ';
             	setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
             }
             $object->barcode_type_code      = $stdobject->barcode_type_code;
@@ -282,43 +282,43 @@ 
             $object->barcode_type_label     = $stdobject->barcode_type_label;
 
             $object->description        	 = dol_htmlcleanlastbr(GETPOST('desc'));
-            $object->url					 = GETPOST('url');
+            $object->url = GETPOST('url');
             $object->note_private          	 = dol_htmlcleanlastbr(GETPOST('note_private'));
-            $object->note               	 = $object->note_private;   // deprecated
+            $object->note               	 = $object->note_private; // deprecated
             $object->customcode              = GETPOST('customcode');
             $object->country_id              = GETPOST('country_id');
             $object->duration_value     	 = $duration_value;
             $object->duration_unit      	 = $duration_unit;
-            $object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte')?GETPOST('seuil_stock_alerte'):0;
-            $object->desiredstock            = GETPOST('desiredstock')?GETPOST('desiredstock'):0;
+            $object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte') ? GETPOST('seuil_stock_alerte') : 0;
+            $object->desiredstock = GETPOST('desiredstock') ? GETPOST('desiredstock') : 0;
             $object->canvas             	 = GETPOST('canvas');
             $object->weight             	 = GETPOST('weight');
             $object->weight_units       	 = GETPOST('weight_units');
             $object->length             	 = GETPOST('size');
             $object->length_units       	 = GETPOST('size_units');
-            $object->width               	 = GETPOST('sizewidth');
+            $object->width = GETPOST('sizewidth');
             $object->height             	 = GETPOST('sizeheight');
-	        $object->surface            	 = GETPOST('surface');
+	        $object->surface = GETPOST('surface');
             $object->surface_units      	 = GETPOST('surface_units');
             $object->volume             	 = GETPOST('volume');
             $object->volume_units       	 = GETPOST('volume_units');
             $object->finished           	 = GETPOST('finished');
 	        $object->fk_unit                 = GETPOST('units');
 
-			$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
-			$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
+			$accountancy_code_sell = GETPOST('accountancy_code_sell');
+			$accountancy_code_buy = GETPOST('accountancy_code_buy');
 
 			if ($accountancy_code_sell <= 0) { $object->accountancy_code_sell = ''; } else { $object->accountancy_code_sell = $accountancy_code_sell; }
 			if ($accountancy_code_buy <= 0) { $object->accountancy_code_buy = ''; } else { $object->accountancy_code_buy = $accountancy_code_buy; }
 
             // MultiPrix
-            if (! empty($conf->global->PRODUIT_MULTIPRICES))
+            if (!empty($conf->global->PRODUIT_MULTIPRICES))
             {
-                for($i=2;$i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT;$i++)
+                for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
                 {
                     if (isset($_POST["price_".$i]))
                     {
-                        $object->multiprices["$i"] = price2num($_POST["price_".$i],'MU');
+                        $object->multiprices["$i"] = price2num($_POST["price_".$i], 'MU');
                         $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
                     }
                     else
@@ -329,10 +329,10 @@ 
             }
 
             // Fill array 'array_options' with data from add form
-        	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+        	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 			if ($ret < 0) $error++;
 
-			if (! $error)
+			if (!$error)
 			{
             	$id = $object->create($user);
 			}
@@ -366,22 +366,22 @@ 
         {
             if ($object->id > 0)
             {
-				$object->oldcopy= clone $object;
+				$object->oldcopy = clone $object;
 
                 $object->ref                    = $ref;
                 $object->label                  = GETPOST('label');
                 $object->description            = dol_htmlcleanlastbr(GETPOST('desc'));
-            	$object->url					= GETPOST('url');
-    			if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+            	$object->url = GETPOST('url');
+    			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     			{
-                	$object->note_private           = dol_htmlcleanlastbr(GETPOST('note_private'));
-                    $object->note                   = $object->note_private;
+                	$object->note_private = dol_htmlcleanlastbr(GETPOST('note_private'));
+                    $object->note = $object->note_private;
     			}
                 $object->customcode             = GETPOST('customcode');
                 $object->country_id             = GETPOST('country_id');
                 $object->status                 = GETPOST('statut');
                 $object->status_buy             = GETPOST('statut_buy');
-                $object->status_batch	        = GETPOST('status_batch');
+                $object->status_batch = GETPOST('status_batch');
                 // removed from update view so GETPOST always empty
                 /*
                 $object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
@@ -395,8 +395,8 @@ 
                 $object->weight_units           = GETPOST('weight_units');
                 $object->length                 = GETPOST('size');
                 $object->length_units           = GETPOST('size_units');
-                $object->width               	 = GETPOST('sizewidth');
-                $object->height             	 = GETPOST('sizeheight');
+                $object->width = GETPOST('sizewidth');
+                $object->height = GETPOST('sizeheight');
 
                 $object->surface                = GETPOST('surface');
                 $object->surface_units          = GETPOST('surface_units');
@@ -412,34 +412,34 @@ 
 		            $object->fk_unit = null;
 	            }
 
-	            $object->barcode_type           = GETPOST('fk_barcode_type');
-    	        $object->barcode		        = GETPOST('barcode');
+	            $object->barcode_type = GETPOST('fk_barcode_type');
+    	        $object->barcode = GETPOST('barcode');
     	        // Set barcode_type_xxx from barcode_type id
-    	        $stdobject=new GenericObject($db);
-    	        $stdobject->element='product';
-    	        $stdobject->barcode_type=GETPOST('fk_barcode_type');
-    	        $result=$stdobject->fetch_barcode();
+    	        $stdobject = new GenericObject($db);
+    	        $stdobject->element = 'product';
+    	        $stdobject->barcode_type = GETPOST('fk_barcode_type');
+    	        $result = $stdobject->fetch_barcode();
     	        if ($result < 0)
     	        {
     	        	$error++;
-    	        	$mesg='Failed to get bar code type information ';
+    	        	$mesg = 'Failed to get bar code type information ';
             		setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
     	        }
     	        $object->barcode_type_code      = $stdobject->barcode_type_code;
     	        $object->barcode_type_coder     = $stdobject->barcode_type_coder;
     	        $object->barcode_type_label     = $stdobject->barcode_type_label;
 
-				$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
-				$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
+				$accountancy_code_sell = GETPOST('accountancy_code_sell');
+				$accountancy_code_buy = GETPOST('accountancy_code_buy');
 
 				if ($accountancy_code_sell <= 0) { $object->accountancy_code_sell = ''; } else { $object->accountancy_code_sell = $accountancy_code_sell; }
 				if ($accountancy_code_buy <= 0) { $object->accountancy_code_buy = ''; } else { $object->accountancy_code_buy = $accountancy_code_buy; }
 
                 // Fill array 'array_options' with data from add form
-        		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+        		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 				if ($ret < 0) $error++;
 
-                if (! $error && $object->check())
+                if (!$error && $object->check())
                 {
                     if ($object->update($object->id, $user) > 0)
                     {
@@ -468,10 +468,10 @@ 
     }
 
     // Action clone object
-    if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; }
+    if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
     if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->produit->creer || $user->rights->service->creer))
     {
-        if (! GETPOST('clone_content') && ! GETPOST('clone_prices') )
+        if (!GETPOST('clone_content') && !GETPOST('clone_prices'))
         {
         	setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
         }
@@ -516,7 +516,7 @@ 
                     }
                     else
                     {
-                        $id=$originalId;
+                        $id = $originalId;
 
                         if ($object->error == 'ErrorProductAlreadyExists')
                         {
@@ -525,8 +525,8 @@ 
                             $refalreadyexists++;
                             $action = "";
 
-                            $mesg=$langs->trans("ErrorProductAlreadyExists",$object->ref);
-                            $mesg.=' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
+                            $mesg = $langs->trans("ErrorProductAlreadyExists", $object->ref);
+                            $mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
                             setEventMessages($mesg, null, 'errors');
                             $object->fetch($id);
                         }
@@ -536,12 +536,12 @@ 
                             if (count($object->errors))
                             {
                             	setEventMessages($object->error, $object->errors, 'errors');
-                            	dol_print_error($db,$object->errors);
+                            	dol_print_error($db, $object->errors);
                             }
                             else
                             {
                             	setEventMessages($langs->trans($object->error), null, 'errors');
-                            	dol_print_error($db,$object->error);
+                            	dol_print_error($db, $object->error);
                             }
                         }
                     }
@@ -550,13 +550,13 @@ 
             else
             {
                 $db->rollback();
-                dol_print_error($db,$object->error);
+                dol_print_error($db, $object->error);
             }
         }
     }
 
     // Delete a product
-    if ($action == 'confirm_delete' && $confirm != 'yes') { $action=''; }
+    if ($action == 'confirm_delete' && $confirm != 'yes') { $action = ''; }
     if ($action == 'confirm_delete' && $confirm == 'yes')
     {
         if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
@@ -573,7 +573,7 @@ 
         {
         	setEventMessages($langs->trans($object->error), null, 'errors');
             $reload = 0;
-            $action='';
+            $action = '';
         }
     }
 
@@ -581,14 +581,14 @@ 
     // Add product into object
     if ($object->id > 0 && $action == 'addin')
     {
-        $thirpdartyid =0 ;
+        $thirpdartyid = 0;
         if (GETPOST('propalid') > 0)
         {
         	$propal = new Propal($db);
-	        $result=$propal->fetch(GETPOST('propalid'));
+	        $result = $propal->fetch(GETPOST('propalid'));
 	        if ($result <= 0)
 	        {
-	            dol_print_error($db,$propal->error);
+	            dol_print_error($db, $propal->error);
 	            exit;
 	        }
 	        $thirpdartyid = $propal->socid;
@@ -596,10 +596,10 @@ 
         elseif (GETPOST('commandeid') > 0)
         {
             $commande = new Commande($db);
-	        $result=$commande->fetch(GETPOST('commandeid'));
+	        $result = $commande->fetch(GETPOST('commandeid'));
 	        if ($result <= 0)
 	        {
-	            dol_print_error($db,$commande->error);
+	            dol_print_error($db, $commande->error);
 	            exit;
 	        }
 	        $thirpdartyid = $commande->socid;
@@ -607,16 +607,16 @@ 
         elseif (GETPOST('factureid') > 0)
         {
     	    $facture = new Facture($db);
-	        $result=$facture->fetch(GETPOST('factureid'));
+	        $result = $facture->fetch(GETPOST('factureid'));
 	        if ($result <= 0)
 	        {
-	            dol_print_error($db,$facture->error);
+	            dol_print_error($db, $facture->error);
 	            exit;
 	        }
 	        $thirpdartyid = $facture->socid;
         }
 
-        if ( $thirpdartyid > 0)  {
+        if ($thirpdartyid > 0) {
             $soc = new Societe($db);
             $result = $soc->fetch($thirpdartyid);
             if ($result <= 0) {
@@ -628,7 +628,7 @@ 
 
             $tva_tx = get_default_tva($mysoc, $soc, $object->id);
             $tva_npr = get_default_npr($mysoc, $soc, $object->id);
-            if (empty($tva_tx)) $tva_npr=0;
+            if (empty($tva_tx)) $tva_npr = 0;
             $localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);
             $localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);
 
@@ -642,7 +642,7 @@ 
                 $pu_ttc = $object->multiprices_ttc[$soc->price_level];
                 $price_base_type = $object->multiprices_base_type[$soc->price_level];
             } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-                require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+                require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
                 $prodcustprice = new Productcustomerprice($db);
 
@@ -674,7 +674,7 @@ 
 
             if (GETPOST('propalid') > 0) {
                 // Define cost price for margin calculation
-                $buyprice=0;
+                $buyprice = 0;
                 if (($result = $propal->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
@@ -710,14 +710,14 @@ 
                     $object->fk_unit
                 );
                 if ($result > 0) {
-                    header("Location: " . DOL_URL_ROOT . "/comm/propal/card.php?id=" . $propal->id);
+                    header("Location: ".DOL_URL_ROOT."/comm/propal/card.php?id=".$propal->id);
                     return;
                 }
 
-                setEventMessages($langs->trans("ErrorUnknown") . ": $result", null, 'errors');
+                setEventMessages($langs->trans("ErrorUnknown").": $result", null, 'errors');
             } elseif (GETPOST('commandeid') > 0) {
                 // Define cost price for margin calculation
-                $buyprice=0;
+                $buyprice = 0;
                 if (($result = $commande->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
@@ -755,12 +755,12 @@ 
                 );
 
                 if ($result > 0) {
-                    header("Location: " . DOL_URL_ROOT . "/commande/card.php?id=" . $commande->id);
+                    header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".$commande->id);
                     exit;
                 }
             } elseif (GETPOST('factureid') > 0) {
                 // Define cost price for margin calculation
-                $buyprice=0;
+                $buyprice = 0;
                 if (($result = $facture->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
@@ -803,13 +803,13 @@ 
                 );
 
                 if ($result > 0) {
-                    header("Location: " . DOL_URL_ROOT . "/compta/facture/card.php?facid=" . $facture->id);
+                    header("Location: ".DOL_URL_ROOT."/compta/facture/card.php?facid=".$facture->id);
                     exit;
                 }
             }
         }
         else {
-            $action="";
+            $action = "";
             setEventMessages($langs->trans("WarningSelectOneDocument"), null, 'warnings');
         }
     }
@@ -823,16 +823,16 @@ 
 
 $title = $langs->trans('ProductServiceCard');
 $helpurl = '';
-$shortlabel = dol_trunc($object->label,16);
+$shortlabel = dol_trunc($object->label, 16);
 if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
 {
-	$title = $langs->trans('Product')." ". $shortlabel ." - ".$langs->trans('Card');
-	$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Card');
+	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 }
 if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
 {
-	$title = $langs->trans('Service')." ". $shortlabel ." - ".$langs->trans('Card');
-	$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Card');
+	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 
 llxHeader('', $title, $helpurl);
@@ -840,22 +840,22 @@ 
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (!empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 // Load object modBarCodeProduct
-$res=0;
-if (! empty($conf->barcode->enabled) && ! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
+$res = 0;
+if (!empty($conf->barcode->enabled) && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
 {
-	$module=strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
-	$dirbarcode=array_merge(array('/core/modules/barcode/'),$conf->modules_parts['barcode']);
+	$module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
+	$dirbarcode = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
 	foreach ($dirbarcode as $dirroot)
 	{
-		$res=dol_include_once($dirroot.$module.'.php');
+		$res = dol_include_once($dirroot.$module.'.php');
 		if ($res) break;
 	}
 	if ($res > 0)
 	{
-			$modBarCodeProduct =new $module();
+			$modBarCodeProduct = new $module();
 	}
 }
 
@@ -868,11 +868,11 @@ 
 	if (empty($object->error) && $id)
 	{
 		$object = new Product($db);
-		$result=$object->fetch($id);
-		if ($result <= 0) dol_print_error('',$object->error);
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error('', $object->error);
 	}
-	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
-	$objcanvas->display_canvas($action);							// Show template
+	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
+	$objcanvas->display_canvas($action); // Show template
 }
 else
 {
@@ -885,12 +885,12 @@ 
         require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
 		// Load object modCodeProduct
-        $module=(! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON)?$conf->global->PRODUCT_CODEPRODUCT_ADDON:'mod_codeproduct_leopard');
+        $module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
         if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
         {
-            $module = substr($module, 0, dol_strlen($module)-4);
+            $module = substr($module, 0, dol_strlen($module) - 4);
         }
-        $result=dol_include_once('/core/modules/product/'.$module.'.php');
+        $result = dol_include_once('/core/modules/product/'.$module.'.php');
         if ($result > 0)
         {
         	$modCodeProduct = new $module();
@@ -902,24 +902,24 @@ 
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<input type="hidden" name="action" value="add">';
         print '<input type="hidden" name="type" value="'.$type.'">'."\n";
-		if (! empty($modCodeProduct->code_auto))
+		if (!empty($modCodeProduct->code_auto))
 			print '<input type="hidden" name="code_auto" value="1">';
-		if (! empty($modBarCodeProduct->code_auto))
+		if (!empty($modBarCodeProduct->code_auto))
 			print '<input type="hidden" name="barcode_auto" value="1">';
 
-        if ($type==1) $title=$langs->trans("NewService");
-        else $title=$langs->trans("NewProduct");
-        $linkback="";
-        print load_fiche_titre($title,$linkback,'title_products.png');
+        if ($type == 1) $title = $langs->trans("NewService");
+        else $title = $langs->trans("NewProduct");
+        $linkback = "";
+        print load_fiche_titre($title, $linkback, 'title_products.png');
 
         dol_fiche_head('');
 
         print '<table class="border centpercent">';
 
         print '<tr>';
-        $tmpcode='';
-		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
-        print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+        $tmpcode = '';
+		if (!empty($modCodeProduct->code_auto)) $tmpcode = $modCodeProduct->getNextValue($object, $type);
+        print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref') ? GETPOST('ref') : $tmpcode).'">';
         if ($refalreadyexists)
         {
             print $langs->trans("RefAlreadyExists");
@@ -931,45 +931,45 @@ 
 
         // On sell
         print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-        $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
-        print $form->selectarray('statut',$statutarray,GETPOST('statut'));
+        $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
+        print $form->selectarray('statut', $statutarray, GETPOST('statut'));
         print '</td></tr>';
 
         // To buy
         print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-        $statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
-        print $form->selectarray('statut_buy',$statutarray,GETPOST('statut_buy'));
+        $statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
+        print $form->selectarray('statut_buy', $statutarray, GETPOST('statut_buy'));
         print '</td></tr>';
 
 	    // Batch number management
-		if (! empty($conf->productbatch->enabled))
+		if (!empty($conf->productbatch->enabled))
 		{
 			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
-			$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
-			print $form->selectarray('status_batch',$statutarray,GETPOST('status_batch'));
+			$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
+			print $form->selectarray('status_batch', $statutarray, GETPOST('status_batch'));
 			print '</td></tr>';
 		}
 
-        $showbarcode=empty($conf->barcode->enabled)?0:1;
-        if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+        $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+        if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
         if ($showbarcode)
         {
  	        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
  	        if (isset($_POST['fk_barcode_type']))
 	        {
-	         	$fk_barcode_type=GETPOST('fk_barcode_type');
+	         	$fk_barcode_type = GETPOST('fk_barcode_type');
 	        }
 	        else
 	        {
-	        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+	        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
 	        }
 	        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
             $formbarcode = new FormBarCode($db);
 	        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
 	        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
-	        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-	        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+	        $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;
+	        if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
 	        print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 	        print '</td></tr>';
         }
@@ -988,7 +988,7 @@ 
         print '</td></tr>';
 
         // Stock min level
-        if ($type != 1 && ! empty($conf->stock->enabled))
+        if ($type != 1 && !empty($conf->stock->enabled))
         {
             print '<tr><td>'.$form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1).'</td><td>';
             print '<input name="seuil_stock_alerte" class="maxwidth50" value="'.GETPOST('seuil_stock_alerte').'">';
@@ -1008,15 +1008,15 @@ 
         if ($type != 1)
         {
             print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
-            $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-            print $form->selectarray('finished',$statutarray,GETPOST('finished'),1);
+            $statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+            print $form->selectarray('finished', $statutarray, GETPOST('finished'), 1);
             print '</td></tr>';
         }
 
         // Duration
         if ($type == 1)
         {
-            print '<tr><td>' . $langs->trans("Duration") . '</td><td colspan="3"><input name="duration_value" size="6" maxlength="5" value="' . $duration_value . '"> &nbsp;';
+            print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="6" maxlength="5" value="'.$duration_value.'"> &nbsp;';
             print '<input name="duration_unit" type="radio" value="h">'.$langs->trans("Hour").'&nbsp;';
             print '<input name="duration_unit" type="radio" value="d">'.$langs->trans("Day").'&nbsp;';
             print '<input name="duration_unit" type="radio" value="w">'.$langs->trans("Week").'&nbsp;';
@@ -1030,7 +1030,7 @@ 
             // Weight
             print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
             print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
-            print $formproduct->select_measuring_units("weight_units","weight");
+            print $formproduct->select_measuring_units("weight_units", "weight");
             print '</td></tr>';
             // Length
             if (empty($conf->global->PRODUCT_DISABLE_SIZE))
@@ -1039,7 +1039,7 @@ 
                 print '<input name="size" size="4" value="'.GETPOST('size').'"> x ';
                 print '<input name="sizewidth" size="4" value="'.GETPOST('sizewidth').'"> x ';
                 print '<input name="sizeheight" size="4" value="'.GETPOST('sizeheight').'">';
-                print $formproduct->select_measuring_units("size_units","size");
+                print $formproduct->select_measuring_units("size_units", "size");
                 print '</td></tr>';
             }
             if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
@@ -1047,22 +1047,22 @@ 
                 // Surface
                 print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
                 print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
-                print $formproduct->select_measuring_units("surface_units","surface");
+                print $formproduct->select_measuring_units("surface_units", "surface");
                 print '</td></tr>';
             }
             // Volume
             print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
             print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
-            print $formproduct->select_measuring_units("volume_units","volume");
+            print $formproduct->select_measuring_units("volume_units", "volume");
             print '</td></tr>';
         }
 
         // Units
-	    if($conf->global->PRODUCT_USE_UNITS)
+	    if ($conf->global->PRODUCT_USE_UNITS)
 	    {
 		    print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
 		    print '<td colspan="3">';
-		    print $form->selectUnits('','units');
+		    print $form->selectUnits('', 'units');
 		    print '</td></tr>';
 	    }
 
@@ -1072,18 +1072,18 @@ 
 	        print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td>';
 	        // Origin country
 	        print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
-	        print $form->select_country(GETPOST('country_id','int'),'country_id');
-	        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	        print $form->select_country(GETPOST('country_id', 'int'), 'country_id');
+	        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	        print '</td></tr>';
         }
 
         // Other attributes
-        $parameters=array('cols' => 3);
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        $parameters = array('cols' => 3);
+        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
+        if (empty($reshook) && !empty($extrafields->attribute_label))
         {
-        	print $object->showOptionals($extrafields,'edit',$parameters);
+        	print $object->showOptionals($extrafields, 'edit', $parameters);
         }
 
         // Note (private, no output on invoices, propales...)
@@ -1098,7 +1098,7 @@ 
             print "</td></tr>";
         //}
 
-		if($conf->categorie->enabled) {
+		if ($conf->categorie->enabled) {
 			// Categories
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
@@ -1110,7 +1110,7 @@ 
 
         print '<br>';
 
-        if (! empty($conf->global->PRODUIT_MULTIPRICES))
+        if (!empty($conf->global->PRODUIT_MULTIPRICES))
         {
             // We do no show price array on create when multiprices enabled.
             // We must set them on prices tab.
@@ -1132,7 +1132,7 @@ 
 
             // VAT
             print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
-            $defaultva=get_default_tva($mysoc, $mysoc);
+            $defaultva = get_default_tva($mysoc, $mysoc);
             print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
             print '</td></tr>';
 
@@ -1144,7 +1144,7 @@ 
         // Accountancy codes
         print '<table class="border" width="100%">';
 
-		if (! empty($conf->accounting->enabled))
+		if (!empty($conf->accounting->enabled))
 		{
             // Accountancy_code_sell
             print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1175,9 +1175,9 @@ 
         dol_fiche_end();
 
 		print '<div class="center">';
-		print '<input type="submit" class="button" value="' . $langs->trans("Create") . '">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
         print ' &nbsp; &nbsp; ';
-		print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
         print '</form>';
@@ -1190,7 +1190,7 @@ 
     else if ($object->id > 0)
     {
         // Fiche en mode edition
-        if ($action == 'edit' &&  ((($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) ||  ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))))
+        if ($action == 'edit' && ((($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))))
         {
             //WYSIWYG Editor
             require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -1206,9 +1206,9 @@ 
             print '<input type="hidden" name="id" value="'.$object->id.'">';
             print '<input type="hidden" name="canvas" value="'.$object->canvas.'">';
 
-            $head=product_prepare_head($object);
-            $titre=$langs->trans("CardProduct".$object->type);
-            $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
+            $head = product_prepare_head($object);
+            $titre = $langs->trans("CardProduct".$object->type);
+            $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
             dol_fiche_head($head, 'card', $titre, 0, $picto);
 
             print '<table class="border allwidth">';
@@ -1254,33 +1254,33 @@ 
 			// Batch number managment
 			if ($conf->productbatch->enabled) {
 				print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
-				$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
-				print $form->selectarray('status_batch',$statutarray,$object->status_batch);
+				$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
+				print $form->selectarray('status_batch', $statutarray, $object->status_batch);
 				print '</td></tr>';
 			}
 
             // Barcode
-            $showbarcode=empty($conf->barcode->enabled)?0:1;
-            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+            $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
 	        if ($showbarcode)
 	        {
 		        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
 		        if (isset($_POST['fk_barcode_type']))
 		        {
-		         	$fk_barcode_type=GETPOST('fk_barcode_type');
+		         	$fk_barcode_type = GETPOST('fk_barcode_type');
 		        }
 		        else
 		        {
-	        		$fk_barcode_type=$object->barcode_type;
-		        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+	        		$fk_barcode_type = $object->barcode_type;
+		        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
 		        }
 		        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
 	            $formbarcode = new FormBarCode($db);
 		        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
 		        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
-		        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-		        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+		        $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;
+		        if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
 		        print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 		        print '</td></tr>';
 	        }
@@ -1319,11 +1319,11 @@ 
             }*/
 
             // Nature
-            if($object->type!= Product::TYPE_SERVICE)
+            if ($object->type != Product::TYPE_SERVICE)
             {
                 print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
-                $statutarray=array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-                print $form->selectarray('finished',$statutarray,$object->finished);
+                $statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+                print $form->selectarray('finished', $statutarray, $object->finished);
                 print '</td></tr>';
             }
 
@@ -1332,15 +1332,15 @@ 
                 // Duration
                 print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="3" maxlength="5" value="'.$object->duration_value.'">';
                 print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="h"'.($object->duration_unit=='h'?' checked':'').'>'.$langs->trans("Hour");
+                print '<input name="duration_unit" type="radio" value="h"'.($object->duration_unit == 'h' ? ' checked' : '').'>'.$langs->trans("Hour");
                 print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="d"'.($object->duration_unit=='d'?' checked':'').'>'.$langs->trans("Day");
+                print '<input name="duration_unit" type="radio" value="d"'.($object->duration_unit == 'd' ? ' checked' : '').'>'.$langs->trans("Day");
                 print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="w"'.($object->duration_unit=='w'?' checked':'').'>'.$langs->trans("Week");
+                print '<input name="duration_unit" type="radio" value="w"'.($object->duration_unit == 'w' ? ' checked' : '').'>'.$langs->trans("Week");
                 print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="m"'.($object->duration_unit=='m'?' checked':'').'>'.$langs->trans("Month");
+                print '<input name="duration_unit" type="radio" value="m"'.($object->duration_unit == 'm' ? ' checked' : '').'>'.$langs->trans("Month");
                 print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="y"'.($object->duration_unit=='y'?' checked':'').'>'.$langs->trans("Year");
+                print '<input name="duration_unit" type="radio" value="y"'.($object->duration_unit == 'y' ? ' checked' : '').'>'.$langs->trans("Year");
 
                 print '</td></tr>';
             }
@@ -1379,7 +1379,7 @@ 
                 }
             }
         	// Units
-	        if($conf->global->PRODUCT_USE_UNITS)
+	        if ($conf->global->PRODUCT_USE_UNITS)
 	        {
 		        print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
 		        print '<td colspan="3">';
@@ -1388,23 +1388,23 @@ 
 	        }
 
 	        // Custom code
-    	    if (! $object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
+    	    if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
         	{
 	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.$object->customcode.'"></td>';
 	            // Origin country
 	            print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
 	            print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
-	            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	            print '</td></tr>';
         	}
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            $parameters = array('colspan' => ' colspan="3"', 'cols'=>3);
+            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            if (empty($reshook) && !empty($extrafields->attribute_label))
             {
-            	print $object->showOptionals($extrafields,'edit');
+            	print $object->showOptionals($extrafields, 'edit');
             }
 
 			// Tags-Categories
@@ -1413,8 +1413,8 @@ 
 				print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
 				$c = new Categorie($db);
-				$cats = $c->containing($object->id,Categorie::TYPE_PRODUCT);
-				foreach($cats as $cat) {
+				$cats = $c->containing($object->id, Categorie::TYPE_PRODUCT);
+				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
 				print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
@@ -1422,7 +1422,7 @@ 
 			}
 
             // Note private
-			if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 			{
                 print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
 
@@ -1438,7 +1438,7 @@ 
 
             print '<table class="border" width="100%">';
 
-			if (! empty($conf->accounting->enabled))
+			if (!empty($conf->accounting->enabled))
 			{
                 // Accountancy_code_sell
                 print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1479,20 +1479,20 @@ 
         // Fiche en mode visu
         else
 		{
-            $showbarcode=empty($conf->barcode->enabled)?0:1;
-            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+            $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
-		    $head=product_prepare_head($object);
-            $titre=$langs->trans("CardProduct".$object->type);
-            $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
+		    $head = product_prepare_head($object);
+            $titre = $langs->trans("CardProduct".$object->type);
+            $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
             dol_fiche_head($head, 'card', $titre, -1, $picto);
 
             $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-            $object->next_prev_filter=" fk_product_type = ".$object->type;
+            $object->next_prev_filter = " fk_product_type = ".$object->type;
 
             $shownav = 1;
-            if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+            if ($user->societe_id && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
             dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
@@ -1504,12 +1504,12 @@ 
             print '<table class="border tableforfield" width="100%">';
 
             // Type
-            if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled))
+            if (!empty($conf->produit->enabled) && !empty($conf->service->enabled))
             {
             	// TODO change for compatibility with edit in place
-            	$typeformat='select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
-                print '<tr><td class="titlefield">'.$form->editfieldkey("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat).'</td><td colspan="2">';
-                print $form->editfieldval("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat);
+            	$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+                print '<tr><td class="titlefield">'.$form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $user->rights->produit->creer || $user->rights->service->creer, $typeformat).'</td><td colspan="2">';
+                print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $user->rights->produit->creer || $user->rights->service->creer, $typeformat);
                 print '</td></tr>';
             }
 
@@ -1520,7 +1520,7 @@ 
                 print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
                 print $langs->trans("BarcodeType");
                 print '</td>';
-                if (($action != 'editbarcodetype') && ! empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+                if (($action != 'editbarcodetype') && !empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
                 print '</tr></table>';
                 print '</td><td colspan="2">';
                 if ($action == 'editbarcodetype' || $action == 'editbarcode')
@@ -1530,12 +1530,12 @@ 
 		}
                 if ($action == 'editbarcodetype')
                 {
-                    $formbarcode->form_barcode_type($_SERVER['PHP_SELF'].'?id='.$object->id,$object->barcode_type,'fk_barcode_type');
+                    $formbarcode->form_barcode_type($_SERVER['PHP_SELF'].'?id='.$object->id, $object->barcode_type, 'fk_barcode_type');
                 }
                 else
                 {
                     $object->fetch_barcode();
-                    print $object->barcode_type_label?$object->barcode_type_label:($object->barcode?'<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>':'');
+                    print $object->barcode_type_label ? $object->barcode_type_label : ($object->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
                 }
                 print '</td></tr>'."\n";
 
@@ -1544,13 +1544,13 @@ 
                 print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
                 print $langs->trans("BarcodeValue");
                 print '</td>';
-                if (($action != 'editbarcode') && ! empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+                if (($action != 'editbarcode') && !empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
                 print '</tr></table>';
                 print '</td><td colspan="2">';
                 if ($action == 'editbarcode')
                 {
-			$tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-			if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+			$tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;
+			if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
 
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -1571,12 +1571,12 @@ 
 			print '<tr><td class="nowrap">';
             print $langs->trans("ProductAccountancySellCode");
             print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled))
+			if (!empty($conf->accounting->enabled))
 			{
 				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch('',$object->accountancy_code_sell);
+				$accountingaccount->fetch('', $object->accountancy_code_sell);
 
-				print $accountingaccount->getNomUrl(0,1,1,'',1);
+				print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
             } else {
 				print $object->accountancy_code_sell;
 			}
@@ -1586,12 +1586,12 @@ 
 			print '<tr><td class="nowrap">';
             print $langs->trans("ProductAccountancyBuyCode");
             print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled))
+			if (!empty($conf->accounting->enabled))
 			{
 				$accountingaccount2 = new AccountingAccount($db);
-				$accountingaccount2->fetch('',$object->accountancy_code_buy);
+				$accountingaccount2->fetch('', $object->accountancy_code_buy);
 
-				print $accountingaccount2->getNomUrl(0,1,1,'',1);
+				print $accountingaccount2->getNomUrl(0, 1, 1, '', 1);
             } else {
 				print $object->accountancy_code_buy;
 			}
@@ -1618,18 +1618,18 @@ 
             */
 
             // Batch number management (to batch)
-            if (! empty($conf->productbatch->enabled)) {
+            if (!empty($conf->productbatch->enabled)) {
                 print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
-                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+                if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
                     print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');
                 } else {
-                    print $object->getLibStatut(0,2);
+                    print $object->getLibStatut(0, 2);
                 }
                 print '</td></tr>';
             }
 
             // Description
-            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).'</td></tr>';
+            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';
 
             // Public URL
             print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="2">';
@@ -1660,7 +1660,7 @@ 
             print '<table class="border tableforfield" width="100%">';
 
             // Nature
-            if($object->type!= Product::TYPE_SERVICE)
+            if ($object->type != Product::TYPE_SERVICE)
             {
                 print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
                 print $object->getLibFinished();
@@ -1673,13 +1673,13 @@ 
                 print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
                 if ($object->duration_value > 1)
                 {
-                    $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
+                    $dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
                 }
                 else if ($object->duration_value > 0)
                 {
-                    $dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
+                    $dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
                 }
-                print (! empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
+                print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
 
                 print '</td></tr>';
             }
@@ -1689,7 +1689,7 @@ 
                 print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
                 if ($object->weight != '')
                 {
-                    print $object->weight." ".measuring_units_string($object->weight_units,"weight");
+                    print $object->weight." ".measuring_units_string($object->weight_units, "weight");
                 }
                 else
                 {
@@ -1705,7 +1705,7 @@ 
                         print $object->length;
                         if ($object->width) print " x ".$object->width;
                         if ($object->height) print " x ".$object->height;
-                        print ' '.measuring_units_string($object->length_units,"size");
+                        print ' '.measuring_units_string($object->length_units, "size");
                     }
                     else
                     {
@@ -1719,7 +1719,7 @@ 
                     print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
                     if ($object->surface != '')
                     {
-                        print $object->surface." ".measuring_units_string($object->surface_units,"surface");
+                        print $object->surface." ".measuring_units_string($object->surface_units, "surface");
                     }
                     else
                     {
@@ -1733,7 +1733,7 @@ 
                     print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
                     if ($object->volume != '')
                     {
-                        print $object->volume." ".measuring_units_string($object->volume_units,"volume");
+                        print $object->volume." ".measuring_units_string($object->volume_units, "volume");
                     }
                     else
                     {
@@ -1744,7 +1744,7 @@ 
             }
 
 			// Unit
-			if (! empty($conf->global->PRODUCT_USE_UNITS))
+			if (!empty($conf->global->PRODUCT_USE_UNITS))
 			{
 				$unit = $object->getLabelOfUnit();
 
@@ -1761,25 +1761,25 @@ 
 	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';
 
             	// Origin country code
-            	print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td colspan="2">'.getCountry($object->country_id,0,$db).'</td>';
+            	print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td colspan="2">'.getCountry($object->country_id, 0, $db).'</td>';
         	}
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'"');
-            include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+            $parameters = array('colspan' => ' colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'"');
+            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
-			if($conf->categorie->enabled) {
+			if ($conf->categorie->enabled) {
 				print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
-				print $form->showCategories($object->id,'product',1);
+				print $form->showCategories($object->id, 'product', 1);
 				print "</td></tr>";
 			}
 
             // Note private
-			if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 			{
     			print '<!-- show Note --> '."\n";
-                print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note_private)?$object->note_private:dol_nl2br($object->note_private,1,true)).'</td></tr>'."\n";
+                print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'">'.(dol_textishtml($object->note_private) ? $object->note_private : dol_nl2br($object->note_private, 1, true)).'</td></tr>'."\n";
                 print '<!-- End show Note --> '."\n";
 			}
 
@@ -1800,44 +1800,44 @@ 
 }
 
 // Load object modCodeProduct
-$module=(! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON)?$conf->global->PRODUCT_CODEPRODUCT_ADDON:'mod_codeproduct_leopard');
+$module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
 if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
 {
-    $module = substr($module, 0, dol_strlen($module)-4);
+    $module = substr($module, 0, dol_strlen($module) - 4);
 }
-$result=dol_include_once('/core/modules/product/'.$module.'.php');
+$result = dol_include_once('/core/modules/product/'.$module.'.php');
 if ($result > 0)
 {
 	$modCodeProduct = new $module();
 }
 
-$tmpcode='';
-if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$object->type);
+$tmpcode = '';
+if (!empty($modCodeProduct->code_auto)) $tmpcode = $modCodeProduct->getNextValue($object, $object->type);
 
 // Define confirmation messages
-$formquestionclone=array(
+$formquestionclone = array(
 	'text' => $langs->trans("ConfirmClone"),
-    array('type' => 'text', 'name' => 'clone_ref','label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'size'=>24),
-    array('type' => 'checkbox', 'name' => 'clone_content','label' => $langs->trans("CloneContentProduct"), 'value' => 1),
+    array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'size'=>24),
+    array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContentProduct"), 'value' => 1),
     array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true),
 );
-if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
+if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
 {
-    $formquestionclone[]=array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1);
+    $formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1);
 }
 
 // Confirm delete product
-if (($action == 'delete' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))	// Output when action = clone if jmobile or no js
-	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
+if (($action == 'delete' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile)))	// Output when action = clone if jmobile or no js
+	|| (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
 {
-    print $form->formconfirm("card.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete");
+    print $form->formconfirm("card.php?id=".$object->id, $langs->trans("DeleteProduct"), $langs->trans("ConfirmDeleteProduct"), "confirm_delete", '', 0, "action-delete");
 }
 
 // Clone confirmation
-if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))		// Output when action = clone if jmobile or no js
-	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
+if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile)))		// Output when action = clone if jmobile or no js
+	|| (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestionclone,'yes','action-clone',250,600);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloneProduct'), $langs->trans('ConfirmCloneProduct', $object->ref), 'confirm_clone', $formquestionclone, 'yes', 'action-clone', 250, 600);
 }
 
 
@@ -1850,18 +1850,18 @@ 
 {
     print "\n".'<div class="tabsAction">'."\n";
 
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    $parameters = array();
+    $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     if (empty($reshook))
     {
-        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) ||
+        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) ||
            ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
         {
-            if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+            if (!isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 
-            if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
+            if (!isset($object->no_button_copy) || $object->no_button_copy <> 1)
             {
-                if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+                if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
                 {
                     print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
                 }
@@ -1876,9 +1876,9 @@ 
         if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
         || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
         {
-            if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
+            if (empty($object_is_used) && (!isset($object->no_button_delete) || $object->no_button_delete <> 1))
             {
-                if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+                if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
                 {
                     print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
                 }
@@ -1905,20 +1905,20 @@ 
  * All the "Add to" areas
  */
 
-if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action == '' || $action == 'view') && $object->status)
+if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action == '' || $action == 'view') && $object->status)
 {
     //Variable used to check if any text is going to be printed
     $html = '';
 	//print '<div class="fichecenter"><div class="fichehalfleft">';
 
     // Propals
-    if (! empty($conf->propal->enabled) && $user->rights->propale->creer)
+    if (!empty($conf->propal->enabled) && $user->rights->propale->creer)
     {
         $propal = new Propal($db);
 
         $langs->load("propal");
 
-        $otherprop = $propal->liste_array(2,1,0);
+        $otherprop = $propal->liste_array(2, 1, 0);
 
         if (is_array($otherprop) && count($otherprop))
         {
@@ -1937,7 +1937,7 @@ 
     }
 
     // Commande
-    if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
+    if (!empty($conf->commande->enabled) && $user->rights->commande->creer)
     {
         $commande = new Commande($db);
 
@@ -1961,7 +1961,7 @@ 
     }
 
     // Factures
-    if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
+    if (!empty($conf->facture->enabled) && $user->rights->facture->creer)
     {
     	$invoice = new Facture($db);
 
@@ -1991,7 +1991,7 @@ 
     	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     	print '<input type="hidden" name="action" value="addin">';
 
-	    print load_fiche_titre($langs->trans("AddToDraft"),'','');
+	    print load_fiche_titre($langs->trans("AddToDraft"), '', '');
 
 		dol_fiche_head('');
 
@@ -2027,16 +2027,16 @@ 
 
     // Documents
     $objectref = dol_sanitizeFileName($object->ref);
-    $relativepath = $comref . '/' . $objectref . '.pdf';
-    $filedir = $conf->produit->dir_output . '/' . $objectref;
-    $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-    $genallowed=$user->rights->produit->creer;
-    $delallowed=$user->rights->produit->supprimer;
+    $relativepath = $comref.'/'.$objectref.'.pdf';
+    $filedir = $conf->produit->dir_output.'/'.$objectref;
+    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+    $genallowed = $user->rights->produit->creer;
+    $delallowed = $user->rights->produit->supprimer;
 
-    $var=true;
+    $var = true;
 
-    print $formfile->showdocuments($modulepart,$object->ref,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang, '', $object);
-    $somethingshown=$formfile->numoffiles;
+    print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
+    $somethingshown = $formfile->numoffiles;
 
     print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 

Braces +222 added lines, -157 removed lines

@@ -48,18 +48,36 @@ 
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.php';
 
-if (! empty($conf->propal->enabled))     require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->facture->enabled))    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->commande->enabled))   require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (! empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+}
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
 
 $langs->load("products");
 $langs->load("other");
-if (! empty($conf->stock->enabled)) $langs->load("stocks");
-if (! empty($conf->facture->enabled)) $langs->load("bills");
-if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
+if (! empty($conf->stock->enabled)) {
+	$langs->load("stocks");
+}
+if (! empty($conf->facture->enabled)) {
+	$langs->load("bills");
+}
+if (! empty($conf->productbatch->enabled)) {
+	$langs->load("productbatch");
+}
 
 $mesg=''; $error=0; $errors=array();
 
@@ -74,7 +92,9 @@ 
 $socid=GETPOST('socid','int');
 $duration_value = GETPOST('duration_value');
 $duration_unit = GETPOST('duration_unit');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+	$socid=$user->societe_id;
+}
 
 $object = new Product($db);
 $extrafields = new ExtraFields($db);
@@ -86,13 +106,19 @@ 
 {
     $result = $object->fetch($id, $ref);
 
-    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+    if (! empty($conf->product->enabled)) {
+    	$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+    } elseif (! empty($conf->service->enabled)) {
+    	$upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+    }
 
-    if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+    if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+    	// For backward compatiblity, we scan also old dirs
     {
         if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-        else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+    } else {
+        	$upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+        }
     }
 }
 
@@ -122,14 +148,20 @@ 
  * Actions
  */
 
-if ($cancel) $action = '';
+if ($cancel) {
+	$action = '';
+}
 
 $createbarcode=empty($conf->barcode->enabled)?0:1;
-if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) $createbarcode=0;
+if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) {
+	$createbarcode=0;
+}
 
 $parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -166,14 +198,18 @@ 
 	    	$result = $object->setValueFrom('barcode', GETPOST('barcode'));
 	    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 	    	exit;
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
-        	if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
-        	else if ($result == -2) $errors[] = 'ErrorBarCodeRequired';
-        	else if ($result == -3) $errors[] = 'ErrorBarCodeAlreadyUsed';
-        	else $errors[] = 'FailedToValidateBarCode';
+        	if ($result == -1) {
+        		$errors[] = 'ErrorBadBarCodeSyntax';
+        	} else if ($result == -2) {
+        		$errors[] = 'ErrorBarCodeRequired';
+        	} else if ($result == -3) {
+        		$errors[] = 'ErrorBarCodeAlreadyUsed';
+        	} else {
+        		$errors[] = 'FailedToValidateBarCode';
+        	}
 
 			$error++;
 			setEventMessages($errors, null, 'errors');
@@ -212,14 +248,16 @@ 
             $object->label                 = GETPOST('label');
             $object->price_base_type       = GETPOST('price_base_type');
 
-            if ($object->price_base_type == 'TTC')
-            	$object->price_ttc = GETPOST('price');
-            else
-            	$object->price = GETPOST('price');
-            if ($object->price_base_type == 'TTC')
-            	$object->price_min_ttc = GETPOST('price_min');
-            else
-            	$object->price_min = GETPOST('price_min');
+            if ($object->price_base_type == 'TTC') {
+                        	$object->price_ttc = GETPOST('price');
+            } else {
+                        	$object->price = GETPOST('price');
+            }
+            if ($object->price_base_type == 'TTC') {
+                        	$object->price_min_ttc = GETPOST('price_min');
+            } else {
+                        	$object->price_min = GETPOST('price_min');
+            }
 
 	        $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
@@ -320,8 +358,7 @@ 
                     {
                         $object->multiprices["$i"] = price2num($_POST["price_".$i],'MU');
                         $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
-                    }
-                    else
+                    } else
                     {
                         $object->multiprices["$i"] = "";
                     }
@@ -330,7 +367,9 @@ 
 
             // Fill array 'array_options' with data from add form
         	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 
 			if (! $error)
 			{
@@ -345,11 +384,13 @@ 
 
                 header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
                 exit;
-            }
-            else
+            } else
 			{
-            	if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
-				else setEventMessages($langs->trans($object->error), null, 'errors');
+            	if (count($object->errors)) {
+            		setEventMessages($object->error, $object->errors, 'errors');
+            	} else {
+					setEventMessages($langs->trans($object->error), null, 'errors');
+				}
                 $action = "create";
             }
         }
@@ -361,8 +402,7 @@ 
     	if (GETPOST('cancel'))
         {
             $action = '';
-        }
-        else
+        } else
         {
             if ($object->id > 0)
             {
@@ -437,7 +477,9 @@ 
 
                 // Fill array 'array_options' with data from add form
         		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-				if ($ret < 0) $error++;
+				if ($ret < 0) {
+					$error++;
+				}
 
                 if (! $error && $object->check())
                 {
@@ -448,18 +490,22 @@ 
 						$object->setCategories($categories);
 
                         $action = 'view';
-                    }
-                    else
+                    } else
 					{
-						if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
-                    	else setEventMessages($langs->trans($object->error), null, 'errors');
+						if (count($object->errors)) {
+							setEventMessages($object->error, $object->errors, 'errors');
+						} else {
+                    		setEventMessages($langs->trans($object->error), null, 'errors');
+                    	}
                         $action = 'edit';
                     }
-                }
-                else
+                } else
 				{
-					if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
-                	else setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
+					if (count($object->errors)) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					} else {
+                		setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
+                	}
                     $action = 'edit';
                 }
             }
@@ -474,8 +520,7 @@ 
         if (! GETPOST('clone_content') && ! GETPOST('clone_prices') )
         {
         	setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-        }
-        else
+        } else
         {
             $db->begin();
 
@@ -513,8 +558,7 @@ 
 
                         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                         exit;
-                    }
-                    else
+                    } else
                     {
                         $id=$originalId;
 
@@ -529,16 +573,14 @@ 
                             $mesg.=' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
                             setEventMessages($mesg, null, 'errors');
                             $object->fetch($id);
-                        }
-                        else
+                        } else
                      {
                             $db->rollback();
                             if (count($object->errors))
                             {
                             	setEventMessages($object->error, $object->errors, 'errors');
                             	dol_print_error($db,$object->errors);
-                            }
-                            else
+                            } else
                             {
                             	setEventMessages($langs->trans($object->error), null, 'errors');
                             	dol_print_error($db,$object->error);
@@ -546,8 +588,7 @@ 
                         }
                     }
                 }
-            }
-            else
+            } else
             {
                 $db->rollback();
                 dol_print_error($db,$object->error);
@@ -568,8 +609,7 @@ 
         {
             header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));
             exit;
-        }
-        else
+        } else
         {
         	setEventMessages($langs->trans($object->error), null, 'errors');
             $reload = 0;
@@ -592,8 +632,7 @@ 
 	            exit;
 	        }
 	        $thirpdartyid = $propal->socid;
-        }
-        elseif (GETPOST('commandeid') > 0)
+        } elseif (GETPOST('commandeid') > 0)
         {
             $commande = new Commande($db);
 	        $result=$commande->fetch(GETPOST('commandeid'));
@@ -603,8 +642,7 @@ 
 	            exit;
 	        }
 	        $thirpdartyid = $commande->socid;
-        }
-        elseif (GETPOST('factureid') > 0)
+        } elseif (GETPOST('factureid') > 0)
         {
     	    $facture = new Facture($db);
 	        $result=$facture->fetch(GETPOST('factureid'));
@@ -628,7 +666,9 @@ 
 
             $tva_tx = get_default_tva($mysoc, $soc, $object->id);
             $tva_npr = get_default_npr($mysoc, $soc, $object->id);
-            if (empty($tva_tx)) $tva_npr=0;
+            if (empty($tva_tx)) {
+            	$tva_npr=0;
+            }
             $localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);
             $localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);
 
@@ -679,8 +719,7 @@ 
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessage($langs->trans('FailedToGetCostPrice'), 'errors');
-                }
-                else
+                } else
                 {
                     $buyprice = $result;
                 }
@@ -722,8 +761,7 @@ 
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessage($langs->trans('FailedToGetCostPrice'), 'errors');
-                }
-                else
+                } else
                 {
                     $buyprice = $result;
                 }
@@ -765,8 +803,7 @@ 
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessage($langs->trans('FailedToGetCostPrice'), 'errors');
-                }
-                else
+                } else
                 {
                     $buyprice = $result;
                 }
@@ -807,8 +844,7 @@ 
                     exit;
                 }
             }
-        }
-        else {
+        } else {
             $action="";
             setEventMessages($langs->trans("WarningSelectOneDocument"), null, 'warnings');
         }
@@ -840,7 +876,9 @@ 
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) {
+	$formaccounting = New FormAccounting($db);
+}
 
 // Load object modBarCodeProduct
 $res=0;
@@ -851,7 +889,9 @@ 
 	foreach ($dirbarcode as $dirroot)
 	{
 		$res=dol_include_once($dirroot.$module.'.php');
-		if ($res) break;
+		if ($res) {
+			break;
+		}
 	}
 	if ($res > 0)
 	{
@@ -869,12 +909,13 @@ 
 	{
 		$object = new Product($db);
 		$result=$object->fetch($id);
-		if ($result <= 0) dol_print_error('',$object->error);
+		if ($result <= 0) {
+			dol_print_error('',$object->error);
+		}
 	}
 	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
 	$objcanvas->display_canvas($action);							// Show template
-}
-else
+} else
 {
     // -----------------------------------------
     // When used in standard mode
@@ -902,13 +943,18 @@ 
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<input type="hidden" name="action" value="add">';
         print '<input type="hidden" name="type" value="'.$type.'">'."\n";
-		if (! empty($modCodeProduct->code_auto))
-			print '<input type="hidden" name="code_auto" value="1">';
-		if (! empty($modBarCodeProduct->code_auto))
-			print '<input type="hidden" name="barcode_auto" value="1">';
+		if (! empty($modCodeProduct->code_auto)) {
+					print '<input type="hidden" name="code_auto" value="1">';
+		}
+		if (! empty($modBarCodeProduct->code_auto)) {
+					print '<input type="hidden" name="barcode_auto" value="1">';
+		}
 
-        if ($type==1) $title=$langs->trans("NewService");
-        else $title=$langs->trans("NewProduct");
+        if ($type==1) {
+        	$title=$langs->trans("NewService");
+        } else {
+        	$title=$langs->trans("NewProduct");
+        }
         $linkback="";
         print load_fiche_titre($title,$linkback,'title_products.png');
 
@@ -918,7 +964,9 @@ 
 
         print '<tr>';
         $tmpcode='';
-		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
+		if (! empty($modCodeProduct->code_auto)) {
+			$tmpcode=$modCodeProduct->getNextValue($object,$type);
+		}
         print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
         if ($refalreadyexists)
         {
@@ -951,7 +999,9 @@ 
 		}
 
         $showbarcode=empty($conf->barcode->enabled)?0:1;
-        if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+        if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+        	$showbarcode=0;
+        }
 
         if ($showbarcode)
         {
@@ -959,17 +1009,20 @@ 
  	        if (isset($_POST['fk_barcode_type']))
 	        {
 	         	$fk_barcode_type=GETPOST('fk_barcode_type');
-	        }
-	        else
+	        } else
 	        {
-	        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+	        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
+	        		$fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+	        	}
 	        }
 	        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
             $formbarcode = new FormBarCode($db);
 	        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
 	        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
 	        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-	        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+	        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) {
+	        	$tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+	        }
 	        print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 	        print '</td></tr>';
         }
@@ -997,8 +1050,7 @@ 
             print '<td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
             print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
             print '</td></tr>';
-        }
-        else
+        } else
         {
             print '<input name="seuil_stock_alerte" type="hidden" value="0">';
             print '<input name="desiredstock" type="hidden" value="0">';
@@ -1025,10 +1077,12 @@ 
             print '</td></tr>';
         }
 
-        if ($type != 1)	// Le poids et le volume ne concerne que les produits et pas les services
+        if ($type != 1) {
+        	// Le poids et le volume ne concerne que les produits et pas les services
         {
             // Weight
             print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
+        }
             print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
             print $formproduct->select_measuring_units("weight_units","weight");
             print '</td></tr>';
@@ -1073,7 +1127,9 @@ 
 	        // Origin country
 	        print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
 	        print $form->select_country(GETPOST('country_id','int'),'country_id');
-	        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	        if ($user->admin) {
+	        	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	        }
 	        print '</td></tr>';
         }
 
@@ -1114,8 +1170,7 @@ 
         {
             // We do no show price array on create when multiprices enabled.
             // We must set them on prices tab.
-        }
-        else
+        } else
 		{
             print '<table class="border" width="100%">';
 
@@ -1157,8 +1212,7 @@ 
             print '<td>';
 			print $formaccounting->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
             print '</td></tr>';
-		}
-		else // For external software
+		} else // For external software
 		{
             // Accountancy_code_sell
             print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1196,7 +1250,9 @@ 
             require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
             $type = $langs->trans('Product');
-            if ($object->isService()) $type = $langs->trans('Service');
+            if ($object->isService()) {
+            	$type = $langs->trans('Service');
+            }
             //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
 
             // Main official, simple, and not duplicated code
@@ -1226,8 +1282,7 @@ 
             {
                 print '<option value="1" selected>'.$langs->trans("OnSell").'</option>';
                 print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
-            }
-            else
+            } else
             {
                 print '<option value="1">'.$langs->trans("OnSell").'</option>';
                 print '<option value="0" selected>'.$langs->trans("NotOnSell").'</option>';
@@ -1242,8 +1297,7 @@ 
             {
                 print '<option value="1" selected>'.$langs->trans("ProductStatusOnBuy").'</option>';
                 print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
-            }
-            else
+            } else
             {
                 print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
                 print '<option value="0" selected>'.$langs->trans("ProductStatusNotOnBuy").'</option>';
@@ -1261,7 +1315,9 @@ 
 
             // Barcode
             $showbarcode=empty($conf->barcode->enabled)?0:1;
-            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+            	$showbarcode=0;
+            }
 
 	        if ($showbarcode)
 	        {
@@ -1269,18 +1325,21 @@ 
 		        if (isset($_POST['fk_barcode_type']))
 		        {
 		         	$fk_barcode_type=GETPOST('fk_barcode_type');
-		        }
-		        else
+		        } else
 		        {
 	        		$fk_barcode_type=$object->barcode_type;
-		        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
+		        		$fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		        	}
 		        }
 		        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
 	            $formbarcode = new FormBarCode($db);
 		        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
 		        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
 		        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-		        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+		        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) {
+		        	$tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+		        }
 		        print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 		        print '</td></tr>';
 	        }
@@ -1343,8 +1402,7 @@ 
                 print '<input name="duration_unit" type="radio" value="y"'.($object->duration_unit=='y'?' checked':'').'>'.$langs->trans("Year");
 
                 print '</td></tr>';
-            }
-            else
+            } else
 			{
                 // Weight
                 print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
@@ -1394,7 +1452,9 @@ 
 	            // Origin country
 	            print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
 	            print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
-	            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	            if ($user->admin) {
+	            	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	            }
 	            print '</td></tr>';
         	}
 
@@ -1451,8 +1511,7 @@ 
                 print '<td>';
 				print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
                 print '</td></tr>';
-			}
-			else // For external software
+			} else // For external software
 			{
                 // Accountancy_code_sell
                 print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1480,7 +1539,9 @@ 
         else
 		{
             $showbarcode=empty($conf->barcode->enabled)?0:1;
-            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+            	$showbarcode=0;
+            }
 
 		    $head=product_prepare_head($object);
             $titre=$langs->trans("CardProduct".$object->type);
@@ -1492,7 +1553,9 @@ 
             $object->next_prev_filter=" fk_product_type = ".$object->type;
 
             $shownav = 1;
-            if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+            if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+            	$shownav=0;
+            }
 
             dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
@@ -1520,7 +1583,9 @@ 
                 print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
                 print $langs->trans("BarcodeType");
                 print '</td>';
-                if (($action != 'editbarcodetype') && ! empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+                if (($action != 'editbarcodetype') && ! empty($user->rights->produit->creer) && $createbarcode) {
+                	print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+                }
                 print '</tr></table>';
                 print '</td><td colspan="2">';
                 if ($action == 'editbarcodetype' || $action == 'editbarcode')
@@ -1531,8 +1596,7 @@ 
                 if ($action == 'editbarcodetype')
                 {
                     $formbarcode->form_barcode_type($_SERVER['PHP_SELF'].'?id='.$object->id,$object->barcode_type,'fk_barcode_type');
-                }
-                else
+                } else
                 {
                     $object->fetch_barcode();
                     print $object->barcode_type_label?$object->barcode_type_label:($object->barcode?'<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>':'');
@@ -1544,13 +1608,17 @@ 
                 print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
                 print $langs->trans("BarcodeValue");
                 print '</td>';
-                if (($action != 'editbarcode') && ! empty($user->rights->produit->creer) && $createbarcode) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+                if (($action != 'editbarcode') && ! empty($user->rights->produit->creer) && $createbarcode) {
+                	print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+                }
                 print '</tr></table>';
                 print '</td><td colspan="2">';
                 if ($action == 'editbarcode')
                 {
 			$tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-			if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+			if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) {
+				$tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+			}
 
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -1559,8 +1627,7 @@ 
 			print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">';
 			print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-                }
-                else
+                } else
                 {
                     print $object->barcode;
                 }
@@ -1674,24 +1741,21 @@ 
                 if ($object->duration_value > 1)
                 {
                     $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
-                }
-                else if ($object->duration_value > 0)
+                } else if ($object->duration_value > 0)
                 {
                     $dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
                 }
                 print (! empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
 
                 print '</td></tr>';
-            }
-            else
+            } else
             {
                 // Weight
                 print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
                 if ($object->weight != '')
                 {
                     print $object->weight." ".measuring_units_string($object->weight_units,"weight");
-                }
-                else
+                } else
                 {
                     print '&nbsp;';
                 }
@@ -1703,11 +1767,14 @@ 
                     if ($object->length != '' || $object->width != '' || $object->height != '')
                     {
                         print $object->length;
-                        if ($object->width) print " x ".$object->width;
-                        if ($object->height) print " x ".$object->height;
+                        if ($object->width) {
+                        	print " x ".$object->width;
+                        }
+                        if ($object->height) {
+                        	print " x ".$object->height;
+                        }
                         print ' '.measuring_units_string($object->length_units,"size");
-                    }
-                    else
+                    } else
                     {
                         print '&nbsp;';
                     }
@@ -1720,8 +1787,7 @@ 
                     if ($object->surface != '')
                     {
                         print $object->surface." ".measuring_units_string($object->surface_units,"surface");
-                    }
-                    else
+                    } else
                     {
                         print '&nbsp;';
                     }
@@ -1734,8 +1800,7 @@ 
                     if ($object->volume != '')
                     {
                         print $object->volume." ".measuring_units_string($object->volume_units,"volume");
-                    }
-                    else
+                    } else
                     {
                         print '&nbsp;';
                     }
@@ -1792,8 +1857,7 @@ 
             dol_fiche_end();
         }
 
-    }
-    else if ($action != 'create')
+    } else if ($action != 'create')
     {
         exit;
     }
@@ -1812,7 +1876,9 @@ 
 }
 
 $tmpcode='';
-if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$object->type);
+if (! empty($modCodeProduct->code_auto)) {
+	$tmpcode=$modCodeProduct->getNextValue($object,$object->type);
+}
 
 // Define confirmation messages
 $formquestionclone=array(
@@ -1828,17 +1894,21 @@ 
 
 // Confirm delete product
 if (($action == 'delete' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))	// Output when action = clone if jmobile or no js
-	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
+	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {
+	// Always output when not jmobile nor js
 {
     print $form->formconfirm("card.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete");
 }
+}
 
 // Clone confirmation
 if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))		// Output when action = clone if jmobile or no js
-	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
+	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {
+	// Always output when not jmobile nor js
 {
     print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestionclone,'yes','action-clone',250,600);
 }
+}
 
 
 /* ************************************************************************** */
@@ -1857,15 +1927,16 @@ 
         if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) ||
            ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
         {
-            if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+            if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) {
+            	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+            }
 
             if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
             {
                 if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
                 {
                     print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
-                }
-                else
+                } else
     			{
                     print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
                 }
@@ -1881,18 +1952,15 @@ 
                 if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
                 {
                     print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
-                }
-                else
+                } else
     			{
                     print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
                 }
-            }
-            else
+            } else
     		{
                 print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
             }
-        }
-        else
+        } else
     	{
             print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
         }
@@ -1926,8 +1994,7 @@ 
         	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
         	$html .= $form->selectarray("propalid", $otherprop, 0, 1);
         	$html .= '</td></tr>';
-        }
-        else
+        } else
        {
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
@@ -1950,8 +2017,7 @@ 
         	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
         	$html .= $form->selectarray("commandeid", $othercom, 0, 1);
         	$html .= '</td></tr>';
-        }
-        else
+        } else
 		{
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
@@ -1974,8 +2040,7 @@ 
     		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
     		$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
     		$html .= '</td></tr>';
-    	}
-    	else
+    	} else
     	{
     		$html .= '<tr><td style="width: 200px;">';
     		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';

htdocs/product/stock/product.php

Indentation +202 added lines, -202 removed lines

@@ -81,7 +81,7 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-    $result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref);
 
 }
 $modulepart='product';
@@ -91,9 +91,9 @@ 
 $objcanvas=null;
 if (! empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db,$action);
-    $objcanvas->getCanvas('stockproduct','card',$canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db,$action);
+	$objcanvas->getCanvas('stockproduct','card',$canvas);
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -167,27 +167,27 @@ 
 // Set stock limit
 if ($action == 'setseuil_stock_alerte')
 {
-    $object = new Product($db);
-    $result=$object->fetch($id);
-    $object->seuil_stock_alerte=$stocklimit;
-    $result=$object->update($object->id,$user,0,'update');
-    if ($result < 0)
-    	setEventMessages($object->error, $object->errors, 'errors');
-    //else
-    //	setEventMessage($lans->trans("SavedRecordSuccessfully"));
-    $action='';
+	$object = new Product($db);
+	$result=$object->fetch($id);
+	$object->seuil_stock_alerte=$stocklimit;
+	$result=$object->update($object->id,$user,0,'update');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
+	//else
+	//	setEventMessage($lans->trans("SavedRecordSuccessfully"));
+	$action='';
 }
 
 // Set desired stock
 if ($action == 'setdesiredstock')
 {
-    $object = new Product($db);
-    $result=$object->fetch($id);
-    $object->desiredstock=$desiredstock;
-    $result=$object->update($object->id,$user,0,'update');
-    if ($result < 0)
-    	setEventMessages($object->error, $object->errors, 'errors');
-    $action='';
+	$object = new Product($db);
+	$result=$object->fetch($id);
+	$object->desiredstock=$desiredstock;
+	$result=$object->update($object->id,$user,0,'update');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
+	$action='';
 }
 
 
@@ -258,12 +258,12 @@ 
 			else
 			{
 				$result=$object->correct_stock(
-		    		$user,
-		    		GETPOST("id_entrepot"),
-		    		GETPOST("nbpiece"),
-		    		GETPOST("mouvement"),
-		    		GETPOST("label"),
-		    		$priceunit,
+					$user,
+					GETPOST("id_entrepot"),
+					GETPOST("nbpiece"),
+					GETPOST("mouvement"),
+					GETPOST("label"),
+					$priceunit,
 					GETPOST('inventorycode'),
 					$origin_element,
 					$origin_id
@@ -279,14 +279,14 @@ 
 				}
 				else
 				{
-	            	header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 					exit;
 				}
 			}
 			else
 			{
-			    setEventMessages($object->error, $object->errors, 'errors');
-			    $action='correction';
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action='correction';
 			}
 		}
 	}
@@ -315,15 +315,15 @@ 
 	}
 	if (! empty($conf->productbatch->enabled))
 	{
-	    $object = new Product($db);
-	    $result=$object->fetch($id);
-
-	    if ($object->hasbatch() && ! $batchnumber)
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
-	        $error++;
-	        $action='transfert';
-	    }
+		$object = new Product($db);
+		$result=$object->fetch($id);
+
+		if ($object->hasbatch() && ! $batchnumber)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
+			$error++;
+			$action='transfert';
+		}
 	}
 
 	if (! $error)
@@ -405,31 +405,31 @@ 
 			{
 				if (! $error)
 				{
-    			    // Remove stock
-    				$result1=$object->correct_stock(
-    					$user,
-    					GETPOST("id_entrepot"),
-    					GETPOST("nbpiece"),
-    					1,
-    					GETPOST("label"),
-    					$pricesrc,
-    					GETPOST('inventorycode')
-    				);
-    				if ($result1 < 0) $error++;
+					// Remove stock
+					$result1=$object->correct_stock(
+						$user,
+						GETPOST("id_entrepot"),
+						GETPOST("nbpiece"),
+						1,
+						GETPOST("label"),
+						$pricesrc,
+						GETPOST('inventorycode')
+					);
+					if ($result1 < 0) $error++;
 				}
 				if (! $error)
 				{
-    				// Add stock
-    				$result2=$object->correct_stock(
-    					$user,
-    					GETPOST("id_entrepot_destination"),
-    					GETPOST("nbpiece"),
-    					0,
-    					GETPOST("label"),
-    					$pricedest,
-    					GETPOST('inventorycode')
-    				);
-    				if ($result2 < 0) $error++;
+					// Add stock
+					$result2=$object->correct_stock(
+						$user,
+						GETPOST("id_entrepot_destination"),
+						GETPOST("nbpiece"),
+						0,
+						GETPOST("label"),
+						$pricedest,
+						GETPOST('inventorycode')
+					);
+					if ($result2 < 0) $error++;
 				}
 			}
 
@@ -463,41 +463,41 @@ 
 if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
 {
 
-    $pdluo = new Productbatch($db);
-    $result=$pdluo->fetch(GETPOST('pdluoid','int'));
-
-    if ($result>0)
-    {
-        if ($pdluo->id)
-        {
-            if ((! GETPOST("sellby")) && (! GETPOST("eatby")) && (! $batchnumber)) {
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
-            }
-            else
-            {
-                $d_eatby=dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
-                $d_sellby=dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
-                $pdluo->batch=$batchnumber;
-                $pdluo->eatby=$d_eatby;
-                $pdluo->sellby=$d_sellby;
-                $result=$pdluo->update($user);
-                if ($result<0)
-                {
-                    setEventMessages($pdluo->error,$pdluo->errors, 'errors');
-                }
-            }
-        }
-        else
-        {
-            setEventMessages($langs->trans('BatchInformationNotfound'),null, 'errors');
-        }
-    }
-    else
-    {
-        setEventMessages($pdluo->error,null, 'errors');
-    }
-    header("Location: product.php?id=".$id);
-    exit;
+	$pdluo = new Productbatch($db);
+	$result=$pdluo->fetch(GETPOST('pdluoid','int'));
+
+	if ($result>0)
+	{
+		if ($pdluo->id)
+		{
+			if ((! GETPOST("sellby")) && (! GETPOST("eatby")) && (! $batchnumber)) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
+			}
+			else
+			{
+				$d_eatby=dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
+				$d_sellby=dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+				$pdluo->batch=$batchnumber;
+				$pdluo->eatby=$d_eatby;
+				$pdluo->sellby=$d_sellby;
+				$result=$pdluo->update($user);
+				if ($result<0)
+				{
+					setEventMessages($pdluo->error,$pdluo->errors, 'errors');
+				}
+			}
+		}
+		else
+		{
+			setEventMessages($langs->trans('BatchInformationNotfound'),null, 'errors');
+		}
+	}
+	else
+	{
+		setEventMessages($pdluo->error,null, 'errors');
+	}
+	header("Location: product.php?id=".$id);
+	exit;
 }
 
 
@@ -543,17 +543,17 @@ 
 
 		dol_htmloutput_events();
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+		$shownav = 1;
+		if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
 		if ($conf->productbatch->enabled)
 		{
@@ -613,34 +613,34 @@ 
 			print '</td></tr>';
 		}
 
-        // Stock alert threshold
-        print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1),'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td>';
-        print $form->editfieldval("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer,'string');
-        print '</td></tr>';
+		// Stock alert threshold
+		print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1),'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td>';
+		print $form->editfieldval("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer,'string');
+		print '</td></tr>';
 
 		// Hook formObject
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
-        // Desired stock
-        print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1),'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer);
-        print '</td><td>';
-        print $form->editfieldval("DesiredStock",'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer,'string');
-        print '</td></tr>';
-
-        // Real stock
-        $text_stock_options = $langs->trans("RealStockDesc").'<br>';
-        $text_stock_options.= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)?$langs->trans("DeStockOnShipment").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)?$langs->trans("DeStockOnValidateOrder").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_BILL)?$langs->trans("DeStockOnBill").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)?$langs->trans("ReStockOnBill").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)?$langs->trans("ReStockOnValidateOrder").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)?$langs->trans("ReStockOnDispatchOrder").'<br>':'');
-        print '<tr><td>';
-        print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1);
-        print '</td>';
+		// Desired stock
+		print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1),'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer);
+		print '</td><td>';
+		print $form->editfieldval("DesiredStock",'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer,'string');
+		print '</td></tr>';
+
+		// Real stock
+		$text_stock_options = $langs->trans("RealStockDesc").'<br>';
+		$text_stock_options.= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
+		$text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)?$langs->trans("DeStockOnShipment").'<br>':'');
+		$text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)?$langs->trans("DeStockOnValidateOrder").'<br>':'');
+		$text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_BILL)?$langs->trans("DeStockOnBill").'<br>':'');
+		$text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)?$langs->trans("ReStockOnBill").'<br>':'');
+		$text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)?$langs->trans("ReStockOnValidateOrder").'<br>':'');
+		$text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)?$langs->trans("ReStockOnDispatchOrder").'<br>':'');
+		print '<tr><td>';
+		print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1);
+		print '</td>';
 		print '<td>'.price2num($object->stock_reel, 'MS');
 		if ($object->seuil_stock_alerte != '' && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
 		print '</td>';
@@ -653,49 +653,49 @@ 
 		// Number of customer orders running
 		if (! empty($conf->commande->enabled))
 		{
-		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $helpondiff.=$langs->trans("ProductQtyInCustomersOrdersRunning").': '.$object->stats_commande['qty'];
-		    $result=$object->load_stats_commande(0,'0', 1);
-		    if ($result < 0) dol_print_error($db,$object->error);
-		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
+			if ($found) $helpondiff.='<br>'; else $found=1;
+			$helpondiff.=$langs->trans("ProductQtyInCustomersOrdersRunning").': '.$object->stats_commande['qty'];
+			$result=$object->load_stats_commande(0,'0', 1);
+			if ($result < 0) dol_print_error($db,$object->error);
+			$helpondiff.=' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
 		}
 
 		// Number of product from customer order already sent (partial shipping)
 		if (! empty($conf->expedition->enabled))
 		{
-		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $result=$object->load_stats_sending(0,'2', 1);
-		    $helpondiff.=$langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
+			if ($found) $helpondiff.='<br>'; else $found=1;
+			$result=$object->load_stats_sending(0,'2', 1);
+			$helpondiff.=$langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
 		}
 
 		// Number of supplier order running
 		if (! empty($conf->fournisseur->enabled))
 		{
-		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $result=$object->load_stats_commande_fournisseur(0,'3,4', 1);
-		    $helpondiff.=$langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$object->stats_commande_fournisseur['qty'];
-		    $result=$object->load_stats_commande_fournisseur(0,'0,1,2', 1);
-		    if ($result < 0) dol_print_error($db,$object->error);
-		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
+			if ($found) $helpondiff.='<br>'; else $found=1;
+			$result=$object->load_stats_commande_fournisseur(0,'3,4', 1);
+			$helpondiff.=$langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$object->stats_commande_fournisseur['qty'];
+			$result=$object->load_stats_commande_fournisseur(0,'0,1,2', 1);
+			if ($result < 0) dol_print_error($db,$object->error);
+			$helpondiff.=' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
 		}
 
 		// Number of product from supplier order already received (partial receipt)
 		if (! empty($conf->fournisseur->enabled))
 		{
-		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $helpondiff.=$langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty'];
+			if ($found) $helpondiff.='<br>'; else $found=1;
+			$helpondiff.=$langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty'];
 		}
 
-        // Calculating a theorical value
-        print '<tr><td>';
-        print $form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc"));
-        print '</td>';
-        print "<td>";
-        //print (empty($stocktheo)?0:$stocktheo);
-        print $form->textwithpicto((empty($stocktheo)?0:$stocktheo), $helpondiff);
-        if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
-        print '</td>';
-        print '</tr>';
+		// Calculating a theorical value
+		print '<tr><td>';
+		print $form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc"));
+		print '</td>';
+		print "<td>";
+		//print (empty($stocktheo)?0:$stocktheo);
+		print $form->textwithpicto((empty($stocktheo)?0:$stocktheo), $helpondiff);
+		if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
+		print '</td>';
+		print '</tr>';
 
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
@@ -714,19 +714,19 @@ 
 		print '<tr><td class="tdtop">'.$langs->trans("LastMovement").'</td><td>';
 		if ($lastmovementdate)
 		{
-		    print dol_print_date($lastmovementdate,'dayhour').' ';
-		    print '(<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$object->id.'">'.$langs->trans("FullList").'</a>)';
+			print dol_print_date($lastmovementdate,'dayhour').' ';
+			print '(<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$object->id.'">'.$langs->trans("FullList").'</a>)';
 		}
 		else
 		{
-		     print '<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$object->id.'">'.$langs->trans("None").'</a>';
+			 print '<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$object->id.'">'.$langs->trans("None").'</a>';
 		}
 		print "</td></tr>";
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
 		dol_fiche_end();
 	}
@@ -765,15 +765,15 @@ 
 
 	if (empty($action) && $object->id)
 	{
-	    print "<div class=\"tabsAction\">\n";
+		print "<div class=\"tabsAction\">\n";
 
-	    if ($user->rights->stock->mouvement->creer)
-	    {
-	        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("StockCorrection").'</a>';
-	    }
+		if ($user->rights->stock->mouvement->creer)
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("StockCorrection").'</a>';
+		}
 
-	    //if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch())
-	    if ($user->rights->stock->mouvement->creer)
+		//if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch())
+		if ($user->rights->stock->mouvement->creer)
 		{
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("StockTransfer").'</a>';
 		}
@@ -846,20 +846,20 @@ 
 		print '<td align="right">'.(price2num($object->pmp)?price2num($object->pmp,'MU'):'').'</td>';
 		// Value purchase
 		print '<td align="right">'.(price2num($object->pmp)?price(price2num($object->pmp*$obj->reel,'MT')):'').'</td>';
-        // Sell price
+		// Sell price
+		print '<td align="right">';
+		if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price,'MU'),1);
+		else print $langs->trans("Variable");
+		print '</td>';
+		// Value sell
 		print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price,'MU'),1);
-        else print $langs->trans("Variable");
-        print '</td>';
-        // Value sell
-        print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price*$obj->reel,'MT'),1).'</td>';
-        else print $langs->trans("Variable");
+		if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price*$obj->reel,'MT'),1).'</td>';
+		else print $langs->trans("Variable");
 		print '</tr>'; ;
 		$total += $obj->reel;
 		if (price2num($object->pmp)) $totalwithpmp += $obj->reel;
 		$totalvalue = $totalvalue + ($object->pmp*$obj->reel);
-        $totalvaluesell = $totalvaluesell + ($object->price*$obj->reel);
+		$totalvaluesell = $totalvaluesell + ($object->price*$obj->reel);
 		// Batch Detail
 		if ((! empty($conf->productbatch->enabled)) && $object->hasbatch())
 		{
@@ -867,41 +867,41 @@ 
 			if ($details<0) dol_print_error($db);
 			foreach ($details as $pdluo)
 			{
-			    if ($action == 'editline' && GETPOST('lineid','int') == $pdluo->id)
-			    { //Current line edit
-			        print "\n".'<tr>';
-			        print '<td colspan="9">';
-			        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-			        print '<input type="hidden" name="pdluoid" value="'.$pdluo->id.'"><input type="hidden" name="action" value="updateline"><input type="hidden" name="id" value="'.$id.'"><table class="noborder" width="100%"><tr><td width="10%"></td>';
-			        print '<td align="right" width="10%"><input type="text" name="batch_number" value="'.$pdluo->batch.'"></td>';
-			        print '<td align="center" width="10%">';
-			        $form->select_date($pdluo->eatby,'eatby','','',1,'',1,0,1);
-			        print '</td>';
-			        print '<td align="center" width="10%">';
-			        $form->select_date($pdluo->sellby,'sellby','','',1,'',1,0,1);
-			        print '</td>';
-			        print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
-			        print '<td colspan="4"><input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'">';
-		            print '<input type="submit" class="button" id="cancellinebutton" name="Cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
-			        print '</table>';
-			        print '</form>';
-			        print '</td></tr>';
-			    }
-			    else
+				if ($action == 'editline' && GETPOST('lineid','int') == $pdluo->id)
+				{ //Current line edit
+					print "\n".'<tr>';
+					print '<td colspan="9">';
+					print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+					print '<input type="hidden" name="pdluoid" value="'.$pdluo->id.'"><input type="hidden" name="action" value="updateline"><input type="hidden" name="id" value="'.$id.'"><table class="noborder" width="100%"><tr><td width="10%"></td>';
+					print '<td align="right" width="10%"><input type="text" name="batch_number" value="'.$pdluo->batch.'"></td>';
+					print '<td align="center" width="10%">';
+					$form->select_date($pdluo->eatby,'eatby','','',1,'',1,0,1);
+					print '</td>';
+					print '<td align="center" width="10%">';
+					$form->select_date($pdluo->sellby,'sellby','','',1,'',1,0,1);
+					print '</td>';
+					print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
+					print '<td colspan="4"><input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'">';
+					print '<input type="submit" class="button" id="cancellinebutton" name="Cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
+					print '</table>';
+					print '</form>';
+					print '</td></tr>';
+				}
+				else
 				{
-                    print "\n".'<tr><td align="right">';
-                    print img_picto($langs->trans("Tranfer"),'uparrow','class="hideonsmartphone"').' ';
+					print "\n".'<tr><td align="right">';
+					print img_picto($langs->trans("Tranfer"),'uparrow','class="hideonsmartphone"').' ';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;id_entrepot='.$entrepotstatic->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">'.$langs->trans("StockTransfer").'</a>';
 					// Disabled, because edition of stock content must use the "Correct stock menu".
 					// Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ...
-                    //print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=editline&amp;lineid='.$pdluo->id.'#'.$pdluo->id.'">';
-                    //print img_edit().'</a></td>';
-                    print '<td align="right">'.$pdluo->batch.'</td>';
-                    print '<td align="center">'. dol_print_date($pdluo->eatby,'day') .'</td>';
-                    print '<td align="center">'. dol_print_date($pdluo->sellby,'day') .'</td>';
-                    print '<td align="right">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
-                    print '<td colspan="4"></td></tr>';
-			    }
+					//print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=editline&amp;lineid='.$pdluo->id.'#'.$pdluo->id.'">';
+					//print img_edit().'</a></td>';
+					print '<td align="right">'.$pdluo->batch.'</td>';
+					print '<td align="center">'. dol_print_date($pdluo->eatby,'day') .'</td>';
+					print '<td align="center">'. dol_print_date($pdluo->sellby,'day') .'</td>';
+					print '<td align="right">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
+					print '<td colspan="4"></td></tr>';
+				}
 			}
 		}
 		$i++;

Spacing +227 added lines, -227 removed lines

@@ -36,8 +36,8 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-if (! empty($conf->projet->enabled))
+if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (!empty($conf->projet->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -48,66 +48,66 @@ 
 $langs->load("bills");
 $langs->load("stocks");
 $langs->load("sendings");
-if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
+if (!empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
-$backtopage=GETPOST('backtopage');
-$action=GETPOST('action','aZ09');
-$cancel=GETPOST('cancel');
+$backtopage = GETPOST('backtopage');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel');
 
-$id=GETPOST('id', 'int');
-$ref=GETPOST('ref', 'alpha');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 $stocklimit = GETPOST('seuil_stock_alerte');
 $desiredstock = GETPOST('desiredstock');
 $cancel = GETPOST('cancel');
-$fieldid = isset($_GET["ref"])?'ref':'rowid';
-$d_eatby=dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
-$d_sellby=dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
-$pdluoid=GETPOST('pdluoid','int');
-$batchnumber=GETPOST('batch_number','san_alpha');
+$fieldid = isset($_GET["ref"]) ? 'ref' : 'rowid';
+$d_eatby = dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
+$d_sellby = dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+$pdluoid = GETPOST('pdluoid', 'int');
+$batchnumber = GETPOST('batch_number', 'san_alpha');
 if (!empty($batchnumber)) {
-	$batchnumber=trim($batchnumber);
+	$batchnumber = trim($batchnumber);
 }
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'produit&stock',$id,'product&product','','',$fieldid);
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'produit&stock', $id, 'product&product', '', '', $fieldid);
 
 
 $object = new Product($db);
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
     $result = $object->fetch($id, $ref);
 
 }
-$modulepart='product';
+$modulepart = 'product';
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$canvas = !empty($object->canvas)?$object->canvas:GETPOST("canvas");
-$objcanvas=null;
-if (! empty($canvas))
+$canvas = !empty($object->canvas) ? $object->canvas : GETPOST("canvas");
+$objcanvas = null;
+if (!empty($canvas))
 {
     require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db,$action);
-    $objcanvas->getCanvas('stockproduct','card',$canvas);
+    $objcanvas = new Canvas($db, $action);
+    $objcanvas->getCanvas('stockproduct', 'card', $canvas);
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('stockproductcard','globalcard'));
+$hookmanager->initHooks(array('stockproductcard', 'globalcard'));
 
 
 /*
  *	Actions
  */
 
-if ($cancel) $action='';
+if ($cancel) $action = '';
 
-$parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if ($action == 'addlimitstockwarehouse') {
@@ -116,33 +116,33 @@ 
 	$desiredstock = GETPOST('desiredstock');
 
 	$maj_ok = true;
-	if($seuil_stock_alerte == '') {
+	if ($seuil_stock_alerte == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("StockLimit")), null, 'errors');
 		$maj_ok = false;
 	}
-	if($desiredstock == '') {
+	if ($desiredstock == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DesiredStock")), null, 'errors');
 		$maj_ok = false;
 	}
 
-	if($maj_ok) {
+	if ($maj_ok) {
 
 		$pse = new ProductStockEntrepot($db);
-		if($pse->fetch('', GETPOST('id'), GETPOST('fk_entrepot')) > 0) {
+		if ($pse->fetch('', GETPOST('id'), GETPOST('fk_entrepot')) > 0) {
 
 			// Update
 			$pse->seuil_stock_alerte = $seuil_stock_alerte;
-			$pse->desiredstock  	 = $desiredstock;
-			if($pse->update($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseUpdated'));
+			$pse->desiredstock = $desiredstock;
+			if ($pse->update($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseUpdated'));
 
 		} else {
 
 			// Create
-			$pse->fk_entrepot 		 = GETPOST('fk_entrepot');
+			$pse->fk_entrepot = GETPOST('fk_entrepot');
 			$pse->fk_product  	 	 = GETPOST('id');
 			$pse->seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 			$pse->desiredstock  	 = GETPOST('desiredstock');
-			if($pse->create($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseCreated'));
+			if ($pse->create($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseCreated'));
 
 		}
 
@@ -153,12 +153,12 @@ 
 
 }
 
-if($action == 'delete_productstockwarehouse')
+if ($action == 'delete_productstockwarehouse')
 {
 
 	$pse = new ProductStockEntrepot($db);
 	$pse->fetch(GETPOST('fk_productstockwarehouse'));
-	if($pse->delete($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseDeleted'));
+	if ($pse->delete($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseDeleted'));
 
 	$action = '';
 
@@ -168,61 +168,61 @@ 
 if ($action == 'setseuil_stock_alerte')
 {
     $object = new Product($db);
-    $result=$object->fetch($id);
-    $object->seuil_stock_alerte=$stocklimit;
-    $result=$object->update($object->id,$user,0,'update');
+    $result = $object->fetch($id);
+    $object->seuil_stock_alerte = $stocklimit;
+    $result = $object->update($object->id, $user, 0, 'update');
     if ($result < 0)
     	setEventMessages($object->error, $object->errors, 'errors');
     //else
     //	setEventMessage($lans->trans("SavedRecordSuccessfully"));
-    $action='';
+    $action = '';
 }
 
 // Set desired stock
 if ($action == 'setdesiredstock')
 {
     $object = new Product($db);
-    $result=$object->fetch($id);
-    $object->desiredstock=$desiredstock;
-    $result=$object->update($object->id,$user,0,'update');
+    $result = $object->fetch($id);
+    $object->desiredstock = $desiredstock;
+    $result = $object->update($object->id, $user, 0, 'update');
     if ($result < 0)
     	setEventMessages($object->error, $object->errors, 'errors');
-    $action='';
+    $action = '';
 }
 
 
 // Correct stock
-if ($action == "correct_stock" && ! $cancel)
+if ($action == "correct_stock" && !$cancel)
 {
-	if (! (GETPOST("id_entrepot") > 0))
+	if (!(GETPOST("id_entrepot") > 0))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 		$error++;
-		$action='correction';
+		$action = 'correction';
 	}
-	if (! GETPOST("nbpiece"))
+	if (!GETPOST("nbpiece"))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
 		$error++;
-		$action='correction';
+		$action = 'correction';
 	}
 
-	if (! empty($conf->productbatch->enabled))
+	if (!empty($conf->productbatch->enabled))
 	{
 		$object = new Product($db);
-		$result=$object->fetch($id);
+		$result = $object->fetch($id);
 
-		if ($object->hasbatch() && ! $batchnumber)
+		if ($object->hasbatch() && !$batchnumber)
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
 			$error++;
-			$action='correction';
+			$action = 'correction';
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$priceunit=price2num(GETPOST("unitprice"));
+		$priceunit = price2num(GETPOST("unitprice"));
 		if (is_numeric(GETPOST("nbpiece")) && $id)
 		{
 			$origin_element = '';
@@ -236,16 +236,16 @@ 
 
 			if (empty($object)) {
 				$object = new Product($db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 			}
 			if ($object->hasbatch())
 			{
-				$result=$object->correct_stock_batch(
+				$result = $object->correct_stock_batch(
 					$user,
 					GETPOST("id_entrepot"),
 					GETPOST("nbpiece"),
 					GETPOST("mouvement"),
-					GETPOST("label"),		// label movement
+					GETPOST("label"), // label movement
 					$priceunit,
 					$d_eatby,
 					$d_sellby,
@@ -253,11 +253,11 @@ 
 					GETPOST('inventorycode'),
 					$origin_element,
 					$origin_id
-				);		// We do not change value of stock for a correction
+				); // We do not change value of stock for a correction
 			}
 			else
 			{
-				$result=$object->correct_stock(
+				$result = $object->correct_stock(
 		    		$user,
 		    		GETPOST("id_entrepot"),
 		    		GETPOST("nbpiece"),
@@ -267,7 +267,7 @@ 
 					GETPOST('inventorycode'),
 					$origin_element,
 					$origin_id
-				);		// We do not change value of stock for a correction
+				); // We do not change value of stock for a correction
 			}
 
 			if ($result > 0)
@@ -286,61 +286,61 @@ 
 			else
 			{
 			    setEventMessages($object->error, $object->errors, 'errors');
-			    $action='correction';
+			    $action = 'correction';
 			}
 		}
 	}
 }
 
 // Transfer stock from a warehouse to another warehouse
-if ($action == "transfert_stock" && ! $cancel)
+if ($action == "transfert_stock" && !$cancel)
 {
-	if (! (GETPOST("id_entrepot",'int') > 0) || ! (GETPOST("id_entrepot_destination",'int') > 0))
+	if (!(GETPOST("id_entrepot", 'int') > 0) || !(GETPOST("id_entrepot_destination", 'int') > 0))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 		$error++;
-		$action='transfert';
+		$action = 'transfert';
 	}
-	if (! GETPOST("nbpiece",'int'))
+	if (!GETPOST("nbpiece", 'int'))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
 		$error++;
-		$action='transfert';
+		$action = 'transfert';
 	}
-	if (GETPOST("id_entrepot",'int') == GETPOST("id_entrepot_destination",'int'))
+	if (GETPOST("id_entrepot", 'int') == GETPOST("id_entrepot_destination", 'int'))
 	{
 		setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors');
 		$error++;
-		$action='transfert';
+		$action = 'transfert';
 	}
-	if (! empty($conf->productbatch->enabled))
+	if (!empty($conf->productbatch->enabled))
 	{
 	    $object = new Product($db);
-	    $result=$object->fetch($id);
+	    $result = $object->fetch($id);
 
-	    if ($object->hasbatch() && ! $batchnumber)
+	    if ($object->hasbatch() && !$batchnumber)
 	    {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
 	        $error++;
-	        $action='transfert';
+	        $action = 'transfert';
 	    }
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		if ($id)
 		{
 			$object = new Product($db);
-			$result=$object->fetch($id);
+			$result = $object->fetch($id);
 
 			$db->begin();
 
-			$object->load_stock('novirtual');	// Load array product->stock_warehouse
+			$object->load_stock('novirtual'); // Load array product->stock_warehouse
 
 			// Define value of products moved
-			$pricesrc=0;
-			if (isset($object->pmp)) $pricesrc=$object->pmp;
-			$pricedest=$pricesrc;
+			$pricesrc = 0;
+			if (isset($object->pmp)) $pricesrc = $object->pmp;
+			$pricedest = $pricesrc;
 
 			if ($object->hasbatch())
 			{
@@ -348,13 +348,13 @@ 
 
 				if ($pdluoid > 0)
 				{
-					$result=$pdluo->fetch($pdluoid);
+					$result = $pdluo->fetch($pdluoid);
 					if ($result)
 					{
-						$srcwarehouseid=$pdluo->warehouseid;
-						$batch=$pdluo->batch;
-						$eatby=$pdluo->eatby;
-						$sellby=$pdluo->sellby;
+						$srcwarehouseid = $pdluo->warehouseid;
+						$batch = $pdluo->batch;
+						$eatby = $pdluo->eatby;
+						$sellby = $pdluo->sellby;
 					}
 					else
 					{
@@ -364,38 +364,38 @@ 
 				}
 				else
 				{
-					$srcwarehouseid=GETPOST('id_entrepot','int');
-					$batch=$batchnumber;
-					$eatby=$d_eatby;
-					$sellby=$d_sellby;
+					$srcwarehouseid = GETPOST('id_entrepot', 'int');
+					$batch = $batchnumber;
+					$eatby = $d_eatby;
+					$sellby = $d_sellby;
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					// Remove stock
-					$result1=$object->correct_stock_batch(
+					$result1 = $object->correct_stock_batch(
 						$user,
 						$srcwarehouseid,
-						GETPOST("nbpiece",'int'),
+						GETPOST("nbpiece", 'int'),
 						1,
-						GETPOST("label",'san_alpha'),
+						GETPOST("label", 'san_alpha'),
 						$pricesrc,
-						$eatby,$sellby,$batch,
+						$eatby, $sellby, $batch,
 						GETPOST('inventorycode')
 					);
 					if ($result1 < 0) $error++;
 				}
-				if (! $error)
+				if (!$error)
 				{
 					// Add stock
-					$result2=$object->correct_stock_batch(
+					$result2 = $object->correct_stock_batch(
 						$user,
-						GETPOST("id_entrepot_destination",'int'),
-						GETPOST("nbpiece",'int'),
+						GETPOST("id_entrepot_destination", 'int'),
+						GETPOST("nbpiece", 'int'),
 						0,
-						GETPOST("label",'san_alpha'),
+						GETPOST("label", 'san_alpha'),
 						$pricedest,
-						$eatby,$sellby,$batch,
+						$eatby, $sellby, $batch,
 						GETPOST('inventorycode')
 					);
 					if ($result2 < 0) $error++;
@@ -403,10 +403,10 @@ 
 			}
 			else
 			{
-				if (! $error)
+				if (!$error)
 				{
     			    // Remove stock
-    				$result1=$object->correct_stock(
+    				$result1 = $object->correct_stock(
     					$user,
     					GETPOST("id_entrepot"),
     					GETPOST("nbpiece"),
@@ -417,10 +417,10 @@ 
     				);
     				if ($result1 < 0) $error++;
 				}
-				if (! $error)
+				if (!$error)
 				{
     				// Add stock
-    				$result2=$object->correct_stock(
+    				$result2 = $object->correct_stock(
     					$user,
     					GETPOST("id_entrepot_destination"),
     					GETPOST("nbpiece"),
@@ -434,7 +434,7 @@ 
 			}
 
 
-			if (! $error && $result1 >= 0 && $result2 >= 0)
+			if (!$error && $result1 >= 0 && $result2 >= 0)
 			{
 				$db->commit();
 
@@ -453,7 +453,7 @@ 
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
-				$action='transfert';
+				$action = 'transfert';
 			}
 		}
 	}
@@ -464,37 +464,37 @@ 
 {
 
     $pdluo = new Productbatch($db);
-    $result=$pdluo->fetch(GETPOST('pdluoid','int'));
+    $result = $pdluo->fetch(GETPOST('pdluoid', 'int'));
 
-    if ($result>0)
+    if ($result > 0)
     {
         if ($pdluo->id)
         {
-            if ((! GETPOST("sellby")) && (! GETPOST("eatby")) && (! $batchnumber)) {
+            if ((!GETPOST("sellby")) && (!GETPOST("eatby")) && (!$batchnumber)) {
                 setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
             }
             else
             {
-                $d_eatby=dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
-                $d_sellby=dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
-                $pdluo->batch=$batchnumber;
-                $pdluo->eatby=$d_eatby;
-                $pdluo->sellby=$d_sellby;
-                $result=$pdluo->update($user);
-                if ($result<0)
+                $d_eatby = dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
+                $d_sellby = dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+                $pdluo->batch = $batchnumber;
+                $pdluo->eatby = $d_eatby;
+                $pdluo->sellby = $d_sellby;
+                $result = $pdluo->update($user);
+                if ($result < 0)
                 {
-                    setEventMessages($pdluo->error,$pdluo->errors, 'errors');
+                    setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                 }
             }
         }
         else
         {
-            setEventMessages($langs->trans('BatchInformationNotfound'),null, 'errors');
+            setEventMessages($langs->trans('BatchInformationNotfound'), null, 'errors');
         }
     }
     else
     {
-        setEventMessages($pdluo->error,null, 'errors');
+        setEventMessages($pdluo->error, null, 'errors');
     }
     header("Location: product.php?id=".$id);
     exit;
@@ -507,37 +507,37 @@ 
  */
 
 $form = new Form($db);
-$formproduct=new FormProduct($db);
-if (! empty($conf->projet->enabled)) $formproject=new FormProjets($db);
+$formproduct = new FormProduct($db);
+if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
 
 if ($id > 0 || $ref)
 {
 	$object = new Product($db);
-	$result = $object->fetch($id,$ref);
+	$result = $object->fetch($id, $ref);
 
 	$object->load_stock();
 
 	$title = $langs->trans('ProductServiceCard');
 	$helpurl = '';
-	$shortlabel = dol_trunc($object->label,16);
+	$shortlabel = dol_trunc($object->label, 16);
 	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
 	{
-		$title = $langs->trans('Product')." ". $shortlabel ." - ".$langs->trans('Stock');
-		$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+		$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Stock');
+		$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 	}
 	if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
 	{
-		$title = $langs->trans('Service')." ". $shortlabel ." - ".$langs->trans('Stock');
-		$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+		$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Stock');
+		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 	}
 
 	llxHeader('', $title, $helpurl);
 
 	if ($result > 0)
 	{
-		$head=product_prepare_head($object);
-		$titre=$langs->trans("CardProduct".$object->type);
-		$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
+		$head = product_prepare_head($object);
+		$titre = $langs->trans("CardProduct".$object->type);
+		$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
 		dol_fiche_head($head, 'stock', $titre, -1, $picto);
 
@@ -546,7 +546,7 @@ 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 
         $shownav = 1;
-        if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+        if ($user->societe_id && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
         dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
@@ -558,7 +558,7 @@ 
 		if ($conf->productbatch->enabled)
 		{
 			print '<tr><td class="titlefield">'.$langs->trans("ManageLotSerial").'</td><td>';
-			print $object->getLibStatut(0,2);
+			print $object->getLibStatut(0, 2);
 			print '</td></tr>';
 		}
 
@@ -583,61 +583,61 @@ 
 		if (empty($conf->global->PRODUIT_MULTIPRICES))
 		{
 			// Price
-			print '<tr><td>' . $langs->trans("SellingPrice") . '</td><td>';
+			print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
 			if ($object->price_base_type == 'TTC') {
-				print price($object->price_ttc) . ' ' . $langs->trans($object->price_base_type);
+				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
 			} else {
-				print price($object->price) . ' ' . $langs->trans($object->price_base_type);
+				print price($object->price).' '.$langs->trans($object->price_base_type);
 			}
 			print '</td></tr>';
 
 			// Price minimum
-			print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
+			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
 			if ($object->price_base_type == 'TTC') {
-				print price($object->price_min_ttc) . ' ' . $langs->trans($object->price_base_type);
+				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
 			} else {
-				print price($object->price_min) . ' ' . $langs->trans($object->price_base_type);
+				print price($object->price_min).' '.$langs->trans($object->price_base_type);
 			}
 			print '</td></tr>';
 		}
 		else
 		{
 			// Price
-			print '<tr><td>' . $langs->trans("SellingPrice") . '</td><td>';
+			print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
 			print $langs->trans("Variable");
 			print '</td></tr>';
 
 			// Price minimum
-			print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
+			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
 			print $langs->trans("Variable");
 			print '</td></tr>';
 		}
 
         // Stock alert threshold
-        print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1),'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td>';
-        print $form->editfieldval("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer,'string');
+        print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1), 'seuil_stock_alerte', $object->seuil_stock_alerte, $object, $user->rights->produit->creer).'</td><td>';
+        print $form->editfieldval("StockLimit", 'seuil_stock_alerte', $object->seuil_stock_alerte, $object, $user->rights->produit->creer, 'string');
         print '</td></tr>';
 
 		// Hook formObject
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
         // Desired stock
-        print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1),'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer);
+        print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1), 'desiredstock', $object->desiredstock, $object, $user->rights->produit->creer);
         print '</td><td>';
-        print $form->editfieldval("DesiredStock",'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer,'string');
+        print $form->editfieldval("DesiredStock", 'desiredstock', $object->desiredstock, $object, $user->rights->produit->creer, 'string');
         print '</td></tr>';
 
         // Real stock
         $text_stock_options = $langs->trans("RealStockDesc").'<br>';
-        $text_stock_options.= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)?$langs->trans("DeStockOnShipment").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)?$langs->trans("DeStockOnValidateOrder").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_BILL)?$langs->trans("DeStockOnBill").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)?$langs->trans("ReStockOnBill").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)?$langs->trans("ReStockOnValidateOrder").'<br>':'');
-        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)?$langs->trans("ReStockOnDispatchOrder").'<br>':'');
+        $text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? $langs->trans("DeStockOnShipment").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? $langs->trans("DeStockOnValidateOrder").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? $langs->trans("DeStockOnBill").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) ? $langs->trans("ReStockOnBill").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) ? $langs->trans("ReStockOnValidateOrder").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) ? $langs->trans("ReStockOnDispatchOrder").'<br>' : '');
         print '<tr><td>';
         print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1);
         print '</td>';
@@ -648,42 +648,42 @@ 
 
 		$stocktheo = price2num($object->stock_theorique, 'MS');
 
-		$found=0;
-		$helpondiff='<strong>'.$langs->trans("StockDiffPhysicTeoric").':</strong><br>';
+		$found = 0;
+		$helpondiff = '<strong>'.$langs->trans("StockDiffPhysicTeoric").':</strong><br>';
 		// Number of customer orders running
-		if (! empty($conf->commande->enabled))
+		if (!empty($conf->commande->enabled))
 		{
-		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $helpondiff.=$langs->trans("ProductQtyInCustomersOrdersRunning").': '.$object->stats_commande['qty'];
-		    $result=$object->load_stats_commande(0,'0', 1);
-		    if ($result < 0) dol_print_error($db,$object->error);
-		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
+		    if ($found) $helpondiff .= '<br>'; else $found = 1;
+		    $helpondiff .= $langs->trans("ProductQtyInCustomersOrdersRunning").': '.$object->stats_commande['qty'];
+		    $result = $object->load_stats_commande(0, '0', 1);
+		    if ($result < 0) dol_print_error($db, $object->error);
+		    $helpondiff .= ' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
 		}
 
 		// Number of product from customer order already sent (partial shipping)
-		if (! empty($conf->expedition->enabled))
+		if (!empty($conf->expedition->enabled))
 		{
-		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $result=$object->load_stats_sending(0,'2', 1);
-		    $helpondiff.=$langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
+		    if ($found) $helpondiff .= '<br>'; else $found = 1;
+		    $result = $object->load_stats_sending(0, '2', 1);
+		    $helpondiff .= $langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
 		}
 
 		// Number of supplier order running
-		if (! empty($conf->fournisseur->enabled))
+		if (!empty($conf->fournisseur->enabled))
 		{
-		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $result=$object->load_stats_commande_fournisseur(0,'3,4', 1);
-		    $helpondiff.=$langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$object->stats_commande_fournisseur['qty'];
-		    $result=$object->load_stats_commande_fournisseur(0,'0,1,2', 1);
-		    if ($result < 0) dol_print_error($db,$object->error);
-		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
+		    if ($found) $helpondiff .= '<br>'; else $found = 1;
+		    $result = $object->load_stats_commande_fournisseur(0, '3,4', 1);
+		    $helpondiff .= $langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$object->stats_commande_fournisseur['qty'];
+		    $result = $object->load_stats_commande_fournisseur(0, '0,1,2', 1);
+		    if ($result < 0) dol_print_error($db, $object->error);
+		    $helpondiff .= ' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
 		}
 
 		// Number of product from supplier order already received (partial receipt)
-		if (! empty($conf->fournisseur->enabled))
+		if (!empty($conf->fournisseur->enabled))
 		{
-		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $helpondiff.=$langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty'];
+		    if ($found) $helpondiff .= '<br>'; else $found = 1;
+		    $helpondiff .= $langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty'];
 		}
 
         // Calculating a theorical value
@@ -692,20 +692,20 @@ 
         print '</td>';
         print "<td>";
         //print (empty($stocktheo)?0:$stocktheo);
-        print $form->textwithpicto((empty($stocktheo)?0:$stocktheo), $helpondiff);
+        print $form->textwithpicto((empty($stocktheo) ? 0 : $stocktheo), $helpondiff);
         if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
         print '</td>';
         print '</tr>';
 
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
-		$sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-		$sql.= " WHERE m.fk_product = '".$object->id."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
+		$sql .= " WHERE m.fk_product = '".$object->id."'";
 		$resqlbis = $db->query($sql);
 		if ($resqlbis)
 		{
 			$obj = $db->fetch_object($resqlbis);
-			$lastmovementdate=$db->jdate($obj->datem);
+			$lastmovementdate = $db->jdate($obj->datem);
 		}
 		else
 		{
@@ -714,7 +714,7 @@ 
 		print '<tr><td class="tdtop">'.$langs->trans("LastMovement").'</td><td>';
 		if ($lastmovementdate)
 		{
-		    print dol_print_date($lastmovementdate,'dayhour').' ';
+		    print dol_print_date($lastmovementdate, 'dayhour').' ';
 		    print '(<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$object->id.'">'.$langs->trans("FullList").'</a>)';
 		}
 		else
@@ -757,9 +757,9 @@ 
 /*                                                                            */
 /* ************************************************************************** */
 
-$parameters=array();
+$parameters = array();
 
-$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook))
 {
 
@@ -798,7 +798,7 @@ 
 print '<td align="right">'.$langs->trans("SellPriceMin").'</td>';
 print '<td align="right">'.$langs->trans("EstimatedStockValueSellShort").'</td>';
 print '</tr>';
-if ((! empty($conf->productbatch->enabled)) && $object->hasbatch())
+if ((!empty($conf->productbatch->enabled)) && $object->hasbatch())
 {
 	print '<tr class="liste_titre"><td width="10%"></td>';
 	print '<td align="right" width="10%">'.$langs->trans("batch_number").'</td>';
@@ -813,61 +813,61 @@ 
 }
 
 $sql = "SELECT e.rowid, e.label, e.lieu, ps.reel, ps.rowid as product_stock_id, p.pmp";
-$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
-$sql.= " ".MAIN_DB_PREFIX."product_stock as ps";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";
-$sql.= " WHERE ps.reel != 0";
-$sql.= " AND ps.fk_entrepot = e.rowid";
-$sql.= " AND e.entity IN (".getEntity('stock').")";
-$sql.= " AND ps.fk_product = ".$object->id;
-$sql.= " ORDER BY e.label";
-
-$entrepotstatic=new Entrepot($db);
-$total=0;
-$totalvalue=$totalvaluesell=0;
-
-$resql=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
+$sql .= " ".MAIN_DB_PREFIX."product_stock as ps";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";
+$sql .= " WHERE ps.reel != 0";
+$sql .= " AND ps.fk_entrepot = e.rowid";
+$sql .= " AND e.entity IN (".getEntity('stock').")";
+$sql .= " AND ps.fk_product = ".$object->id;
+$sql .= " ORDER BY e.label";
+
+$entrepotstatic = new Entrepot($db);
+$total = 0;
+$totalvalue = $totalvaluesell = 0;
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
-	$total=$totalwithpmp;
-	$i=0; $var=false;
+	$total = $totalwithpmp;
+	$i = 0; $var = false;
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
-		$entrepotstatic->id=$obj->rowid;
-		$entrepotstatic->libelle=$obj->label;
-		$entrepotstatic->lieu=$obj->lieu;
+		$entrepotstatic->id = $obj->rowid;
+		$entrepotstatic->libelle = $obj->label;
+		$entrepotstatic->lieu = $obj->lieu;
 		$stock_real = price2num($obj->reel, 'MS');
 		print '<tr class="oddeven">';
 		print '<td colspan="4">'.$entrepotstatic->getNomUrl(1).'</td>';
-		print '<td align="right">'.$stock_real.($stock_real < 0 ?' '.img_warning():'').'</td>';
+		print '<td align="right">'.$stock_real.($stock_real < 0 ? ' '.img_warning() : '').'</td>';
 		// PMP
-		print '<td align="right">'.(price2num($object->pmp)?price2num($object->pmp,'MU'):'').'</td>';
+		print '<td align="right">'.(price2num($object->pmp) ? price2num($object->pmp, 'MU') : '').'</td>';
 		// Value purchase
-		print '<td align="right">'.(price2num($object->pmp)?price(price2num($object->pmp*$obj->reel,'MT')):'').'</td>';
+		print '<td align="right">'.(price2num($object->pmp) ? price(price2num($object->pmp * $obj->reel, 'MT')) : '').'</td>';
         // Sell price
 		print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price,'MU'),1);
+        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price, 'MU'), 1);
         else print $langs->trans("Variable");
         print '</td>';
         // Value sell
         print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price*$obj->reel,'MT'),1).'</td>';
+        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price * $obj->reel, 'MT'), 1).'</td>';
         else print $langs->trans("Variable");
 		print '</tr>'; ;
 		$total += $obj->reel;
 		if (price2num($object->pmp)) $totalwithpmp += $obj->reel;
-		$totalvalue = $totalvalue + ($object->pmp*$obj->reel);
-        $totalvaluesell = $totalvaluesell + ($object->price*$obj->reel);
+		$totalvalue = $totalvalue + ($object->pmp * $obj->reel);
+        $totalvaluesell = $totalvaluesell + ($object->price * $obj->reel);
 		// Batch Detail
-		if ((! empty($conf->productbatch->enabled)) && $object->hasbatch())
+		if ((!empty($conf->productbatch->enabled)) && $object->hasbatch())
 		{
-			$details=Productbatch::findAll($db, $obj->product_stock_id, 0, $object->id);
-			if ($details<0) dol_print_error($db);
+			$details = Productbatch::findAll($db, $obj->product_stock_id, 0, $object->id);
+			if ($details < 0) dol_print_error($db);
 			foreach ($details as $pdluo)
 			{
-			    if ($action == 'editline' && GETPOST('lineid','int') == $pdluo->id)
+			    if ($action == 'editline' && GETPOST('lineid', 'int') == $pdluo->id)
 			    { //Current line edit
 			        print "\n".'<tr>';
 			        print '<td colspan="9">';
@@ -875,12 +875,12 @@ 
 			        print '<input type="hidden" name="pdluoid" value="'.$pdluo->id.'"><input type="hidden" name="action" value="updateline"><input type="hidden" name="id" value="'.$id.'"><table class="noborder" width="100%"><tr><td width="10%"></td>';
 			        print '<td align="right" width="10%"><input type="text" name="batch_number" value="'.$pdluo->batch.'"></td>';
 			        print '<td align="center" width="10%">';
-			        $form->select_date($pdluo->eatby,'eatby','','',1,'',1,0,1);
+			        $form->select_date($pdluo->eatby, 'eatby', '', '', 1, '', 1, 0, 1);
 			        print '</td>';
 			        print '<td align="center" width="10%">';
-			        $form->select_date($pdluo->sellby,'sellby','','',1,'',1,0,1);
+			        $form->select_date($pdluo->sellby, 'sellby', '', '', 1, '', 1, 0, 1);
 			        print '</td>';
-			        print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
+			        print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').'</td>';
 			        print '<td colspan="4"><input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'">';
 		            print '<input type="submit" class="button" id="cancellinebutton" name="Cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
 			        print '</table>';
@@ -890,16 +890,16 @@ 
 			    else
 				{
                     print "\n".'<tr><td align="right">';
-                    print img_picto($langs->trans("Tranfer"),'uparrow','class="hideonsmartphone"').' ';
+                    print img_picto($langs->trans("Tranfer"), 'uparrow', 'class="hideonsmartphone"').' ';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;id_entrepot='.$entrepotstatic->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">'.$langs->trans("StockTransfer").'</a>';
 					// Disabled, because edition of stock content must use the "Correct stock menu".
 					// Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ...
                     //print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=editline&amp;lineid='.$pdluo->id.'#'.$pdluo->id.'">';
                     //print img_edit().'</a></td>';
                     print '<td align="right">'.$pdluo->batch.'</td>';
-                    print '<td align="center">'. dol_print_date($pdluo->eatby,'day') .'</td>';
-                    print '<td align="center">'. dol_print_date($pdluo->sellby,'day') .'</td>';
-                    print '<td align="right">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
+                    print '<td align="center">'.dol_print_date($pdluo->eatby, 'day').'</td>';
+                    print '<td align="center">'.dol_print_date($pdluo->sellby, 'day').'</td>';
+                    print '<td align="right">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').'</td>';
                     print '<td colspan="4"></td></tr>';
 			    }
 			}
@@ -913,19 +913,19 @@ 
 print '<tr class="liste_total"><td align="right" class="liste_total" colspan="4">'.$langs->trans("Total").':</td>';
 print '<td class="liste_total" align="right">'.price2num($total, 'MS').'</td>';
 print '<td class="liste_total" align="right">';
-print ($totalwithpmp?price(price2num($totalvalue/$totalwithpmp,'MU')):'&nbsp;');	// This value may have rounding errors
+print ($totalwithpmp ? price(price2num($totalvalue / $totalwithpmp, 'MU')) : '&nbsp;'); // This value may have rounding errors
 print '</td>';
 // Value purchase
 print '<td class="liste_total" align="right">';
-print $totalvalue?price(price2num($totalvalue,'MT'),1):'&nbsp;';
+print $totalvalue ? price(price2num($totalvalue, 'MT'), 1) : '&nbsp;';
 print '</td>';
 print '<td class="liste_total" align="right">';
-if (empty($conf->global->PRODUIT_MULTIPRICES)) print ($total?price($totalvaluesell/$total,1):'&nbsp;');
+if (empty($conf->global->PRODUIT_MULTIPRICES)) print ($total ? price($totalvaluesell / $total, 1) : '&nbsp;');
 else print $langs->trans("Variable");
 print '</td>';
 // Value to sell
 print '<td class="liste_total" align="right">';
-if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($totalvaluesell,'MT'),1);
+if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($totalvaluesell, 'MT'), 1);
 else print $langs->trans("Variable");
 print '</td>';
 print "</tr>";
@@ -954,8 +954,8 @@ 
 
 	if (!empty($lines))
 	{
-		$var=false;
-		foreach($lines as $line)
+		$var = false;
+		foreach ($lines as $line)
 		{
 			$ent = new Entrepot($db);
 			$ent->fetch($line['fk_entrepot']);

htdocs/product/inventory/list.php

Indentation +221 added lines, -221 removed lines

@@ -99,7 +99,7 @@ 
 $socid=0;
 if ($user->societe_id > 0)
 {
-    //$socid = $user->societe_id;
+	//$socid = $user->societe_id;
 	accessforbidden();
 }
 
@@ -108,14 +108,14 @@ 
 $search=array();
 foreach($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach($object->fields as $key => $val)
 {
-    if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
+	if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
 }
 
 // Definition of fields for list
@@ -123,15 +123,15 @@ 
 foreach($object->fields as $key => $val)
 {
 	// If $val['visible']==0, then we never show the field
-    if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
+	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
 }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
-    }
+	foreach($extrafields->attribute_label as $key => $val)
+	{
+		$arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+	}
 }
 
 
@@ -152,32 +152,32 @@ 
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
-    {
-        foreach($object->fields as $key => $val)
-        {
-            $search[$key]='';
-        }
-        $toselect='';
-        $search_array_options=array();
-    }
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-        || GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
-    {
-        $massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
-
-    // Mass actions
-    $objectclass='Inventory';
-    $objectlabel='Inventory';
-    $permtoread = $user->rights->inventory->read;
-    $permtodelete = $user->rights->inventory->delete;
-    $uploaddir = $conf->inventory->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+	{
+		foreach($object->fields as $key => $val)
+		{
+			$search[$key]='';
+		}
+		$toselect='';
+		$search_array_options=array();
+	}
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
+		|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+	{
+		$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass='Inventory';
+	$objectlabel='Inventory';
+	$permtoread = $user->rights->inventory->read;
+	$permtodelete = $user->rights->inventory->delete;
+	$uploaddir = $conf->inventory->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -202,7 +202,7 @@ 
 $sql = 'SELECT ';
 foreach($object->fields as $key => $val)
 {
-    $sql.='t.'.$key.', ';
+	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
@@ -216,21 +216,21 @@ 
 $sql.= " WHERE t.entity IN (".getEntity('inventory').")";
 foreach($search as $key => $val)
 {
-    if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:($object->fields[$key]['type'] == 'integer'?1:0)));
+	if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:($object->fields[$key]['type'] == 'integer'?1:0)));
 }
 if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double','real'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
+	$crit=$val;
+	$tmpkey=preg_replace('/search_options_/','',$key);
+	$typ=$extrafields->attribute_type[$tmpkey];
+	$mode=0;
+	if (in_array($typ, array('int','double','real'))) $mode=1;    // Search on a numeric
+	if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
+	{
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+	}
 }
 // Add where from hooks
 $parameters=array();
@@ -252,8 +252,8 @@ 
 $resql=$db->query($sql);
 if (! $resql)
 {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 
 $num = $db->num_rows($resql);
@@ -261,10 +261,10 @@ 
 // Direct jump if only one record found
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/inventory/inventory_card.php?id='.$id);
-    exit;
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".DOL_URL_ROOT.'/inventory/inventory_card.php?id='.$id);
+	exit;
 }
 
 
@@ -295,20 +295,20 @@ 
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 foreach($search as $key => $val)
 {
-    $param.= '&search_'.$key.'='.urlencode($search[$key]);
+	$param.= '&search_'.$key.'='.urlencode($search[$key]);
 }
 if ($optioncss != '')     $param.='&optioncss='.$optioncss;
 // Add $param from extra fields
 foreach ($search_array_options as $key => $val)
 {
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+	$crit=$val;
+	$tmpkey=preg_replace('/search_options_/','',$key);
+	if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 }
 
 $arrayofmassactions =  array(
-    'presend'=>$langs->trans("SendByMail"),
-    'builddoc'=>$langs->trans("PDFMerge"),
+	'presend'=>$langs->trans("SendByMail"),
+	'builddoc'=>$langs->trans("PDFMerge"),
 );
 if ($user->rights->inventory->delete) $arrayofmassactions['delete']=$langs->trans("Delete");
 if ($massaction == 'presend') $arrayofmassactions=array();
@@ -328,8 +328,8 @@ 
 
 if ($sall)
 {
-    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
+	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+	print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
 }
 
 $moreforfilter = '';
@@ -346,7 +346,7 @@ 
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
-    print '</div>';
+	print '</div>';
 }
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
@@ -362,34 +362,34 @@ 
 print '<tr class="liste_titre">';
 foreach($object->fields as $key => $val)
 {
-    if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+	$align='';
+	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+	if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
+	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        if (! empty($arrayfields["ef.".$key]['checked']))
-        {
-            $align=$extrafields->getAlignFlag($key);
-            $typeofextrafield=$extrafields->attribute_type[$key];
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
-            {
-                $crit=$val;
-                $tmpkey=preg_replace('/search_options_/','',$key);
-                $searchclass='';
-                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-            }
-            print '</td>';
-        }
-    }
+	foreach($extrafields->attribute_label as $key => $val)
+	{
+		if (! empty($arrayfields["ef.".$key]['checked']))
+		{
+			$align=$extrafields->getAlignFlag($key);
+			$typeofextrafield=$extrafields->attribute_type[$key];
+			print '<td class="liste_titre'.($align?' '.$align:'').'">';
+			if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
+			{
+				$crit=$val;
+				$tmpkey=preg_replace('/search_options_/','',$key);
+				$searchclass='';
+				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+			}
+			print '</td>';
+		}
+	}
 }
 // Fields from hook
 $parameters=array('arrayfields'=>$arrayfields);
@@ -398,11 +398,11 @@ 
 // Rest of fields search
 foreach($object->fields as $key => $val)
 {
-    if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+	$align='';
+	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+	if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
+	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 }
 // Action column
 print '<td class="liste_titre" align="right">';
@@ -417,24 +417,24 @@ 
 print '<tr class="liste_titre">';
 foreach($object->fields as $key => $val)
 {
-    if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+	if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+	$align='';
+	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+	if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
+	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
 }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-       if (! empty($arrayfields["ef.".$key]['checked']))
-       {
+	   if (! empty($arrayfields["ef.".$key]['checked']))
+	   {
 			$align=$extrafields->getAlignFlag($key);
 			$sortonfield = "ef.".$key;
 			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
 			print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
-       }
+	   }
    }
 }
 // Hook fields
@@ -444,11 +444,11 @@ 
 // Rest of fields title
 foreach($object->fields as $key => $val)
 {
-    if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+	if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+	$align='';
+	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+	if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
+	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
 }
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
 print '</tr>'."\n";
@@ -458,7 +458,7 @@ 
 $needToFetchEachLine=0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
 }
 
 
@@ -468,42 +468,42 @@ 
 $totalarray=array();
 while ($i < min($num, $limit))
 {
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-    	// Store properties in $object
-    	$object->id = $obj->rowid;
-    	foreach($object->fields as $key => $val)
-    	{
-    		if (isset($obj->$key)) $object->$key = $obj->$key;
-    	}
-
-        // Show here line of result
-        print '<tr class="oddeven">';
-        foreach($object->fields as $key => $val)
-        {
-            if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-            $align='';
-            if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-            if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-            if ($key == 'status') $align.=($align?' ':'').'center';
-            if (! empty($arrayfields['t.'.$key]['checked']))
-            {
-                print '<td'.($align?' class="'.$align.'"':'').'>';
-                if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
-                elseif ($key == 'ref') print $object->getNomUrl(1);
-                elseif ($key == 'status') print $object->getLibStatut(3);
-                else print $obj->$key;
-                print '</td>';
-                if (! $i) $totalarray['nbfield']++;
-                if (! empty($val['isameasure']))
-                {
-                	if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
-                	$totalarray['val']['t.'.$key] += $obj->$key;
-                }
-            }
-        }
-    	// Extra fields
+	$obj = $db->fetch_object($resql);
+	if ($obj)
+	{
+		// Store properties in $object
+		$object->id = $obj->rowid;
+		foreach($object->fields as $key => $val)
+		{
+			if (isset($obj->$key)) $object->$key = $obj->$key;
+		}
+
+		// Show here line of result
+		print '<tr class="oddeven">';
+		foreach($object->fields as $key => $val)
+		{
+			if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+			$align='';
+			if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+			if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
+			if ($key == 'status') $align.=($align?' ':'').'center';
+			if (! empty($arrayfields['t.'.$key]['checked']))
+			{
+				print '<td'.($align?' class="'.$align.'"':'').'>';
+				if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
+				elseif ($key == 'ref') print $object->getNomUrl(1);
+				elseif ($key == 'status') print $object->getLibStatut(3);
+				else print $obj->$key;
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+				if (! empty($val['isameasure']))
+				{
+					if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+					$totalarray['val']['t.'.$key] += $obj->$key;
+				}
+			}
+		}
+		// Extra fields
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{
 		   foreach($extrafields->attribute_label as $key => $val)
@@ -517,86 +517,86 @@ 
 					$tmpkey='options_'.$key;
 					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 					print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
-		            if (! empty($val['isameasure']))
-		            {
-		            	if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
-		            	$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
-		            }
+					if (! $i) $totalarray['nbfield']++;
+					if (! empty($val['isameasure']))
+					{
+						if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+						$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
+					}
 				}
 		   }
 		}
-        // Fields from hook
-	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		// Fields from hook
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        // Rest of fields
-        foreach($object->fields as $key => $val)
-        {
-            if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-            $align='';
-            if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-            if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-            if ($key == 'status') $align.=($align?' ':'').'center';
-            if (! empty($arrayfields['t.'.$key]['checked']))
-            {
-                print '<td'.($align?' class="'.$align.'"':'').'>';
-                if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
-                elseif ($key == 'status') print $object->getLibStatut(3);
-                else print $obj->$key;
-                print '</td>';
-                if (! $i) $totalarray['nbfield']++;
-                if (! empty($val['isameasure']))
-                {
-	                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
-	               	$totalarray['val']['t.'.$key] += $obj->$key;
-                }
-            }
-        }
-        // Action column
-        print '<td class="nowrap" align="center">';
-	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-	        $selected=0;
+		print $hookmanager->resPrint;
+		// Rest of fields
+		foreach($object->fields as $key => $val)
+		{
+			if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+			$align='';
+			if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
+			if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
+			if ($key == 'status') $align.=($align?' ':'').'center';
+			if (! empty($arrayfields['t.'.$key]['checked']))
+			{
+				print '<td'.($align?' class="'.$align.'"':'').'>';
+				if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
+				elseif ($key == 'status') print $object->getLibStatut(3);
+				else print $obj->$key;
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+				if (! empty($val['isameasure']))
+				{
+					if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				   	$totalarray['val']['t.'.$key] += $obj->$key;
+				}
+			}
+		}
+		// Action column
+		print '<td class="nowrap" align="center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected=0;
 			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
 			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-        }
-	    print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+		}
+		print '</td>';
+		if (! $i) $totalarray['nbfield']++;
 
-        print '</tr>';
-    }
-    $i++;
+		print '</tr>';
+	}
+	$i++;
 }
 
 // Show total line
 if (isset($totalarray['pos']))
 {
-    print '<tr class="liste_total">';
-    $i=0;
-    while ($i < $totalarray['nbfield'])
-    {
-        $i++;
-        if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-        else
-        {
-            if ($i == 1)
-	        {
-	            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-	            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-	        }
-        	print '<td></td>';
-        }
-    }
-    print '</tr>';
+	print '<tr class="liste_total">';
+	$i=0;
+	while ($i < $totalarray['nbfield'])
+	{
+		$i++;
+		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+		else
+		{
+			if ($i == 1)
+			{
+				if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+				else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+			}
+			print '<td></td>';
+		}
+	}
+	print '</tr>';
 }
 
 // If no record found
 if ($num == 0)
 {
-    $colspan=1;
-    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
-    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	$colspan=1;
+	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
@@ -613,25 +613,25 @@ 
 
 if ($nbtotalofrecords === '' || $nbtotalofrecords)
 {
-    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-    {
-        require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
-        $formfile = new FormFile($db);
-
-        // Show list of available documents
-        $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-        $urlsource.=str_replace('&amp;','&',$param);
-
-        $filedir=$diroutputmassaction;
-        $genallowed=$user->rights->inventory->read;
-        $delallowed=$user->rights->inventory->read;
-
-        print $formfile->showdocuments('massfilesarea_inventory','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-    }
-    else
-    {
-        print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-    }
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+	{
+		require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
+		$formfile = new FormFile($db);
+
+		// Show list of available documents
+		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+		$urlsource.=str_replace('&amp;','&',$param);
+
+		$filedir=$diroutputmassaction;
+		$genallowed=$user->rights->inventory->read;
+		$delallowed=$user->rights->inventory->read;
+
+		print $formfile->showdocuments('massfilesarea_inventory','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+	}
+	else
+	{
+		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+	}
 }
 
 // End of page

Spacing +207 added lines, -207 removed lines

@@ -38,19 +38,19 @@ 
 
 
 // Load Dolibarr environment
-$res=0;
+$res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
 // Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
-$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
-while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
-if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include(substr($tmp, 0, ($i + 1))."/main.inc.php");
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php");
 // Try main.inc.php using relative path
-if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php");
-if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
-if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
-if (! $res) die("Include of main fails");
+if (!$res && file_exists("../main.inc.php")) $res = @include("../main.inc.php");
+if (!$res && file_exists("../../main.inc.php")) $res = @include("../../main.inc.php");
+if (!$res && file_exists("../../../main.inc.php")) $res = @include("../../../main.inc.php");
+if (!$res) die("Include of main fails");
 
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -58,45 +58,45 @@ 
 dol_include_once('/inventory/class/inventory.class.php');
 
 // Load traductions files requiredby by page
-$langs->loadLangs(array("inventory","other"));
+$langs->loadLangs(array("inventory", "other"));
 
-$action     = GETPOST('action','alpha');
-$massaction = GETPOST('massaction','alpha');
-$show_files = GETPOST('show_files','int');
-$confirm    = GETPOST('confirm','alpha');
+$action     = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'inventorylist';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'inventorylist'; // To manage different context of search
 
-$id			= GETPOST('id','int');
+$id = GETPOST('id', 'int');
 $backtopage = GETPOST('backtopage');
-$optioncss  = GETPOST('optioncss','alpha');
+$optioncss  = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Initialize technical objects
-$object=new Inventory($db);
+$object = new Inventory($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction=$conf->inventory->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('inventorylist'));     // Note that conf->hooks_modules contains array
+$diroutputmassaction = $conf->inventory->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('inventorylist')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('inventory');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($extralabels, '', 'search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (! $sortfield) $sortfield="t.".key($object->fields);   // Set here default search field. By default 1st field in definition.
-if (! $sortorder) $sortorder="ASC";
+if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+if (!$sortorder) $sortorder = "ASC";
 
 // Protection if external user
-$socid=0;
+$socid = 0;
 if ($user->societe_id > 0)
 {
     //$socid = $user->societe_id;
@@ -104,33 +104,33 @@ 
 }
 
 // Initialize array of search criterias
-$search_all=trim(GETPOST("search_all",'alpha'));
-$search=array();
-foreach($object->fields as $key => $val)
+$search_all = trim(GETPOST("search_all", 'alpha'));
+$search = array();
+foreach ($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
-    if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
+    if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
 
 // Definition of fields for list
-$arrayfields=array();
-foreach($object->fields as $key => $val)
+$arrayfields = array();
+foreach ($object->fields as $key => $val)
 {
 	// If $val['visible']==0, then we never show the field
-    if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
+    if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled']);
 }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val)
+    foreach ($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
@@ -143,11 +143,11 @@ 
  * Put here all code to do according to value of "$action" parameter
  */
 
-if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
@@ -156,24 +156,24 @@ 
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
     {
-        foreach($object->fields as $key => $val)
+        foreach ($object->fields as $key => $val)
         {
-            $search[$key]='';
+            $search[$key] = '';
         }
-        $toselect='';
-        $search_array_options=array();
+        $toselect = '';
+        $search_array_options = array();
     }
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-        || GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+        || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
     {
-        $massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+        $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
     }
 
     // Mass actions
-    $objectclass='Inventory';
-    $objectlabel='Inventory';
+    $objectclass = 'Inventory';
+    $objectlabel = 'Inventory';
     $permtoread = $user->rights->inventory->read;
     $permtodelete = $user->rights->inventory->delete;
     $uploaddir = $conf->inventory->dir_output;
@@ -188,55 +188,55 @@ 
  * Put here all code to build page
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
-$now=dol_now();
+$now = dol_now();
 
 //$help_url="EN:Module_Inventory|FR:Module_Inventory_FR|ES:Módulo_Inventory";
-$help_url='';
+$help_url = '';
 $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Inventorys"));
 
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
-    $sql.='t.'.$key.', ';
+    $sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/, $/','', $sql);
-$sql.= " FROM ".MAIN_DB_PREFIX."inventory as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."inventory_extrafields as ef on (t.rowid = ef.fk_object)";
-$sql.= " WHERE t.entity IN (".getEntity('inventory').")";
-foreach($search as $key => $val)
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/, $/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."inventory as t";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."inventory_extrafields as ef on (t.rowid = ef.fk_object)";
+$sql .= " WHERE t.entity IN (".getEntity('inventory').")";
+foreach ($search as $key => $val)
 {
-    if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:($object->fields[$key]['type'] == 'integer'?1:0)));
+    if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : ($object->fields[$key]['type'] == 'integer' ? 1 : 0)));
 }
-if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double','real'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
+    $crit = $val;
+    $tmpkey = preg_replace('/search_options_/', '', $key);
+    $typ = $extrafields->attribute_type[$tmpkey];
+    $mode = 0;
+    if (in_array($typ, array('int', 'double', 'real'))) $mode = 1; // Search on a numeric
+    if ($val && (($crit != '' && !in_array($typ, array('select'))) || !empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
 }
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.=$db->order($sortfield,$sortorder);
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -246,11 +246,11 @@ 
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if (! $resql)
+$resql = $db->query($sql);
+if (!$resql)
 {
     dol_print_error($db);
     exit;
@@ -259,7 +259,7 @@ 
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
     $obj = $db->fetch_object($resql);
     $id = $obj->rowid;
@@ -288,31 +288,31 @@ 
 });
 </script>';
 
-$arrayofselected=is_array($toselect)?$toselect:array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-foreach($search as $key => $val)
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+foreach ($search as $key => $val)
 {
-    $param.= '&search_'.$key.'='.urlencode($search[$key]);
+    $param .= '&search_'.$key.'='.urlencode($search[$key]);
 }
-if ($optioncss != '')     $param.='&optioncss='.$optioncss;
+if ($optioncss != '')     $param .= '&optioncss='.$optioncss;
 // Add $param from extra fields
 foreach ($search_array_options as $key => $val)
 {
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+    $crit = $val;
+    $tmpkey = preg_replace('/search_options_/', '', $key);
+    if ($val != '') $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
 }
 
-$arrayofmassactions =  array(
+$arrayofmassactions = array(
     'presend'=>$langs->trans("SendByMail"),
     'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->inventory->delete) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+if ($user->rights->inventory->delete) $arrayofmassactions['delete'] = $langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -328,85 +328,85 @@ 
 
 if ($sall)
 {
-    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
+    foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+    print $langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall);
 }
 
 $moreforfilter = '';
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
-$moreforfilter.= '</div>';
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('MyFilter').': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter .= '</div>';
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
 
-if (! empty($moreforfilter))
+if (!empty($moreforfilter))
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
     print '</div>';
 }
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
     if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+    $align = '';
+    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
+    if (in_array($val['type'], array('timestamp'))) $align .= ' nowrap';
+    if (!empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align ? ' '.$align : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val)
+    foreach ($extrafields->attribute_label as $key => $val)
     {
-        if (! empty($arrayfields["ef.".$key]['checked']))
+        if (!empty($arrayfields["ef.".$key]['checked']))
         {
-            $align=$extrafields->getAlignFlag($key);
-            $typeofextrafield=$extrafields->attribute_type[$key];
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+            $align = $extrafields->getAlignFlag($key);
+            $typeofextrafield = $extrafields->attribute_type[$key];
+            print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
             if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
             {
-                $crit=$val;
-                $tmpkey=preg_replace('/search_options_/','',$key);
-                $searchclass='';
-                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+                $crit = $val;
+                $tmpkey = preg_replace('/search_options_/', '', $key);
+                $searchclass = '';
+                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass = 'searchstring';
+                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';
+                print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
             }
             print '</td>';
         }
     }
 }
 // Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Rest of fields search
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
-    if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+    if (!in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+    $align = '';
+    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
+    if (in_array($val['type'], array('timestamp'))) $align .= ' nowrap';
+    if (!empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align ? ' '.$align : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterButtons();
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
@@ -415,57 +415,57 @@ 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
     if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+    $align = '';
+    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
+    if (in_array($val['type'], array('timestamp'))) $align .= 'nowrap';
+    if (!empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
 }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val)
+   foreach ($extrafields->attribute_label as $key => $val)
    {
-       if (! empty($arrayfields["ef.".$key]['checked']))
+       if (!empty($arrayfields["ef.".$key]['checked']))
        {
-			$align=$extrafields->getAlignFlag($key);
+			$align = $extrafields->getAlignFlag($key);
 			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-			print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
+			if (!empty($extrafields->attribute_computed[$key])) $sortonfield = '';
+			print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'"' : ''), $sortfield, $sortorder)."\n";
        }
    }
 }
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Rest of fields title
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
-    if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-    $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+    if (!in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+    $align = '';
+    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
+    if (in_array($val['type'], array('timestamp'))) $align .= ' nowrap';
+    if (!empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
 }
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
-$needToFetchEachLine=0;
+$needToFetchEachLine = 0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+    if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
 }
 
 
 // Loop on record
 // --------------------------------------------------------------------
-$i=0;
-$totalarray=array();
+$i = 0;
+$totalarray = array();
 while ($i < min($num, $limit))
 {
     $obj = $db->fetch_object($resql);
@@ -473,32 +473,32 @@ 
     {
     	// Store properties in $object
     	$object->id = $obj->rowid;
-    	foreach($object->fields as $key => $val)
+    	foreach ($object->fields as $key => $val)
     	{
     		if (isset($obj->$key)) $object->$key = $obj->$key;
     	}
 
         // Show here line of result
         print '<tr class="oddeven">';
-        foreach($object->fields as $key => $val)
+        foreach ($object->fields as $key => $val)
         {
             if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-            $align='';
-            if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-            if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-            if ($key == 'status') $align.=($align?' ':'').'center';
-            if (! empty($arrayfields['t.'.$key]['checked']))
+            $align = '';
+            if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
+            if (in_array($val['type'], array('timestamp'))) $align .= 'nowrap';
+            if ($key == 'status') $align .= ($align ? ' ' : '').'center';
+            if (!empty($arrayfields['t.'.$key]['checked']))
             {
-                print '<td'.($align?' class="'.$align.'"':'').'>';
-                if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
+                print '<td'.($align ? ' class="'.$align.'"' : '').'>';
+                if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
                 elseif ($key == 'ref') print $object->getNomUrl(1);
                 elseif ($key == 'status') print $object->getLibStatut(3);
                 else print $obj->$key;
                 print '</td>';
-                if (! $i) $totalarray['nbfield']++;
-                if (! empty($val['isameasure']))
+                if (!$i) $totalarray['nbfield']++;
+                if (!empty($val['isameasure']))
                 {
-                	if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+                	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
                 	$totalarray['val']['t.'.$key] += $obj->$key;
                 }
             }
@@ -506,49 +506,49 @@ 
     	// Extra fields
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{
-		   foreach($extrafields->attribute_label as $key => $val)
+		   foreach ($extrafields->attribute_label as $key => $val)
 		   {
-				if (! empty($arrayfields["ef.".$key]['checked']))
+				if (!empty($arrayfields["ef.".$key]['checked']))
 				{
 					print '<td';
-					$align=$extrafields->getAlignFlag($key);
+					$align = $extrafields->getAlignFlag($key);
 					if ($align) print ' align="'.$align.'"';
 					print '>';
-					$tmpkey='options_'.$key;
+					$tmpkey = 'options_'.$key;
 					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 					print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
-		            if (! empty($val['isameasure']))
+		            if (!$i) $totalarray['nbfield']++;
+		            if (!empty($val['isameasure']))
 		            {
-		            	if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+		            	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'ef.'.$tmpkey;
 		            	$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
 		            }
 				}
 		   }
 		}
         // Fields from hook
-	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+	    $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
         // Rest of fields
-        foreach($object->fields as $key => $val)
+        foreach ($object->fields as $key => $val)
         {
-            if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
-            $align='';
-            if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-            if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-            if ($key == 'status') $align.=($align?' ':'').'center';
-            if (! empty($arrayfields['t.'.$key]['checked']))
+            if (!in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+            $align = '';
+            if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
+            if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
+            if ($key == 'status') $align .= ($align ? ' ' : '').'center';
+            if (!empty($arrayfields['t.'.$key]['checked']))
             {
-                print '<td'.($align?' class="'.$align.'"':'').'>';
-                if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
+                print '<td'.($align ? ' class="'.$align.'"' : '').'>';
+                if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
                 elseif ($key == 'status') print $object->getLibStatut(3);
                 else print $obj->$key;
                 print '</td>';
-                if (! $i) $totalarray['nbfield']++;
-                if (! empty($val['isameasure']))
+                if (!$i) $totalarray['nbfield']++;
+                if (!empty($val['isameasure']))
                 {
-	                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+	                if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 	               	$totalarray['val']['t.'.$key] += $obj->$key;
                 }
             }
@@ -557,12 +557,12 @@ 
         print '<td class="nowrap" align="center">';
 	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
-	        $selected=0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+	        $selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
         }
 	    print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 
         print '</tr>';
     }
@@ -573,11 +573,11 @@ 
 if (isset($totalarray['pos']))
 {
     print '<tr class="liste_total">';
-    $i=0;
+    $i = 0;
     while ($i < $totalarray['nbfield'])
     {
         $i++;
-        if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+        if (!empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
         else
         {
             if ($i == 1)
@@ -594,16 +594,16 @@ 
 // If no record found
 if ($num == 0)
 {
-    $colspan=1;
-    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+    $colspan = 1;
+    foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
     print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
 $db->free($resql);
 
-$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
@@ -619,14 +619,14 @@ 
         $formfile = new FormFile($db);
 
         // Show list of available documents
-        $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-        $urlsource.=str_replace('&amp;','&',$param);
+        $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+        $urlsource .= str_replace('&amp;', '&', $param);
 
-        $filedir=$diroutputmassaction;
-        $genallowed=$user->rights->inventory->read;
-        $delallowed=$user->rights->inventory->read;
+        $filedir = $diroutputmassaction;
+        $genallowed = $user->rights->inventory->read;
+        $delallowed = $user->rights->inventory->read;
 
-        print $formfile->showdocuments('massfilesarea_inventory','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+        print $formfile->showdocuments('massfilesarea_inventory', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '');
     }
     else
     {

Braces +243 added lines, -90 removed lines

@@ -40,17 +40,31 @@ 
 // Load Dolibarr environment
 $res=0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+}
 // Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
 $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
 while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
-if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) {
+	$res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
+}
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) {
+	$res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
+}
 // Try main.inc.php using relative path
-if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php");
-if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
-if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
-if (! $res) die("Include of main fails");
+if (! $res && file_exists("../main.inc.php")) {
+	$res=@include("../main.inc.php");
+}
+if (! $res && file_exists("../../main.inc.php")) {
+	$res=@include("../../main.inc.php");
+}
+if (! $res && file_exists("../../../main.inc.php")) {
+	$res=@include("../../../main.inc.php");
+}
+if (! $res) {
+	die("Include of main fails");
+}
 
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -92,8 +106,13 @@ 
 $search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (! $sortfield) $sortfield="t.".key($object->fields);   // Set here default search field. By default 1st field in definition.
-if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) {
+	$sortfield="t.".key($object->fields);
+}
+// Set here default search field. By default 1st field in definition.
+if (! $sortorder) {
+	$sortorder="ASC";
+}
 
 // Protection if external user
 $socid=0;
@@ -108,23 +127,29 @@ 
 $search=array();
 foreach($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
-}
+    if (GETPOST('search_'.$key,'alpha')) {
+    	$search[$key]=GETPOST('search_'.$key,'alpha');
+    }
+    }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach($object->fields as $key => $val)
 {
-    if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
-}
+    if ($val['searchall']) {
+    	$fieldstosearchall['t.'.$key]=$val['label'];
+    }
+    }
 
 // Definition of fields for list
 $arrayfields=array();
 foreach($object->fields as $key => $val)
 {
 	// If $val['visible']==0, then we never show the field
-    if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
-}
+    if (! empty($val['visible'])) {
+    	$arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
+    }
+    }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
@@ -148,7 +173,9 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -156,11 +183,13 @@ 
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) {
+    	// All tests are required to be compatible with all browsers
     {
         foreach($object->fields as $key => $val)
         {
             $search[$key]='';
+    }
         }
         $toselect='';
         $search_array_options=array();
@@ -205,20 +234,28 @@ 
     $sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) {
+	$sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+}
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/, $/','', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX."inventory as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."inventory_extrafields as ef on (t.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."inventory_extrafields as ef on (t.rowid = ef.fk_object)";
+}
 $sql.= " WHERE t.entity IN (".getEntity('inventory').")";
 foreach($search as $key => $val)
 {
-    if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:($object->fields[$key]['type'] == 'integer'?1:0)));
+    if ($search[$key] != '') {
+    	$sql.=natural_search($key, $search[$key], (($key == 'status')?2:($object->fields[$key]['type'] == 'integer'?1:0)));
+    }
+    }
+if ($search_all) {
+	$sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
@@ -226,7 +263,10 @@ 
     $tmpkey=preg_replace('/search_options_/','',$key);
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
-    if (in_array($typ, array('int','double','real'))) $mode=1;    // Search on a numeric
+    if (in_array($typ, array('int','double','real'))) {
+    	$mode=1;
+    }
+    // Search on a numeric
     if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
@@ -291,31 +331,45 @@ 
 $arrayofselected=is_array($toselect)?$toselect:array();
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param.='&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param.='&limit='.$limit;
+}
 foreach($search as $key => $val)
 {
     $param.= '&search_'.$key.'='.urlencode($search[$key]);
 }
-if ($optioncss != '')     $param.='&optioncss='.$optioncss;
+if ($optioncss != '') {
+	$param.='&optioncss='.$optioncss;
+}
 // Add $param from extra fields
 foreach ($search_array_options as $key => $val)
 {
     $crit=$val;
     $tmpkey=preg_replace('/search_options_/','',$key);
-    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-}
+    if ($val != '') {
+    	$param.='&search_options_'.$tmpkey.'='.urlencode($val);
+    }
+    }
 
 $arrayofmassactions =  array(
     'presend'=>$langs->trans("SendByMail"),
     'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->inventory->delete) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
+if ($user->rights->inventory->delete) {
+	$arrayofmassactions['delete']=$langs->trans("Delete");
+}
+if ($massaction == 'presend') {
+	$arrayofmassactions=array();
+}
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -328,7 +382,9 @@ 
 
 if ($sall)
 {
-    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    foreach($fieldstosearchall as $key => $val) {
+    	$fieldstosearchall[$key]=$langs->trans($val);
+    }
     print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
 }
 
@@ -339,8 +395,11 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
 
 if (! empty($moreforfilter))
 {
@@ -362,12 +421,20 @@ 
 print '<tr class="liste_titre">';
 foreach($object->fields as $key => $val)
 {
-    if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+    if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) {
+    	continue;
+    }
     $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
-}
+    if (in_array($val['type'], array('date','datetime','timestamp'))) {
+    	$align='center';
+    }
+    if (in_array($val['type'], array('timestamp'))) {
+    	$align.=' nowrap';
+    }
+    if (! empty($arrayfields['t.'.$key]['checked'])) {
+    	print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+    }
+    }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
@@ -383,8 +450,12 @@ 
                 $crit=$val;
                 $tmpkey=preg_replace('/search_options_/','',$key);
                 $searchclass='';
-                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+                if (in_array($typeofextrafield, array('varchar', 'select'))) {
+                	$searchclass='searchstring';
+                }
+                if (in_array($typeofextrafield, array('int', 'double'))) {
+                	$searchclass='searchnum';
+                }
                 print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
             }
             print '</td>';
@@ -398,12 +469,20 @@ 
 // Rest of fields search
 foreach($object->fields as $key => $val)
 {
-    if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+    if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) {
+    	continue;
+    }
     $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
-}
+    if (in_array($val['type'], array('date','datetime','timestamp'))) {
+    	$align='center';
+    }
+    if (in_array($val['type'], array('timestamp'))) {
+    	$align.=' nowrap';
+    }
+    if (! empty($arrayfields['t.'.$key]['checked'])) {
+    	print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+    }
+    }
 // Action column
 print '<td class="liste_titre" align="right">';
 $searchpicto=$form->showFilterButtons();
@@ -417,12 +496,20 @@ 
 print '<tr class="liste_titre">';
 foreach($object->fields as $key => $val)
 {
-    if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+    if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) {
+    	continue;
+    }
     $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
-}
+    if (in_array($val['type'], array('date','datetime','timestamp'))) {
+    	$align='center';
+    }
+    if (in_array($val['type'], array('timestamp'))) {
+    	$align.='nowrap';
+    }
+    if (! empty($arrayfields['t.'.$key]['checked'])) {
+    	print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+    }
+    }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
@@ -432,7 +519,9 @@ 
        {
 			$align=$extrafields->getAlignFlag($key);
 			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			if (! empty($extrafields->attribute_computed[$key])) {
+				$sortonfield='';
+			}
 			print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
        }
    }
@@ -444,12 +533,20 @@ 
 // Rest of fields title
 foreach($object->fields as $key => $val)
 {
-    if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+    if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) {
+    	continue;
+    }
     $align='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
-}
+    if (in_array($val['type'], array('date','datetime','timestamp'))) {
+    	$align='center';
+    }
+    if (in_array($val['type'], array('timestamp'))) {
+    	$align.=' nowrap';
+    }
+    if (! empty($arrayfields['t.'.$key]['checked'])) {
+    	print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+    }
+    }
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
 print '</tr>'."\n";
 
@@ -458,7 +555,10 @@ 
 $needToFetchEachLine=0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+    if (preg_match('/\$object/',$val)) {
+    	$needToFetchEachLine++;
+    }
+    // There is at least one compute field that use $object
 }
 
 
@@ -475,30 +575,49 @@ 
     	$object->id = $obj->rowid;
     	foreach($object->fields as $key => $val)
     	{
-    		if (isset($obj->$key)) $object->$key = $obj->$key;
+    		if (isset($obj->$key)) {
+    			$object->$key = $obj->$key;
+    		}
     	}
 
         // Show here line of result
         print '<tr class="oddeven">';
         foreach($object->fields as $key => $val)
         {
-            if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+            if (in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) {
+            	continue;
+            }
             $align='';
-            if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-            if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-            if ($key == 'status') $align.=($align?' ':'').'center';
+            if (in_array($val['type'], array('date','datetime','timestamp'))) {
+            	$align='center';
+            }
+            if (in_array($val['type'], array('timestamp'))) {
+            	$align.='nowrap';
+            }
+            if ($key == 'status') {
+            	$align.=($align?' ':'').'center';
+            }
             if (! empty($arrayfields['t.'.$key]['checked']))
             {
                 print '<td'.($align?' class="'.$align.'"':'').'>';
-                if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
-                elseif ($key == 'ref') print $object->getNomUrl(1);
-                elseif ($key == 'status') print $object->getLibStatut(3);
-                else print $obj->$key;
+                if (in_array($val['type'], array('date','datetime','timestamp'))) {
+                	print dol_print_date($db->jdate($obj->$key), 'dayhour');
+                } elseif ($key == 'ref') {
+                	print $object->getNomUrl(1);
+                } elseif ($key == 'status') {
+                	print $object->getLibStatut(3);
+                } else {
+                	print $obj->$key;
+                }
                 print '</td>';
-                if (! $i) $totalarray['nbfield']++;
+                if (! $i) {
+                	$totalarray['nbfield']++;
+                }
                 if (! empty($val['isameasure']))
                 {
-                	if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+                	if (! $i) {
+                		$totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+                	}
                 	$totalarray['val']['t.'.$key] += $obj->$key;
                 }
             }
@@ -512,15 +631,21 @@ 
 				{
 					print '<td';
 					$align=$extrafields->getAlignFlag($key);
-					if ($align) print ' align="'.$align.'"';
+					if ($align) {
+						print ' align="'.$align.'"';
+					}
 					print '>';
 					$tmpkey='options_'.$key;
 					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 					print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
+		            if (! $i) {
+		            	$totalarray['nbfield']++;
+		            }
 		            if (! empty($val['isameasure']))
 		            {
-		            	if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+		            	if (! $i) {
+		            		$totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+		            	}
 		            	$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
 		            }
 				}
@@ -533,36 +658,58 @@ 
         // Rest of fields
         foreach($object->fields as $key => $val)
         {
-            if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) continue;
+            if (! in_array($key, array('date_creation', 'tms', 'import_key', 'status'))) {
+            	continue;
+            }
             $align='';
-            if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-            if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-            if ($key == 'status') $align.=($align?' ':'').'center';
+            if (in_array($val['type'], array('date','datetime','timestamp'))) {
+            	$align.=($align?' ':'').'center';
+            }
+            if (in_array($val['type'], array('timestamp'))) {
+            	$align.=($align?' ':'').'nowrap';
+            }
+            if ($key == 'status') {
+            	$align.=($align?' ':'').'center';
+            }
             if (! empty($arrayfields['t.'.$key]['checked']))
             {
                 print '<td'.($align?' class="'.$align.'"':'').'>';
-                if (in_array($val['type'], array('date','datetime','timestamp'))) print dol_print_date($db->jdate($obj->$key), 'dayhour');
-                elseif ($key == 'status') print $object->getLibStatut(3);
-                else print $obj->$key;
+                if (in_array($val['type'], array('date','datetime','timestamp'))) {
+                	print dol_print_date($db->jdate($obj->$key), 'dayhour');
+                } elseif ($key == 'status') {
+                	print $object->getLibStatut(3);
+                } else {
+                	print $obj->$key;
+                }
                 print '</td>';
-                if (! $i) $totalarray['nbfield']++;
+                if (! $i) {
+                	$totalarray['nbfield']++;
+                }
                 if (! empty($val['isameasure']))
                 {
-	                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+	                if (! $i) {
+	                	$totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+	                }
 	               	$totalarray['val']['t.'.$key] += $obj->$key;
                 }
             }
         }
         // Action column
         print '<td class="nowrap" align="center">';
-	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	    if ($massactionbutton || $massaction) {
+	    	// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
 	        $selected=0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+	    }
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected=1;
+			}
 			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
         }
 	    print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+        	$totalarray['nbfield']++;
+        }
 
         print '</tr>';
     }
@@ -577,13 +724,17 @@ 
     while ($i < $totalarray['nbfield'])
     {
         $i++;
-        if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-        else
+        if (! empty($totalarray['pos'][$i])) {
+        	print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+        } else
         {
             if ($i == 1)
 	        {
-	            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-	            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+	            if ($num < $limit) {
+	            	print '<td align="left">'.$langs->trans("Total").'</td>';
+	            } else {
+	            	print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+	            }
 	        }
         	print '<td></td>';
         }
@@ -595,7 +746,10 @@ 
 if ($num == 0)
 {
     $colspan=1;
-    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) {
+    	$colspan++;
+    }
+    }
     print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
@@ -627,8 +781,7 @@ 
         $delallowed=$user->rights->inventory->read;
 
         print $formfile->showdocuments('massfilesarea_inventory','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-    }
-    else
+    } else
     {
         print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
     }

htdocs/product/inventory/card.php

Indentation +79 added lines, -79 removed lines

@@ -78,7 +78,7 @@ 
 $search=array();
 foreach($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
 }
 
 if (empty($action) && empty($id) && empty($ref)) $action='view';
@@ -127,17 +127,17 @@ 
 	// Action to add record
 	if ($action == 'add' && ! empty($user->rights->inventory->create))
 	{
-        foreach ($object->fields as $key => $val)
-        {
-            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;	// Ignore special fields
-
-            $object->$key=GETPOST($key,'alpha');
-            if ($val['notnull'] && $object->$key == '')
-            {
-                $error++;
-                setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
-            }
-        }
+		foreach ($object->fields as $key => $val)
+		{
+			if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;	// Ignore special fields
+
+			$object->$key=GETPOST($key,'alpha');
+			if ($val['notnull'] && $object->$key == '')
+			{
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			}
+		}
 
 		if (! $error)
 		{
@@ -166,16 +166,16 @@ 
 	// Action to update record
 	if ($action == 'update' && ! empty($user->rights->inventory->create))
 	{
-	    foreach ($object->fields as $key => $val)
-        {
-            $object->$key=GETPOST($key,'alpha');
-            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;
-            if ($val['notnull'] && $object->$key == '')
-            {
-                $error++;
-                setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
-            }
-        }
+		foreach ($object->fields as $key => $val)
+		{
+			$object->$key=GETPOST($key,'alpha');
+			if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;
+			if ($val['notnull'] && $object->$key == '')
+			{
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			}
+		}
 
 		if (! $error)
 		{
@@ -261,12 +261,12 @@ 
 	print '<table class="border centpercent">'."\n";
 	foreach($object->fields as $key => $val)
 	{
-	    if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;
-    	print '<tr><td';
-    	print ' class="titlefieldcreate';
-    	if ($val['notnull']) print ' fieldrequired';
-    	print '"';
-    	print '>'.$langs->trans($val['label']).'</td><td><input class="flat" type="text" name="'.$key.'" value="'.(GETPOST($key,'alpha')?GETPOST($key,'alpha'):'').'"></td></tr>';
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;
+		print '<tr><td';
+		print ' class="titlefieldcreate';
+		if ($val['notnull']) print ' fieldrequired';
+		print '"';
+		print '>'.$langs->trans($val['label']).'</td><td><input class="flat" type="text" name="'.$key.'" value="'.(GETPOST($key,'alpha')?GETPOST($key,'alpha'):'').'"></td></tr>';
 	}
 	print '</table>'."\n";
 
@@ -310,7 +310,7 @@ 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-    $res = $object->fetch_optionals($object->id, $extralabels);
+	$res = $object->fetch_optionals($object->id, $extralabels);
 
 	$head = inventory_prepare_head($object);
 	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
@@ -319,28 +319,28 @@ 
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Confirmation of action xxxx
 	if ($action == 'xxx')
 	{
-	    $formquestion=array();
-	    /*
+		$formquestion=array();
+		/*
 	        $formquestion = array(
 	            // 'text' => $langs->trans("ConfirmClone"),
 	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
 	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
 	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
 	    }*/
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
 
 	if (! $formconfirm) {
-	    $parameters = array('lineid' => $lineid);
-	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+		$parameters = array('lineid' => $lineid);
+		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+		elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
 	}
 
 	// Print form confirm
@@ -434,69 +434,69 @@ 
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters=array();
-    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-    	if (empty($reshook))
-    	{
-    	    // Send
-            print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'."\n";
-
-    		if ($user->rights->inventory->write)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-    		}
-
-    		if ($user->rights->inventory->delete)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+		print '<div class="tabsAction">'."\n";
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+		if (empty($reshook))
+		{
+			// Send
+			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'."\n";
+
+			if ($user->rights->inventory->write)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+			}
+
+			if ($user->rights->inventory->delete)
+			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
 	// Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
-	    $action = 'presend';
+		$action = 'presend';
 	}
 
 	if ($action != 'presend')
 	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
-	    // Documents
-	    $comref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref . '/' . $comref . '.pdf';
-	    $filedir = $conf->inventory->dir_output . '/' . $comref;
-	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-	    $genallowed = $user->rights->inventory->creer;
-	    $delallowed = $user->rights->inventory->supprimer;
-	    print $formfile->showdocuments('inventory', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+		// Documents
+		$comref = dol_sanitizeFileName($object->ref);
+		$relativepath = $comref . '/' . $comref . '.pdf';
+		$filedir = $conf->inventory->dir_output . '/' . $comref;
+		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+		$genallowed = $user->rights->inventory->creer;
+		$delallowed = $user->rights->inventory->supprimer;
+		print $formfile->showdocuments('inventory', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
 
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'order', $socid);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'order', $socid);
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 
 	/*
 	 * Action presend
 	 */
-    /*
+	/*
 	if ($action == 'presend')
 	{
 		$object->fetch_projet();

Spacing +73 added lines, -73 removed lines

@@ -38,50 +38,50 @@ 
 //if (! defined("NOLOGIN"))                define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
 // Load Dolibarr environment
-$res=0;
+$res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
 // Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
-$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
-while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
-if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include(substr($tmp, 0, ($i + 1))."/main.inc.php");
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php");
 // Try main.inc.php using relative path
-if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php");
-if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
-if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
-if (! $res) die("Include of main fails");
+if (!$res && file_exists("../main.inc.php")) $res = @include("../main.inc.php");
+if (!$res && file_exists("../../main.inc.php")) $res = @include("../../main.inc.php");
+if (!$res && file_exists("../../../main.inc.php")) $res = @include("../../../main.inc.php");
+if (!$res) die("Include of main fails");
 
 include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 dol_include_once('/inventory/class/inventory.class.php');
 
 // Load traductions files requiredby by page
-$langs->loadLangs(array("inventory","other"));
+$langs->loadLangs(array("inventory", "other"));
 
 // Get parameters
-$id			= GETPOST('id', 'int');
-$action		= GETPOST('action', 'alpha');
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
-$object=new Inventory($db);
+$object = new Inventory($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction=$conf->inventory->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('inventorycard'));     // Note that conf->hooks_modules contains array
+$diroutputmassaction = $conf->inventory->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('inventorycard')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('inventory');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($extralabels, '', 'search_');
 
 // Initialize array of search criterias
-$search_all=trim(GETPOST("search_all",'alpha'));
-$search=array();
-foreach($object->fields as $key => $val)
+$search_all = trim(GETPOST("search_all", 'alpha'));
+$search = array();
+foreach ($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
-if (empty($action) && empty($id) && empty($ref)) $action='view';
+if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 
 // Protection if external user
 if ($user->societe_id > 0)
@@ -94,7 +94,7 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 
 
@@ -104,114 +104,114 @@ 
  * Put here all code to do according to value of "action" parameter
  */
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
-	$error=0;
+	$error = 0;
 
 	if ($cancel)
 	{
 		if ($action != 'addlink')
 		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/inventory/inventory_list.php',1);
+			$urltogo = $backtopage ? $backtopage : dol_buildpath('/inventory/inventory_list.php', 1);
 			header("Location: ".$urltogo);
 			exit;
 		}
-		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
-		$action='';
+		if ($id > 0 || !empty($ref)) $ret = $object->fetch($id, $ref);
+		$action = '';
 	}
 
 	// Action to add record
-	if ($action == 'add' && ! empty($user->rights->inventory->create))
+	if ($action == 'add' && !empty($user->rights->inventory->create))
 	{
         foreach ($object->fields as $key => $val)
         {
-            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;	// Ignore special fields
+            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue; // Ignore special fields
 
-            $object->$key=GETPOST($key,'alpha');
+            $object->$key = GETPOST($key, 'alpha');
             if ($val['notnull'] && $object->$key == '')
             {
                 $error++;
-                setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
             }
         }
 
-		if (! $error)
+		if (!$error)
 		{
-			$result=$object->createCommon($user);
+			$result = $object->createCommon($user);
 			if ($result > 0)
 			{
 				// Creation OK
-				$urltogo=$backtopage?$backtopage:dol_buildpath('/inventory/inventory_list.php',1);
+				$urltogo = $backtopage ? $backtopage : dol_buildpath('/inventory/inventory_list.php', 1);
 				header("Location: ".$urltogo);
 				exit;
 			}
 			else
 			{
 				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else  setEventMessages($object->error, null, 'errors');
-				$action='create';
+				$action = 'create';
 			}
 		}
 		else
 		{
-			$action='create';
+			$action = 'create';
 		}
 	}
 
 	// Action to update record
-	if ($action == 'update' && ! empty($user->rights->inventory->create))
+	if ($action == 'update' && !empty($user->rights->inventory->create))
 	{
 	    foreach ($object->fields as $key => $val)
         {
-            $object->$key=GETPOST($key,'alpha');
+            $object->$key = GETPOST($key, 'alpha');
             if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;
             if ($val['notnull'] && $object->$key == '')
             {
                 $error++;
-                setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
             }
         }
 
-		if (! $error)
+		if (!$error)
 		{
-			$result=$object->updateCommon($user);
+			$result = $object->updateCommon($user);
 			if ($result > 0)
 			{
-				$action='view';
+				$action = 'view';
 			}
 			else
 			{
 				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else setEventMessages($object->error, null, 'errors');
-				$action='edit';
+				$action = 'edit';
 			}
 		}
 		else
 		{
-			$action='edit';
+			$action = 'edit';
 		}
 	}
 
 	// Action to delete
-	if ($action == 'confirm_delete' && ! empty($user->rights->inventory->delete))
+	if ($action == 'confirm_delete' && !empty($user->rights->inventory->delete))
 	{
-		$result=$object->deleteCommon($user);
+		$result = $object->deleteCommon($user);
 		if ($result > 0)
 		{
 			// Delete OK
 			setEventMessages("RecordDeleted", null, 'mesgs');
-			header("Location: ".dol_buildpath('/inventory/inventory_list.php',1));
+			header("Location: ".dol_buildpath('/inventory/inventory_list.php', 1));
 			exit;
 		}
 		else
 		{
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else setEventMessages($object->error, null, 'errors');
 		}
 	}
@@ -226,9 +226,9 @@ 
  * Put here all code to build page
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
-llxHeader('','Inventory','');
+llxHeader('', 'Inventory', '');
 
 // Example : Adding jquery code
 print '<script type="text/javascript" language="javascript">
@@ -259,14 +259,14 @@ 
 	dol_fiche_head(array(), '');
 
 	print '<table class="border centpercent">'."\n";
-	foreach($object->fields as $key => $val)
+	foreach ($object->fields as $key => $val)
 	{
 	    if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;
     	print '<tr><td';
     	print ' class="titlefieldcreate';
     	if ($val['notnull']) print ' fieldrequired';
     	print '"';
-    	print '>'.$langs->trans($val['label']).'</td><td><input class="flat" type="text" name="'.$key.'" value="'.(GETPOST($key,'alpha')?GETPOST($key,'alpha'):'').'"></td></tr>';
+    	print '>'.$langs->trans($val['label']).'</td><td><input class="flat" type="text" name="'.$key.'" value="'.(GETPOST($key, 'alpha') ? GETPOST($key, 'alpha') : '').'"></td></tr>';
 	}
 	print '</table>'."\n";
 
@@ -319,13 +319,13 @@ 
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Confirmation of action xxxx
 	if ($action == 'xxx')
 	{
-	    $formquestion=array();
+	    $formquestion = array();
 	    /*
 	        $formquestion = array(
 	            // 'text' => $langs->trans("ConfirmClone"),
@@ -333,14 +333,14 @@ 
 	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
 	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
 	    }*/
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
 
-	if (! $formconfirm) {
+	if (!$formconfirm) {
 	    $parameters = array('lineid' => $lineid);
 	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+	    if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+	    elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
 	}
 
 	// Print form confirm
@@ -351,10 +351,10 @@ 
 	// Object card
 	// ------------------------------------------------------------
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/inventory/inventory_list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/inventory/inventory_list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-	$morehtmlref='<div class="refidno">';
+	$morehtmlref = '<div class="refidno">';
 	/*
 	// Ref bis
 	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->inventory->creer, 'string', '', 0, 1);
@@ -396,7 +396,7 @@ 
 	    }
 	}
 	*/
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -411,7 +411,7 @@ 
 
 
 	// Other attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 	print '</div>';
@@ -435,14 +435,14 @@ 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
     	print '<div class="tabsAction">'."\n";
-    	$parameters=array();
-    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    	$parameters = array();
+    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
     	if (empty($reshook))
     	{
     	    // Send
-            print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'."\n";
+            print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a></div>'."\n";
 
     		if ($user->rights->inventory->write)
     		{
@@ -469,9 +469,9 @@ 
 	    print '<a name="builddoc"></a>'; // ancre
 	    // Documents
 	    $comref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref . '/' . $comref . '.pdf';
-	    $filedir = $conf->inventory->dir_output . '/' . $comref;
-	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+	    $relativepath = $comref.'/'.$comref.'.pdf';
+	    $filedir = $conf->inventory->dir_output.'/'.$comref;
+	    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 	    $genallowed = $user->rights->inventory->creer;
 	    $delallowed = $user->rights->inventory->supprimer;
 	    print $formfile->showdocuments('inventory', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
@@ -485,7 +485,7 @@ 
 	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 	    $formactions = new FormActions($db);
 	    $somethingshown = $formactions->showactions($object, 'order', $socid);
 

Braces +75 added lines, -35 removed lines

@@ -40,17 +40,31 @@ 
 // Load Dolibarr environment
 $res=0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+}
 // Try main.inc.php into web root detected using web root caluclated from SCRIPT_FILENAME
 $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
 while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
-if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) {
+	$res=@include(substr($tmp, 0, ($i+1))."/main.inc.php");
+}
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) {
+	$res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php");
+}
 // Try main.inc.php using relative path
-if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php");
-if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
-if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
-if (! $res) die("Include of main fails");
+if (! $res && file_exists("../main.inc.php")) {
+	$res=@include("../main.inc.php");
+}
+if (! $res && file_exists("../../main.inc.php")) {
+	$res=@include("../../main.inc.php");
+}
+if (! $res && file_exists("../../../main.inc.php")) {
+	$res=@include("../../../main.inc.php");
+}
+if (! $res) {
+	die("Include of main fails");
+}
 
 include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 dol_include_once('/inventory/class/inventory.class.php');
@@ -78,10 +92,14 @@ 
 $search=array();
 foreach($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
-}
+    if (GETPOST('search_'.$key,'alpha')) {
+    	$search[$key]=GETPOST('search_'.$key,'alpha');
+    }
+    }
 
-if (empty($action) && empty($id) && empty($ref)) $action='view';
+if (empty($action) && empty($id) && empty($ref)) {
+	$action='view';
+}
 
 // Protection if external user
 if ($user->societe_id > 0)
@@ -106,7 +124,9 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -120,7 +140,9 @@ 
 			header("Location: ".$urltogo);
 			exit;
 		}
-		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
+		if ($id > 0 || ! empty($ref)) {
+			$ret = $object->fetch($id,$ref);
+		}
 		$action='';
 	}
 
@@ -129,7 +151,10 @@ 
 	{
         foreach ($object->fields as $key => $val)
         {
-            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;	// Ignore special fields
+            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) {
+            	continue;
+            }
+            // Ignore special fields
 
             $object->$key=GETPOST($key,'alpha');
             if ($val['notnull'] && $object->$key == '')
@@ -148,16 +173,17 @@ 
 				$urltogo=$backtopage?$backtopage:dol_buildpath('/inventory/inventory_list.php',1);
 				header("Location: ".$urltogo);
 				exit;
-			}
-			else
+			} else
 			{
 				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else  setEventMessages($object->error, null, 'errors');
+				if (! empty($object->errors)) {
+					setEventMessages(null, $object->errors, 'errors');
+				} else {
+					setEventMessages($object->error, null, 'errors');
+				}
 				$action='create';
 			}
-		}
-		else
+		} else
 		{
 			$action='create';
 		}
@@ -169,7 +195,9 @@ 
 	    foreach ($object->fields as $key => $val)
         {
             $object->$key=GETPOST($key,'alpha');
-            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;
+            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) {
+            	continue;
+            }
             if ($val['notnull'] && $object->$key == '')
             {
                 $error++;
@@ -183,16 +211,17 @@ 
 			if ($result > 0)
 			{
 				$action='view';
-			}
-			else
+			} else
 			{
 				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else setEventMessages($object->error, null, 'errors');
+				if (! empty($object->errors)) {
+					setEventMessages(null, $object->errors, 'errors');
+				} else {
+					setEventMessages($object->error, null, 'errors');
+				}
 				$action='edit';
 			}
-		}
-		else
+		} else
 		{
 			$action='edit';
 		}
@@ -208,11 +237,13 @@ 
 			setEventMessages("RecordDeleted", null, 'mesgs');
 			header("Location: ".dol_buildpath('/inventory/inventory_list.php',1));
 			exit;
-		}
-		else
+		} else
 		{
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else setEventMessages($object->error, null, 'errors');
+			if (! empty($object->errors)) {
+				setEventMessages(null, $object->errors, 'errors');
+			} else {
+				setEventMessages($object->error, null, 'errors');
+			}
 		}
 	}
 }
@@ -261,10 +292,14 @@ 
 	print '<table class="border centpercent">'."\n";
 	foreach($object->fields as $key => $val)
 	{
-	    if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) continue;
+	    if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'import_key'))) {
+	    	continue;
+	    }
     	print '<tr><td';
     	print ' class="titlefieldcreate';
-    	if ($val['notnull']) print ' fieldrequired';
+    	if ($val['notnull']) {
+    		print ' fieldrequired';
+    	}
     	print '"';
     	print '>'.$langs->trans($val['label']).'</td><td><input class="flat" type="text" name="'.$key.'" value="'.(GETPOST($key,'alpha')?GETPOST($key,'alpha'):'').'"></td></tr>';
 	}
@@ -339,8 +374,11 @@ 
 	if (! $formconfirm) {
 	    $parameters = array('lineid' => $lineid);
 	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+	    if (empty($reshook)) {
+	    	$formconfirm.=$hookmanager->resPrint;
+	    } elseif ($reshook > 0) {
+	    	$formconfirm=$hookmanager->resPrint;
+	    }
 	}
 
 	// Print form confirm
@@ -437,7 +475,9 @@ 
     	print '<div class="tabsAction">'."\n";
     	$parameters=array();
     	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+    	if ($reshook < 0) {
+    		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+    	}
 
     	if (empty($reshook))
     	{

htdocs/product/inventory/class/inventory.class.php

Indentation +27 added lines, -27 removed lines

@@ -149,48 +149,48 @@
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	int  	$notooltip			1=Disable tooltip
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	int  	$notooltip			1=Disable tooltip
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='')
 	{
 		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        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 = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>' . $langs->trans("Inventory") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		$label = '<u>' . $langs->trans("Inventory") . '</u>';
+		$label.= '<br>';
+		$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
 
-        $url = $url = dol_buildpath('/inventory/m_card.php',1).'?id='.$this->id;
+		$url = $url = dol_buildpath('/inventory/m_card.php',1).'?id='.$this->id;
 
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowInventory");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-        }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+		$linkclose='';
+		if (empty($notooltip))
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowInventory");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+		}
+		else $linkclose = ($morecss?' class="'.$morecss.'"':'');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-        if ($withpicto)
-        {
-            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
+		if ($withpicto)
+		{
+			$result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
+			if ($withpicto != 2) $result.=' ';
 		}
 		$result.= $linkstart . $this->ref . $linkend;
 		return $result;

Spacing +34 added lines, -34 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -73,7 +73,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
 		'ref' => array('type'=>'varchar(64)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Reference of object',),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
@@ -153,46 +153,46 @@ 
      *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='')
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '')
 	{
 		global $db, $conf, $langs;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
-        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 = '';
         $companylink = '';
 
-        $label = '<u>' . $langs->trans("Inventory") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        $label = '<u>'.$langs->trans("Inventory").'</u>';
+        $label .= '<br>';
+        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = $url = dol_buildpath('/inventory/m_card.php',1).'?id='.$this->id;
+        $url = $url = dol_buildpath('/inventory/m_card.php', 1).'?id='.$this->id;
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowInventory");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowInventory");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
         }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
         if ($withpicto)
         {
-            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
+            $result .= ($linkstart.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
+            if ($withpicto != 2) $result .= ' ';
 		}
-		$result.= $linkstart . $this->ref . $linkend;
+		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
 	}
 
@@ -202,9 +202,9 @@ 
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string 			       Label of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
 	/**
@@ -214,13 +214,13 @@ 
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
 	 *  @return string 			       	Label of status
 	 */
-	static function LibStatut($status,$mode=0)
+	static function LibStatut($status, $mode = 0)
 	{
 		global $langs;
 
 		if ($mode == 0)
 		{
-			$prefix='';
+			$prefix = '';
 			if ($status == 1) return $langs->trans('Enabled');
 			if ($status == 0) return $langs->trans('Disabled');
 		}
@@ -231,28 +231,28 @@ 
 		}
 		if ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		if ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		if ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		if ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		if ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 	}
 

htdocs/fourn/facture/list.php

Indentation +653 added lines, -653 removed lines

@@ -61,7 +61,7 @@ 
 if ($user->societe_id > 0)
 {
 	$action='';
-    $_GET["action"] = '';
+	$_GET["action"] = '';
 	$socid = $user->societe_id;
 }
 
@@ -135,47 +135,47 @@ 
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'f.ref'=>'Ref',
-    'f.ref_supplier'=>'RefSupplier',
-    'pd.description'=>'Description',
-    's.nom'=>"ThirdParty",
-    'f.note_public'=>'NotePublic',
+	'f.ref'=>'Ref',
+	'f.ref_supplier'=>'RefSupplier',
+	'pd.description'=>'Description',
+	's.nom'=>"ThirdParty",
+	'f.note_public'=>'NotePublic',
 );
 if (empty($user->socid)) $fieldstosearchall["f.note_private"]="NotePrivate";
 
 $checkedtypetiers=0;
 $arrayfields=array(
-    'f.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'f.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
-    'f.label'=>array('label'=>$langs->trans("Label"), 'checked'=>0),
-    'f.datef'=>array('label'=>$langs->trans("DateInvoice"), 'checked'=>1),
-    'f.date_lim_reglement'=>array('label'=>$langs->trans("DateDue"), 'checked'=>1),
+	'f.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'f.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
+	'f.label'=>array('label'=>$langs->trans("Label"), 'checked'=>0),
+	'f.datef'=>array('label'=>$langs->trans("DateInvoice"), 'checked'=>1),
+	'f.date_lim_reglement'=>array('label'=>$langs->trans("DateDue"), 'checked'=>1),
 	'p.ref'=>array('label'=>$langs->trans("Project"), 'checked'=>0),
-    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-    's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
-    's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
-    'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-    'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-    'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-    'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
-    'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-    'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
-    'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj=="1"),
-    'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj=="1"),
-    'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
-    'dynamount_payed'=>array('label'=>$langs->trans("Payed"), 'checked'=>0),
-    'rtp'=>array('label'=>$langs->trans("Rest"), 'checked'=>0),
-    'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    'f.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
+	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
+	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
+	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
+	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
+	'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
+	'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
+	'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
+	'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj=="1"),
+	'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj=="1"),
+	'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+	'dynamount_payed'=>array('label'=>$langs->trans("Payed"), 'checked'=>0),
+	'rtp'=>array('label'=>$langs->trans("Rest"), 'checked'=>0),
+	'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+	'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+	'f.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
-    }
+	foreach($extrafields->attribute_label as $key => $val)
+	{
+		$arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+	}
 }
 
 
@@ -192,55 +192,55 @@ 
 
 if (empty($reshook))
 {
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha') || GETPOST('button_removefilter.x','alpha'))		// All tests must be present to be compatible with all browsers
-    {
-        $search_all="";
-        $search_user='';
-        $search_sale='';
-        $search_product_category='';
-        $search_ref="";
-        $search_refsupplier="";
-        $search_label="";
-        $search_project='';
-        $search_societe="";
-        $search_company="";
-        $search_amount_no_tax="";
-        $search_amount_all_tax="";
-        $search_montant_ht='';
-        $search_montant_vat='';
-        $search_montant_localtax1='';
-        $search_montant_localtax2='';
-        $search_montant_ttc='';
-        $search_status='';
-        $search_paymentmode='';
-        $search_town='';
-        $search_zip="";
-        $search_state="";
-        $search_type='';
-        $search_country='';
-        $search_type_thirdparty='';
-        $year="";
-        $month="";
-        $day="";
-        $year_lim="";
-        $month_lim="";
-        $day_lim="";
-        $toselect='';
-        $search_array_options=array();
-        $filter='';
-        $option='';
-    }
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha') || GETPOST('button_removefilter.x','alpha'))		// All tests must be present to be compatible with all browsers
+	{
+		$search_all="";
+		$search_user='';
+		$search_sale='';
+		$search_product_category='';
+		$search_ref="";
+		$search_refsupplier="";
+		$search_label="";
+		$search_project='';
+		$search_societe="";
+		$search_company="";
+		$search_amount_no_tax="";
+		$search_amount_all_tax="";
+		$search_montant_ht='';
+		$search_montant_vat='';
+		$search_montant_localtax1='';
+		$search_montant_localtax2='';
+		$search_montant_ttc='';
+		$search_status='';
+		$search_paymentmode='';
+		$search_town='';
+		$search_zip="";
+		$search_state="";
+		$search_type='';
+		$search_country='';
+		$search_type_thirdparty='';
+		$year="";
+		$month="";
+		$day="";
+		$year_lim="";
+		$month_lim="";
+		$day_lim="";
+		$toselect='';
+		$search_array_options=array();
+		$filter='';
+		$option='';
+	}
 
-    // Mass actions
-    $objectclass='FactureFournisseur';
-    $objectlabel='SupplierInvoices';
-    $permtoread = $user->rights->fournisseur->facture->lire;
-    $permtocreate = $user->rights->fournisseur->facture->creer;
-    $permtodelete = $user->rights->fournisseur->facture->supprimer;
-    $uploaddir = $conf->fournisseur->facture->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass='FactureFournisseur';
+	$objectlabel='SupplierInvoices';
+	$permtoread = $user->rights->fournisseur->facture->lire;
+	$permtocreate = $user->rights->fournisseur->facture->creer;
+	$permtodelete = $user->rights->fournisseur->facture->supprimer;
+	$uploaddir = $conf->fournisseur->facture->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -289,8 +289,8 @@ 
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 if ($search_user > 0)
 {
-    $sql.=", ".MAIN_DB_PREFIX."element_contact as ec";
-    $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
+	$sql.=", ".MAIN_DB_PREFIX."element_contact as ec";
+	$sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE f.fk_soc = s.rowid';
 $sql.= ' AND f.entity IN ('.getEntity('facture_fourn').')';
@@ -364,20 +364,20 @@ 
 if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
 if ($search_user > 0)
 {
-    $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='invoice_supplier' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
+	$sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='invoice_supplier' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
 }
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
+	$crit=$val;
+	$tmpkey=preg_replace('/search_options_/','',$key);
+	$typ=$extrafields->attribute_type[$tmpkey];
+	$mode=0;
+	if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
+	if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
+	{
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+	}
 }
 // Add where from hooks
 $parameters=array();
@@ -386,22 +386,22 @@ 
 
 if (! $search_all)
 {
-    $sql.= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.datef, f.date_lim_reglement, f.fk_mode_reglement,";
-    $sql.= " f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut, f.libelle, f.datec, f.tms,";
-    $sql.= " f.localtax1, f.localtax2,";
-    $sql.= " s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
-    $sql.= " typent.code,";
-    $sql.= " state.code_departement, state.nom,";
-    $sql.= " p.rowid, p.ref";
-
-    foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
-    {
-        $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
-    }
+	$sql.= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.datef, f.date_lim_reglement, f.fk_mode_reglement,";
+	$sql.= " f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut, f.libelle, f.datec, f.tms,";
+	$sql.= " f.localtax1, f.localtax2,";
+	$sql.= " s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
+	$sql.= " typent.code,";
+	$sql.= " state.code_departement, state.nom,";
+	$sql.= " p.rowid, p.ref";
+
+	foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
+	{
+		$sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+	}
 }
 else
 {
-    $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+	$sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 
 $sql.= $db->order($sortfield,$sortorder);
@@ -431,10 +431,10 @@ 
 	}
 
 	$param='&socid='.$socid;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($search_all)			$param.='&search_all='.urlencode($search_all);
-    if ($day) 					$param.='&day='.urlencode($day);
+	if ($day) 					$param.='&day='.urlencode($day);
 	if ($month) 				$param.='&month='.urlencode($month);
 	if ($year)  				$param.='&year=' .urlencode($year);
 	if ($day_lim) 				$param.='&day_lim='.urlencode($day_lim);
@@ -444,30 +444,30 @@ 
 	if ($search_refsupplier) 	$param.='&search_refsupplier='.urlencode($search_refsupplier);
 	if ($search_label)      	$param.='&search_label='.urlencode($search_label);
 	if ($search_company)      	$param.='&search_company='.urlencode($search_company);
-    if ($search_montant_ht != '')  $param.='&search_montant_ht='.urlencode($search_montant_ht);
-    if ($search_montant_vat != '')  $param.='&search_montant_vat='.urlencode($search_montant_vat);
-    if ($search_montant_localtax1 != '')  $param.='&search_montant_localtax1='.urlencode($search_montant_localtax1);
-    if ($search_montant_localtax2 != '')  $param.='&search_montant_localtax2='.urlencode($search_montant_localtax2);
-    if ($search_montant_ttc != '') $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
+	if ($search_montant_ht != '')  $param.='&search_montant_ht='.urlencode($search_montant_ht);
+	if ($search_montant_vat != '')  $param.='&search_montant_vat='.urlencode($search_montant_vat);
+	if ($search_montant_localtax1 != '')  $param.='&search_montant_localtax1='.urlencode($search_montant_localtax1);
+	if ($search_montant_localtax2 != '')  $param.='&search_montant_localtax2='.urlencode($search_montant_localtax2);
+	if ($search_montant_ttc != '') $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
 	if ($search_amount_no_tax)	$param.='&search_amount_no_tax='.urlencode($search_amount_no_tax);
 	if ($search_amount_all_tax)	$param.='&search_amount_all_tax='.urlencode($search_amount_all_tax);
 	if ($search_status >= 0)  	$param.="&search_status=".urlencode($search_status);
-    if ($show_files)            $param.='&show_files=' .$show_files;
+	if ($show_files)            $param.='&show_files=' .$show_files;
 	if ($option)                $param.="&option=".$option;
 	if ($optioncss != '')       $param.='&optioncss='.$optioncss;
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
 	{
-	    $crit=$val;
-	    $tmpkey=preg_replace('/search_options_/','',$key);
-	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+		$crit=$val;
+		$tmpkey=preg_replace('/search_options_/','',$key);
+		if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
 
 	// List of mass actions available
 	$arrayofmassactions =  array(
-	    'validate'=>$langs->trans("Validate"),
+		'validate'=>$langs->trans("Validate"),
 		//'presend'=>$langs->trans("SendByMail"),
-	    //'builddoc'=>$langs->trans("PDFMerge"),
+		//'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
@@ -476,13 +476,13 @@ 
 
 	$i = 0;
 	print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
 
@@ -490,149 +490,149 @@ 
 
 	if ($massaction == 'presend')
 	{
-	    $langs->load("mails");
-
-	    if (! GETPOST('cancel'))
-	    {
-	    	$objecttmp=new FactureFournisseur($db);
-	        $listofselectedid=array();
-	        $listofselectedthirdparties=array();
-	        $listofselectedref=array();
-	        foreach($arrayofselected as $toselectid)
-	        {
-	            $result=$objecttmp->fetch($toselectid);
-	            if ($result > 0)
-	            {
-	                $listofselectedid[$toselectid]=$toselectid;
-	                $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
-	                $listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
-	                $listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
-	            }
-	        }
-	    }
-
-	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	    $formmail = new FormMail($db);
-
-	    dol_fiche_head(null, '', '');
-
-	    $topicmail="SendBillRef";
-	    $modelmail="supplier_invoice_send";
-
-	    // Cree l'objet formulaire mail
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	    $formmail = new FormMail($db);
-	    $formmail->withform=-1;
-	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-	    if($formmail->fromtype === 'user'){
-	        $formmail->fromid = $user->id;
-
-	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
-	    {
-	        $formmail->trackid='sinv'.$object->id;
-	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-	    {
-	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sinv'.$object->id);
-	    }
-	    $formmail->withfrom=1;
-	    $liste=$langs->trans("AllRecipientSelected");
-	    if (count($listofselectedthirdparties) == 1)
-	    {
-	        $liste=array();
-	        $thirdpartyid=array_shift($listofselectedthirdparties);
-	        $soc=new Societe($db);
-	        $soc->fetch($thirdpartyid);
-	        foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-	        {
-	            $liste[$key]=$value;
-	        }
-	        $formmail->withtoreadonly=0;
-	    }
-	    else
-	    {
-	        $formmail->withtoreadonly=1;
-	    }
-	    $formmail->withto=$liste;
-	    $formmail->withtofree=0;
-	    $formmail->withtocc=1;
-	    $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-	    $formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-	    $formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
-	    $formmail->withbody=1;
-	    $formmail->withdeliveryreceipt=1;
-	    $formmail->withcancel=1;
-	    // Tableau des substitutions
-	    $formmail->substit['__REF__']='__REF__';	// We want to keep the tag
-	    $formmail->substit['__SIGNATURE__']=$user->signature;
-	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
-	    $formmail->substit['__PERSONALIZED__']='';
-	    $formmail->substit['__CONTACTCIVNAME__']='';
-
-	    // Tableau des parametres complementaires du post
-	    $formmail->param['action']=$action;
-	    $formmail->param['models']=$modelmail;
-	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
-	    $formmail->param['id']=join(',',$arrayofselected);
-	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-	    print $formmail->get_form();
-
-	    dol_fiche_end();
+		$langs->load("mails");
+
+		if (! GETPOST('cancel'))
+		{
+			$objecttmp=new FactureFournisseur($db);
+			$listofselectedid=array();
+			$listofselectedthirdparties=array();
+			$listofselectedref=array();
+			foreach($arrayofselected as $toselectid)
+			{
+				$result=$objecttmp->fetch($toselectid);
+				if ($result > 0)
+				{
+					$listofselectedid[$toselectid]=$toselectid;
+					$thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
+					$listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
+					$listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
+				}
+			}
+		}
+
+		print '<input type="hidden" name="massaction" value="confirm_presend">';
+
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+
+		dol_fiche_head(null, '', '');
+
+		$topicmail="SendBillRef";
+		$modelmail="supplier_invoice_send";
+
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->withform=-1;
+		$formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+		if($formmail->fromtype === 'user'){
+			$formmail->fromid = $user->id;
+
+		}
+		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
+		{
+			$formmail->trackid='sinv'.$object->id;
+		}
+		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+		{
+			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sinv'.$object->id);
+		}
+		$formmail->withfrom=1;
+		$liste=$langs->trans("AllRecipientSelected");
+		if (count($listofselectedthirdparties) == 1)
+		{
+			$liste=array();
+			$thirdpartyid=array_shift($listofselectedthirdparties);
+			$soc=new Societe($db);
+			$soc->fetch($thirdpartyid);
+			foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+			{
+				$liste[$key]=$value;
+			}
+			$formmail->withtoreadonly=0;
+		}
+		else
+		{
+			$formmail->withtoreadonly=1;
+		}
+		$formmail->withto=$liste;
+		$formmail->withtofree=0;
+		$formmail->withtocc=1;
+		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+		$formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
+		$formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
+		$formmail->withbody=1;
+		$formmail->withdeliveryreceipt=1;
+		$formmail->withcancel=1;
+		// Tableau des substitutions
+		$formmail->substit['__REF__']='__REF__';	// We want to keep the tag
+		$formmail->substit['__SIGNATURE__']=$user->signature;
+		$formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
+		$formmail->substit['__PERSONALIZED__']='';
+		$formmail->substit['__CONTACTCIVNAME__']='';
+
+		// Tableau des parametres complementaires du post
+		$formmail->param['action']=$action;
+		$formmail->param['models']=$modelmail;
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
+		$formmail->param['id']=join(',',$arrayofselected);
+		//$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+
+		print $formmail->get_form();
+
+		dol_fiche_end();
 	}
 	elseif ($massaction == 'createbills')
 	{
-	    //var_dump($_REQUEST);
-	    print '<input type="hidden" name="massaction" value="confirm_createbills">';
-
-	    print '<table class="border" width="100%" >';
-	    print '<tr>';
-	    print '<td class="titlefieldmiddle">';
-	    print $langs->trans('DateInvoice');
-	    print '</td>';
-	    print '<td>';
-	    print $form->select_date('', '', '', '', '', '', 1, 1);
-	    print '</td>';
-	    print '</tr>';
-	    print '<tr>';
-	    print '<td>';
-	    print $langs->trans('CreateOneBillByThird');
-	    print '</td>';
-	    print '<td>';
-	    print $form->selectyesno('createbills_onebythird', '', 1);
-	    print '</td>';
-	    print '</tr>';
-	    print '<tr>';
-	    print '<td>';
-	    print $langs->trans('ValidateInvoices');
-	    print '</td>';
-	    print '<td>';
-	    print $form->selectyesno('valdate_invoices', 1, 1);
-	    print '</td>';
-	    print '</tr>';
-	    print '</table>';
-
-	    print '<br>';
-	    print '<div class="center">';
-	    print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
-	    print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
-	    print '</div>';
-	    print '<br>';
+		//var_dump($_REQUEST);
+		print '<input type="hidden" name="massaction" value="confirm_createbills">';
+
+		print '<table class="border" width="100%" >';
+		print '<tr>';
+		print '<td class="titlefieldmiddle">';
+		print $langs->trans('DateInvoice');
+		print '</td>';
+		print '<td>';
+		print $form->select_date('', '', '', '', '', '', 1, 1);
+		print '</td>';
+		print '</tr>';
+		print '<tr>';
+		print '<td>';
+		print $langs->trans('CreateOneBillByThird');
+		print '</td>';
+		print '<td>';
+		print $form->selectyesno('createbills_onebythird', '', 1);
+		print '</td>';
+		print '</tr>';
+		print '<tr>';
+		print '<td>';
+		print $langs->trans('ValidateInvoices');
+		print '</td>';
+		print '<td>';
+		print $form->selectyesno('valdate_invoices', 1, 1);
+		print '</td>';
+		print '</tr>';
+		print '</table>';
+
+		print '<br>';
+		print '<div class="center">';
+		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
+		print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+		print '</div>';
+		print '<br>';
 	}
 
 	if ($search_all)
-    {
-        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
-    }
+	{
+		foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+		print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
+	}
 
  	// If the user can view prospects other than his'
-    $moreforfilter='';
+	$moreforfilter='';
  	if ($user->rights->societe->client->voir || $socid)
  	{
  		$langs->load("commercial");
@@ -641,14 +641,14 @@ 
 		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	 	$moreforfilter.='</div>';
  	}
-    // If the user can view prospects other than his'
-    if ($user->rights->societe->client->voir || $socid)
-    {
+	// If the user can view prospects other than his'
+	if ($user->rights->societe->client->voir || $socid)
+	{
 		$moreforfilter.='<div class="divsearchfield">';
-    	$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
+		$moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	 	$moreforfilter.='</div>';
-    }
+	}
 	// If the user can view prospects other than his'
 	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
@@ -659,76 +659,76 @@ 
 		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
 
-    if ($moreforfilter)
-    {
+	if ($moreforfilter)
+	{
    		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-        print $moreforfilter;
-        print '</div>';
-    }
+		print $moreforfilter;
+		print '</div>';
+	}
 
-    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	// Line for filters
 	print '<tr class="liste_titre_filter">';
 	// Ref
 	if (! empty($arrayfields['f.ref']['checked']))
 	{
-	    print '<td class="liste_titre" align="left">';
-	    print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
-	    print '</td>';
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+		print '</td>';
 	}
 	// Ref supplier
 	if (! empty($arrayfields['f.ref_supplier']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '<input class="flat" size="6" type="text" name="search_refsupplier" value="'.$search_refsupplier.'">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_refsupplier" value="'.$search_refsupplier.'">';
+		print '</td>';
 	}
 	// Label
 	if (! empty($arrayfields['f.label']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '<input class="flat" size="6" type="text" name="search_label" value="'.$search_label.'">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_label" value="'.$search_label.'">';
+		print '</td>';
 	}
 	// Date invoice
 	if (! empty($arrayfields['f.datef']['checked']))
 	{
-	    print '<td class="liste_titre" align="center">';
-	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-	    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-	    $formother->select_year($year?$year:-1,'year',1, 20, 5);
-	    print '</td>';
+		print '<td class="liste_titre" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+		print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+		$formother->select_year($year?$year:-1,'year',1, 20, 5);
+		print '</td>';
 	}
 	// Date due
 	if (! empty($arrayfields['f.date_lim_reglement']['checked']))
 	{
-	    print '<td class="liste_titre" align="center">';
-	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
-	    print '<input class="flat" type="text" size="1" maxlength="2" name="month_lim" value="'.$month_lim.'">';
-	    $formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
-	    print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
-	    print '</td>';
+		print '<td class="liste_titre" align="center">';
+		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
+		print '<input class="flat" type="text" size="1" maxlength="2" name="month_lim" value="'.$month_lim.'">';
+		$formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
+		print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
+		print '</td>';
 	}
 	// Project
 	if (! empty($arrayfields['p.ref']['checked']))
 	{
-	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
+		print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirpdarty
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
-	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
+		print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
 	}
 	// Town
 	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
@@ -737,98 +737,98 @@ 
 	// State
 	if (! empty($arrayfields['state.nom']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+		print '</td>';
 	}
 	// Country
 	if (! empty($arrayfields['country.code_iso']['checked']))
 	{
-	    print '<td class="liste_titre" align="center">';
-	    print $form->select_country($search_country,'search_country','',0,'maxwidth100');
-	    print '</td>';
+		print '<td class="liste_titre" align="center">';
+		print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+		print '</td>';
 	}
 	// Company type
 	if (! empty($arrayfields['typent.code']['checked']))
 	{
-	    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	    print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-	    print '</td>';
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print '</td>';
 	}
 	// Payment mode
 	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
-	    print '<td class="liste_titre" align="left">';
-	    $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 0, 1, 10);
-	    print '</td>';
+		print '<td class="liste_titre" align="left">';
+		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 0, 1, 10);
+		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_ht']['checked']))
 	{
-	    // Amount
-	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
-	    print '</td>';
+		// Amount
+		print '<td class="liste_titre" align="right">';
+		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
+		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_vat']['checked']))
 	{
-	    // Amount
-	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
-	    print '</td>';
+		// Amount
+		print '<td class="liste_titre" align="right">';
+		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
+		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_localtax1']['checked']))
 	{
-	    // Amount
-	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
-	    print '</td>';
+		// Amount
+		print '<td class="liste_titre" align="right">';
+		print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
+		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_localtax2']['checked']))
 	{
-	    // Amount
- 	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
-	    print '</td>';
+		// Amount
+ 		print '<td class="liste_titre" align="right">';
+		print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
+		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_ttc']['checked']))
 	{
-	    // Amount
-	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
-	    print '</td>';
+		// Amount
+		print '<td class="liste_titre" align="right">';
+		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
+		print '</td>';
+	}
+	if (! empty($arrayfields['dynamount_payed']['checked']))
+	{
+		print '<td class="liste_titre" align="right">';
+		print '</td>';
+	}
+	if (! empty($arrayfields['rtp']['checked']))
+	{
+		print '<td class="liste_titre" align="right">';
+		print '</td>';
 	}
-    if (! empty($arrayfields['dynamount_payed']['checked']))
-    {
-        print '<td class="liste_titre" align="right">';
-        print '</td>';
-    }
-    if (! empty($arrayfields['rtp']['checked']))
-    {
-        print '<td class="liste_titre" align="right">';
-        print '</td>';
-    }
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	    foreach($extrafields->attribute_label as $key => $val)
-	    {
-	        if (! empty($arrayfields["ef.".$key]['checked']))
-	        {
-	            $align=$extrafields->getAlignFlag($key);
-	            $typeofextrafield=$extrafields->attribute_type[$key];
-	            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-	            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
-	            {
-	                $crit=$val;
-	                $tmpkey=preg_replace('/search_options_/','',$key);
-	                $searchclass='';
-	                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-	                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-	                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-	            }
-	            print '</td>';
-	        }
-	    }
+		foreach($extrafields->attribute_label as $key => $val)
+		{
+			if (! empty($arrayfields["ef.".$key]['checked']))
+			{
+				$align=$extrafields->getAlignFlag($key);
+				$typeofextrafield=$extrafields->attribute_type[$key];
+				print '<td class="liste_titre'.($align?' '.$align:'').'">';
+				if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+				{
+					$crit=$val;
+					$tmpkey=preg_replace('/search_options_/','',$key);
+					$searchclass='';
+					if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+					print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+				}
+				print '</td>';
+			}
+		}
 	}
 	// Fields from hook
 	$parameters=array('arrayfields'=>$arrayfields);
@@ -837,22 +837,22 @@ 
 	// Date creation
 	if (! empty($arrayfields['f.datec']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Date modification
 	if (! empty($arrayfields['f.tms']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Status
 	if (! empty($arrayfields['f.fk_statut']['checked']))
 	{
-	    print '<td class="liste_titre maxwidthonsmartphone" align="right">';
-	    $liststatus=array('0'=>$langs->trans("Draft"),'1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
-	    print $form->selectarray('search_status', $liststatus, $search_status, 1);
-	    print '</td>';
+		print '<td class="liste_titre maxwidthonsmartphone" align="right">';
+		$liststatus=array('0'=>$langs->trans("Draft"),'1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
+		print $form->selectarray('search_status', $liststatus, $search_status, 1);
+		print '</td>';
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
@@ -881,21 +881,21 @@ 
 	if (! empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'],$_SERVER['PHP_SELF'],'f.localtax1','',$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'],$_SERVER['PHP_SELF'],'f.localtax2','',$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
-    if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
-    if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	    foreach($extrafields->attribute_label as $key => $val)
-	    {
-	        if (! empty($arrayfields["ef.".$key]['checked']))
-	        {
-	            $align=$extrafields->getAlignFlag($key);
-    			$sortonfield = "ef.".$key;
-    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-	        }
-	    }
+		foreach($extrafields->attribute_label as $key => $val)
+		{
+			if (! empty($arrayfields["ef.".$key]['checked']))
+			{
+				$align=$extrafields->getAlignFlag($key);
+				$sortonfield = "ef.".$key;
+				if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			}
+		}
 	}
 	// Hook fields
 	$parameters=array('arrayfields'=>$arrayfields);
@@ -907,16 +907,16 @@ 
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
-    $facturestatic=new FactureFournisseur($db);
+	$facturestatic=new FactureFournisseur($db);
 	$supplierstatic=new Fournisseur($db);
 	$projectstatic=new Project($db);
 
 	if ($num > 0)
-    {
+	{
 		$i=0;
 
 		$var=true;
-	    $totalarray=array();
+		$totalarray=array();
 		while ($i < min($num,$limit))
 		{
 			$obj = $db->fetch_object($resql);
@@ -924,7 +924,7 @@ 
 			$datelimit=$db->jdate($obj->datelimite);
 			$facturestatic->id=$obj->facid;
 			$facturestatic->ref=$obj->ref;
-            $facturestatic->type=$obj->type;
+			$facturestatic->type=$obj->type;
 			$facturestatic->ref_supplier=$obj->ref_supplier;
 			$facturestatic->date_echeance = $db->jdate($obj->datelimite);
 			$facturestatic->statut = $obj->fk_statut;
@@ -935,271 +935,271 @@ 
 			$totalpay = $paiement + $totalcreditnotes + $totaldeposits;
 			$remaintopay = $obj->total_ttc - $totalpay;
 
-            print '<tr class="oddeven">';
-    		if (! empty($arrayfields['f.ref']['checked']))
-    		{
-                print '<td class="nowrap">';
-
-                print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-                // Picto + Ref
-                print '<td class="nobordernopadding nowrap">';
-                print $facturestatic->getNomUrl(1);
-                print '</td>';
-                // Warning
-                //print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-                //print '</td>';
-                // Other picto tool
-                print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
-                $filename=dol_sanitizeFileName($obj->ref);
-                $filedir=$conf->fournisseur->facture->dir_output.'/'.get_exdir($obj->facid,2,0,0,$facturestatic,'invoice_supplier').dol_sanitizeFileName($obj->ref);
+			print '<tr class="oddeven">';
+			if (! empty($arrayfields['f.ref']['checked']))
+			{
+				print '<td class="nowrap">';
+
+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+				// Picto + Ref
+				print '<td class="nobordernopadding nowrap">';
+				print $facturestatic->getNomUrl(1);
+				print '</td>';
+				// Warning
+				//print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+				//print '</td>';
+				// Other picto tool
+				print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+				$filename=dol_sanitizeFileName($obj->ref);
+				$filedir=$conf->fournisseur->facture->dir_output.'/'.get_exdir($obj->facid,2,0,0,$facturestatic,'invoice_supplier').dol_sanitizeFileName($obj->ref);
 				$subdir = get_exdir($obj->facid,2,0,0,$facturestatic,'invoice_supplier').dol_sanitizeFileName($obj->ref);
 				print $formfile->getDocumentsLink('facture_fournisseur', $subdir, $filedir);
 				print '</td></tr></table>';
 
-                print "</td>\n";
+				print "</td>\n";
 				if (! $i) $totalarray['nbfield']++;
-    		}
+			}
 
 			// Customer ref
-    		if (! empty($arrayfields['f.ref_supplier']['checked']))
-    		{
-        		print '<td class="nowrap">';
-    			print $obj->ref_supplier;
-    			print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
+			if (! empty($arrayfields['f.ref_supplier']['checked']))
+			{
+				print '<td class="nowrap">';
+				print $obj->ref_supplier;
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
 
 			// Label
-    		if (! empty($arrayfields['f.label']['checked']))
-    		{
-        		print '<td class="nowrap">';
-    			print $obj->label;
-    			print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
+			if (! empty($arrayfields['f.label']['checked']))
+			{
+				print '<td class="nowrap">';
+				print $obj->label;
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
 
 			// Date
-    		if (! empty($arrayfields['f.datef']['checked']))
-    		{
-        		print '<td align="center" class="nowrap">';
-                print dol_print_date($db->jdate($obj->datef),'day');
-                print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
-
-            // Date limit
-    		if (! empty($arrayfields['f.date_lim_reglement']['checked']))
-    		{
-        		print '<td align="center" class="nowrap">'.dol_print_date($datelimit,'day');
-                if ($facturestatic->hasDelay())
-                {
-                    print img_warning($langs->trans('Late'));
-                }
-                print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
-
-    		// Project
-    		if (! empty($arrayfields['p.ref']['checked']))
-    		{
-    		    print '<td class="nowrap">';
-    		    if ($obj->project_id > 0)
-    		    {
-	    		    $projectstatic->id=$obj->project_id;
-    			    $projectstatic->ref=$obj->project_ref;
-    			    print $projectstatic->getNomUrl(1);
-    		    }
-    		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
-
-    		// Third party
-    		if (! empty($arrayfields['s.nom']['checked']))
-    		{
-                print '<td class="tdoverflowmax200">';
-                $thirdparty=new Societe($db);
-                $thirdparty->id=$obj->socid;
-                $thirdparty->name=$obj->name;
-                $thirdparty->client=$obj->client;
-                $thirdparty->code_client=$obj->code_client;
-                print $thirdparty->getNomUrl(1,'supplier');
-                print '</td>';
-                if (! $i) $totalarray['nbfield']++;
-    		}
-    		// Town
-    		if (! empty($arrayfields['s.town']['checked']))
-    		{
-    		    print '<td class="nocellnopadd">';
-    		    print $obj->town;
-    		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
-    		// Zip
-    		if (! empty($arrayfields['s.zip']['checked']))
-    		{
-    		    print '<td class="nocellnopadd">';
-    		    print $obj->zip;
-    		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
-    		// State
-    		if (! empty($arrayfields['state.nom']['checked']))
-    		{
-    		    print "<td>".$obj->state_name."</td>\n";
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
-    		// Country
-    		if (! empty($arrayfields['country.code_iso']['checked']))
-    		{
-    		    print '<td align="center">';
-    		    $tmparray=getCountry($obj->fk_pays,'all');
-    		    print $tmparray['label'];
-    		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
-    		// Type ent
-    		if (! empty($arrayfields['typent.code']['checked']))
-    		{
-    		    print '<td align="center">';
-    		    if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
-    		    print $typenArray[$obj->typent_code];
-    		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
-
-            // Payment mode
-    		if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
-    		{
-        		print '<td>';
-                $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
-                print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
-    		}
-
-            // Amount HT
-            if (! empty($arrayfields['f.total_ht']['checked']))
-            {
-    		      print '<td align="right">'.price($obj->total_ht)."</td>\n";
-    		      if (! $i) $totalarray['nbfield']++;
-    		      if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
-    		      $totalarray['totalht'] += $obj->total_ht;
-            }
-            // Amount VAT
-            if (! empty($arrayfields['f.total_vat']['checked']))
-            {
-                print '<td align="right">'.price($obj->total_vat)."</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
-    		    $totalarray['totalvat'] += $obj->total_vat;
-            }
-            // Amount LocalTax1
-            if (! empty($arrayfields['f.total_localtax1']['checked']))
-            {
-                print '<td align="right">'.price($obj->total_localtax1)."</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield'];
-    		    $totalarray['totallocaltax1'] += $obj->total_localtax1;
-            }
-            // Amount LocalTax2
-            if (! empty($arrayfields['f.total_localtax2']['checked']))
-            {
-                print '<td align="right">'.price($obj->total_localtax2)."</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield'];
-    		    $totalarray['totallocaltax2'] += $obj->total_localtax2;
-            }
-            // Amount TTC
-            if (! empty($arrayfields['f.total_ttc']['checked']))
-            {
-                print '<td align="right">'.price($obj->total_ttc)."</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
-    		    $totalarray['totalttc'] += $obj->total_ttc;
-            }
-
-		    if (! empty($arrayfields['dynamount_payed']['checked']))
-            {
-                print '<td align="right">'.(! empty($totalpay)?price($totalpay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
-    		    $totalarray['totalam'] += $totalpay;
-            }
-
-            if (! empty($arrayfields['rtp']['checked']))
-            {
-                print '<td align="right">'.(! empty($remaintopay)?price($remaintopay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
-    		    $totalarray['totalrtp'] += $remaintopay;
-            }
-
-
-            // Extra fields
-            if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-            {
-                foreach($extrafields->attribute_label as $key => $val)
-                {
-                    if (! empty($arrayfields["ef.".$key]['checked']))
-                    {
-                        print '<td';
-                        $align=$extrafields->getAlignFlag($key);
-                        if ($align) print ' align="'.$align.'"';
-                        print '>';
-                        $tmpkey='options_'.$key;
-                        print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-                        print '</td>';
-                        if (! $i) $totalarray['nbfield']++;
-                    }
-                }
-            }
-            // Fields from hook
-            $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-            $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
-            // Date creation
-            if (! empty($arrayfields['f.datec']['checked']))
-            {
-                print '<td align="center" class="nowrap">';
-                print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-                print '</td>';
-                if (! $i) $totalarray['nbfield']++;
-            }
-            // Date modification
-            if (! empty($arrayfields['f.tms']['checked']))
-            {
-                print '<td align="center" class="nowrap">';
-                print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-                print '</td>';
-                if (! $i) $totalarray['nbfield']++;
-            }
-            // Status
-            if (! empty($arrayfields['f.fk_statut']['checked']))
-            {
-                print '<td align="right" class="nowrap">';
-                // TODO $paiement is not yet defined
-                print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$paiement,$obj->type);
-                print "</td>";
-                if (! $i) $totalarray['nbfield']++;
-            }
-
-    		// Action column
-            print '<td class="nowrap" align="center">';
-            if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-            {
-                $selected=0;
-                if (in_array($obj->facid, $arrayofselected)) $selected=1;
-                print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected?' checked="checked"':'').'>';
-            }
-            print '</td>';
-    		if (! $i) $totalarray['nbfield']++;
+			if (! empty($arrayfields['f.datef']['checked']))
+			{
+				print '<td align="center" class="nowrap">';
+				print dol_print_date($db->jdate($obj->datef),'day');
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+
+			// Date limit
+			if (! empty($arrayfields['f.date_lim_reglement']['checked']))
+			{
+				print '<td align="center" class="nowrap">'.dol_print_date($datelimit,'day');
+				if ($facturestatic->hasDelay())
+				{
+					print img_warning($langs->trans('Late'));
+				}
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+
+			// Project
+			if (! empty($arrayfields['p.ref']['checked']))
+			{
+				print '<td class="nowrap">';
+				if ($obj->project_id > 0)
+				{
+					$projectstatic->id=$obj->project_id;
+					$projectstatic->ref=$obj->project_ref;
+					print $projectstatic->getNomUrl(1);
+				}
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+
+			// Third party
+			if (! empty($arrayfields['s.nom']['checked']))
+			{
+				print '<td class="tdoverflowmax200">';
+				$thirdparty=new Societe($db);
+				$thirdparty->id=$obj->socid;
+				$thirdparty->name=$obj->name;
+				$thirdparty->client=$obj->client;
+				$thirdparty->code_client=$obj->code_client;
+				print $thirdparty->getNomUrl(1,'supplier');
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+			// Town
+			if (! empty($arrayfields['s.town']['checked']))
+			{
+				print '<td class="nocellnopadd">';
+				print $obj->town;
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+			// Zip
+			if (! empty($arrayfields['s.zip']['checked']))
+			{
+				print '<td class="nocellnopadd">';
+				print $obj->zip;
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+			// State
+			if (! empty($arrayfields['state.nom']['checked']))
+			{
+				print "<td>".$obj->state_name."</td>\n";
+				if (! $i) $totalarray['nbfield']++;
+			}
+			// Country
+			if (! empty($arrayfields['country.code_iso']['checked']))
+			{
+				print '<td align="center">';
+				$tmparray=getCountry($obj->fk_pays,'all');
+				print $tmparray['label'];
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+			// Type ent
+			if (! empty($arrayfields['typent.code']['checked']))
+			{
+				print '<td align="center">';
+				if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+				print $typenArray[$obj->typent_code];
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+
+			// Payment mode
+			if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
+			{
+				print '<td>';
+				$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+
+			// Amount HT
+			if (! empty($arrayfields['f.total_ht']['checked']))
+			{
+				  print '<td align="right">'.price($obj->total_ht)."</td>\n";
+				  if (! $i) $totalarray['nbfield']++;
+				  if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
+				  $totalarray['totalht'] += $obj->total_ht;
+			}
+			// Amount VAT
+			if (! empty($arrayfields['f.total_vat']['checked']))
+			{
+				print '<td align="right">'.price($obj->total_vat)."</td>\n";
+				if (! $i) $totalarray['nbfield']++;
+				if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
+				$totalarray['totalvat'] += $obj->total_vat;
+			}
+			// Amount LocalTax1
+			if (! empty($arrayfields['f.total_localtax1']['checked']))
+			{
+				print '<td align="right">'.price($obj->total_localtax1)."</td>\n";
+				if (! $i) $totalarray['nbfield']++;
+				if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield'];
+				$totalarray['totallocaltax1'] += $obj->total_localtax1;
+			}
+			// Amount LocalTax2
+			if (! empty($arrayfields['f.total_localtax2']['checked']))
+			{
+				print '<td align="right">'.price($obj->total_localtax2)."</td>\n";
+				if (! $i) $totalarray['nbfield']++;
+				if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield'];
+				$totalarray['totallocaltax2'] += $obj->total_localtax2;
+			}
+			// Amount TTC
+			if (! empty($arrayfields['f.total_ttc']['checked']))
+			{
+				print '<td align="right">'.price($obj->total_ttc)."</td>\n";
+				if (! $i) $totalarray['nbfield']++;
+				if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
+				$totalarray['totalttc'] += $obj->total_ttc;
+			}
+
+			if (! empty($arrayfields['dynamount_payed']['checked']))
+			{
+				print '<td align="right">'.(! empty($totalpay)?price($totalpay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
+				if (! $i) $totalarray['nbfield']++;
+				if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
+				$totalarray['totalam'] += $totalpay;
+			}
+
+			if (! empty($arrayfields['rtp']['checked']))
+			{
+				print '<td align="right">'.(! empty($remaintopay)?price($remaintopay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
+				if (! $i) $totalarray['nbfield']++;
+				if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
+				$totalarray['totalrtp'] += $remaintopay;
+			}
+
+
+			// Extra fields
+			if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+			{
+				foreach($extrafields->attribute_label as $key => $val)
+				{
+					if (! empty($arrayfields["ef.".$key]['checked']))
+					{
+						print '<td';
+						$align=$extrafields->getAlignFlag($key);
+						if ($align) print ' align="'.$align.'"';
+						print '>';
+						$tmpkey='options_'.$key;
+						print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+						print '</td>';
+						if (! $i) $totalarray['nbfield']++;
+					}
+				}
+			}
+			// Fields from hook
+			$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+			$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			// Date creation
+			if (! empty($arrayfields['f.datec']['checked']))
+			{
+				print '<td align="center" class="nowrap">';
+				print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+			// Date modification
+			if (! empty($arrayfields['f.tms']['checked']))
+			{
+				print '<td align="center" class="nowrap">';
+				print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+			// Status
+			if (! empty($arrayfields['f.fk_statut']['checked']))
+			{
+				print '<td align="right" class="nowrap">';
+				// TODO $paiement is not yet defined
+				print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$paiement,$obj->type);
+				print "</td>";
+				if (! $i) $totalarray['nbfield']++;
+			}
+
+			// Action column
+			print '<td class="nowrap" align="center">';
+			if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			{
+				$selected=0;
+				if (in_array($obj->facid, $arrayofselected)) $selected=1;
+				print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected?' checked="checked"':'').'>';
+			}
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
 
 			print "</tr>\n";
 
 			$i++;
 		}
 
-	    // Show total line
-    	if (isset($totalarray['totalhtfield'])
+		// Show total line
+		if (isset($totalarray['totalhtfield'])
  	   || isset($totalarray['totalvatfield'])
  	   || isset($totalarray['totallocaltax1field'])
  	   || isset($totalarray['totallocaltax2field'])
@@ -1207,29 +1207,29 @@ 
  	   || isset($totalarray['totalamfield'])
  	   || isset($totalarray['totalrtpfield'])
  	   )
-    	{
-    		print '<tr class="liste_total">';
-    		$i=0;
-    		while ($i < $totalarray['nbfield'])
-    		{
-    		   $i++;
-    		   if ($i == 1)
-    	       {
-            		if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
-            		else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-    	       }
-    		   elseif ($totalarray['totalhtfield'] == $i)  print '<td align="right">'.price($totalarray['totalht']).'</td>';
-    		   elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-    		   elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>';
-    		   elseif ($totalarray['totallocaltax2field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax2']).'</td>';
-    		   elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
-    		   elseif ($totalarray['totalamfield'] == $i)  print '<td align="right">'.price($totalarray['totalam']).'</td>';
-    		   elseif ($totalarray['totalrtpfield'] == $i)  print '<td align="right">'.price($totalarray['totalrtp']).'</td>';
-    		   else print '<td></td>';
-    		}
-    		print '</tr>';
-
-    	}
+		{
+			print '<tr class="liste_total">';
+			$i=0;
+			while ($i < $totalarray['nbfield'])
+			{
+			   $i++;
+			   if ($i == 1)
+			   {
+					if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
+					else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+			   }
+			   elseif ($totalarray['totalhtfield'] == $i)  print '<td align="right">'.price($totalarray['totalht']).'</td>';
+			   elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+			   elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>';
+			   elseif ($totalarray['totallocaltax2field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax2']).'</td>';
+			   elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+			   elseif ($totalarray['totalamfield'] == $i)  print '<td align="right">'.price($totalarray['totalam']).'</td>';
+			   elseif ($totalarray['totalrtpfield'] == $i)  print '<td align="right">'.price($totalarray['totalrtp']).'</td>';
+			   else print '<td></td>';
+			}
+			print '</tr>';
+
+		}
 	}
 
 	$db->free($resql);
@@ -1239,11 +1239,11 @@ 
 	print $hookmanager->resPrint;
 
 	print "</table>\n";
-    print '</div>';
+	print '</div>';
 
 	print "</form>\n";
 
-    /*
+	/*
     if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
     {
         // Show list of available documents

Spacing +456 added lines, -456 removed lines

@@ -49,81 +49,81 @@ 
 $langs->load('products');
 $langs->load('projects');
 
-$action=GETPOST('action','alpha');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
+$action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
-$socid = GETPOST('socid','int');
+$socid = GETPOST('socid', 'int');
 
 // Security check
 if ($user->societe_id > 0)
 {
-	$action='';
+	$action = '';
     $_GET["action"] = '';
 	$socid = $user->societe_id;
 }
 
-$mode=GETPOST("mode");
-
-$search_product_category=GETPOST('search_product_category','int');
-$search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','alpha');
-$search_refsupplier=GETPOST('search_refsupplier','alpha');
-$search_project=GETPOST('search_project','alpha');
-$search_societe=GETPOST('search_societe','alpha');
-$search_montant_ht=GETPOST('search_montant_ht','alpha');
-$search_montant_vat=GETPOST('search_montant_vat','alpha');
-$search_montant_localtax1=GETPOST('search_montant_localtax1','alpha');
-$search_montant_localtax2=GETPOST('search_montant_localtax2','alpha');
-$search_montant_ttc=GETPOST('search_montant_ttc','alpha');
-$search_status=GETPOST('search_status','int');
-$search_paymentmode=GETPOST('search_paymentmode','int');
-$search_town=GETPOST('search_town','alpha');
-$search_zip=GETPOST('search_zip','alpha');
-$search_state=trim(GETPOST("search_state"));
-$search_country=GETPOST("search_country",'int');
-$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
-$search_user = GETPOST('search_user','int');
-$search_sale = GETPOST('search_sale','int');
-$day	= GETPOST('day','int');
-$month	= GETPOST('month','int');
-$year	= GETPOST('year','int');
-$day_lim	= GETPOST('day_lim','int');
-$month_lim	= GETPOST('month_lim','int');
-$year_lim	= GETPOST('year_lim','int');
+$mode = GETPOST("mode");
+
+$search_product_category = GETPOST('search_product_category', 'int');
+$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
+$search_refsupplier = GETPOST('search_refsupplier', 'alpha');
+$search_project = GETPOST('search_project', 'alpha');
+$search_societe = GETPOST('search_societe', 'alpha');
+$search_montant_ht = GETPOST('search_montant_ht', 'alpha');
+$search_montant_vat = GETPOST('search_montant_vat', 'alpha');
+$search_montant_localtax1 = GETPOST('search_montant_localtax1', 'alpha');
+$search_montant_localtax2 = GETPOST('search_montant_localtax2', 'alpha');
+$search_montant_ttc = GETPOST('search_montant_ttc', 'alpha');
+$search_status = GETPOST('search_status', 'int');
+$search_paymentmode = GETPOST('search_paymentmode', 'int');
+$search_town = GETPOST('search_town', 'alpha');
+$search_zip = GETPOST('search_zip', 'alpha');
+$search_state = trim(GETPOST("search_state"));
+$search_country = GETPOST("search_country", 'int');
+$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$search_user = GETPOST('search_user', 'int');
+$search_sale = GETPOST('search_sale', 'int');
+$day = GETPOST('day', 'int');
+$month = GETPOST('month', 'int');
+$year = GETPOST('year', 'int');
+$day_lim = GETPOST('day_lim', 'int');
+$month_lim = GETPOST('month_lim', 'int');
+$year_lim	= GETPOST('year_lim', 'int');
 $toselect = GETPOST('toselect', 'array');
 
 $option = GETPOST('option');
 if ($option == 'late') $filter = 'paye:0';
 
 $search_all = GETPOST('sall', 'alphanohtml');
-$search_label = GETPOST("search_label","alpha");
-$search_company = GETPOST("search_company","alpha");
-$search_amount_no_tax = GETPOST("search_amount_no_tax","alpha");
-$search_amount_all_tax = GETPOST("search_amount_all_tax","alpha");
-$search_status=GETPOST('search_status','alpha');
-$optioncss = GETPOST('optioncss','alpha');
-
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page=GETPOST("page",'int');
-if ($page == -1 || $page == null) { $page = 0 ; }
-$offset = $limit * $page ;
+$search_label = GETPOST("search_label", "alpha");
+$search_company = GETPOST("search_company", "alpha");
+$search_amount_no_tax = GETPOST("search_amount_no_tax", "alpha");
+$search_amount_all_tax = GETPOST("search_amount_all_tax", "alpha");
+$search_status = GETPOST('search_status', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
+
+$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
+if ($page == -1 || $page == null) { $page = 0; }
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="f.datef,f.rowid";
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "f.datef,f.rowid";
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$contextpage='supplierinvoicelist';
+$contextpage = 'supplierinvoicelist';
 
-$diroutputmassaction=$conf->fournisseur->facture->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id;
 
-$object=new FactureFournisseur($db);
+$object = new FactureFournisseur($db);
 
-$now=dol_now();
+$now = dol_now();
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('supplierinvoicelist'));
@@ -131,7 +131,7 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('facture_fourn');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($extralabels, '', 'search_');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -141,10 +141,10 @@ 
     's.nom'=>"ThirdParty",
     'f.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["f.note_private"]="NotePrivate";
+if (empty($user->socid)) $fieldstosearchall["f.note_private"] = "NotePrivate";
 
-$checkedtypetiers=0;
-$arrayfields=array(
+$checkedtypetiers = 0;
+$arrayfields = array(
     'f.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
     'f.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
     'f.label'=>array('label'=>$langs->trans("Label"), 'checked'=>0),
@@ -160,8 +160,8 @@ 
     'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
     'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
     'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
-    'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj=="1"),
-    'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj=="1"),
+    'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj == "1"),
+    'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj == "1"),
     'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
     'dynamount_payed'=>array('label'=>$langs->trans("Payed"), 'checked'=>0),
     'rtp'=>array('label'=>$langs->trans("Rest"), 'checked'=>0),
@@ -172,9 +172,9 @@ 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val)
+    foreach ($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
@@ -183,59 +183,59 @@ 
  * Actions
  */
 
-if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction=''; }
+if (GETPOST('cancel')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
 
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha') || GETPOST('button_removefilter.x','alpha'))		// All tests must be present to be compatible with all browsers
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha'))		// All tests must be present to be compatible with all browsers
     {
-        $search_all="";
-        $search_user='';
-        $search_sale='';
-        $search_product_category='';
-        $search_ref="";
-        $search_refsupplier="";
-        $search_label="";
-        $search_project='';
-        $search_societe="";
-        $search_company="";
-        $search_amount_no_tax="";
-        $search_amount_all_tax="";
-        $search_montant_ht='';
-        $search_montant_vat='';
-        $search_montant_localtax1='';
-        $search_montant_localtax2='';
-        $search_montant_ttc='';
-        $search_status='';
-        $search_paymentmode='';
-        $search_town='';
-        $search_zip="";
-        $search_state="";
-        $search_type='';
-        $search_country='';
-        $search_type_thirdparty='';
-        $year="";
-        $month="";
-        $day="";
-        $year_lim="";
-        $month_lim="";
-        $day_lim="";
-        $toselect='';
-        $search_array_options=array();
-        $filter='';
-        $option='';
+        $search_all = "";
+        $search_user = '';
+        $search_sale = '';
+        $search_product_category = '';
+        $search_ref = "";
+        $search_refsupplier = "";
+        $search_label = "";
+        $search_project = '';
+        $search_societe = "";
+        $search_company = "";
+        $search_amount_no_tax = "";
+        $search_amount_all_tax = "";
+        $search_montant_ht = '';
+        $search_montant_vat = '';
+        $search_montant_localtax1 = '';
+        $search_montant_localtax2 = '';
+        $search_montant_ttc = '';
+        $search_status = '';
+        $search_paymentmode = '';
+        $search_town = '';
+        $search_zip = "";
+        $search_state = "";
+        $search_type = '';
+        $search_country = '';
+        $search_type_thirdparty = '';
+        $year = "";
+        $month = "";
+        $day = "";
+        $year_lim = "";
+        $month_lim = "";
+        $day_lim = "";
+        $toselect = '';
+        $search_array_options = array();
+        $filter = '';
+        $option = '';
     }
 
     // Mass actions
-    $objectclass='FactureFournisseur';
-    $objectlabel='SupplierInvoices';
+    $objectclass = 'FactureFournisseur';
+    $objectlabel = 'SupplierInvoices';
     $permtoread = $user->rights->fournisseur->facture->lire;
     $permtocreate = $user->rights->fournisseur->facture->creer;
     $permtodelete = $user->rights->fournisseur->facture->supprimer;
@@ -248,54 +248,54 @@ 
  * View
  */
 
-$form=new Form($db);
-$formother=new FormOther($db);
+$form = new Form($db);
+$formother = new FormOther($db);
 $formfile = new FormFile($db);
-$bankaccountstatic=new Account($db);
-$facturestatic=new FactureFournisseur($db);
-$formcompany=new FormCompany($db);
+$bankaccountstatic = new Account($db);
+$facturestatic = new FactureFournisseur($db);
+$formcompany = new FormCompany($db);
 
-llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
+llxHeader('', $langs->trans("SuppliersInvoices"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
 
 $sql = "SELECT";
 if ($search_all || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.datef, f.date_lim_reglement as datelimite, f.fk_mode_reglement,";
-$sql.= " f.total_ht, f.total_ttc, f.total_tva as total_vat, f.paye as paye, f.fk_statut as fk_statut, f.libelle as label, f.datec as date_creation, f.tms as date_update,";
-$sql.= " f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,";
-$sql.= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
-$sql.= " typent.code as typent_code,";
-$sql.= " state.code_departement as state_code, state.nom as state_name,";
-$sql.= " p.rowid as project_id, p.ref as project_ref";
+$sql .= " f.rowid as facid, f.ref, f.ref_supplier, f.datef, f.date_lim_reglement as datelimite, f.fk_mode_reglement,";
+$sql .= " f.total_ht, f.total_ttc, f.total_tva as total_vat, f.paye as paye, f.fk_statut as fk_statut, f.libelle as label, f.datec as date_creation, f.tms as date_update,";
+$sql .= " f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,";
+$sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
+$sql .= " typent.code as typent_code,";
+$sql .= " state.code_departement as state_code, state.nom as state_name,";
+$sql .= " p.rowid as project_id, p.ref as project_ref";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
-if (! $search_all) $sql.= ', SUM(pf.amount) as dynamount_payed';
+if (!$search_all) $sql .= ', SUM(pf.amount) as dynamount_payed';
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-$sql.= ', '.MAIN_DB_PREFIX.'facture_fourn as f';
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn_extrafields as ef on (f.rowid = ef.fk_object)";
-if (! $search_all) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
-if ($search_all || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det as pd ON f.rowid=pd.fk_facture_fourn';
-if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+$sql .= ', '.MAIN_DB_PREFIX.'facture_fourn as f';
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn_extrafields as ef on (f.rowid = ef.fk_object)";
+if (!$search_all) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
+if ($search_all || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det as pd ON f.rowid=pd.fk_facture_fourn';
+if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 if ($search_user > 0)
 {
-    $sql.=", ".MAIN_DB_PREFIX."element_contact as ec";
-    $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
+    $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+    $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
-$sql.= ' WHERE f.fk_soc = s.rowid';
-$sql.= ' AND f.entity IN ('.getEntity('facture_fourn').')';
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
+$sql .= ' WHERE f.fk_soc = s.rowid';
+$sql .= ' AND f.entity IN ('.getEntity('facture_fourn').')';
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
 if ($search_ref)
 {
@@ -306,51 +306,51 @@ 
 if ($search_refsupplier) $sql .= natural_search('f.ref_supplier', $search_refsupplier);
 if ($search_project) $sql .= natural_search('p.ref', $search_project);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($search_town)  $sql.= natural_search('s.town', $search_town);
-if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
-if ($search_state) $sql.= natural_search("state.nom",$search_state);
+if ($search_town)  $sql .= natural_search('s.town', $search_town);
+if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
+if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_montant_ht != '') $sql.= natural_search('f.total_ht', $search_montant_ht, 1);
-if ($search_montant_vat != '') $sql.= natural_search('f.total_tva', $search_montant_vat, 1);
-if ($search_montant_localtax1 != '') $sql.= natural_search('f.localtax1', $search_montant_localtax1, 1);
-if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1);
-if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
-if ($search_status != '' && $search_status >= 0) $sql.= " AND f.fk_statut = ".$db->escape($search_status);
+if ($search_montant_ht != '') $sql .= natural_search('f.total_ht', $search_montant_ht, 1);
+if ($search_montant_vat != '') $sql .= natural_search('f.total_tva', $search_montant_vat, 1);
+if ($search_montant_localtax1 != '') $sql .= natural_search('f.localtax1', $search_montant_localtax1, 1);
+if ($search_montant_localtax2 != '') $sql .= natural_search('f.localtax2', $search_montant_localtax2, 1);
+if ($search_montant_ttc != '') $sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
+if ($search_status != '' && $search_status >= 0) $sql .= " AND f.fk_statut = ".$db->escape($search_status);
 if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
 if ($month > 0)
 {
 	if ($year > 0 && empty($day))
-	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-	else if ($year > 0 && ! empty($day))
-		$sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+	$sql .= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year, $month, false))."' AND '".$db->idate(dol_get_last_day($year, $month, false))."'";
+	else if ($year > 0 && !empty($day))
+		$sql .= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
 	else
-	$sql.= " AND date_format(f.datef, '%m') = '".$month."'";
+	$sql .= " AND date_format(f.datef, '%m') = '".$month."'";
 }
 else if ($year > 0)
 {
-	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+	$sql .= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
 }
 if ($month_lim > 0)
 {
 	if ($year_lim > 0 && empty($day_lim))
-		$sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,$month_lim,false))."' AND '".$db->idate(dol_get_last_day($year_lim,$month_lim,false))."'";
-	else if ($year_lim > 0 && ! empty($day_lim))
-		$sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
+		$sql .= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim, $month_lim, false))."' AND '".$db->idate(dol_get_last_day($year_lim, $month_lim, false))."'";
+	else if ($year_lim > 0 && !empty($day_lim))
+		$sql .= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
 	else
-		$sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'";
+		$sql .= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'";
 }
 else if ($year_lim > 0)
 {
-	$sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,1,false))."' AND '".$db->idate(dol_get_last_day($year_lim,12,false))."'";
+	$sql .= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim, 1, false))."' AND '".$db->idate(dol_get_last_day($year_lim, 12, false))."'";
 }
-if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
-if ($filter == 'paye:0') $sql.= " AND f.fk_statut = 1";
+if ($option == 'late') $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
+if ($filter == 'paye:0') $sql .= " AND f.fk_statut = 1";
 if ($search_label) $sql .= natural_search('f.libelle', $search_label);
 if ($search_status != '' && $search_status >= 0)
 {
-	$sql.= " AND f.fk_statut = ".$search_status;
+	$sql .= " AND f.fk_statut = ".$search_status;
 }
 if ($filter && $filter != -1)
 {
@@ -358,53 +358,53 @@ 
 	foreach ($aFilter as $fil)
 	{
 		$filt = explode(':', $fil);
-		$sql .= ' AND ' . trim($filt[0]) . ' = ' . trim($filt[1]);
+		$sql .= ' AND '.trim($filt[0]).' = '.trim($filt[1]);
 	}
 }
-if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
+if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
 if ($search_user > 0)
 {
-    $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='invoice_supplier' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
+    $sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='invoice_supplier' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
 }
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
+    $crit = $val;
+    $tmpkey = preg_replace('/search_options_/', '', $key);
+    $typ = $extrafields->attribute_type[$tmpkey];
+    $mode = 0;
+    if (in_array($typ, array('int', 'double'))) $mode = 1; // Search on a numeric
+    if ($val && (($crit != '' && !in_array($typ, array('select'))) || !empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
 }
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
-if (! $search_all)
+if (!$search_all)
 {
-    $sql.= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.datef, f.date_lim_reglement, f.fk_mode_reglement,";
-    $sql.= " f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut, f.libelle, f.datec, f.tms,";
-    $sql.= " f.localtax1, f.localtax2,";
-    $sql.= " s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
-    $sql.= " typent.code,";
-    $sql.= " state.code_departement, state.nom,";
-    $sql.= " p.rowid, p.ref";
+    $sql .= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.datef, f.date_lim_reglement, f.fk_mode_reglement,";
+    $sql .= " f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut, f.libelle, f.datec, f.tms,";
+    $sql .= " f.localtax1, f.localtax2,";
+    $sql .= " s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
+    $sql .= " typent.code,";
+    $sql .= " state.code_departement, state.nom,";
+    $sql .= " p.rowid, p.ref";
 
     foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
     {
-        $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+        $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
     }
 }
 else
 {
-    $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+    $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 
-$sql.= $db->order($sortfield,$sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -413,7 +413,7 @@ 
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
 
 $resql = $db->query($sql);
@@ -421,7 +421,7 @@ 
 {
 	$num = $db->num_rows($resql);
 
-	$arrayofselected=is_array($toselect)?$toselect:array();
+	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	if ($socid)
 	{
@@ -430,49 +430,49 @@ 
 		if (empty($search_societe)) $search_societe = $soc->name;
 	}
 
-	$param='&socid='.$socid;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($search_all)			$param.='&search_all='.urlencode($search_all);
-    if ($day) 					$param.='&day='.urlencode($day);
-	if ($month) 				$param.='&month='.urlencode($month);
-	if ($year)  				$param.='&year=' .urlencode($year);
-	if ($day_lim) 				$param.='&day_lim='.urlencode($day_lim);
-	if ($month_lim) 			$param.='&month_lim='.urlencode($month_lim);
-	if ($year_lim)  			$param.='&year_lim=' .urlencode($year_lim);
-	if ($search_ref)          	$param.='&search_ref='.urlencode($search_ref);
-	if ($search_refsupplier) 	$param.='&search_refsupplier='.urlencode($search_refsupplier);
-	if ($search_label)      	$param.='&search_label='.urlencode($search_label);
-	if ($search_company)      	$param.='&search_company='.urlencode($search_company);
-    if ($search_montant_ht != '')  $param.='&search_montant_ht='.urlencode($search_montant_ht);
-    if ($search_montant_vat != '')  $param.='&search_montant_vat='.urlencode($search_montant_vat);
-    if ($search_montant_localtax1 != '')  $param.='&search_montant_localtax1='.urlencode($search_montant_localtax1);
-    if ($search_montant_localtax2 != '')  $param.='&search_montant_localtax2='.urlencode($search_montant_localtax2);
-    if ($search_montant_ttc != '') $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
-	if ($search_amount_no_tax)	$param.='&search_amount_no_tax='.urlencode($search_amount_no_tax);
-	if ($search_amount_all_tax)	$param.='&search_amount_all_tax='.urlencode($search_amount_all_tax);
-	if ($search_status >= 0)  	$param.="&search_status=".urlencode($search_status);
-    if ($show_files)            $param.='&show_files=' .$show_files;
-	if ($option)                $param.="&option=".$option;
-	if ($optioncss != '')       $param.='&optioncss='.$optioncss;
+	$param = '&socid='.$socid;
+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if ($search_all)			$param .= '&search_all='.urlencode($search_all);
+    if ($day) 					$param .= '&day='.urlencode($day);
+	if ($month) 				$param .= '&month='.urlencode($month);
+	if ($year)  				$param .= '&year='.urlencode($year);
+	if ($day_lim) 				$param .= '&day_lim='.urlencode($day_lim);
+	if ($month_lim) 			$param .= '&month_lim='.urlencode($month_lim);
+	if ($year_lim)  			$param .= '&year_lim='.urlencode($year_lim);
+	if ($search_ref)          	$param .= '&search_ref='.urlencode($search_ref);
+	if ($search_refsupplier) 	$param .= '&search_refsupplier='.urlencode($search_refsupplier);
+	if ($search_label)      	$param .= '&search_label='.urlencode($search_label);
+	if ($search_company)      	$param .= '&search_company='.urlencode($search_company);
+    if ($search_montant_ht != '')  $param .= '&search_montant_ht='.urlencode($search_montant_ht);
+    if ($search_montant_vat != '')  $param .= '&search_montant_vat='.urlencode($search_montant_vat);
+    if ($search_montant_localtax1 != '')  $param .= '&search_montant_localtax1='.urlencode($search_montant_localtax1);
+    if ($search_montant_localtax2 != '')  $param .= '&search_montant_localtax2='.urlencode($search_montant_localtax2);
+    if ($search_montant_ttc != '') $param .= '&search_montant_ttc='.urlencode($search_montant_ttc);
+	if ($search_amount_no_tax)	$param .= '&search_amount_no_tax='.urlencode($search_amount_no_tax);
+	if ($search_amount_all_tax)	$param .= '&search_amount_all_tax='.urlencode($search_amount_all_tax);
+	if ($search_status >= 0)  	$param .= "&search_status=".urlencode($search_status);
+    if ($show_files)            $param .= '&show_files='.$show_files;
+	if ($option)                $param .= "&option=".$option;
+	if ($optioncss != '')       $param .= '&optioncss='.$optioncss;
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
 	{
-	    $crit=$val;
-	    $tmpkey=preg_replace('/search_options_/','',$key);
-	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+	    $crit = $val;
+	    $tmpkey = preg_replace('/search_options_/', '', $key);
+	    if ($val != '') $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
 	}
 
 	// List of mass actions available
-	$arrayofmassactions =  array(
+	$arrayofmassactions = array(
 	    'validate'=>$langs->trans("Validate"),
 		//'presend'=>$langs->trans("SendByMail"),
 	    //'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['delete'] = $langs->trans("Delete");
 	//if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
-	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$i = 0;
 	print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -486,27 +486,27 @@ 
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
 
-	print_barre_liste($langs->trans("BillsSuppliers").($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
+	print_barre_liste($langs->trans("BillsSuppliers").($socid ? ' '.$soc->name : ''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
 
-	    if (! GETPOST('cancel'))
+	    if (!GETPOST('cancel'))
 	    {
-	    	$objecttmp=new FactureFournisseur($db);
-	        $listofselectedid=array();
-	        $listofselectedthirdparties=array();
-	        $listofselectedref=array();
-	        foreach($arrayofselected as $toselectid)
+	    	$objecttmp = new FactureFournisseur($db);
+	        $listofselectedid = array();
+	        $listofselectedthirdparties = array();
+	        $listofselectedref = array();
+	        foreach ($arrayofselected as $toselectid)
 	        {
-	            $result=$objecttmp->fetch($toselectid);
+	            $result = $objecttmp->fetch($toselectid);
 	            if ($result > 0)
 	            {
-	                $listofselectedid[$toselectid]=$toselectid;
-	                $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
-	                $listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
-	                $listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
+	                $listofselectedid[$toselectid] = $toselectid;
+	                $thirdpartyid = $objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid;
+	                $listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
+	                $listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
 	            }
 	        }
 	    }
@@ -518,67 +518,67 @@ 
 
 	    dol_fiche_head(null, '', '');
 
-	    $topicmail="SendBillRef";
-	    $modelmail="supplier_invoice_send";
+	    $topicmail = "SendBillRef";
+	    $modelmail = "supplier_invoice_send";
 
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
-	    $formmail->withform=-1;
-	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+	    $formmail->withform = -1;
+	    $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
 
-	    if($formmail->fromtype === 'user'){
+	    if ($formmail->fromtype === 'user') {
 	        $formmail->fromid = $user->id;
 
 	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
+	    if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
 	    {
-	        $formmail->trackid='sinv'.$object->id;
+	        $formmail->trackid = 'sinv'.$object->id;
 	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+	    if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 	    {
 	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sinv'.$object->id);
+	        $formmail->frommail = dolAddEmailTrackId($formmail->frommail, 'sinv'.$object->id);
 	    }
-	    $formmail->withfrom=1;
-	    $liste=$langs->trans("AllRecipientSelected");
+	    $formmail->withfrom = 1;
+	    $liste = $langs->trans("AllRecipientSelected");
 	    if (count($listofselectedthirdparties) == 1)
 	    {
-	        $liste=array();
-	        $thirdpartyid=array_shift($listofselectedthirdparties);
-	        $soc=new Societe($db);
+	        $liste = array();
+	        $thirdpartyid = array_shift($listofselectedthirdparties);
+	        $soc = new Societe($db);
 	        $soc->fetch($thirdpartyid);
 	        foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
 	        {
-	            $liste[$key]=$value;
+	            $liste[$key] = $value;
 	        }
-	        $formmail->withtoreadonly=0;
+	        $formmail->withtoreadonly = 0;
 	    }
 	    else
 	    {
-	        $formmail->withtoreadonly=1;
+	        $formmail->withtoreadonly = 1;
 	    }
-	    $formmail->withto=$liste;
-	    $formmail->withtofree=0;
-	    $formmail->withtocc=1;
-	    $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-	    $formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-	    $formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
-	    $formmail->withbody=1;
-	    $formmail->withdeliveryreceipt=1;
-	    $formmail->withcancel=1;
+	    $formmail->withto = $liste;
+	    $formmail->withtofree = 0;
+	    $formmail->withtocc = 1;
+	    $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+	    $formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
+	    $formmail->withfile = $langs->trans("OnlyPDFattachmentSupported");
+	    $formmail->withbody = 1;
+	    $formmail->withdeliveryreceipt = 1;
+	    $formmail->withcancel = 1;
 	    // Tableau des substitutions
-	    $formmail->substit['__REF__']='__REF__';	// We want to keep the tag
-	    $formmail->substit['__SIGNATURE__']=$user->signature;
-	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
-	    $formmail->substit['__PERSONALIZED__']='';
-	    $formmail->substit['__CONTACTCIVNAME__']='';
+	    $formmail->substit['__REF__'] = '__REF__'; // We want to keep the tag
+	    $formmail->substit['__SIGNATURE__'] = $user->signature;
+	    $formmail->substit['__REFCLIENT__'] = '__REFCLIENT__'; // We want to keep the tag
+	    $formmail->substit['__PERSONALIZED__'] = '';
+	    $formmail->substit['__CONTACTCIVNAME__'] = '';
 
 	    // Tableau des parametres complementaires du post
-	    $formmail->param['action']=$action;
-	    $formmail->param['models']=$modelmail;
-	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
-	    $formmail->param['id']=join(',',$arrayofselected);
+	    $formmail->param['action'] = $action;
+	    $formmail->param['models'] = $modelmail;
+	    $formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
+	    $formmail->param['id'] = join(',', $arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 
 	    print $formmail->get_form();
@@ -627,40 +627,40 @@ 
 
 	if ($search_all)
     {
-        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
+        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+        print $langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall);
     }
 
  	// If the user can view prospects other than his'
-    $moreforfilter='';
+    $moreforfilter = '';
  	if ($user->rights->societe->client->voir || $socid)
  	{
  		$langs->load("commercial");
- 		$moreforfilter.='<div class="divsearchfield">';
- 		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
-	 	$moreforfilter.='</div>';
+ 		$moreforfilter .= '<div class="divsearchfield">';
+ 		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
+		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
+	 	$moreforfilter .= '</div>';
  	}
     // If the user can view prospects other than his'
     if ($user->rights->societe->client->voir || $socid)
     {
-		$moreforfilter.='<div class="divsearchfield">';
-    	$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
-	 	$moreforfilter.='</div>';
+		$moreforfilter .= '<div class="divsearchfield">';
+    	$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
+        $moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+	 	$moreforfilter .= '</div>';
     }
 	// If the user can view prospects other than his'
 	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$moreforfilter.='<div class="divsearchfield">';
-		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
+		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
-		$moreforfilter.='</div>';
+		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+		$moreforfilter .= '</div>';
 	}
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    $parameters = array();
+    $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
 
@@ -671,138 +671,138 @@ 
         print '</div>';
     }
 
-    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+    if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Line for filters
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (! empty($arrayfields['f.ref']['checked']))
+	if (!empty($arrayfields['f.ref']['checked']))
 	{
 	    print '<td class="liste_titre" align="left">';
 	    print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
 	    print '</td>';
 	}
 	// Ref supplier
-	if (! empty($arrayfields['f.ref_supplier']['checked']))
+	if (!empty($arrayfields['f.ref_supplier']['checked']))
 	{
 	    print '<td class="liste_titre">';
 	    print '<input class="flat" size="6" type="text" name="search_refsupplier" value="'.$search_refsupplier.'">';
 	    print '</td>';
 	}
 	// Label
-	if (! empty($arrayfields['f.label']['checked']))
+	if (!empty($arrayfields['f.label']['checked']))
 	{
 	    print '<td class="liste_titre">';
 	    print '<input class="flat" size="6" type="text" name="search_label" value="'.$search_label.'">';
 	    print '</td>';
 	}
 	// Date invoice
-	if (! empty($arrayfields['f.datef']['checked']))
+	if (!empty($arrayfields['f.datef']['checked']))
 	{
 	    print '<td class="liste_titre" align="center">';
-	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+	    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
 	    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-	    $formother->select_year($year?$year:-1,'year',1, 20, 5);
+	    $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
 	    print '</td>';
 	}
 	// Date due
-	if (! empty($arrayfields['f.date_lim_reglement']['checked']))
+	if (!empty($arrayfields['f.date_lim_reglement']['checked']))
 	{
 	    print '<td class="liste_titre" align="center">';
-	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
+	    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
 	    print '<input class="flat" type="text" size="1" maxlength="2" name="month_lim" value="'.$month_lim.'">';
-	    $formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
-	    print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
+	    $formother->select_year($year_lim ? $year_lim : -1, 'year_lim', 1, 20, 5);
+	    print '<br><input type="checkbox" name="option" value="late"'.($option == 'late' ? ' checked' : '').'> '.$langs->trans("Late");
 	    print '</td>';
 	}
 	// Project
-	if (! empty($arrayfields['p.ref']['checked']))
+	if (!empty($arrayfields['p.ref']['checked']))
 	{
 	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirpdarty
-	if (! empty($arrayfields['s.nom']['checked']))
+	if (!empty($arrayfields['s.nom']['checked']))
 	{
 	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 	// State
-	if (! empty($arrayfields['state.nom']['checked']))
+	if (!empty($arrayfields['state.nom']['checked']))
 	{
 	    print '<td class="liste_titre">';
 	    print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 	    print '</td>';
 	}
 	// Country
-	if (! empty($arrayfields['country.code_iso']['checked']))
+	if (!empty($arrayfields['country.code_iso']['checked']))
 	{
 	    print '<td class="liste_titre" align="center">';
-	    print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+	    print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100');
 	    print '</td>';
 	}
 	// Company type
-	if (! empty($arrayfields['typent.code']['checked']))
+	if (!empty($arrayfields['typent.code']['checked']))
 	{
 	    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	    print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+	    print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
 	    print '</td>';
 	}
 	// Payment mode
-	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
 	    print '<td class="liste_titre" align="left">';
 	    $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 0, 1, 10);
 	    print '</td>';
 	}
-	if (! empty($arrayfields['f.total_ht']['checked']))
+	if (!empty($arrayfields['f.total_ht']['checked']))
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
 	    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 	    print '</td>';
 	}
-	if (! empty($arrayfields['f.total_vat']['checked']))
+	if (!empty($arrayfields['f.total_vat']['checked']))
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
 	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 	    print '</td>';
 	}
-	if (! empty($arrayfields['f.total_localtax1']['checked']))
+	if (!empty($arrayfields['f.total_localtax1']['checked']))
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
 	    print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
 	    print '</td>';
 	}
-	if (! empty($arrayfields['f.total_localtax2']['checked']))
+	if (!empty($arrayfields['f.total_localtax2']['checked']))
 	{
 	    // Amount
  	    print '<td class="liste_titre" align="right">';
 	    print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
 	    print '</td>';
 	}
-	if (! empty($arrayfields['f.total_ttc']['checked']))
+	if (!empty($arrayfields['f.total_ttc']['checked']))
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
 	    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 	    print '</td>';
 	}
-    if (! empty($arrayfields['dynamount_payed']['checked']))
+    if (!empty($arrayfields['dynamount_payed']['checked']))
     {
         print '<td class="liste_titre" align="right">';
         print '</td>';
     }
-    if (! empty($arrayfields['rtp']['checked']))
+    if (!empty($arrayfields['rtp']['checked']))
     {
         print '<td class="liste_titre" align="right">';
         print '</td>';
@@ -810,122 +810,122 @@ 
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	    foreach($extrafields->attribute_label as $key => $val)
+	    foreach ($extrafields->attribute_label as $key => $val)
 	    {
-	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        if (!empty($arrayfields["ef.".$key]['checked']))
 	        {
-	            $align=$extrafields->getAlignFlag($key);
-	            $typeofextrafield=$extrafields->attribute_type[$key];
-	            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+	            $align = $extrafields->getAlignFlag($key);
+	            $typeofextrafield = $extrafields->attribute_type[$key];
+	            print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
 	            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
 	            {
-	                $crit=$val;
-	                $tmpkey=preg_replace('/search_options_/','',$key);
-	                $searchclass='';
-	                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-	                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-	                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+	                $crit = $val;
+	                $tmpkey = preg_replace('/search_options_/', '', $key);
+	                $searchclass = '';
+	                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass = 'searchstring';
+	                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';
+	                print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
 	            }
 	            print '</td>';
 	        }
 	    }
 	}
 	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields);
-	$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (! empty($arrayfields['f.datec']['checked']))
+	if (!empty($arrayfields['f.datec']['checked']))
 	{
 	    print '<td class="liste_titre">';
 	    print '</td>';
 	}
 	// Date modification
-	if (! empty($arrayfields['f.tms']['checked']))
+	if (!empty($arrayfields['f.tms']['checked']))
 	{
 	    print '<td class="liste_titre">';
 	    print '</td>';
 	}
 	// Status
-	if (! empty($arrayfields['f.fk_statut']['checked']))
+	if (!empty($arrayfields['f.fk_statut']['checked']))
 	{
 	    print '<td class="liste_titre maxwidthonsmartphone" align="right">';
-	    $liststatus=array('0'=>$langs->trans("Draft"),'1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
+	    $liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
 	    print $form->selectarray('search_status', $liststatus, $search_status, 1);
 	    print '</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">';
-	if (! empty($arrayfields['f.ref']['checked']))                print_liste_field_titre($arrayfields['f.ref']['label'],$_SERVER['PHP_SELF'],'f.ref,f.rowid','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.ref_supplier']['checked']))       print_liste_field_titre($arrayfields['f.ref_supplier']['label'],$_SERVER["PHP_SELF"],'f.ref_supplier','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.label']['checked']))              print_liste_field_titre($arrayfields['f.label']['label'],$_SERVER['PHP_SELF'],"f.libelle,f.rowid",'',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.datef']['checked']))              print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER['PHP_SELF'],'f.datef,f.rowid','',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'],$_SERVER['PHP_SELF'],"f.date_lim_reglement",'',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.ref']['checked']))                print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER['PHP_SELF'],"p.ref",'',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))                print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],'s.nom','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))               print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))                print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))            print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER["PHP_SELF"],"f.fk_mode_reglement","",$param,"",$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'],$_SERVER['PHP_SELF'],'f.total','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'],$_SERVER['PHP_SELF'],'f.tva','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'],$_SERVER['PHP_SELF'],'f.localtax1','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'],$_SERVER['PHP_SELF'],'f.localtax2','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
-    if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
-    if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+	if (!empty($arrayfields['f.ref']['checked']))                print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER['PHP_SELF'], 'f.ref,f.rowid', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.ref_supplier']['checked']))       print_liste_field_titre($arrayfields['f.ref_supplier']['label'], $_SERVER["PHP_SELF"], 'f.ref_supplier', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.label']['checked']))              print_liste_field_titre($arrayfields['f.label']['label'], $_SERVER['PHP_SELF'], "f.libelle,f.rowid", '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.datef']['checked']))              print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER['PHP_SELF'], 'f.datef,f.rowid', '', $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'], $_SERVER['PHP_SELF'], "f.date_lim_reglement", '', $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.ref']['checked']))                print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER['PHP_SELF'], "p.ref", '', $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.nom']['checked']))                print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], 's.nom', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.town']['checked']))               print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.zip']['checked']))                print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['state.nom']['checked']))            print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
+	if (!empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'align="right"', $sortfield, $sortorder);
+    if (!empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
+    if (!empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	    foreach($extrafields->attribute_label as $key => $val)
+	    foreach ($extrafields->attribute_label as $key => $val)
 	    {
-	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        if (!empty($arrayfields["ef.".$key]['checked']))
 	        {
-	            $align=$extrafields->getAlignFlag($key);
+	            $align = $extrafields->getAlignFlag($key);
     			$sortonfield = "ef.".$key;
-    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-    			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    			if (!empty($extrafields->attribute_computed[$key])) $sortonfield = '';
+    			print_liste_field_titre($langs->trans($extralabels[$key]), $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'"' : ''), $sortfield, $sortorder);
 	        }
 	    }
 	}
 	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+	if (!empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "fk_statut,paye", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
-    $facturestatic=new FactureFournisseur($db);
-	$supplierstatic=new Fournisseur($db);
-	$projectstatic=new Project($db);
+    $facturestatic = new FactureFournisseur($db);
+	$supplierstatic = new Fournisseur($db);
+	$projectstatic = new Project($db);
 
 	if ($num > 0)
     {
-		$i=0;
+		$i = 0;
 
-		$var=true;
-	    $totalarray=array();
-		while ($i < min($num,$limit))
+		$var = true;
+	    $totalarray = array();
+		while ($i < min($num, $limit))
 		{
 			$obj = $db->fetch_object($resql);
 
-			$datelimit=$db->jdate($obj->datelimite);
-			$facturestatic->id=$obj->facid;
-			$facturestatic->ref=$obj->ref;
-            $facturestatic->type=$obj->type;
-			$facturestatic->ref_supplier=$obj->ref_supplier;
+			$datelimit = $db->jdate($obj->datelimite);
+			$facturestatic->id = $obj->facid;
+			$facturestatic->ref = $obj->ref;
+            $facturestatic->type = $obj->type;
+			$facturestatic->ref_supplier = $obj->ref_supplier;
 			$facturestatic->date_echeance = $db->jdate($obj->datelimite);
 			$facturestatic->statut = $obj->fk_statut;
 
@@ -936,7 +936,7 @@ 
 			$remaintopay = $obj->total_ttc - $totalpay;
 
             print '<tr class="oddeven">';
-    		if (! empty($arrayfields['f.ref']['checked']))
+    		if (!empty($arrayfields['f.ref']['checked']))
     		{
                 print '<td class="nowrap">';
 
@@ -950,186 +950,186 @@ 
                 //print '</td>';
                 // Other picto tool
                 print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
-                $filename=dol_sanitizeFileName($obj->ref);
-                $filedir=$conf->fournisseur->facture->dir_output.'/'.get_exdir($obj->facid,2,0,0,$facturestatic,'invoice_supplier').dol_sanitizeFileName($obj->ref);
-				$subdir = get_exdir($obj->facid,2,0,0,$facturestatic,'invoice_supplier').dol_sanitizeFileName($obj->ref);
+                $filename = dol_sanitizeFileName($obj->ref);
+                $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
+				$subdir = get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
 				print $formfile->getDocumentsLink('facture_fournisseur', $subdir, $filedir);
 				print '</td></tr></table>';
 
                 print "</td>\n";
-				if (! $i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['nbfield']++;
     		}
 
 			// Customer ref
-    		if (! empty($arrayfields['f.ref_supplier']['checked']))
+    		if (!empty($arrayfields['f.ref_supplier']['checked']))
     		{
         		print '<td class="nowrap">';
     			print $obj->ref_supplier;
     			print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
 
 			// Label
-    		if (! empty($arrayfields['f.label']['checked']))
+    		if (!empty($arrayfields['f.label']['checked']))
     		{
         		print '<td class="nowrap">';
     			print $obj->label;
     			print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
 
 			// Date
-    		if (! empty($arrayfields['f.datef']['checked']))
+    		if (!empty($arrayfields['f.datef']['checked']))
     		{
         		print '<td align="center" class="nowrap">';
-                print dol_print_date($db->jdate($obj->datef),'day');
+                print dol_print_date($db->jdate($obj->datef), 'day');
                 print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
 
             // Date limit
-    		if (! empty($arrayfields['f.date_lim_reglement']['checked']))
+    		if (!empty($arrayfields['f.date_lim_reglement']['checked']))
     		{
-        		print '<td align="center" class="nowrap">'.dol_print_date($datelimit,'day');
+        		print '<td align="center" class="nowrap">'.dol_print_date($datelimit, 'day');
                 if ($facturestatic->hasDelay())
                 {
                     print img_warning($langs->trans('Late'));
                 }
                 print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
 
     		// Project
-    		if (! empty($arrayfields['p.ref']['checked']))
+    		if (!empty($arrayfields['p.ref']['checked']))
     		{
     		    print '<td class="nowrap">';
     		    if ($obj->project_id > 0)
     		    {
-	    		    $projectstatic->id=$obj->project_id;
-    			    $projectstatic->ref=$obj->project_ref;
+	    		    $projectstatic->id = $obj->project_id;
+    			    $projectstatic->ref = $obj->project_ref;
     			    print $projectstatic->getNomUrl(1);
     		    }
     		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
 
     		// Third party
-    		if (! empty($arrayfields['s.nom']['checked']))
+    		if (!empty($arrayfields['s.nom']['checked']))
     		{
                 print '<td class="tdoverflowmax200">';
-                $thirdparty=new Societe($db);
-                $thirdparty->id=$obj->socid;
-                $thirdparty->name=$obj->name;
-                $thirdparty->client=$obj->client;
-                $thirdparty->code_client=$obj->code_client;
-                print $thirdparty->getNomUrl(1,'supplier');
+                $thirdparty = new Societe($db);
+                $thirdparty->id = $obj->socid;
+                $thirdparty->name = $obj->name;
+                $thirdparty->client = $obj->client;
+                $thirdparty->code_client = $obj->code_client;
+                print $thirdparty->getNomUrl(1, 'supplier');
                 print '</td>';
-                if (! $i) $totalarray['nbfield']++;
+                if (!$i) $totalarray['nbfield']++;
     		}
     		// Town
-    		if (! empty($arrayfields['s.town']['checked']))
+    		if (!empty($arrayfields['s.town']['checked']))
     		{
     		    print '<td class="nocellnopadd">';
     		    print $obj->town;
     		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
     		// Zip
-    		if (! empty($arrayfields['s.zip']['checked']))
+    		if (!empty($arrayfields['s.zip']['checked']))
     		{
     		    print '<td class="nocellnopadd">';
     		    print $obj->zip;
     		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
     		// State
-    		if (! empty($arrayfields['state.nom']['checked']))
+    		if (!empty($arrayfields['state.nom']['checked']))
     		{
     		    print "<td>".$obj->state_name."</td>\n";
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
     		// Country
-    		if (! empty($arrayfields['country.code_iso']['checked']))
+    		if (!empty($arrayfields['country.code_iso']['checked']))
     		{
     		    print '<td align="center">';
-    		    $tmparray=getCountry($obj->fk_pays,'all');
+    		    $tmparray = getCountry($obj->fk_pays, 'all');
     		    print $tmparray['label'];
     		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
     		// Type ent
-    		if (! empty($arrayfields['typent.code']['checked']))
+    		if (!empty($arrayfields['typent.code']['checked']))
     		{
     		    print '<td align="center">';
-    		    if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+    		    if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
     		    print $typenArray[$obj->typent_code];
     		    print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
 
             // Payment mode
-    		if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
+    		if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
     		{
         		print '<td>';
                 $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
                 print '</td>';
-    		    if (! $i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['nbfield']++;
     		}
 
             // Amount HT
-            if (! empty($arrayfields['f.total_ht']['checked']))
+            if (!empty($arrayfields['f.total_ht']['checked']))
             {
     		      print '<td align="right">'.price($obj->total_ht)."</td>\n";
-    		      if (! $i) $totalarray['nbfield']++;
-    		      if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
+    		      if (!$i) $totalarray['nbfield']++;
+    		      if (!$i) $totalarray['totalhtfield'] = $totalarray['nbfield'];
     		      $totalarray['totalht'] += $obj->total_ht;
             }
             // Amount VAT
-            if (! empty($arrayfields['f.total_vat']['checked']))
+            if (!empty($arrayfields['f.total_vat']['checked']))
             {
                 print '<td align="right">'.price($obj->total_vat)."</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
+                if (!$i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['totalvatfield'] = $totalarray['nbfield'];
     		    $totalarray['totalvat'] += $obj->total_vat;
             }
             // Amount LocalTax1
-            if (! empty($arrayfields['f.total_localtax1']['checked']))
+            if (!empty($arrayfields['f.total_localtax1']['checked']))
             {
                 print '<td align="right">'.price($obj->total_localtax1)."</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield'];
+                if (!$i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['totallocaltax1field'] = $totalarray['nbfield'];
     		    $totalarray['totallocaltax1'] += $obj->total_localtax1;
             }
             // Amount LocalTax2
-            if (! empty($arrayfields['f.total_localtax2']['checked']))
+            if (!empty($arrayfields['f.total_localtax2']['checked']))
             {
                 print '<td align="right">'.price($obj->total_localtax2)."</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield'];
+                if (!$i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['totallocaltax2field'] = $totalarray['nbfield'];
     		    $totalarray['totallocaltax2'] += $obj->total_localtax2;
             }
             // Amount TTC
-            if (! empty($arrayfields['f.total_ttc']['checked']))
+            if (!empty($arrayfields['f.total_ttc']['checked']))
             {
                 print '<td align="right">'.price($obj->total_ttc)."</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
+                if (!$i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['totalttcfield'] = $totalarray['nbfield'];
     		    $totalarray['totalttc'] += $obj->total_ttc;
             }
 
-		    if (! empty($arrayfields['dynamount_payed']['checked']))
+		    if (!empty($arrayfields['dynamount_payed']['checked']))
             {
-                print '<td align="right">'.(! empty($totalpay)?price($totalpay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
+                print '<td align="right">'.(!empty($totalpay) ? price($totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
+                if (!$i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['totalamfield'] = $totalarray['nbfield'];
     		    $totalarray['totalam'] += $totalpay;
             }
 
-            if (! empty($arrayfields['rtp']['checked']))
+            if (!empty($arrayfields['rtp']['checked']))
             {
-                print '<td align="right">'.(! empty($remaintopay)?price($remaintopay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
-                if (! $i) $totalarray['nbfield']++;
-    		    if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
+                print '<td align="right">'.(!empty($remaintopay) ? price($remaintopay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
+                if (!$i) $totalarray['nbfield']++;
+    		    if (!$i) $totalarray['totalrtpfield'] = $totalarray['nbfield'];
     		    $totalarray['totalrtp'] += $remaintopay;
             }
 
@@ -1137,61 +1137,61 @@ 
             // Extra fields
             if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
             {
-                foreach($extrafields->attribute_label as $key => $val)
+                foreach ($extrafields->attribute_label as $key => $val)
                 {
-                    if (! empty($arrayfields["ef.".$key]['checked']))
+                    if (!empty($arrayfields["ef.".$key]['checked']))
                     {
                         print '<td';
-                        $align=$extrafields->getAlignFlag($key);
+                        $align = $extrafields->getAlignFlag($key);
                         if ($align) print ' align="'.$align.'"';
                         print '>';
-                        $tmpkey='options_'.$key;
+                        $tmpkey = 'options_'.$key;
                         print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
                         print '</td>';
-                        if (! $i) $totalarray['nbfield']++;
+                        if (!$i) $totalarray['nbfield']++;
                     }
                 }
             }
             // Fields from hook
-            $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-            $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+            $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+            $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
             // Date creation
-            if (! empty($arrayfields['f.datec']['checked']))
+            if (!empty($arrayfields['f.datec']['checked']))
             {
                 print '<td align="center" class="nowrap">';
                 print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
                 print '</td>';
-                if (! $i) $totalarray['nbfield']++;
+                if (!$i) $totalarray['nbfield']++;
             }
             // Date modification
-            if (! empty($arrayfields['f.tms']['checked']))
+            if (!empty($arrayfields['f.tms']['checked']))
             {
                 print '<td align="center" class="nowrap">';
                 print dol_print_date($db->jdate($obj->date_update), 'dayhour');
                 print '</td>';
-                if (! $i) $totalarray['nbfield']++;
+                if (!$i) $totalarray['nbfield']++;
             }
             // Status
-            if (! empty($arrayfields['f.fk_statut']['checked']))
+            if (!empty($arrayfields['f.fk_statut']['checked']))
             {
                 print '<td align="right" class="nowrap">';
                 // TODO $paiement is not yet defined
-                print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$paiement,$obj->type);
+                print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
                 print "</td>";
-                if (! $i) $totalarray['nbfield']++;
+                if (!$i) $totalarray['nbfield']++;
             }
 
     		// Action column
             print '<td class="nowrap" align="center">';
             if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
             {
-                $selected=0;
-                if (in_array($obj->facid, $arrayofselected)) $selected=1;
-                print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected?' checked="checked"':'').'>';
+                $selected = 0;
+                if (in_array($obj->facid, $arrayofselected)) $selected = 1;
+                print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
             }
             print '</td>';
-    		if (! $i) $totalarray['nbfield']++;
+    		if (!$i) $totalarray['nbfield']++;
 
 			print "</tr>\n";
 
@@ -1209,7 +1209,7 @@ 
  	   )
     	{
     		print '<tr class="liste_total">';
-    		$i=0;
+    		$i = 0;
     		while ($i < $totalarray['nbfield'])
     		{
     		   $i++;
@@ -1234,8 +1234,8 @@ 
 
 	$db->free($resql);
 
-	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
 	print "</table>\n";

htdocs/master.inc.php

Braces +57 added lines, -20 removed lines

@@ -56,7 +56,10 @@ 
 $conf->db->dolibarr_main_db_collation	= $dolibarr_main_db_collation;
 $conf->db->dolibarr_main_db_encryption	= $dolibarr_main_db_encryption;
 $conf->db->dolibarr_main_db_cryptkey	= $dolibarr_main_db_cryptkey;
-if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type=constant('TEST_DB_FORCE_TYPE');	// Force db type (for test purpose, by PHP unit for example)
+if (defined('TEST_DB_FORCE_TYPE')) {
+	$conf->db->type=constant('TEST_DB_FORCE_TYPE');
+}
+// Force db type (for test purpose, by PHP unit for example)
 
 // Set properties specific to conf file
 $conf->file->main_limit_users			= $dolibarr_main_limit_users;
@@ -73,7 +76,9 @@ 
 	// dolibarr_main_document_root_alt can contains several directories
 	$values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
 	$i=0;
-	foreach($values as $value) $conf->file->dol_document_root['alt'.($i++)]=(string) $value;
+	foreach($values as $value) {
+		$conf->file->dol_document_root['alt'.($i++)]=(string) $value;
+	}
 	$values=preg_split('/[;,]/',$dolibarr_main_url_root_alt);
 	$i=0;
 	foreach($values as $value)
@@ -99,9 +104,16 @@ 
 }
 
 // Chargement des includes principaux de librairies communes
-if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';		// Need 500ko memory
-if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
-if (! defined('NOREQUIRESOC'))  require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+if (! defined('NOREQUIREUSER')) {
+	require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
+}
+// Need 500ko memory
+if (! defined('NOREQUIRETRAN')) {
+	require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
+}
+if (! defined('NOREQUIRESOC')) {
+	require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+}
 
 
 /*
@@ -144,25 +156,32 @@ 
  */
 
 // By default conf->entity is 1, but we change this if we ask another value.
-if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session
+if (session_id() && ! empty($_SESSION["dol_entity"])) {
+	// Entity inside an opened session
 {
 	$conf->entity = $_SESSION["dol_entity"];
 }
-else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script
+} else if (! empty($_ENV["dol_entity"])) {
+	// Entity inside a CLI script
 {
 	$conf->entity = $_ENV["dol_entity"];
 }
-else if (isset($_POST["loginfunction"]) && GETPOST("entity"))	// Just after a login page
+} else if (isset($_POST["loginfunction"]) && GETPOST("entity")) {
+	// Just after a login page
 {
 	$conf->entity = GETPOST("entity",'int');
 }
-else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
+} else if (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+	// For public page with MultiCompany module
 {
 	$conf->entity = DOLENTITY;
 }
+}
 
 // Sanitize entity
-if (! is_numeric($conf->entity)) $conf->entity=1;
+if (! is_numeric($conf->entity)) {
+	$conf->entity=1;
+}
 
 if (! defined('NOREQUIREDB'))
 {
@@ -194,11 +213,26 @@ 
 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
 	$ok=0;
-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)
-	elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)
-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)
-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin
+	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) {
+		$ok=1;
+	}
+	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
+	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+		$ok=1;
+	}
+	// We let working pages that is a login submission (login submit, to allow login by admin)
+	elseif (defined('NOREQUIREDB')) {
+		$ok=1;
+	}
+	// We let working pages that don't need database access (xxx.css.php)
+	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) {
+		$ok=1;
+	}
+	// We let working pages that ask to work even if only login enabled (logout.php)
+	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+		$ok=1;
+	}
+	// We let working if user is allowed admin
 	if (! $ok)
 	{
 		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
@@ -207,8 +241,7 @@ 
 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
 			$nexturl=DOL_URL_ROOT.'/user/logout.php';
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		}
-		else
+		} else
 		{
 			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
 			$nexturl=DOL_URL_ROOT.'/';
@@ -227,8 +260,10 @@ 
 	$mysoc->setMysoc($conf);
 
 	// For some countries, we need to invert our address with customer address
-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
-}
+	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+		$conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
+	}
+	}
 
 
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
@@ -244,5 +279,7 @@ 
 $hookmanager=new HookManager($db);
 
 
-if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
+if (! defined('MAIN_LABEL_MENTION_NPR') ) {
+	define('MAIN_LABEL_MENTION_NPR','NPR');
+}