alxarafe / alixar

dolibarr/htdocs/societe/class/companybankaccount.class.php

Indentation +381 added lines, -381 removed lines

@@ -33,386 +33,386 @@
  */
 class CompanyBankAccount extends Account
 {
-	var $socid;
-
-	var $default_rib;
-	var $frstrecur;
-	var $rum;
-	var $date_rum;
-
-	var $datec;
-	var $datem;
-
-
-	/**
-	 *  Constructor
-	 *
-	 *  @param      DoliDB		$db      Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-
-		$this->socid = 0;
-		$this->solde = 0;
-		$this->error_number = 0;
-		$this->default_rib = 0;
-	}
-
-
-	/**
-	 * Create bank information record
-	 *
-	 * @param   User   $user		User
-	 * @param   int    $notrigger   1=Disable triggers
-	 * @return	int					<0 if KO, >= 0 if OK
-	 */
-	function create(User $user = null, $notrigger=0)
-	{
-		$now	= dol_now();
-		$error	= 0;
-		// Correct default_rib to be sure to have always one default
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1 AND type = 'ban'";
-   		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$numrows=$this->db->num_rows($result);
-			if ($this->default_rib && $numrows > 0) $this->default_rib = 0;
-			if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
-		}
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
-		$sql.= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->affected_rows($resql))
-			{
-				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
-
-				if (! $notrigger)
-				{
-				   	// Call trigger
-					$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
-					if ($result < 0) $error++;
-					// End call triggers
-
-					if (! $error)
-					{
-						return 1;
-					}
-					else
-					{
-						return 0;
-					}
-				}
-				else
-				{
-					return 1;
-				}
-			}
-		}
-		else
-		{
-			print $this->db->error();
-			return 0;
-		}
-	}
-
-	/**
-	 *	Update bank account
-	 *
-	 *	@param	User	$user	     Object user
-	 *  @param  int     $notrigger   1=Disable triggers
-	 *	@return	int				     <=0 if KO, >0 if OK
-	 */
-	function update(User $user = null, $notrigger = 0)
-	{
-		global $conf;
-		$error = 0;
-
-		if (! $this->id) return -1;
-
-		if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
-		if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
-		$sql.= " bank = '" .$this->db->escape($this->bank)."'";
-		$sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
-		$sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
-		$sql.= ",number='".$this->db->escape($this->number)."'";
-		$sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
-		$sql.= ",bic='".$this->db->escape($this->bic)."'";
-		$sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
-		$sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
-		$sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
-		$sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
-		$sql.= ",default_rib = ".$this->default_rib;
-		if ($conf->prelevement->enabled)
-		{
-			$sql.= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
-			$sql.= ",rum = '".$this->db->escape($this->rum)."'";
-			$sql.= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
-		}
-		if (trim($this->label) != '')
-			$sql.= ",label = '".$this->db->escape($this->label)."'";
-		else
-			$sql.= ",label = NULL";
-		$sql.= " WHERE rowid = ".$this->id;
-
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-
-
-		if (! $notrigger)
-		{
-			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_MODIFY',$user);
-			if ($result < 0) $error++;
-			// End call triggers
-			if(! $error )
-			{
-				return 1;
-			}
-			else
-			{
-				return -1;
-			}
-		}
-		else
-		{
-			return 1;
-		}
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-	/**
-	 * 	Load record from database
-	 *
-	 *	@param	int		$id			Id of record
-	 * 	@param	int		$socid		Id of company. If this is filled, function will return the first entry found (matching $default and $type)
-	 *  @param	int		$default	If id of company filled, we say if we want first record among all (-1), default record (1) or non default record (0)
-	 *  @param	int		$type		If id of company filled, we say if we want record of this type only
-	 * 	@return	int					<0 if KO, >0 if OK
-	 */
-	function fetch($id, $socid=0, $default=1, $type='ban')
-	{
-		if (empty($id) && empty($socid)) return -1;
-
-		$sql = "SELECT rowid, type, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id)    $sql.= " WHERE rowid = ".$id;
-		if ($socid)
-		{
-			$sql.= " WHERE fk_soc  = ".$socid;
-			if ($default > -1) $sql.=" AND default_rib = ".$this->db->escape($default);
-			if ($type) $sql.= " AND type ='".$this->db->escape($type)."'";
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$this->ref             = $obj->fk_soc.'-'.$obj->label;      // Generate an artificial ref
-
-				$this->id			   = $obj->rowid;
-				$this->type			   = $obj->type;
-				$this->socid           = $obj->fk_soc;
-				$this->bank            = $obj->bank;
-				$this->code_banque     = $obj->code_banque;
-				$this->code_guichet    = $obj->code_guichet;
-				$this->number          = $obj->number;
-				$this->cle_rib         = $obj->cle_rib;
-				$this->bic             = $obj->bic;
-				$this->iban		       = $obj->iban;
-				$this->domiciliation   = $obj->domiciliation;
-				$this->proprio         = $obj->proprio;
-				$this->owner_address   = $obj->owner_address;
-				$this->label           = $obj->label;
-				$this->default_rib     = $obj->default_rib;
-				$this->datec           = $this->db->jdate($obj->datec);
-				$this->datem           = $this->db->jdate($obj->datem);
-				$this->rum             = $obj->rum;
-				$this->frstrecur       = $obj->frstrecur;
-			}
-			$this->db->free($resql);
-
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-	/**
-	 *  Delete a rib from database
-	 *
-	 *	@param		User	$user		User deleting
-	 *	@param  	int		$notrigger	1=Disable triggers
-	 *  @return		int		            <0 if KO, >0 if OK
-	 */
-	function delete(User $user = null, $notrigger=0)
-	{
-		global $conf;
-
-		$error = 0;
-
-		dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
-
-		$this->db->begin();
-
-		if (! $error && ! $notrigger)
-		{
-			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_DELETE',$user);
-			if ($result < 0) $error++;
-			// End call triggers
-		}
-
-		if (! $error)
-		{
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe_rib";
-			$sql .= " WHERE rowid  = " . $this->id;
-
-			if (! $this->db->query($sql))
-			{
-				$error++;
-				$this->errors[]=$this->db->lasterror();
-			}
-		}
-
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1*$error;
-		}
-	}
-
-	/**
-	 * Return RIB
-	 *
-	 * @param   boolean     $displayriblabel     Prepend or Hide Label
-	 * @return	string		RIB
-	 */
-	public function getRibLabel($displayriblabel = true)
-	{
-		$rib = '';
-
-		if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib || $this->iban || $this->bic ) {
-
-			if ($this->label && $displayriblabel) {
-				$rib = $this->label." : ";
-			}
-
-			$rib .= (string) $this;
-		}
-
-		return $rib;
-	}
-
-	/**
-	 * Set a BAN as Default
-	 *
-	 * @param   int     $rib    RIB id
-	 * @return  int             0 if KO, 1 if OK
-	 */
-	function setAsDefault($rib=0)
-	{
-		$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
-		$sql1.= " WHERE rowid = ".($rib?$rib:$this->id);
-
-		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
-		$result1 = $this->db->query($sql1);
-		if ($result1)
-		{
-			if ($this->db->num_rows($result1) == 0)
-			{
-				return 0;
-			}
-			else
-			{
-				$obj = $this->db->fetch_object($result1);
-
-				$this->db->begin();
-
-				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
-				$sql2.= " WHERE type = 'ban' AND fk_soc = ".$obj->fk_soc;
-				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
-				$result2 = $this->db->query($sql2);
-
-				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
-				$sql3.= " WHERE rowid = ".$obj->id;
-				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
-				$result3 = $this->db->query($sql3);
-
-				if (!$result2 || !$result3)
-				{
-					dol_print_error($this->db);
-					$this->db->rollback();
-					return -1;
-				}
-				else
-				{
-					$this->db->commit();
-					return 1;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-	/**
-	 *  Initialise an instance with random values.
-	 *  Used to build previews or test instances.
-	 *	id must be 0 if object instance is a specimen.
-	 *
-	 *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		$this->specimen        = 1;
-		$this->ref             = 'CBA';
-		$this->label           = 'CustomerCorp Bank account';
-		$this->bank            = 'CustomerCorp Bank';
-		$this->courant         = Account::TYPE_CURRENT;
-		$this->clos            = Account::STATUS_OPEN;
-		$this->code_banque     = '123';
-		$this->code_guichet    = '456';
-		$this->number          = 'CUST12345';
-		$this->cle_rib         = 50;
-		$this->bic             = 'CC12';
-		$this->iban            = 'FR999999999';
-		$this->domiciliation   = 'Bank address of customer corp';
-		$this->proprio         = 'Owner';
-		$this->owner_address   = 'Owner address';
-		$this->country_id      = 1;
-
-		$this->rum             = 'UMR-CU1212-0007-5-1475405262';
-		$this->date_rum        =dol_now() - 10000;
-		$this->frstrecur       = 'FRST';
-
-		$this->socid = 0;
-	}
+    var $socid;
+
+    var $default_rib;
+    var $frstrecur;
+    var $rum;
+    var $date_rum;
+
+    var $datec;
+    var $datem;
+
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        $this->db = $db;
+
+        $this->socid = 0;
+        $this->solde = 0;
+        $this->error_number = 0;
+        $this->default_rib = 0;
+    }
+
+
+    /**
+     * Create bank information record
+     *
+     * @param   User   $user		User
+     * @param   int    $notrigger   1=Disable triggers
+     * @return	int					<0 if KO, >= 0 if OK
+     */
+    function create(User $user = null, $notrigger=0)
+    {
+        $now	= dol_now();
+        $error	= 0;
+        // Correct default_rib to be sure to have always one default
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1 AND type = 'ban'";
+            $result = $this->db->query($sql);
+        if ($result)
+        {
+            $numrows=$this->db->num_rows($result);
+            if ($this->default_rib && $numrows > 0) $this->default_rib = 0;
+            if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
+        }
+
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
+        $sql.= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->affected_rows($resql))
+            {
+                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
+
+                if (! $notrigger)
+                {
+                        // Call trigger
+                    $result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
+                    if ($result < 0) $error++;
+                    // End call triggers
+
+                    if (! $error)
+                    {
+                        return 1;
+                    }
+                    else
+                    {
+                        return 0;
+                    }
+                }
+                else
+                {
+                    return 1;
+                }
+            }
+        }
+        else
+        {
+            print $this->db->error();
+            return 0;
+        }
+    }
+
+    /**
+     *	Update bank account
+     *
+     *	@param	User	$user	     Object user
+     *  @param  int     $notrigger   1=Disable triggers
+     *	@return	int				     <=0 if KO, >0 if OK
+     */
+    function update(User $user = null, $notrigger = 0)
+    {
+        global $conf;
+        $error = 0;
+
+        if (! $this->id) return -1;
+
+        if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
+        if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
+        $sql.= " bank = '" .$this->db->escape($this->bank)."'";
+        $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
+        $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+        $sql.= ",number='".$this->db->escape($this->number)."'";
+        $sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+        $sql.= ",bic='".$this->db->escape($this->bic)."'";
+        $sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
+        $sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+        $sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
+        $sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
+        $sql.= ",default_rib = ".$this->default_rib;
+        if ($conf->prelevement->enabled)
+        {
+            $sql.= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
+            $sql.= ",rum = '".$this->db->escape($this->rum)."'";
+            $sql.= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
+        }
+        if (trim($this->label) != '')
+            $sql.= ",label = '".$this->db->escape($this->label)."'";
+        else
+            $sql.= ",label = NULL";
+        $sql.= " WHERE rowid = ".$this->id;
+
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+
+
+        if (! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('COMPANY_RIB_MODIFY',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+            if(! $error )
+            {
+                return 1;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+        else
+        {
+            return 1;
+        }
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     * 	Load record from database
+     *
+     *	@param	int		$id			Id of record
+     * 	@param	int		$socid		Id of company. If this is filled, function will return the first entry found (matching $default and $type)
+     *  @param	int		$default	If id of company filled, we say if we want first record among all (-1), default record (1) or non default record (0)
+     *  @param	int		$type		If id of company filled, we say if we want record of this type only
+     * 	@return	int					<0 if KO, >0 if OK
+     */
+    function fetch($id, $socid=0, $default=1, $type='ban')
+    {
+        if (empty($id) && empty($socid)) return -1;
+
+        $sql = "SELECT rowid, type, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
+        $sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
+        if ($id)    $sql.= " WHERE rowid = ".$id;
+        if ($socid)
+        {
+            $sql.= " WHERE fk_soc  = ".$socid;
+            if ($default > -1) $sql.=" AND default_rib = ".$this->db->escape($default);
+            if ($type) $sql.= " AND type ='".$this->db->escape($type)."'";
+        }
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->ref             = $obj->fk_soc.'-'.$obj->label;      // Generate an artificial ref
+
+                $this->id			   = $obj->rowid;
+                $this->type			   = $obj->type;
+                $this->socid           = $obj->fk_soc;
+                $this->bank            = $obj->bank;
+                $this->code_banque     = $obj->code_banque;
+                $this->code_guichet    = $obj->code_guichet;
+                $this->number          = $obj->number;
+                $this->cle_rib         = $obj->cle_rib;
+                $this->bic             = $obj->bic;
+                $this->iban		       = $obj->iban;
+                $this->domiciliation   = $obj->domiciliation;
+                $this->proprio         = $obj->proprio;
+                $this->owner_address   = $obj->owner_address;
+                $this->label           = $obj->label;
+                $this->default_rib     = $obj->default_rib;
+                $this->datec           = $this->db->jdate($obj->datec);
+                $this->datem           = $this->db->jdate($obj->datem);
+                $this->rum             = $obj->rum;
+                $this->frstrecur       = $obj->frstrecur;
+            }
+            $this->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *  Delete a rib from database
+     *
+     *	@param		User	$user		User deleting
+     *	@param  	int		$notrigger	1=Disable triggers
+     *  @return		int		            <0 if KO, >0 if OK
+     */
+    function delete(User $user = null, $notrigger=0)
+    {
+        global $conf;
+
+        $error = 0;
+
+        dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
+
+        $this->db->begin();
+
+        if (! $error && ! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('COMPANY_RIB_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+        }
+
+        if (! $error)
+        {
+            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe_rib";
+            $sql .= " WHERE rowid  = " . $this->id;
+
+            if (! $this->db->query($sql))
+            {
+                $error++;
+                $this->errors[]=$this->db->lasterror();
+            }
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1*$error;
+        }
+    }
+
+    /**
+     * Return RIB
+     *
+     * @param   boolean     $displayriblabel     Prepend or Hide Label
+     * @return	string		RIB
+     */
+    public function getRibLabel($displayriblabel = true)
+    {
+        $rib = '';
+
+        if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib || $this->iban || $this->bic ) {
+
+            if ($this->label && $displayriblabel) {
+                $rib = $this->label." : ";
+            }
+
+            $rib .= (string) $this;
+        }
+
+        return $rib;
+    }
+
+    /**
+     * Set a BAN as Default
+     *
+     * @param   int     $rib    RIB id
+     * @return  int             0 if KO, 1 if OK
+     */
+    function setAsDefault($rib=0)
+    {
+        $sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
+        $sql1.= " WHERE rowid = ".($rib?$rib:$this->id);
+
+        dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
+        $result1 = $this->db->query($sql1);
+        if ($result1)
+        {
+            if ($this->db->num_rows($result1) == 0)
+            {
+                return 0;
+            }
+            else
+            {
+                $obj = $this->db->fetch_object($result1);
+
+                $this->db->begin();
+
+                $sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
+                $sql2.= " WHERE type = 'ban' AND fk_soc = ".$obj->fk_soc;
+                dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
+                $result2 = $this->db->query($sql2);
+
+                $sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
+                $sql3.= " WHERE rowid = ".$obj->id;
+                dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
+                $result3 = $this->db->query($sql3);
+
+                if (!$result2 || !$result3)
+                {
+                    dol_print_error($this->db);
+                    $this->db->rollback();
+                    return -1;
+                }
+                else
+                {
+                    $this->db->commit();
+                    return 1;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *  Initialise an instance with random values.
+     *  Used to build previews or test instances.
+     *	id must be 0 if object instance is a specimen.
+     *
+     *  @return	void
+     */
+    function initAsSpecimen()
+    {
+        $this->specimen        = 1;
+        $this->ref             = 'CBA';
+        $this->label           = 'CustomerCorp Bank account';
+        $this->bank            = 'CustomerCorp Bank';
+        $this->courant         = Account::TYPE_CURRENT;
+        $this->clos            = Account::STATUS_OPEN;
+        $this->code_banque     = '123';
+        $this->code_guichet    = '456';
+        $this->number          = 'CUST12345';
+        $this->cle_rib         = 50;
+        $this->bic             = 'CC12';
+        $this->iban            = 'FR999999999';
+        $this->domiciliation   = 'Bank address of customer corp';
+        $this->proprio         = 'Owner';
+        $this->owner_address   = 'Owner address';
+        $this->country_id      = 1;
+
+        $this->rum             = 'UMR-CU1212-0007-5-1475405262';
+        $this->date_rum        =dol_now() - 10000;
+        $this->frstrecur       = 'FRST';
+
+        $this->socid = 0;
+    }
 }
 

Spacing +58 added lines, -58 removed lines

@@ -25,7 +25,7 @@ 
  *		\brief      File of class to manage bank accounts description of third parties
  */
 
-require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 
 /**
@@ -67,37 +67,37 @@ 
 	 * @param   int    $notrigger   1=Disable triggers
 	 * @return	int					<0 if KO, >= 0 if OK
 	 */
-	function create(User $user = null, $notrigger=0)
+	function create(User $user = null, $notrigger = 0)
 	{
 		$now	= dol_now();
-		$error	= 0;
+		$error = 0;
 		// Correct default_rib to be sure to have always one default
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1 AND type = 'ban'";
    		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$numrows=$this->db->num_rows($result);
+			$numrows = $this->db->num_rows($result);
 			if ($this->default_rib && $numrows > 0) $this->default_rib = 0;
 			if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
-		$sql.= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
-		$resql=$this->db->query($sql);
+		$sql .= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->affected_rows($resql))
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
 
-				if (! $notrigger)
+				if (!$notrigger)
 				{
 				   	// Call trigger
-					$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
+					$result = $this->call_trigger('COMPANY_RIB_CREATE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
 
-					if (! $error)
+					if (!$error)
 					{
 						return 1;
 					}
@@ -131,47 +131,47 @@ 
 		global $conf;
 		$error = 0;
 
-		if (! $this->id) return -1;
+		if (!$this->id) return -1;
 
 		if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
 		if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
-		$sql.= " bank = '" .$this->db->escape($this->bank)."'";
-		$sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
-		$sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
-		$sql.= ",number='".$this->db->escape($this->number)."'";
-		$sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
-		$sql.= ",bic='".$this->db->escape($this->bic)."'";
-		$sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
-		$sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
-		$sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
-		$sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
-		$sql.= ",default_rib = ".$this->default_rib;
+		$sql .= " bank = '".$this->db->escape($this->bank)."'";
+		$sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
+		$sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+		$sql .= ",number='".$this->db->escape($this->number)."'";
+		$sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+		$sql .= ",bic='".$this->db->escape($this->bic)."'";
+		$sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
+		$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
+		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
+		$sql .= ",default_rib = ".$this->default_rib;
 		if ($conf->prelevement->enabled)
 		{
-			$sql.= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
-			$sql.= ",rum = '".$this->db->escape($this->rum)."'";
-			$sql.= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
+			$sql .= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
+			$sql .= ",rum = '".$this->db->escape($this->rum)."'";
+			$sql .= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
 		}
 		if (trim($this->label) != '')
-			$sql.= ",label = '".$this->db->escape($this->label)."'";
+			$sql .= ",label = '".$this->db->escape($this->label)."'";
 		else
-			$sql.= ",label = NULL";
-		$sql.= " WHERE rowid = ".$this->id;
+			$sql .= ",label = NULL";
+		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 
 
-		if (! $notrigger)
+		if (!$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_MODIFY',$user);
+			$result = $this->call_trigger('COMPANY_RIB_MODIFY', $user);
 			if ($result < 0) $error++;
 			// End call triggers
-			if(! $error )
+			if (!$error)
 			{
 				return 1;
 			}
@@ -201,19 +201,19 @@ 
 	 *  @param	int		$type		If id of company filled, we say if we want record of this type only
 	 * 	@return	int					<0 if KO, >0 if OK
 	 */
-	function fetch($id, $socid=0, $default=1, $type='ban')
+	function fetch($id, $socid = 0, $default = 1, $type = 'ban')
 	{
 		if (empty($id) && empty($socid)) return -1;
 
 		$sql = "SELECT rowid, type, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id)    $sql.= " WHERE rowid = ".$id;
+		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id)    $sql .= " WHERE rowid = ".$id;
 		if ($socid)
 		{
-			$sql.= " WHERE fk_soc  = ".$socid;
-			if ($default > -1) $sql.=" AND default_rib = ".$this->db->escape($default);
-			if ($type) $sql.= " AND type ='".$this->db->escape($type)."'";
+			$sql .= " WHERE fk_soc  = ".$socid;
+			if ($default > -1) $sql .= " AND default_rib = ".$this->db->escape($default);
+			if ($type) $sql .= " AND type ='".$this->db->escape($type)."'";
 		}
 
 		$resql = $this->db->query($sql);
@@ -223,10 +223,10 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->ref             = $obj->fk_soc.'-'.$obj->label;      // Generate an artificial ref
+				$this->ref = $obj->fk_soc.'-'.$obj->label; // Generate an artificial ref
 
-				$this->id			   = $obj->rowid;
-				$this->type			   = $obj->type;
+				$this->id = $obj->rowid;
+				$this->type = $obj->type;
 				$this->socid           = $obj->fk_soc;
 				$this->bank            = $obj->bank;
 				$this->code_banque     = $obj->code_banque;
@@ -234,7 +234,7 @@ 
 				$this->number          = $obj->number;
 				$this->cle_rib         = $obj->cle_rib;
 				$this->bic             = $obj->bic;
-				$this->iban		       = $obj->iban;
+				$this->iban = $obj->iban;
 				$this->domiciliation   = $obj->domiciliation;
 				$this->proprio         = $obj->proprio;
 				$this->owner_address   = $obj->owner_address;
@@ -263,37 +263,37 @@ 
 	 *	@param  	int		$notrigger	1=Disable triggers
 	 *  @return		int		            <0 if KO, >0 if OK
 	 */
-	function delete(User $user = null, $notrigger=0)
+	function delete(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 
 		$error = 0;
 
-		dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete ".$this->id, LOG_DEBUG);
 
 		$this->db->begin();
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_DELETE',$user);
+			$result = $this->call_trigger('COMPANY_RIB_DELETE', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe_rib";
-			$sql .= " WHERE rowid  = " . $this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
+			$sql .= " WHERE rowid  = ".$this->id;
 
-			if (! $this->db->query($sql))
+			if (!$this->db->query($sql))
 			{
 				$error++;
-				$this->errors[]=$this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -301,7 +301,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -315,7 +315,7 @@ 
 	{
 		$rib = '';
 
-		if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib || $this->iban || $this->bic ) {
+		if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib || $this->iban || $this->bic) {
 
 			if ($this->label && $displayriblabel) {
 				$rib = $this->label." : ";
@@ -333,10 +333,10 @@ 
 	 * @param   int     $rib    RIB id
 	 * @return  int             0 if KO, 1 if OK
 	 */
-	function setAsDefault($rib=0)
+	function setAsDefault($rib = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
-		$sql1.= " WHERE rowid = ".($rib?$rib:$this->id);
+		$sql1 .= " WHERE rowid = ".($rib ? $rib : $this->id);
 
 		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 		$result1 = $this->db->query($sql1);
@@ -353,12 +353,12 @@ 
 				$this->db->begin();
 
 				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
-				$sql2.= " WHERE type = 'ban' AND fk_soc = ".$obj->fk_soc;
+				$sql2 .= " WHERE type = 'ban' AND fk_soc = ".$obj->fk_soc;
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result2 = $this->db->query($sql2);
 
 				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
-				$sql3.= " WHERE rowid = ".$obj->id;
+				$sql3 .= " WHERE rowid = ".$obj->id;
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
@@ -409,7 +409,7 @@ 
 		$this->country_id      = 1;
 
 		$this->rum             = 'UMR-CU1212-0007-5-1475405262';
-		$this->date_rum        =dol_now() - 10000;
+		$this->date_rum        = dol_now() - 10000;
 		$this->frstrecur       = 'FRST';
 
 		$this->socid = 0;

Braces +52 added lines, -38 removed lines

@@ -77,8 +77,12 @@ 
 		if ($result)
 		{
 			$numrows=$this->db->num_rows($result);
-			if ($this->default_rib && $numrows > 0) $this->default_rib = 0;
-			if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
+			if ($this->default_rib && $numrows > 0) {
+			    $this->default_rib = 0;
+			}
+			if (empty($this->default_rib) && $numrows == 0) {
+			    $this->default_rib = 1;
+			}
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
@@ -94,25 +98,24 @@ 
 				{
 				   	// Call trigger
 					$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+					    $error++;
+					}
 					// End call triggers
 
 					if (! $error)
 					{
 						return 1;
-					}
-					else
+					} else
 					{
 						return 0;
 					}
-				}
-				else
+				} else
 				{
 					return 1;
 				}
 			}
-		}
-		else
+		} else
 		{
 			print $this->db->error();
 			return 0;
@@ -131,10 +134,16 @@ 
 		global $conf;
 		$error = 0;
 
-		if (! $this->id) return -1;
+		if (! $this->id) {
+		    return -1;
+		}
 
-		if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
-		if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
+		if (dol_strlen($this->domiciliation) > 255) {
+		    $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
+		}
+		if (dol_strlen($this->owner_address) > 255) {
+		    $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
 		$sql.= " bank = '" .$this->db->escape($this->bank)."'";
@@ -154,10 +163,11 @@ 
 			$sql.= ",rum = '".$this->db->escape($this->rum)."'";
 			$sql.= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
 		}
-		if (trim($this->label) != '')
-			$sql.= ",label = '".$this->db->escape($this->label)."'";
-		else
-			$sql.= ",label = NULL";
+		if (trim($this->label) != '') {
+					$sql.= ",label = '".$this->db->escape($this->label)."'";
+		} else {
+					$sql.= ",label = NULL";
+		}
 		$sql.= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
@@ -169,23 +179,22 @@ 
 		{
 			// Call trigger
 			$result=$this->call_trigger('COMPANY_RIB_MODIFY',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+			    $error++;
+			}
 			// End call triggers
 			if(! $error )
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 1;
 		}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -203,17 +212,25 @@ 
 	 */
 	function fetch($id, $socid=0, $default=1, $type='ban')
 	{
-		if (empty($id) && empty($socid)) return -1;
+		if (empty($id) && empty($socid)) {
+		    return -1;
+		}
 
 		$sql = "SELECT rowid, type, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
 		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id)    $sql.= " WHERE rowid = ".$id;
+		if ($id) {
+		    $sql.= " WHERE rowid = ".$id;
+		}
 		if ($socid)
 		{
 			$sql.= " WHERE fk_soc  = ".$socid;
-			if ($default > -1) $sql.=" AND default_rib = ".$this->db->escape($default);
-			if ($type) $sql.= " AND type ='".$this->db->escape($type)."'";
+			if ($default > -1) {
+			    $sql.=" AND default_rib = ".$this->db->escape($default);
+			}
+			if ($type) {
+			    $sql.= " AND type ='".$this->db->escape($type)."'";
+			}
 		}
 
 		$resql = $this->db->query($sql);
@@ -248,8 +265,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -277,7 +293,9 @@ 
 		{
 			// Call trigger
 			$result=$this->call_trigger('COMPANY_RIB_DELETE',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+			    $error++;
+			}
 			// End call triggers
 		}
 
@@ -297,8 +315,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1*$error;
@@ -345,8 +362,7 @@ 
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				$obj = $this->db->fetch_object($result1);
 
@@ -367,15 +383,13 @@ 
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;

dolibarr/htdocs/societe/class/api_contacts.class.php

Indentation +308 added lines, -308 removed lines

@@ -29,305 +29,305 @@ 
  */
 class Contacts extends DolibarrApi
 {
-	/**
-	 *
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
-	 */
-	static $FIELDS = array(
-		'lastname',
-	);
-
-	/**
-	 * @var Contact $contact {@type Contact}
-	 */
-	public $contact;
-
-	/**
-	 * Constructor
-	 */
-	function __construct()
-	{
-		global $db, $conf;
-		$this->db = $db;
-
-		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
-		$this->contact = new Contact($this->db);
-	}
-
-	/**
-	 * Get properties of a contact object
-	 *
-	 * Return an array with contact informations
-	 *
-	 * @param 	int 	$id ID of contact
-	 * @return 	array|mixed data without useless information
-	 *
-	 * @throws 	RestException
-	 */
-	function get($id)
-	{
-		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
-		{
-			throw new RestException(401, 'No permission to read contacts');
-		}
-
-		$result = $this->contact->fetch($id);
-		if (!$result)
-		{
-			throw new RestException(404, 'Contact not found');
-		}
-
-		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
-		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
-		}
-
-		return $this->_cleanObjectDatas($this->contact);
-	}
-
-	/**
-	 * List contacts
-	 *
-	 * Get a list of contacts
-	 *
-	 * @param string	$sortfield	        Sort field
-	 * @param string	$sortorder	        Sort order
-	 * @param int		$limit		        Limit for list
-	 * @param int		$page		        Page number
+    /**
+     *
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $FIELDS = array(
+        'lastname',
+    );
+
+    /**
+     * @var Contact $contact {@type Contact}
+     */
+    public $contact;
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db, $conf;
+        $this->db = $db;
+
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+        $this->contact = new Contact($this->db);
+    }
+
+    /**
+     * Get properties of a contact object
+     *
+     * Return an array with contact informations
+     *
+     * @param 	int 	$id ID of contact
+     * @return 	array|mixed data without useless information
+     *
+     * @throws 	RestException
+     */
+    function get($id)
+    {
+        if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
+        {
+            throw new RestException(401, 'No permission to read contacts');
+        }
+
+        $result = $this->contact->fetch($id);
+        if (!$result)
+        {
+            throw new RestException(404, 'Contact not found');
+        }
+
+        if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
+        {
+            throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+        }
+
+        return $this->_cleanObjectDatas($this->contact);
+    }
+
+    /**
+     * List contacts
+     *
+     * Get a list of contacts
+     *
+     * @param string	$sortfield	        Sort field
+     * @param string	$sortorder	        Sort order
+     * @param int		$limit		        Limit for list
+     * @param int		$page		        Page number
      * @param string   	$thirdparty_ids	    Thirdparty ids to filter contacts of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
      * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-	 * @return array                        Array of contact objects
+     * @return array                        Array of contact objects
      *
-	 * @throws RestException
+     * @throws RestException
      */
     function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
     {
-		global $db, $conf;
+        global $db, $conf;
 
-		$obj_ret = array();
+        $obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
-		{
-		    throw new RestException(401, 'No permission to read contacts');
-		}
+        if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
+        {
+            throw new RestException(401, 'No permission to read contacts');
+        }
 
         // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
-
-		// If the internal user must only see his customers, force searching by him
-		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)
-			$search_sale = DolibarrApiAccess::$user->id;
-
-		$sql = "SELECT t.rowid";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX . "socpeople_extrafields as te ON te.fk_object = t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
-			// We need this table joined to the select in order to filter by sale
-			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
-		}
-		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
-		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
-		if ($socids) $sql.= " AND t.fk_soc IN (" . $socids . ")";
-
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0)
-			$sql.= " AND t.fk_soc = sc.fk_soc";
-		if ($search_sale > 0)
-			$sql.= " AND s.rowid = sc.fk_soc";  // Join for the needed table to filter by sale
-		// Insert sale filter
-		if ($search_sale > 0)
-		{
-			$sql .= " AND sc.fk_user = " . $search_sale;
-		}
-	    // Add sql filters
+        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+
+        // If the internal user must only see his customers, force searching by him
+        $search_sale = 0;
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)
+            $search_sale = DolibarrApiAccess::$user->id;
+
+        $sql = "SELECT t.rowid";
+        $sql.= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX . "socpeople_extrafields as te ON te.fk_object = t.rowid";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+            // We need this table joined to the select in order to filter by sale
+            $sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        }
+        $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
+        $sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
+        if ($socids) $sql.= " AND t.fk_soc IN (" . $socids . ")";
+
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0)
+            $sql.= " AND t.fk_soc = sc.fk_soc";
+        if ($search_sale > 0)
+            $sql.= " AND s.rowid = sc.fk_soc";  // Join for the needed table to filter by sale
+        // Insert sale filter
+        if ($search_sale > 0)
+        {
+            $sql .= " AND sc.fk_user = " . $search_sale;
+        }
+        // Add sql filters
         if ($sqlfilters)
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-		$sql.= $db->order($sortfield, $sortorder);
-
-		if ($limit)
-		{
-			if ($page < 0)
-			{
-				$page = 0;
-			}
-			$offset = $limit * $page;
-
-			$sql.= $db->plimit($limit + 1, $offset);
-		}
-		$result = $db->query($sql);
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			$min = min($num, ($limit <= 0 ? $num : $limit));
-			while ($i < $min)
-			{
-				$obj = $db->fetch_object($result);
-				$contact_static = new Contact($db);
-				if ($contact_static->fetch($obj->rowid))
-				{
-					$obj_ret[] = $this->_cleanObjectDatas($contact_static);
-				}
-				$i++;
-			}
-		}
-		else {
-			throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
-		}
-		if (!count($obj_ret))
-		{
-			throw new RestException(404, 'Contacts not found');
-		}
-		return $obj_ret;
-	}
-
-	/**
-	 * Create contact object
-	 *
-	 * @param   array   $request_data   Request datas
-	 * @return  int     ID of contact
-	 */
+        $sql.= $db->order($sortfield, $sortorder);
+
+        if ($limit)
+        {
+            if ($page < 0)
+            {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql.= $db->plimit($limit + 1, $offset);
+        }
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
+            {
+                $obj = $db->fetch_object($result);
+                $contact_static = new Contact($db);
+                if ($contact_static->fetch($obj->rowid))
+                {
+                    $obj_ret[] = $this->_cleanObjectDatas($contact_static);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
+        }
+        if (!count($obj_ret))
+        {
+            throw new RestException(404, 'Contacts not found');
+        }
+        return $obj_ret;
+    }
+
+    /**
+     * Create contact object
+     *
+     * @param   array   $request_data   Request datas
+     * @return  int     ID of contact
+     */
     function post($request_data = null)
     {
-		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
-		{
-			throw new RestException(401, 'No permission to create/update contacts');
-		}
-		// Check mandatory fields
-		$result = $this->_validate($request_data);
-
-		foreach ($request_data as $field => $value)
-		{
-			$this->contact->$field = $value;
-		}
-		if ($this->contact->create(DolibarrApiAccess::$user) < 0) {
-		    throw new RestException(500, "Error creating contact", array_merge(array($this->contact->error), $this->contact->errors));
-		}
-		return $this->contact->id;
-	}
-
-	/**
-	 * Update contact
-	 *
-	 * @param int   $id             Id of contact to update
-	 * @param array $request_data   Datas
-	 * @return int
-	 */
+        if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
+        {
+            throw new RestException(401, 'No permission to create/update contacts');
+        }
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+
+        foreach ($request_data as $field => $value)
+        {
+            $this->contact->$field = $value;
+        }
+        if ($this->contact->create(DolibarrApiAccess::$user) < 0) {
+            throw new RestException(500, "Error creating contact", array_merge(array($this->contact->error), $this->contact->errors));
+        }
+        return $this->contact->id;
+    }
+
+    /**
+     * Update contact
+     *
+     * @param int   $id             Id of contact to update
+     * @param array $request_data   Datas
+     * @return int
+     */
     function put($id, $request_data = null)
     {
-		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
-		{
-			throw new RestException(401, 'No permission to create/update contacts');
-		}
-
-		$result = $this->contact->fetch($id);
-		if (!$result)
-		{
-			throw new RestException(404, 'Contact not found');
-		}
-
-		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
-		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
-		}
-
-		foreach ($request_data as $field => $value)
-		{
+        if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
+        {
+            throw new RestException(401, 'No permission to create/update contacts');
+        }
+
+        $result = $this->contact->fetch($id);
+        if (!$result)
+        {
+            throw new RestException(404, 'Contact not found');
+        }
+
+        if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
+        {
+            throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+        }
+
+        foreach ($request_data as $field => $value)
+        {
             if ($field == 'id') continue;
-		    $this->contact->$field = $value;
-		}
+            $this->contact->$field = $value;
+        }
 
-		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
-			return $this->get($id);
+        if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
+            return $this->get($id);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Delete contact
-	 *
-	 * @param   int     $id Contact ID
-	 * @return  integer
-	 */
+    /**
+     * Delete contact
+     *
+     * @param   int     $id Contact ID
+     * @return  integer
+     */
     function delete($id)
     {
-		if (!DolibarrApiAccess::$user->rights->societe->contact->supprimer)
-		{
-			throw new RestException(401, 'No permission to delete contacts');
-		}
-		$result = $this->contact->fetch($id);
-		if (!$result)
-		{
-			throw new RestException(404, 'Contact not found');
-		}
-
-		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
-		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
-		}
-
-		return $this->contact->delete($id);
-	}
-
-	/**
-	 * Create an user account object from contact (external user)
-	 *
-	 * @param   int   	$id   Id of contact
-	 * @param   array   $request_data   Request datas
-	 * @return  int     ID of user
-	 *
-	 * @url	POST {id}/createUser
-	 */
+        if (!DolibarrApiAccess::$user->rights->societe->contact->supprimer)
+        {
+            throw new RestException(401, 'No permission to delete contacts');
+        }
+        $result = $this->contact->fetch($id);
+        if (!$result)
+        {
+            throw new RestException(404, 'Contact not found');
+        }
+
+        if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
+        {
+            throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+        }
+
+        return $this->contact->delete($id);
+    }
+
+    /**
+     * Create an user account object from contact (external user)
+     *
+     * @param   int   	$id   Id of contact
+     * @param   array   $request_data   Request datas
+     * @return  int     ID of user
+     *
+     * @url	POST {id}/createUser
+     */
     function createUser($id, $request_data = null)
     {
-	    //if (!DolibarrApiAccess::$user->rights->user->user->creer) {
-	    //throw new RestException(401);
-	    //}
-
-	    if (!isset($request_data["login"]))
-	    				throw new RestException(400, "login field missing");
-	    if (!isset($request_data["password"]))
-	    				throw new RestException(400, "password field missing");
-
-	    if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
-	        throw new RestException(401, 'No permission to read contacts');
-	    }
-	    if (!DolibarrApiAccess::$user->rights->user->user->creer) {
-	        throw new RestException(401, 'No permission to create user');
-	    }
-
-	    $contact = new Contact($this->db);
-	    $contact->fetch($id);
-	    if ($contact->id <= 0) {
-	        throw new RestException(404, 'Contact not found');
-	    }
-
-	    if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
-	        throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
-	    }
-
-	    // Check mandatory fields
-	    $login = $request_data["login"];
-	    $password = $request_data["password"];
-	    $useraccount = new User($this->db);
-	    $result = $useraccount->create_from_contact($contact,$login,$password);
-	    if ($result <= 0) {
-	        throw new RestException(500, "User not created");
-	    }
-	    // password parameter not used in create_from_contact
-	    $useraccount->setPassword($useraccount,$password);
-
-	    return $result;
-	}
+        //if (!DolibarrApiAccess::$user->rights->user->user->creer) {
+        //throw new RestException(401);
+        //}
+
+        if (!isset($request_data["login"]))
+                        throw new RestException(400, "login field missing");
+        if (!isset($request_data["password"]))
+                        throw new RestException(400, "password field missing");
+
+        if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
+            throw new RestException(401, 'No permission to read contacts');
+        }
+        if (!DolibarrApiAccess::$user->rights->user->user->creer) {
+            throw new RestException(401, 'No permission to create user');
+        }
+
+        $contact = new Contact($this->db);
+        $contact->fetch($id);
+        if ($contact->id <= 0) {
+            throw new RestException(404, 'Contact not found');
+        }
+
+        if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
+            throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+        }
+
+        // Check mandatory fields
+        $login = $request_data["login"];
+        $password = $request_data["password"];
+        $useraccount = new User($this->db);
+        $result = $useraccount->create_from_contact($contact,$login,$password);
+        if ($result <= 0) {
+            throw new RestException(500, "User not created");
+        }
+        // password parameter not used in create_from_contact
+        $useraccount->setPassword($useraccount,$password);
+
+        return $result;
+    }
 
     /**
      * Get categories for a contact
@@ -342,25 +342,25 @@ 
      *
      * @url GET {id}/categories
      */
-	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
-	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
-			throw new RestException(401);
-		}
+    function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+    {
+        if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+            throw new RestException(401);
+        }
 
-		$categories = new Categorie($this->db);
+        $categories = new Categorie($this->db);
 
-		$result = $categories->getListForItem($id, 'contact', $sortfield, $sortorder, $limit, $page);
+        $result = $categories->getListForItem($id, 'contact', $sortfield, $sortorder, $limit, $page);
 
-		if (empty($result)) {
-			throw new RestException(404, 'No category found');
-		}
+        if (empty($result)) {
+            throw new RestException(404, 'No category found');
+        }
 
-		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
-		}
+        if ($result < 0) {
+            throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
+        }
 
-		return $result;
+        return $result;
     }
 
 
@@ -373,38 +373,38 @@ 
     function _cleanObjectDatas($object)
     {
 
-    	$object = parent::_cleanObjectDatas($object);
+        $object = parent::_cleanObjectDatas($object);
 
-    	unset($object->total_ht);
-    	unset($object->total_tva);
-    	unset($object->total_localtax1);
-    	unset($object->total_localtax2);
-    	unset($object->total_ttc);
+        unset($object->total_ht);
+        unset($object->total_tva);
+        unset($object->total_localtax1);
+        unset($object->total_localtax2);
+        unset($object->total_ttc);
 
-    	unset($object->note);
-    	unset($object->lines);
-    	unset($object->thirdparty);
+        unset($object->note);
+        unset($object->lines);
+        unset($object->thirdparty);
 
-    	return $object;
+        return $object;
     }
 
-	/**
-	 * Validate fields before create or update object
+    /**
+     * Validate fields before create or update object
      *
-	 * @param   array|null     $data   Data to validate
-	 * @return  array
-	 * @throws RestException
-	 */
+     * @param   array|null     $data   Data to validate
+     * @return  array
+     * @throws RestException
+     */
     function _validate($data)
     {
-		$contact = array();
-		foreach (Contacts::$FIELDS as $field)
-		{
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
-			$contact[$field] = $data[$field];
-		}
-
-		return $contact;
-	}
+        $contact = array();
+        foreach (Contacts::$FIELDS as $field)
+        {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $contact[$field] = $data[$field];
+        }
+
+        return $contact;
+    }
 }

Spacing +22 added lines, -22 removed lines

@@ -81,7 +81,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->_cleanObjectDatas($this->contact);
@@ -122,37 +122,37 @@ 
 			$search_sale = DolibarrApiAccess::$user->id;
 
 		$sql = "SELECT t.rowid";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX . "socpeople_extrafields as te ON te.fk_object = t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as te ON te.fk_object = t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
 			// We need this table joined to the select in order to filter by sale
-			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
-		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
-		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
-		if ($socids) $sql.= " AND t.fk_soc IN (" . $socids . ")";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON t.fk_soc = s.rowid";
+		$sql .= ' WHERE t.entity IN ('.getEntity('socpeople').')';
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
 
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0)
-			$sql.= " AND t.fk_soc = sc.fk_soc";
+			$sql .= " AND t.fk_soc = sc.fk_soc";
 		if ($search_sale > 0)
-			$sql.= " AND s.rowid = sc.fk_soc";  // Join for the needed table to filter by sale
+			$sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 		// Insert sale filter
 		if ($search_sale > 0)
 		{
-			$sql .= " AND sc.fk_user = " . $search_sale;
+			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 	    // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-		$sql.= $db->order($sortfield, $sortorder);
+		$sql .= $db->order($sortfield, $sortorder);
 
 		if ($limit)
 		{
@@ -162,7 +162,7 @@ 
 			}
 			$offset = $limit * $page;
 
-			$sql.= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 		}
 		$result = $db->query($sql);
 		if ($result)
@@ -181,7 +181,7 @@ 
 			}
 		}
 		else {
-			throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
+			throw new RestException(503, 'Error when retrieve contacts : '.$sql);
 		}
 		if (!count($obj_ret))
 		{
@@ -237,7 +237,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		foreach ($request_data as $field => $value)
@@ -272,7 +272,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->contact->delete($id);
@@ -312,19 +312,19 @@ 
 	    }
 
 	    if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
-	        throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+	        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 	    }
 
 	    // Check mandatory fields
 	    $login = $request_data["login"];
 	    $password = $request_data["password"];
 	    $useraccount = new User($this->db);
-	    $result = $useraccount->create_from_contact($contact,$login,$password);
+	    $result = $useraccount->create_from_contact($contact, $login, $password);
 	    if ($result <= 0) {
 	        throw new RestException(500, "User not created");
 	    }
 	    // password parameter not used in create_from_contact
-	    $useraccount->setPassword($useraccount,$password);
+	    $useraccount->setPassword($useraccount, $password);
 
 	    return $result;
 	}
@@ -344,7 +344,7 @@ 
      */
 	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 

Braces +29 added lines, -18 removed lines

@@ -118,8 +118,9 @@ 
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)
-			$search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+					$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
 		$sql.= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
@@ -130,12 +131,17 @@ 
 		}
 		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
 		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
-		if ($socids) $sql.= " AND t.fk_soc IN (" . $socids . ")";
+		if ($socids) {
+		    $sql.= " AND t.fk_soc IN (" . $socids . ")";
+		}
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0)
-			$sql.= " AND t.fk_soc = sc.fk_soc";
-		if ($search_sale > 0)
-			$sql.= " AND s.rowid = sc.fk_soc";  // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+					$sql.= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($search_sale > 0) {
+					$sql.= " AND s.rowid = sc.fk_soc";
+		}
+		// Join for the needed table to filter by sale
 		// Insert sale filter
 		if ($search_sale > 0)
 		{
@@ -179,8 +185,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
 		}
 		if (!count($obj_ret))
@@ -242,12 +247,15 @@ 
 
 		foreach ($request_data as $field => $value)
 		{
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+                continue;
+            }
 		    $this->contact->$field = $value;
 		}
 
-		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
-			return $this->get($id);
+		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update')) {
+					return $this->get($id);
+		}
 
 		return false;
 	}
@@ -293,10 +301,12 @@ 
 	    //throw new RestException(401);
 	    //}
 
-	    if (!isset($request_data["login"]))
-	    				throw new RestException(400, "login field missing");
-	    if (!isset($request_data["password"]))
-	    				throw new RestException(400, "password field missing");
+	    if (!isset($request_data["login"])) {
+	    	    				throw new RestException(400, "login field missing");
+	    }
+	    if (!isset($request_data["password"])) {
+	    	    				throw new RestException(400, "password field missing");
+	    }
 
 	    if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
 	        throw new RestException(401, 'No permission to read contacts');
@@ -400,8 +410,9 @@ 
 		$contact = array();
 		foreach (Contacts::$FIELDS as $field)
 		{
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
+			if (!isset($data[$field])) {
+							throw new RestException(400, "$field field missing");
+			}
 			$contact[$field] = $data[$field];
 		}
 

dolibarr/htdocs/societe/class/societeaccount.class.php

Indentation +452 added lines, -452 removed lines

@@ -35,320 +35,320 @@ 
  */
 class SocieteAccount extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element = 'societeaccount';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'societe_account';
-
-	/**
-	 * @var array  Does societeaccount support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 */
-	public $ismultientitymanaged = 0;
-
-	/**
-	 * @var string String with name of icon for societeaccount. Must be the part after the 'object_' into object_myobject.png
-	 */
-	public $picto = 'lock';
-
-
-	/**
-	 *  'type' if the field format.
-	 *  'label' the translation key.
-	 *  'enabled' is a condition when the field must be managed.
-	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
-	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *  'position' is the sort order of field.
-	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'help' is a string visible as a tooltip on field
-	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
-	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
-	 *  'showoncombobox' if field must be shown into the label of combobox
-	 */
-
-	// BEGIN MODULEBUILDER PROPERTIES
-	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'default'=>1),
-		'key_account' => array('type'=>'varchar(128)', 'label'=>'KeyAccount', 'visible'=>-1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Key account',),
-		'login' => array('type'=>'varchar(64)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>10),
-		'pass_encoding' => array('type'=>'varchar(24)', 'label'=>'PassEncoding', 'visible'=>0, 'enabled'=>1, 'position'=>30),
-		'pass_crypted' => array('type'=>'varchar(128)', 'label'=>'Password', 'visible'=>1, 'enabled'=>1, 'position'=>31, 'notnull'=>1),
-		'pass_temp'    => array('type'=>'varchar(128)', 'label'=>'Temp', 'visible'=>0, 'enabled'=>0, 'position'=>32, 'notnull'=>-1,),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'index'=>1),
-		'site' => array('type'=>'varchar(128)', 'label'=>'Site', 'visible'=>-1, 'enabled'=>1, 'position'=>41),
-		'fk_website' => array('type'=>'integer:Website:website/class/website.class.php', 'label'=>'WebSite', 'visible'=>1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'index'=>1),
-		'date_last_login' => array('type'=>'datetime', 'label'=>'LastConnexion', 'visible'=>2, 'enabled'=>1, 'position'=>50, 'notnull'=>0,),
-		'date_previous_login' => array('type'=>'datetime', 'label'=>'PreviousConnexion', 'visible'=>2, 'enabled'=>1, 'position'=>51, 'notnull'=>0,),
-		//'note_public' => array('type'=>'text', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>45, 'notnull'=>-1,),
-		'note_private' => array('type'=>'text', 'label'=>'NotePrivate', 'visible'=>-1, 'enabled'=>1, 'position'=>46, 'notnull'=>-1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active','0'=>'Disabled')),
-	);
-
-	/**
-	 * @var int ID
-	 */
-	public $rowid;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	public $key_account;
-	public $login;
-	public $pass_encoding;
-	public $pass_crypted;
-	public $pass_temp;
-
-	/**
-	 * @var int Thirdparty ID
-	 */
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element = 'societeaccount';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'societe_account';
+
+    /**
+     * @var array  Does societeaccount support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     */
+    public $ismultientitymanaged = 0;
+
+    /**
+     * @var string String with name of icon for societeaccount. Must be the part after the 'object_' into object_myobject.png
+     */
+    public $picto = 'lock';
+
+
+    /**
+     *  'type' if the field format.
+     *  'label' the translation key.
+     *  'enabled' is a condition when the field must be managed.
+     *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
+     *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+     *  'index' if we want an index in database.
+     *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+     *  'position' is the sort order of field.
+     *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+     *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+     *  'help' is a string visible as a tooltip on field
+     *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+     *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+     *  'showoncombobox' if field must be shown into the label of combobox
+     */
+
+    // BEGIN MODULEBUILDER PROPERTIES
+    /**
+     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+     */
+    public $fields=array(
+        'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
+        'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'default'=>1),
+        'key_account' => array('type'=>'varchar(128)', 'label'=>'KeyAccount', 'visible'=>-1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Key account',),
+        'login' => array('type'=>'varchar(64)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>10),
+        'pass_encoding' => array('type'=>'varchar(24)', 'label'=>'PassEncoding', 'visible'=>0, 'enabled'=>1, 'position'=>30),
+        'pass_crypted' => array('type'=>'varchar(128)', 'label'=>'Password', 'visible'=>1, 'enabled'=>1, 'position'=>31, 'notnull'=>1),
+        'pass_temp'    => array('type'=>'varchar(128)', 'label'=>'Temp', 'visible'=>0, 'enabled'=>0, 'position'=>32, 'notnull'=>-1,),
+        'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'index'=>1),
+        'site' => array('type'=>'varchar(128)', 'label'=>'Site', 'visible'=>-1, 'enabled'=>1, 'position'=>41),
+        'fk_website' => array('type'=>'integer:Website:website/class/website.class.php', 'label'=>'WebSite', 'visible'=>1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'index'=>1),
+        'date_last_login' => array('type'=>'datetime', 'label'=>'LastConnexion', 'visible'=>2, 'enabled'=>1, 'position'=>50, 'notnull'=>0,),
+        'date_previous_login' => array('type'=>'datetime', 'label'=>'PreviousConnexion', 'visible'=>2, 'enabled'=>1, 'position'=>51, 'notnull'=>0,),
+        //'note_public' => array('type'=>'text', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>45, 'notnull'=>-1,),
+        'note_private' => array('type'=>'text', 'label'=>'NotePrivate', 'visible'=>-1, 'enabled'=>1, 'position'=>46, 'notnull'=>-1,),
+        'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+        'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+        'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+        'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
+        'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
+        'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active','0'=>'Disabled')),
+    );
+
+    /**
+     * @var int ID
+     */
+    public $rowid;
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    public $key_account;
+    public $login;
+    public $pass_encoding;
+    public $pass_crypted;
+    public $pass_temp;
+
+    /**
+     * @var int Thirdparty ID
+     */
     public $fk_soc;
 
-	public $site;
-	public $date_last_login;
-	public $date_previous_login;
-	public $note_private;
-	public $date_creation;
-	public $tms;
+    public $site;
+    public $date_last_login;
+    public $date_previous_login;
+    public $note_private;
+    public $date_creation;
+    public $tms;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_user_creat;
+    public $fk_user_creat;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_user_modif;
-
-	public $import_key;
-
-	/**
-	 * @var int Status
-	 */
-	public $status;
-
-	// END MODULEBUILDER PROPERTIES
-
-
-
-
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'societe_accountdet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_societe_account';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'societeAccountline';
-	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
-	 */
-	//protected $childtables=array('societe_accountdet');
-	/**
-	 * @var societeAccountLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		global $conf;
-
-		$this->db = $db;
-
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		return $this->createCommon($user, $notrigger);
-	}
-
-	/**
-	 * Clone and object into another one
-	 *
-	 * @param  	User 	$user      	User that creates
-	 * @param  	int 	$fromid     Id of object to clone
-	 * @return 	mixed 				New object created, <0 if KO
-	 */
-	public function createFromClone(User $user, $fromid)
-	{
-		global $hookmanager, $langs;
-	    $error = 0;
-
-	    dol_syslog(__METHOD__, LOG_DEBUG);
-
-	    $object = new self($this->db);
-
-	    $this->db->begin();
-
-	    // Load source object
-	    $object->fetchCommon($fromid);
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
-
-	    // Clear fields
-	    $object->ref = "copy_of_".$object->ref;
-	    $object->title = $langs->trans("CopyOf")." ".$object->title;
-	    // ...
-
-	    // Create clone
-		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
-
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id   Id object
-	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
-		return $result;
-	}
-
-	/**
-	 * Load object lines in memory from the database
-	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetchLines()
-	{
-		$this->lines=array();
-
-		// Load lines with object societeAccountLine
-
-		return count($this->lines)?1:0;
-	}
-
-	/**
-	 * Try to find the external customer id of a thirdparty for an another site/system.
-	 *
-	 * @param	int		$id			Id of third party
-	 * @param	string	$site		Site (example: 'stripe', '...')
-	 * @param	int		$status		Status (0=test, 1=live)
-	 * @return	string				Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
-	 */
-	public function getCustomerAccount($id, $site, $status=0)
-	{
-		$sql = "SELECT sa.key_account as key_account, sa.entity";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
-		$sql.= " WHERE sa.fk_soc = " . $id;
-		$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
-		$sql.= " AND key_account IS NOT NULL AND key_account <> ''";
-		//$sql.= " ORDER BY sa.key_account DESC";
-
-		dol_syslog(get_class($this) . "::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result) {
-			if ($this->db->num_rows($result)) {
-				$obj = $this->db->fetch_object($result);
-				$key = $obj->key_account;
-			} else {
-				$key = '';
-			}
-		} else {
-			$key = '';
-		}
-
-		return $key;
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		return $this->updateCommon($user, $notrigger);
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		return $this->deleteCommon($user, $notrigger);
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@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 ('nolink', ...)
+    public $fk_user_modif;
+
+    public $import_key;
+
+    /**
+     * @var int Status
+     */
+    public $status;
+
+    // END MODULEBUILDER PROPERTIES
+
+
+
+
+    // If this object has a subtable with lines
+
+    /**
+     * @var int    Name of subtable line
+     */
+    //public $table_element_line = 'societe_accountdet';
+    /**
+     * @var int    Field with ID of parent key if this field has a parent
+     */
+    //public $fk_element = 'fk_societe_account';
+    /**
+     * @var int    Name of subtable class that manage subtable lines
+     */
+    //public $class_element_line = 'societeAccountline';
+    /**
+     * @var array  Array of child tables (child tables to delete before deleting a record)
+     */
+    //protected $childtables=array('societe_accountdet');
+    /**
+     * @var societeAccountLine[]     Array of subtable lines
+     */
+    //public $lines = array();
+
+
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        global $conf;
+
+        $this->db = $db;
+
+        if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        return $this->createCommon($user, $notrigger);
+    }
+
+    /**
+     * Clone and object into another one
+     *
+     * @param  	User 	$user      	User that creates
+     * @param  	int 	$fromid     Id of object to clone
+     * @return 	mixed 				New object created, <0 if KO
+     */
+    public function createFromClone(User $user, $fromid)
+    {
+        global $hookmanager, $langs;
+        $error = 0;
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $object = new self($this->db);
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetchCommon($fromid);
+        // Reset some properties
+        unset($object->id);
+        unset($object->fk_user_creat);
+        unset($object->import_key);
+
+        // Clear fields
+        $object->ref = "copy_of_".$object->ref;
+        $object->title = $langs->trans("CopyOf")." ".$object->title;
+        // ...
+
+        // Create clone
+        $object->context['createfromclone'] = 'createfromclone';
+        $result = $object->createCommon($user);
+        if ($result < 0) {
+            $error++;
+            $this->error = $object->error;
+            $this->errors = $object->errors;
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+            return $object;
+        } else {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param int    $id   Id object
+     * @param string $ref  Ref
+     * @return int         <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id, $ref = null)
+    {
+        $result = $this->fetchCommon($id, $ref);
+        if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+        return $result;
+    }
+
+    /**
+     * Load object lines in memory from the database
+     *
+     * @return int         <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetchLines()
+    {
+        $this->lines=array();
+
+        // Load lines with object societeAccountLine
+
+        return count($this->lines)?1:0;
+    }
+
+    /**
+     * Try to find the external customer id of a thirdparty for an another site/system.
+     *
+     * @param	int		$id			Id of third party
+     * @param	string	$site		Site (example: 'stripe', '...')
+     * @param	int		$status		Status (0=test, 1=live)
+     * @return	string				Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
+     */
+    public function getCustomerAccount($id, $site, $status=0)
+    {
+        $sql = "SELECT sa.key_account as key_account, sa.entity";
+        $sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
+        $sql.= " WHERE sa.fk_soc = " . $id;
+        $sql.= " AND sa.entity IN (".getEntity('societe').")";
+        $sql.= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
+        $sql.= " AND key_account IS NOT NULL AND key_account <> ''";
+        //$sql.= " ORDER BY sa.key_account DESC";
+
+        dol_syslog(get_class($this) . "::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result) {
+            if ($this->db->num_rows($result)) {
+                $obj = $this->db->fetch_object($result);
+                $key = $obj->key_account;
+            } else {
+                $key = '';
+            }
+        } else {
+            $key = '';
+        }
+
+        return $key;
+    }
+
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        return $this->updateCommon($user, $notrigger);
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user       User that deletes
+     * @param bool $notrigger  false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        return $this->deleteCommon($user, $notrigger);
+    }
+
+    /**
+     *  Return a link to the object card (with optionaly the picto)
+     *
+     *	@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 ('nolink', ...)
      *  @param	int  	$notooltip					1=Disable tooltip
      *  @param  string  $morecss            		Add more css on link
      *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *	@return	string								String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
-	{
-		global $db, $conf, $langs;
+     *	@return	string								String with URL
+     */
+    function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+    {
+        global $db, $conf, $langs;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
@@ -368,10 +368,10 @@ 
 
         if ($option != 'nolink')
         {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-	        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+            // Add 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='';
@@ -387,152 +387,152 @@ 
         }
         else $linkclose = ($morecss?' class="'.$morecss.'"':'');
 
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
-		$result .= $linkend;
-
-		return $result;
-	}
-
-	/**
-	 * Return link to download file from a direct external access
-	 *
-	 * @param	int				$withpicto			Add download picto into link
-	 * @return	string			HTML link to file
-	 */
-	function getDirectExternalLink($withpicto=0)
-	{
-		return 'todo';
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @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)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
+        $linkend='</a>';
+
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= $this->ref;
+        $result .= $linkend;
+
+        return $result;
+    }
+
+    /**
+     * Return link to download file from a direct external access
+     *
+     * @param	int				$withpicto			Add download picto into link
+     * @return	string			HTML link to file
+     */
+    function getDirectExternalLink($withpicto=0)
+    {
+        return 'todo';
+    }
+
+    /**
+     *  Retourne le libelle du status d'un user (actif, inactif)
+     *
+     *  @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)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
+    /**
+     *  Return the status
+     *
+     *  @param	int		$status        	Id status
+     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+     *  @return string 			       	Label of status
+     */
+    static function LibStatut($status,$mode=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		if ($mode == 0)
-		{
-			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-	}
-
-	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
-	 *
-	 *	@param  int		$id       Id of order
-	 *	@return	void
-	 */
-	function info($id)
-	{
-		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
-				}
-
-				if ($obj->fk_user_valid)
-				{
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_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_validation   = $this->db->jdate($obj->datev);
-			}
-
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->initAsSpecimenCommon();
-	}
+        global $langs;
+
+        if ($mode == 0)
+        {
+            $prefix='';
+            if ($status == 1) return $langs->trans('Enabled');
+            elseif ($status == 0) return $langs->trans('Disabled');
+        }
+        elseif ($mode == 1)
+        {
+            if ($status == 1) return $langs->trans('Enabled');
+            elseif ($status == 0) return $langs->trans('Disabled');
+        }
+        elseif ($mode == 2)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        elseif ($mode == 3)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+            elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+        }
+        elseif ($mode == 4)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        elseif ($mode == 5)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+        elseif ($mode == 6)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+    }
+
+    /**
+     *	Charge les informations d'ordre info dans l'objet commande
+     *
+     *	@param  int		$id       Id of order
+     *	@return	void
+     */
+    function info($id)
+    {
+        $sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+        $sql.= ' fk_user_creat, fk_user_modif';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+        $sql.= ' WHERE t.rowid = '.$id;
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+                $this->id = $obj->rowid;
+                if ($obj->fk_user_author)
+                {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_author);
+                    $this->user_creation   = $cuser;
+                }
+
+                if ($obj->fk_user_valid)
+                {
+                    $vuser = new User($this->db);
+                    $vuser->fetch($obj->fk_user_valid);
+                    $this->user_validation = $vuser;
+                }
+
+                if ($obj->fk_user_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_validation   = $this->db->jdate($obj->datev);
+            }
+
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->initAsSpecimenCommon();
+    }
 }

Spacing +55 added lines, -55 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';
 
@@ -77,7 +77,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'default'=>1),
 		'key_account' => array('type'=>'varchar(128)', 'label'=>'KeyAccount', 'visible'=>-1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Key account',),
@@ -97,7 +97,7 @@ 
 		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
 		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active','0'=>'Disabled')),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active', '0'=>'Disabled')),
 	);
 
 	/**
@@ -186,7 +186,7 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -271,11 +271,11 @@ 
 	 */
 	public function fetchLines()
 	{
-		$this->lines=array();
+		$this->lines = array();
 
 		// Load lines with object societeAccountLine
 
-		return count($this->lines)?1:0;
+		return count($this->lines) ? 1 : 0;
 	}
 
 	/**
@@ -286,17 +286,17 @@ 
 	 * @param	int		$status		Status (0=test, 1=live)
 	 * @return	string				Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
 	 */
-	public function getCustomerAccount($id, $site, $status=0)
+	public function getCustomerAccount($id, $site, $status = 0)
 	{
 		$sql = "SELECT sa.key_account as key_account, sa.entity";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
-		$sql.= " WHERE sa.fk_soc = " . $id;
-		$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
-		$sql.= " AND key_account IS NOT NULL AND key_account <> ''";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as sa";
+		$sql .= " WHERE sa.fk_soc = ".$id;
+		$sql .= " AND sa.entity IN (".getEntity('societe').")";
+		$sql .= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
+		$sql .= " AND key_account IS NOT NULL AND key_account <> ''";
 		//$sql.= " ORDER BY sa.key_account DESC";
 
-		dol_syslog(get_class($this) . "::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
+		dol_syslog(get_class($this)."::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result)) {
@@ -346,54 +346,54 @@ 
      *  @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='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		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 = '';
 
         $this->ref = $this->login;
 
-        $label = '<u>' . $langs->trans("SocieteAccount") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Login') . ':</b> ' . $this->ref;
+        $label = '<u>'.$langs->trans("SocieteAccount").'</u>';
+        $label .= '<br>';
+        $label .= '<b>'.$langs->trans('Login').':</b> '.$this->ref;
         //$label.= '<b>' . $langs->trans('WebSite') . ':</b> ' . $this->ref;
 
-        $url = dol_buildpath('/website/websiteaccount_card.php',1).'?id='.$this->id;
+        $url = dol_buildpath('/website/websiteaccount_card.php', 1).'?id='.$this->id;
 
         if ($option != 'nolink')
         {
 	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-	        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowsocieteAccount");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowsocieteAccount");
+                $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>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 
 		return $result;
@@ -405,7 +405,7 @@ 
 	 * @param	int				$withpicto			Add download picto into link
 	 * @return	string			HTML link to file
 	 */
-	function getDirectExternalLink($withpicto=0)
+	function getDirectExternalLink($withpicto = 0)
 	{
 		return 'todo';
 	}
@@ -416,9 +416,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);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -429,14 +429,14 @@ 
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return string 			       	Label of status
 	 */
-	static function LibStatut($status,$mode=0)
+	static function LibStatut($status, $mode = 0)
 	{
         // phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
 		{
-			$prefix='';
+			$prefix = '';
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
 		}
@@ -447,28 +447,28 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			elseif ($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');
+			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
+			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			elseif ($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');
+			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($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');
+			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($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');
+			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 	}
 
@@ -481,10 +481,10 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -495,7 +495,7 @@ 
 				{
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_valid)
@@ -509,7 +509,7 @@ 
 				{
 					$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);

Braces +66 added lines, -36 removed lines

@@ -186,7 +186,9 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		    $this->fields['rowid']['visible']=0;
+		}
 	}
 
 	/**
@@ -260,7 +262,9 @@ 
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && ! empty($this->table_element_line)) {
+		    $this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -352,7 +356,10 @@ 
         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 = '';
@@ -370,8 +377,12 @@ 
         {
 	        // Add param to save lastsearch_values or not
 	        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-	        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+	            $add_save_lastsearch_values=1;
+	        }
+	        if ($add_save_lastsearch_values) {
+	            $url.='&save_lastsearch_values=1';
+	        }
         }
 
         $linkclose='';
@@ -384,16 +395,21 @@ 
             }
             $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        } else {
+            $linkclose = ($morecss?' class="'.$morecss.'"':'');
         }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) {
+		    $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+		    $result.= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -437,38 +453,53 @@ 
 		if ($mode == 0)
 		{
 			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			} elseif ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			} elseif ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			} elseif ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 4)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4');
+			} elseif ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			} elseif ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 6)
+			if ($status == 1) {
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			} elseif ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
+		} elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($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');
+			} elseif ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
 		}
 	}
 
@@ -518,8 +549,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

dolibarr/htdocs/societe/class/client.class.php

Indentation +23 added lines, -23 removed lines

@@ -34,7 +34,7 @@ 
     public $cacheprospectstatus=array();
 
 
-	/**
+    /**
      *  Constructor
      *
      *  @param	DoliDB	$db		Database handler
@@ -65,9 +65,9 @@ 
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
-        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-        	$sql.= " WHERE sc.fk_user = " .$user->id;
-        	$clause = "AND";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $clause = "AND";
         }
         $sql.= " ".$clause." s.client IN (1,2,3)";
         $sql.= ' AND s.entity IN ('.getEntity($this->element).')';
@@ -92,27 +92,27 @@ 
         }
     }
 
-	/**
-	 *  Load array of prospect status
-	 *
-	 *  @param	int		$active     1=Active only, 0=Not active only, -1=All
-	 *  @return int					<0 if KO, >0 if OK
-	 */
+    /**
+     *  Load array of prospect status
+     *
+     *  @param	int		$active     1=Active only, 0=Not active only, -1=All
+     *  @return int					<0 if KO, >0 if OK
+     */
     function loadCacheOfProspStatus($active=1)
     {
-    	global $langs;
+        global $langs;
 
-   		$sql="SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
-   		if ($active >= 0) $sql.=" WHERE active = ".$active;
-		$resql=$this->db->query($sql);
-		$num=$this->db->num_rows($resql);
-		$i=0;
-		while ($i < $num)
-		{
-			$obj=$this->db->fetch_object($resql);
-			$this->cacheprospectstatus[$obj->id]=array('id'=>$obj->id, 'code'=>$obj->code, 'label'=> ($langs->trans("ST_".strtoupper($obj->code))=="ST_".strtoupper($obj->code))?$obj->label:$langs->trans("ST_".strtoupper($obj->code)));
-			$i++;
-		}
-		return 1;
+            $sql="SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
+            if ($active >= 0) $sql.=" WHERE active = ".$active;
+        $resql=$this->db->query($sql);
+        $num=$this->db->num_rows($resql);
+        $i=0;
+        while ($i < $num)
+        {
+            $obj=$this->db->fetch_object($resql);
+            $this->cacheprospectstatus[$obj->id]=array('id'=>$obj->id, 'code'=>$obj->code, 'label'=> ($langs->trans("ST_".strtoupper($obj->code))=="ST_".strtoupper($obj->code))?$obj->label:$langs->trans("ST_".strtoupper($obj->code)));
+            $i++;
+        }
+        return 1;
     }
 }

Spacing +22 added lines, -22 removed lines

@@ -29,9 +29,9 @@ 
  */
 class Client extends Societe
 {
-    public $next_prev_filter="te.client in (1,2,3)";	// Used to add a filter in Form::showrefnav method
+    public $next_prev_filter = "te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
 
-    public $cacheprospectstatus=array();
+    public $cacheprospectstatus = array();
 
 
 	/**
@@ -58,28 +58,28 @@ 
         // phpcs:enable
         global $user;
 
-        $this->nb=array("customers" => 0,"prospects" => 0);
+        $this->nb = array("customers" => 0, "prospects" => 0);
         $clause = "WHERE";
 
         $sql = "SELECT count(s.rowid) as nb, s.client";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
-        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-        	$sql.= " WHERE sc.fk_user = " .$user->id;
+        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+        	$sql .= " WHERE sc.fk_user = ".$user->id;
         	$clause = "AND";
         }
-        $sql.= " ".$clause." s.client IN (1,2,3)";
-        $sql.= ' AND s.entity IN ('.getEntity($this->element).')';
-        $sql.= " GROUP BY s.client";
+        $sql .= " ".$clause." s.client IN (1,2,3)";
+        $sql .= ' AND s.entity IN ('.getEntity($this->element).')';
+        $sql .= " GROUP BY s.client";
 
-        $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))
             {
-                if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"]+=$obj->nb;
-                if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"]+=$obj->nb;
+                if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"] += $obj->nb;
+                if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"] += $obj->nb;
             }
             $this->db->free($resql);
             return 1;
@@ -87,7 +87,7 @@ 
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -98,19 +98,19 @@ 
 	 *  @param	int		$active     1=Active only, 0=Not active only, -1=All
 	 *  @return int					<0 if KO, >0 if OK
 	 */
-    function loadCacheOfProspStatus($active=1)
+    function loadCacheOfProspStatus($active = 1)
     {
     	global $langs;
 
-   		$sql="SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
-   		if ($active >= 0) $sql.=" WHERE active = ".$active;
-		$resql=$this->db->query($sql);
-		$num=$this->db->num_rows($resql);
-		$i=0;
+   		$sql = "SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
+   		if ($active >= 0) $sql .= " WHERE active = ".$active;
+		$resql = $this->db->query($sql);
+		$num = $this->db->num_rows($resql);
+		$i = 0;
 		while ($i < $num)
 		{
-			$obj=$this->db->fetch_object($resql);
-			$this->cacheprospectstatus[$obj->id]=array('id'=>$obj->id, 'code'=>$obj->code, 'label'=> ($langs->trans("ST_".strtoupper($obj->code))=="ST_".strtoupper($obj->code))?$obj->label:$langs->trans("ST_".strtoupper($obj->code)));
+			$obj = $this->db->fetch_object($resql);
+			$this->cacheprospectstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=> ($langs->trans("ST_".strtoupper($obj->code)) == "ST_".strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_".strtoupper($obj->code)));
 			$i++;
 		}
 		return 1;

Braces +10 added lines, -5 removed lines

@@ -78,13 +78,16 @@ 
         {
             while ($obj=$this->db->fetch_object($resql))
             {
-                if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"]+=$obj->nb;
-                if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"]+=$obj->nb;
+                if ($obj->client == 1 || $obj->client == 3) {
+                    $this->nb["customers"]+=$obj->nb;
+                }
+                if ($obj->client == 2 || $obj->client == 3) {
+                    $this->nb["prospects"]+=$obj->nb;
+                }
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             $this->error=$this->db->lasterror();
@@ -103,7 +106,9 @@ 
     	global $langs;
 
    		$sql="SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
-   		if ($active >= 0) $sql.=" WHERE active = ".$active;
+   		if ($active >= 0) {
+   		    $sql.=" WHERE active = ".$active;
+   		}
 		$resql=$this->db->query($sql);
 		$num=$this->db->num_rows($resql);
 		$i=0;

dolibarr/htdocs/societe/class/api_thirdparties.class.php

Indentation +1621 added lines, -1621 removed lines

@@ -28,1644 +28,1644 @@
  */
 class Thirdparties extends DolibarrApi
 {
-	/**
-	 *
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
-	 */
-	static $FIELDS = array(
-		'name'
-	);
-
-	/**
-	 * @var Societe $company {@type Societe}
-	 */
-	public $company;
-
-	/**
-	 * Constructor
-	 */
-	function __construct()
-	{
-		global $db, $conf;
-		$this->db = $db;
-
-		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-
-		$this->company = new Societe($this->db);
-
-		if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
-			static::$FIELDS[] = 'email';
-		}
-	}
-
-	/**
-	 * Get properties of a thirdparty object
-	 *
-	 * Return an array with thirdparty informations
-	 *
-	 * @param 	int 	$id ID of thirdparty
-	 * @return 	array|mixed data without useless information
-	 *
-	 * @throws 	RestException
-	 */
-	function get($id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-		} else {
-			$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
-			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
-		}
-
-		$absolute_discount = $this->company->getAvailableDiscounts('', $filterabsolutediscount);
-		$absolute_creditnote = $this->company->getAvailableDiscounts('', $filtercreditnote);
-		$this->company->absolute_discount = price2num($absolute_discount, 'MT');
-		$this->company->absolute_creditnote = price2num($absolute_creditnote, 'MT');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-	/**
-	 * List thirdparties
-	 *
-	 * Get a list of thirdparties
-	 *
-	 * @param   string  $sortfield  Sort field
-	 * @param   string  $sortorder  Sort order
-	 * @param   int     $limit      Limit for list
-	 * @param   int     $page       Page number
-	 * @param   int     $mode       Set to 1 to show only customers
-	 *                              Set to 2 to show only prospects
-	 *                              Set to 3 to show only those are not customer neither prospect
-	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
-	 * @return  array               Array of thirdparty objects
-	 */
-	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $sqlfilters = '')
+    /**
+     *
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $FIELDS = array(
+        'name'
+    );
+
+    /**
+     * @var Societe $company {@type Societe}
+     */
+    public $company;
+
+    /**
+     * Constructor
+     */
+    function __construct()
     {
-		global $db, $conf;
-
-		$obj_ret = array();
-
-		// case of external user, we force socids
-		$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-
-		// If the internal user must only see his customers, force searching by him
-		$search_sale = 0;
-		if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
-
-		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as t";
-
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-		$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-		$sql.= " WHERE t.fk_stcomm = st.id";
-		if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-		if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-		if ($mode == 3) $sql.= " AND t.client IN (0)";
-		$sql.= ' AND t.entity IN ('.getEntity('societe').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
-		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-		if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
-		if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-		// Insert sale filter
-		if ($search_sale > 0)
-		{
-			$sql .= " AND sc.fk_user = ".$search_sale;
-		}
-		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (! DolibarrApi::_checkFilters($sqlfilters))
-			{
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-			}
-			$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-			$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-		}
-
-		$sql.= $db->order($sortfield, $sortorder);
-
-		if ($limit) {
-			if ($page < 0)
-			{
-				$page = 0;
-			}
-			$offset = $limit * $page;
-
-			$sql.= $db->plimit($limit + 1, $offset);
-		}
-
-		$result = $db->query($sql);
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			$min = min($num, ($limit <= 0 ? $num : $limit));
-			while ($i < $min)
-			{
-				$obj = $db->fetch_object($result);
-				$soc_static = new Societe($db);
-				if($soc_static->fetch($obj->rowid)) {
-					$obj_ret[] = $this->_cleanObjectDatas($soc_static);
-				}
-				$i++;
-			}
-		}
-		else {
-			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
-		}
-		if( ! count($obj_ret)) {
-			throw new RestException(404, 'Thirdparties not found');
-		}
-		return $obj_ret;
-	}
-
-	/**
-	 * Create thirdparty object
-	 *
-	 * @param array $request_data   Request datas
-	 * @return int  ID of thirdparty
-	 */
-	function post($request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-		// Check mandatory fields
-		$result = $this->_validate($request_data);
-
-		foreach($request_data as $field => $value) {
-			$this->company->$field = $value;
-		}
-		if ($this->company->create(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
-
-		return $this->company->id;
-	}
-
-	/**
-	 * Update thirdparty
-	 *
-	 * @param int   $id             Id of thirdparty to update
-	 * @param array $request_data   Datas
-	 * @return int
-	 */
-	function put($id, $request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		foreach($request_data as $field => $value) {
-			if ($field == 'id') continue;
-			$this->company->$field = $value;
-		}
-
-		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
-			return $this->get($id);
-
-		return false;
-	}
-
-	/**
-	 * Merge a thirdparty into another one.
-	 *
-	 * Merge content (properties, notes) and objects (like invoices, events, orders, proposals, ...) of a thirdparty into a target thirdparty,
-	 * then delete the merged thirdparty.
-	 * If a property has a defined value both in thirdparty to delete and thirdparty to keep, the value into the thirdparty to
-	 * delete will be ignored, the value of target thirdparty will remain, except for notes (content is concatenated).
-	 *
-	 * @param int   $id             ID of thirdparty to keep (the target thirdparty)
-	 * @param int   $idtodelete     ID of thirdparty to remove (the thirdparty to delete), once data has been merged into the target thirdparty.
-	 * @return int
-	 *
-	 * @url PUT {id}/merge/{idtodelete}
-	 */
-	function merge($id, $idtodelete)
-	{
-		global $db, $hookmanager;
-
-		$error = 0;
-
-		if ($id == $idtodelete)
-		{
-			throw new RestException(400, 'Try to merge a thirdparty into itself');
-		}
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);	// include the fetch of extra fields
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$this->companytoremove = new Societe($db);
-
-		$result = $this->companytoremove->fetch($idtodelete);	// include the fetch of extra fields
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->companytoremove->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$soc_origin = $this->companytoremove;
-		$object = $this->company;
-		$user = DolibarrApiAccess::$user;
-
-
-		// Call same code than into action 'confirm_merge'
-
-
-		$db->begin();
-
-		// Recopy some data
-		$object->client = $object->client | $soc_origin->client;
-		$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
-		$listofproperties=array(
-			'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
-			'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
-			'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
-			'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
-			'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
-			'model_pdf', 'fk_projet'
-		);
-		foreach ($listofproperties as $property)
-		{
-			if (empty($object->$property)) $object->$property = $soc_origin->$property;
-		}
-
-		// Concat some data
-		$listofproperties=array(
-			'note_public', 'note_private'
-		);
-		foreach ($listofproperties as $property)
-		{
-			$object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
-		}
-
-		// Merge extrafields
-		if (is_array($soc_origin->array_options))
-		{
-			foreach ($soc_origin->array_options as $key => $val)
-			{
-				if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
-			}
-		}
-
-		// Merge categories
-		$static_cat = new Categorie($db);
-		$custcats = $static_cat->containing($soc_origin->id, 'customer', 'id');
-		$object->setCategories($custcats, 'customer');
-		$suppcats = $static_cat->containing($soc_origin->id, 'supplier', 'id');
-		$object->setCategories($suppcats, 'supplier');
-
-		// If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
-		if ($soc_origin->code_client == $object->code_client
-			|| $soc_origin->code_fournisseur == $object->code_fournisseur
-			|| $soc_origin->barcode == $object->barcode)
-		{
-			dol_syslog("We clean customer and supplier code so we will be able to make the update of target");
-			$soc_origin->code_client = '';
-			$soc_origin->code_fournisseur = '';
-			$soc_origin->barcode = '';
-			$soc_origin->update($soc_origin->id, $user, 0, 1, 1, 'merge');
-		}
-
-		// Update
-		$result = $object->update($object->id, $user, 0, 1, 1, 'merge');
-		if ($result < 0)
-		{
-			$error++;
-		}
-
-		// Move links
-		if (! $error)
-		{
-			$objects = array(
-				'Adherent' => '/adherents/class/adherent.class.php',
-				'Societe' => '/societe/class/societe.class.php',
-				'Categorie' => '/categories/class/categorie.class.php',
-				'ActionComm' => '/comm/action/class/actioncomm.class.php',
-				'Propal' => '/comm/propal/class/propal.class.php',
-				'Commande' => '/commande/class/commande.class.php',
-				'Facture' => '/compta/facture/class/facture.class.php',
-				'FactureRec' => '/compta/facture/class/facture-rec.class.php',
-				'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
-				'Contact' => '/contact/class/contact.class.php',
-				'Contrat' => '/contrat/class/contrat.class.php',
-				'Expedition' => '/expedition/class/expedition.class.php',
-				'Fichinter' => '/fichinter/class/fichinter.class.php',
-				'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
-				'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
-				'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
-				'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
-				'Livraison' => '/livraison/class/livraison.class.php',
-				'Product' => '/product/class/product.class.php',
-				'Project' => '/projet/class/project.class.php',
-				'User' => '/user/class/user.class.php',
-			);
-
-			//First, all core objects must update their tables
-			foreach ($objects as $object_name => $object_file)
-			{
-				require_once DOL_DOCUMENT_ROOT.$object_file;
-
-				if (!$errors && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id))
-				{
-					$errors++;
-					//setEventMessages($db->lasterror(), null, 'errors');
-				}
-			}
-		}
-
-		// External modules should update their ones too
-		if (!$errors)
-		{
-			$reshook = $hookmanager->executeHooks('replaceThirdparty', array(
-				'soc_origin' => $soc_origin->id,
-				'soc_dest' => $object->id
-			), $soc_dest, $action);
-
-			if ($reshook < 0)
-			{
-				//setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-				$errors++;
-			}
-		}
-
-
-		if (! $error)
-		{
-			$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
-
-			// Call trigger
-			$result=$object->call_trigger('COMPANY_MODIFY',$user);
-			if ($result < 0)
-			{
-				//setEventMessages($object->error, $object->errors, 'errors');
-				$error++;
-			}
-			// End call triggers
-		}
-
-		if (! $error)
-		{
-			//We finally remove the old thirdparty
-			if ($soc_origin->delete($soc_origin->id, $user) < 1)
-			{
-				$errors++;
-			}
-		}
-
-		// End of merge
-
-		if ($error)
-		{
-			$db->rollback();
-
-			throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
-		}
-		else
-		{
-			$db->commit();
-		}
-
-		return $this->get($id);
-	}
-
-	/**
-	 * Delete thirdparty
-	 *
-	 * @param int $id   Thirparty ID
-	 * @return integer
-	 */
-	function delete($id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
-			throw new RestException(401);
-		}
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		return $this->company->delete($id);
-	}
-
-	/**
-	 * Get customer categories for a thirdparty
-	 *
-	 * @param int		$id         ID of thirdparty
-	 * @param string	$sortfield	Sort field
-	 * @param string	$sortorder	Sort order
-	 * @param int		$limit		Limit for list
-	 * @param int		$page		Page number
-	 *
-	 * @return mixed
-	 *
-	 * @url GET {id}/categories
-	 */
-	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
-	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result )
-		{
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$categories = new Categorie($this->db);
-
-		$result = $categories->getListForItem($id, 'customer', $sortfield, $sortorder, $limit, $page);
-
-		if (is_numeric($result) && $result < 0)
-		{
-			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
-		}
-
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
-		{
-			return array();
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Add a customer category to a thirdparty
-	 *
-	 * @param int		$id				Id of thirdparty
-	 * @param int       $category_id	Id of category
-	 *
-	 * @return mixed
-	 *
-	 * @url POST {id}/categories/{category_id}
-	 */
-	function addCategory($id, $category_id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		$category = new Categorie($this->db);
-		$result = $category->fetch($category_id);
-		if( ! $result ) {
-			throw new RestException(404, 'category not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$category->add_type($this->company,'customer');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-	/**
-	 * Remove the link between a customer category and the thirdparty
-	 *
-	 * @param int		$id				Id of thirdparty
-	 * @param int		$category_id	Id of category
-	 *
-	 * @return mixed
-	 *
-	 * @url DELETE {id}/categories/{category_id}
-	 */
-	function deleteCategory($id, $category_id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		$category = new Categorie($this->db);
-		$result = $category->fetch($category_id);
-		if( ! $result ) {
-			throw new RestException(404, 'category not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$category->del_type($this->company,'customer');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-	/**
-	 * Get supplier categories for a thirdparty
-	 *
-	 * @param int		$id         ID of thirdparty
-	 * @param string	$sortfield	Sort field
-	 * @param string	$sortorder	Sort order
-	 * @param int		$limit		Limit for list
-	 * @param int		$page		Page number
-	 *
-	 * @return mixed
-	 *
-	 * @url GET {id}/supplier_categories
-	 */
-	function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
-	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result )
-		{
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$categories = new Categorie($this->db);
-
-		$result = $categories->getListForItem($id, 'supplier', $sortfield, $sortorder, $limit, $page);
-
-		if (is_numeric($result) && $result < 0)
-		{
-			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
-		}
-
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
-		{
-			return array();
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Add a supplier category to a thirdparty
-	 *
-	 * @param int		$id				Id of thirdparty
-	 * @param int       $category_id	Id of category
-	 *
-	 * @return mixed
-	 *
-	 * @url POST {id}/supplier_categories/{category_id}
-	 */
-	function addSupplierCategory($id, $category_id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		$category = new Categorie($this->db);
-		$result = $category->fetch($category_id);
-		if( ! $result ) {
-			throw new RestException(404, 'category not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$category->add_type($this->company,'supplier');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-	/**
-	 * Remove the link between a category and the thirdparty
-	 *
-	 * @param int		$id				Id of thirdparty
-	 * @param int		$category_id	Id of category
-	 *
-	 * @return mixed
-	 *
-	 * @url DELETE {id}/supplier_categories/{category_id}
-	 */
-	function deleteSupplierCategory($id, $category_id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		$category = new Categorie($this->db);
-		$result = $category->fetch($category_id);
-		if( ! $result ) {
-			throw new RestException(404, 'category not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$category->del_type($this->company,'supplier');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-
-	/**
-	 * Get outstanding proposals of thirdparty
-	 *
-	 * @param 	int 	$id			ID of the thirdparty
-	 * @param 	string 	$mode		'customer' or 'supplier'
-	 *
-	 * @url     GET {id}/outstandingproposals
-	 *
-	 * @return array  				List of outstandings proposals of thirdparty
-	 *
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 */
-	function getOutStandingProposals($id, $mode='customer')
-	{
-		$obj_ret = array();
-
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$result = $this->company->getOutstandingProposals($mode);
-
-		unset($result['total_ht']);
-		unset($result['total_ttc']);
-
-		return $result;
-	}
-
-
-	/**
-	 * Get outstanding orders of thirdparty
-	 *
-	 * @param 	int 	$id			ID of the thirdparty
-	 * @param 	string 	$mode		'customer' or 'supplier'
-	 *
-	 * @url     GET {id}/outstandingorders
-	 *
-	 * @return array  				List of outstandings orders of thirdparty
-	 *
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 */
-	function getOutStandingOrder($id, $mode='customer')
-	{
-		$obj_ret = array();
-
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$result = $this->company->getOutstandingOrders($mode);
-
-		unset($result['total_ht']);
-		unset($result['total_ttc']);
-
-		return $result;
-	}
-
-	/**
-	 * Get outstanding invoices of thirdparty
-	 *
-	 * @param 	int 	$id			ID of the thirdparty
-	 * @param 	string 	$mode		'customer' or 'supplier'
-	 *
-	 * @url     GET {id}/outstandinginvoices
-	 *
-	 * @return array  				List of outstandings invoices of thirdparty
-	 *
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 */
-	function getOutStandingInvoices($id, $mode='customer')
-	{
-		$obj_ret = array();
-
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$result = $this->company->getOutstandingBills($mode);
-
-		unset($result['total_ht']);
-		unset($result['total_ttc']);
-
-		return $result;
-	}
-
-	/**
-	 * Get fixed amount discount of a thirdparty (all sources: deposit, credit note, commercial offers...)
-	 *
-	 * @param 	int 	$id             ID of the thirdparty
-	 * @param 	string 	$filter    	Filter exceptional discount. "none" will return every discount, "available" returns unapplied discounts, "used" returns applied discounts   {@choice none,available,used}
-	 * @param   string  $sortfield  	Sort field
-	 * @param   string  $sortorder  	Sort order
-	 *
-	 * @url     GET {id}/fixedamountdiscounts
-	 *
-	 * @return array  List of fixed discount of thirdparty
-	 *
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 503
-	 */
-	function getFixedAmountDiscounts($id, $filter="none", $sortfield = "f.type", $sortorder = 'ASC')
-	{
-		$obj_ret = array();
-
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-
-		$sql = "SELECT f.ref, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
-		$sql .= " WHERE f.rowid = re.fk_facture_source AND re.fk_soc = ".$id;
-		if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
-		if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
-
-		$sql.= $this->db->order($sortfield, $sortorder);
-
-		$result = $this->db->query($sql);
-		if( ! $result ) {
-			throw new RestException(503, $this->db->lasterror());
-		} else {
-			$num = $this->db->num_rows($result);
-			while ( $obj = $this->db->fetch_object($result) ) {
-				$obj_ret[] = $obj;
-			}
-		}
-
-		return $obj_ret;
-	}
-
-
-
-	/**
-	 * Return list of invoices qualified to be replaced by another invoice.
-	 *
-	 * @param int   $id             Id of thirdparty
-	 *
-	 * @url     GET {id}/getinvoicesqualifiedforreplacement
-	 *
-	 * @return array
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 405
-	 */
-	function getInvoicesQualifiedForReplacement($id)
+        global $db, $conf;
+        $this->db = $db;
+
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+
+        $this->company = new Societe($this->db);
+
+        if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
+            static::$FIELDS[] = 'email';
+        }
+    }
+
+    /**
+     * Get properties of a thirdparty object
+     *
+     * Return an array with thirdparty informations
+     *
+     * @param 	int 	$id ID of thirdparty
+     * @return 	array|mixed data without useless information
+     *
+     * @throws 	RestException
+     */
+    function get($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+            $filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+            $filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+        } else {
+            $filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
+            $filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
+        }
+
+        $absolute_discount = $this->company->getAvailableDiscounts('', $filterabsolutediscount);
+        $absolute_creditnote = $this->company->getAvailableDiscounts('', $filtercreditnote);
+        $this->company->absolute_discount = price2num($absolute_discount, 'MT');
+        $this->company->absolute_creditnote = price2num($absolute_creditnote, 'MT');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+    /**
+     * List thirdparties
+     *
+     * Get a list of thirdparties
+     *
+     * @param   string  $sortfield  Sort field
+     * @param   string  $sortorder  Sort order
+     * @param   int     $limit      Limit for list
+     * @param   int     $page       Page number
+     * @param   int     $mode       Set to 1 to show only customers
+     *                              Set to 2 to show only prospects
+     *                              Set to 3 to show only those are not customer neither prospect
+     * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
+     * @return  array               Array of thirdparty objects
+     */
+    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $sqlfilters = '')
+    {
+        global $db, $conf;
+
+        $obj_ret = array();
+
+        // case of external user, we force socids
+        $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
+
+        // If the internal user must only see his customers, force searching by him
+        $search_sale = 0;
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+
+        $sql = "SELECT t.rowid";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as t";
+
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+        $sql.= " WHERE t.fk_stcomm = st.id";
+        if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
+        if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
+        if ($mode == 3) $sql.= " AND t.client IN (0)";
+        $sql.= ' AND t.entity IN ('.getEntity('societe').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+        //if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
+        if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
+        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        // Insert sale filter
+        if ($search_sale > 0)
+        {
+            $sql .= " AND sc.fk_user = ".$search_sale;
+        }
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+        $sql.= $db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0)
+            {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql.= $db->plimit($limit + 1, $offset);
+        }
+
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
+            {
+                $obj = $db->fetch_object($result);
+                $soc_static = new Societe($db);
+                if($soc_static->fetch($obj->rowid)) {
+                    $obj_ret[] = $this->_cleanObjectDatas($soc_static);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
+        }
+        if( ! count($obj_ret)) {
+            throw new RestException(404, 'Thirdparties not found');
+        }
+        return $obj_ret;
+    }
+
+    /**
+     * Create thirdparty object
+     *
+     * @param array $request_data   Request datas
+     * @return int  ID of thirdparty
+     */
+    function post($request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+
+        foreach($request_data as $field => $value) {
+            $this->company->$field = $value;
+        }
+        if ($this->company->create(DolibarrApiAccess::$user) < 0)
+            throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+
+        return $this->company->id;
+    }
+
+    /**
+     * Update thirdparty
+     *
+     * @param int   $id             Id of thirdparty to update
+     * @param array $request_data   Datas
+     * @return int
+     */
+    function put($id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        foreach($request_data as $field => $value) {
+            if ($field == 'id') continue;
+            $this->company->$field = $value;
+        }
+
+        if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
+            return $this->get($id);
+
+        return false;
+    }
+
+    /**
+     * Merge a thirdparty into another one.
+     *
+     * Merge content (properties, notes) and objects (like invoices, events, orders, proposals, ...) of a thirdparty into a target thirdparty,
+     * then delete the merged thirdparty.
+     * If a property has a defined value both in thirdparty to delete and thirdparty to keep, the value into the thirdparty to
+     * delete will be ignored, the value of target thirdparty will remain, except for notes (content is concatenated).
+     *
+     * @param int   $id             ID of thirdparty to keep (the target thirdparty)
+     * @param int   $idtodelete     ID of thirdparty to remove (the thirdparty to delete), once data has been merged into the target thirdparty.
+     * @return int
+     *
+     * @url PUT {id}/merge/{idtodelete}
+     */
+    function merge($id, $idtodelete)
+    {
+        global $db, $hookmanager;
+
+        $error = 0;
+
+        if ($id == $idtodelete)
+        {
+            throw new RestException(400, 'Try to merge a thirdparty into itself');
+        }
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);	// include the fetch of extra fields
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $this->companytoremove = new Societe($db);
+
+        $result = $this->companytoremove->fetch($idtodelete);	// include the fetch of extra fields
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->companytoremove->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $soc_origin = $this->companytoremove;
+        $object = $this->company;
+        $user = DolibarrApiAccess::$user;
+
+
+        // Call same code than into action 'confirm_merge'
+
+
+        $db->begin();
+
+        // Recopy some data
+        $object->client = $object->client | $soc_origin->client;
+        $object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
+        $listofproperties=array(
+            'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
+            'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
+            'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
+            'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
+            'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
+            'model_pdf', 'fk_projet'
+        );
+        foreach ($listofproperties as $property)
+        {
+            if (empty($object->$property)) $object->$property = $soc_origin->$property;
+        }
+
+        // Concat some data
+        $listofproperties=array(
+            'note_public', 'note_private'
+        );
+        foreach ($listofproperties as $property)
+        {
+            $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
+        }
+
+        // Merge extrafields
+        if (is_array($soc_origin->array_options))
+        {
+            foreach ($soc_origin->array_options as $key => $val)
+            {
+                if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+            }
+        }
+
+        // Merge categories
+        $static_cat = new Categorie($db);
+        $custcats = $static_cat->containing($soc_origin->id, 'customer', 'id');
+        $object->setCategories($custcats, 'customer');
+        $suppcats = $static_cat->containing($soc_origin->id, 'supplier', 'id');
+        $object->setCategories($suppcats, 'supplier');
+
+        // If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
+        if ($soc_origin->code_client == $object->code_client
+            || $soc_origin->code_fournisseur == $object->code_fournisseur
+            || $soc_origin->barcode == $object->barcode)
+        {
+            dol_syslog("We clean customer and supplier code so we will be able to make the update of target");
+            $soc_origin->code_client = '';
+            $soc_origin->code_fournisseur = '';
+            $soc_origin->barcode = '';
+            $soc_origin->update($soc_origin->id, $user, 0, 1, 1, 'merge');
+        }
+
+        // Update
+        $result = $object->update($object->id, $user, 0, 1, 1, 'merge');
+        if ($result < 0)
+        {
+            $error++;
+        }
+
+        // Move links
+        if (! $error)
+        {
+            $objects = array(
+                'Adherent' => '/adherents/class/adherent.class.php',
+                'Societe' => '/societe/class/societe.class.php',
+                'Categorie' => '/categories/class/categorie.class.php',
+                'ActionComm' => '/comm/action/class/actioncomm.class.php',
+                'Propal' => '/comm/propal/class/propal.class.php',
+                'Commande' => '/commande/class/commande.class.php',
+                'Facture' => '/compta/facture/class/facture.class.php',
+                'FactureRec' => '/compta/facture/class/facture-rec.class.php',
+                'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
+                'Contact' => '/contact/class/contact.class.php',
+                'Contrat' => '/contrat/class/contrat.class.php',
+                'Expedition' => '/expedition/class/expedition.class.php',
+                'Fichinter' => '/fichinter/class/fichinter.class.php',
+                'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
+                'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
+                'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
+                'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
+                'Livraison' => '/livraison/class/livraison.class.php',
+                'Product' => '/product/class/product.class.php',
+                'Project' => '/projet/class/project.class.php',
+                'User' => '/user/class/user.class.php',
+            );
+
+            //First, all core objects must update their tables
+            foreach ($objects as $object_name => $object_file)
+            {
+                require_once DOL_DOCUMENT_ROOT.$object_file;
+
+                if (!$errors && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id))
+                {
+                    $errors++;
+                    //setEventMessages($db->lasterror(), null, 'errors');
+                }
+            }
+        }
+
+        // External modules should update their ones too
+        if (!$errors)
+        {
+            $reshook = $hookmanager->executeHooks('replaceThirdparty', array(
+                'soc_origin' => $soc_origin->id,
+                'soc_dest' => $object->id
+            ), $soc_dest, $action);
+
+            if ($reshook < 0)
+            {
+                //setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+                $errors++;
+            }
+        }
+
+
+        if (! $error)
+        {
+            $object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
+
+            // Call trigger
+            $result=$object->call_trigger('COMPANY_MODIFY',$user);
+            if ($result < 0)
+            {
+                //setEventMessages($object->error, $object->errors, 'errors');
+                $error++;
+            }
+            // End call triggers
+        }
+
+        if (! $error)
+        {
+            //We finally remove the old thirdparty
+            if ($soc_origin->delete($soc_origin->id, $user) < 1)
+            {
+                $errors++;
+            }
+        }
+
+        // End of merge
+
+        if ($error)
+        {
+            $db->rollback();
+
+            throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
+        }
+        else
+        {
+            $db->commit();
+        }
+
+        return $this->get($id);
+    }
+
+    /**
+     * Delete thirdparty
+     *
+     * @param int $id   Thirparty ID
+     * @return integer
+     */
+    function delete($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
-			throw new RestException(401);
-		}
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		/*$result = $this->thirdparty->fetch($id);
+        if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
+            throw new RestException(401);
+        }
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        return $this->company->delete($id);
+    }
+
+    /**
+     * Get customer categories for a thirdparty
+     *
+     * @param int		$id         ID of thirdparty
+     * @param string	$sortfield	Sort field
+     * @param string	$sortorder	Sort order
+     * @param int		$limit		Limit for list
+     * @param int		$page		Page number
+     *
+     * @return mixed
+     *
+     * @url GET {id}/categories
+     */
+    function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+    {
+        if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result )
+        {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $categories = new Categorie($this->db);
+
+        $result = $categories->getListForItem($id, 'customer', $sortfield, $sortorder, $limit, $page);
+
+        if (is_numeric($result) && $result < 0)
+        {
+            throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
+        }
+
+        if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+        {
+            return array();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Add a customer category to a thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int       $category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url POST {id}/categories/{category_id}
+     */
+    function addCategory($id, $category_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        $category = new Categorie($this->db);
+        $result = $category->fetch($category_id);
+        if( ! $result ) {
+            throw new RestException(404, 'category not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $category->add_type($this->company,'customer');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+    /**
+     * Remove the link between a customer category and the thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int		$category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url DELETE {id}/categories/{category_id}
+     */
+    function deleteCategory($id, $category_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        $category = new Categorie($this->db);
+        $result = $category->fetch($category_id);
+        if( ! $result ) {
+            throw new RestException(404, 'category not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $category->del_type($this->company,'customer');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+    /**
+     * Get supplier categories for a thirdparty
+     *
+     * @param int		$id         ID of thirdparty
+     * @param string	$sortfield	Sort field
+     * @param string	$sortorder	Sort order
+     * @param int		$limit		Limit for list
+     * @param int		$page		Page number
+     *
+     * @return mixed
+     *
+     * @url GET {id}/supplier_categories
+     */
+    function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+    {
+        if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result )
+        {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $categories = new Categorie($this->db);
+
+        $result = $categories->getListForItem($id, 'supplier', $sortfield, $sortorder, $limit, $page);
+
+        if (is_numeric($result) && $result < 0)
+        {
+            throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
+        }
+
+        if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+        {
+            return array();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Add a supplier category to a thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int       $category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url POST {id}/supplier_categories/{category_id}
+     */
+    function addSupplierCategory($id, $category_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        $category = new Categorie($this->db);
+        $result = $category->fetch($category_id);
+        if( ! $result ) {
+            throw new RestException(404, 'category not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $category->add_type($this->company,'supplier');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+    /**
+     * Remove the link between a category and the thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int		$category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url DELETE {id}/supplier_categories/{category_id}
+     */
+    function deleteSupplierCategory($id, $category_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        $category = new Categorie($this->db);
+        $result = $category->fetch($category_id);
+        if( ! $result ) {
+            throw new RestException(404, 'category not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $category->del_type($this->company,'supplier');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+
+    /**
+     * Get outstanding proposals of thirdparty
+     *
+     * @param 	int 	$id			ID of the thirdparty
+     * @param 	string 	$mode		'customer' or 'supplier'
+     *
+     * @url     GET {id}/outstandingproposals
+     *
+     * @return array  				List of outstandings proposals of thirdparty
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     */
+    function getOutStandingProposals($id, $mode='customer')
+    {
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $result = $this->company->getOutstandingProposals($mode);
+
+        unset($result['total_ht']);
+        unset($result['total_ttc']);
+
+        return $result;
+    }
+
+
+    /**
+     * Get outstanding orders of thirdparty
+     *
+     * @param 	int 	$id			ID of the thirdparty
+     * @param 	string 	$mode		'customer' or 'supplier'
+     *
+     * @url     GET {id}/outstandingorders
+     *
+     * @return array  				List of outstandings orders of thirdparty
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     */
+    function getOutStandingOrder($id, $mode='customer')
+    {
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $result = $this->company->getOutstandingOrders($mode);
+
+        unset($result['total_ht']);
+        unset($result['total_ttc']);
+
+        return $result;
+    }
+
+    /**
+     * Get outstanding invoices of thirdparty
+     *
+     * @param 	int 	$id			ID of the thirdparty
+     * @param 	string 	$mode		'customer' or 'supplier'
+     *
+     * @url     GET {id}/outstandinginvoices
+     *
+     * @return array  				List of outstandings invoices of thirdparty
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     */
+    function getOutStandingInvoices($id, $mode='customer')
+    {
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $result = $this->company->getOutstandingBills($mode);
+
+        unset($result['total_ht']);
+        unset($result['total_ttc']);
+
+        return $result;
+    }
+
+    /**
+     * Get fixed amount discount of a thirdparty (all sources: deposit, credit note, commercial offers...)
+     *
+     * @param 	int 	$id             ID of the thirdparty
+     * @param 	string 	$filter    	Filter exceptional discount. "none" will return every discount, "available" returns unapplied discounts, "used" returns applied discounts   {@choice none,available,used}
+     * @param   string  $sortfield  	Sort field
+     * @param   string  $sortorder  	Sort order
+     *
+     * @url     GET {id}/fixedamountdiscounts
+     *
+     * @return array  List of fixed discount of thirdparty
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 503
+     */
+    function getFixedAmountDiscounts($id, $filter="none", $sortfield = "f.type", $sortorder = 'ASC')
+    {
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+
+        $sql = "SELECT f.ref, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
+        $sql .= " WHERE f.rowid = re.fk_facture_source AND re.fk_soc = ".$id;
+        if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
+        if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        $result = $this->db->query($sql);
+        if( ! $result ) {
+            throw new RestException(503, $this->db->lasterror());
+        } else {
+            $num = $this->db->num_rows($result);
+            while ( $obj = $this->db->fetch_object($result) ) {
+                $obj_ret[] = $obj;
+            }
+        }
+
+        return $obj_ret;
+    }
+
+
+
+    /**
+     * Return list of invoices qualified to be replaced by another invoice.
+     *
+     * @param int   $id             Id of thirdparty
+     *
+     * @url     GET {id}/getinvoicesqualifiedforreplacement
+     *
+     * @return array
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 405
+     */
+    function getInvoicesQualifiedForReplacement($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->facture->lire) {
+            throw new RestException(401);
+        }
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        /*$result = $this->thirdparty->fetch($id);
 		 if( ! $result ) {
 		 throw new RestException(404, 'Thirdparty not found');
 		 }*/
 
-		$invoice = new Facture($this->db);
-		$result = $invoice->list_replacable_invoices($id);
-		if( $result < 0) {
-			throw new RestException(405, $this->thirdparty->error);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Return list of invoices qualified to be corrected by a credit note.
-	 * Invoices matching the following rules are returned
-	 * (validated + payment on process) or classified (payed completely or payed partialy) + not already replaced + not already a credit note
-	 *
-	 * @param int   $id             Id of thirdparty
-	 *
-	 * @url     GET {id}/getinvoicesqualifiedforcreditnote
-	 *
-	 * @return array
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 405
-	 */
-	function getInvoicesQualifiedForCreditNote($id)
+        $invoice = new Facture($this->db);
+        $result = $invoice->list_replacable_invoices($id);
+        if( $result < 0) {
+            throw new RestException(405, $this->thirdparty->error);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return list of invoices qualified to be corrected by a credit note.
+     * Invoices matching the following rules are returned
+     * (validated + payment on process) or classified (payed completely or payed partialy) + not already replaced + not already a credit note
+     *
+     * @param int   $id             Id of thirdparty
+     *
+     * @url     GET {id}/getinvoicesqualifiedforcreditnote
+     *
+     * @return array
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 405
+     */
+    function getInvoicesQualifiedForCreditNote($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
-			throw new RestException(401);
-		}
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		/*$result = $this->thirdparty->fetch($id);
+        if(! DolibarrApiAccess::$user->rights->facture->lire) {
+            throw new RestException(401);
+        }
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        /*$result = $this->thirdparty->fetch($id);
 		 if( ! $result ) {
 		 throw new RestException(404, 'Thirdparty not found');
 		 }*/
 
-		$invoice = new Facture($this->db);
-		$result = $invoice->list_qualified_avoir_invoices($id);
-		if( $result < 0) {
-			throw new RestException(405, $this->thirdparty->error);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get CompanyBankAccount objects for thirdparty
-	 *
-	 * @param int $id ID of thirdparty
-	 *
-	 * @return array
-	 *
-	 * @url GET {id}/bankaccounts
-	 */
-	function getCompanyBankAccount($id)
+        $invoice = new Facture($this->db);
+        $result = $invoice->list_qualified_avoir_invoices($id);
+        if( $result < 0) {
+            throw new RestException(405, $this->thirdparty->error);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get CompanyBankAccount objects for thirdparty
+     *
+     * @param int $id ID of thirdparty
+     *
+     * @return array
+     *
+     * @url GET {id}/bankaccounts
+     */
+    function getCompanyBankAccount($id)
+    {
+        global $db, $conf;
+
+        if(! DolibarrApiAccess::$user->rights->facture->lire) {
+            throw new RestException(401);
+        }
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        /**
+         * We select all the records that match the socid
+         */
+
+        $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
+        $sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
+        if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
+
+
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            throw new RestException(404, 'Account not found');
+        }
+
+        $i=0;
+
+        $accounts =[];
+
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($result);
+                $account = new CompanyBankAccount($db);
+                if($account->fetch($obj->rowid)) {
+                    $accounts[] = $account;
+                }
+                $i++;
+            }
+        }
+        else{
+            throw new RestException(404, 'Account not found');
+        }
+
+
+        $fields = ['socid', 'default_rib', 'frstrecur', '1000110000001', 'datec', 'datem', 'label', 'bank', 'bic', 'iban', 'id', 'rum'];
+
+        $returnAccounts = [];
+
+        foreach($accounts as $account){
+            $object= [];
+            foreach($account as $key => $value)
+                if(in_array($key, $fields)){
+                    $object[$key] = $value;
+                }
+            $returnAccounts[] = $object;
+        }
+
+        return $returnAccounts;
+    }
+
+    /**
+     * Create CompanyBankAccount object for thirdparty
+     * @param int  $id ID of thirdparty
+     * @param array $request_data Request data
+     *
+     * @return object  ID of thirdparty
+     *
+     * @url POST {id}/bankaccounts
+     */
+    function createCompanyBankAccount($id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $account = new CompanyBankAccount($this->db);
+
+        $account->socid = $id;
+
+        foreach($request_data as $field => $value) {
+            $account->$field = $value;
+        }
+
+        if ($account->create(DolibarrApiAccess::$user) < 0)
+            throw new RestException(500, 'Error creating Company Bank account');
+
+
+        if ($account->update(DolibarrApiAccess::$user) < 0)
+            throw new RestException(500, 'Error updating values');
+
+        return $account;
+    }
+
+    /**
+     * Update CompanyBankAccount object for thirdparty
+     *
+     * @param int $id ID of thirdparty
+     * @param int  $bankaccount_id ID of CompanyBankAccount
+     * @param array $request_data Request data
+     *
+     * @return object  ID of thirdparty
+     *
+     * @url PUT {id}/bankaccounts/{bankaccount_id}
+     */
+    function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $account = new CompanyBankAccount($this->db);
+
+        $account->fetch($bankaccount_id, $id, -1, '');
+
+        if($account->socid != $id){
+            throw new RestException(401);
+        }
+
+
+        foreach($request_data as $field => $value) {
+            $account->$field = $value;
+        }
+
+        if ($account->update(DolibarrApiAccess::$user) < 0)
+            throw new RestException(500, 'Error updating values');
+
+        return $account;
+    }
+
+    /**
+     * Delete a bank account attached to a thirdparty
+     *
+     * @param int $id ID of thirdparty
+     * @param int $bankaccount_id ID of CompanyBankAccount
+     *
+     * @return int -1 if error 1 if correct deletion
+     *
+     * @url DELETE {id}/bankaccounts/{bankaccount_id}
+     */
+    function deleteCompanyBankAccount($id, $bankaccount_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $account = new CompanyBankAccount($this->db);
+
+        $account->fetch($bankaccount_id);
+
+        if(!$account->socid == $id)
+            throw new RestException(401);
+
+        return $account->delete(DolibarrApiAccess::$user);
+    }
+
+    /**
+     * Generate a Document from a bank account record (like SEPA mandate)
+     *
+     * @param int 		$id 			Thirdparty id
+     * @param int 		$companybankid 	Companybank id
+     * @param string 	$model 			Model of document to generate
+     * @return void
+     *
+     * @url GET {id}/generateBankAccountDocument/{companybankid}/{model}
+     */
+    public function generateBankAccountDocument($id, $companybankid = null, $model = 'sepamandate')
+    {
+        global $conf;
+
+        $this->langs->loadLangs(array("main","dict","commercial","products","companies","banks","bills","withdrawals"));
+
+        $this->company->fetch($id);
+
+        $action = 'builddoc';
+        if(! DolibarrApiAccess::$user->rights->societe->creer)
+            throw new RestException(401);
+
+        $this->company->setDocModel(DolibarrApiAccess::$user, $model);
+
+        $this->company->fk_bank = $this->company->fk_account;
+
+        $outputlangs = $this->langs;
+        $newlang='';
+
+        if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
+        if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang;  // for proposal, order, invoice, ...
+        if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang;                  // for thirdparty
+        if (! empty($newlang)) {
+            $outputlangs = new Translate("",$conf);
+            $outputlangs->setDefaultLang($newlang);
+        }
+
+        // To be sure vars is defined
+        $hidedetails = $hidedesc = $hideref = 0;
+        $moreparams=null;
+        if (empty($hidedetails)) $hidedetails=0;
+        if (empty($hidedesc)) $hidedesc=0;
+        if (empty($hideref)) $hideref=0;
+        if (empty($moreparams)) $moreparams=null;
+
+
+        $sql = "SELECT rowid";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
+        if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
+        if ($companybankid) $sql.= " AND id = ".$companybankid."";
+
+        $i=0;
+        $accounts=array();
+
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            if ($result->num_rows == 0) {
+                throw new RestException(404, 'Bank account not found');
+            }
+
+            $num = $this->db->num_rows($result);
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($result);
+
+                $account = new CompanyBankAccount($this->db);
+                if ($account->fetch($obj->rowid)) {
+                    $accounts[] = $account;
+                }
+                $i++;
+            }
+        }
+        else
+        {
+            throw new RestException(404, 'Bank account not found');
+        }
+
+        $moreparams = array(
+            'use_companybankid'=>$accounts[0]->id,
+            'force_dir_output'=>$this->conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName($this->company->id)
+        );
+
+        $result = 0;
+
+        $result = $this->company->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+
+        if ($result > 0)
+        {
+            return array("success" => $result);
+        }
+        else
+        {
+            throw new RestException(500);
+        }
+    }
+
+    /**
+     * Get a specific gateway attached to a thirdparty (by specifying the site key)
+     *
+     * @param int $id ID of thirdparty
+     * @param string $site Site key
+     *
+     * @return SocieteAccount[]
+     * @throws 401 Unauthorized: User does not have permission to read thirdparties
+     * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+     *
+     * @url GET {id}/gateways/
+     */
+    function getSocieteAccounts($id, $site=null)
+    {
+        global $db, $conf;
+
+        if(!DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(!DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        /**
+         * We select all the records that match the socid
+         */
+        $sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
+        $sql.= " WHERE fk_soc = $id";
+        if($site) $sql .= " AND site ='$site'";
+
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0){
+            throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
+        }
+
+        $i=0;
+
+        $accounts =[];
+
+        $num = $db->num_rows($result);
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($result);
+            $account = new SocieteAccount($db);
+
+            if($account->fetch($obj->rowid)) {
+                $accounts[] = $account;
+            }
+            $i++;
+        }
+
+        $fields = ['id', 'fk_soc', 'key_account', 'site', 'date_creation', 'tms'];
+
+        $returnAccounts = [];
+
+        foreach($accounts as $account){
+            $object= [];
+            foreach($account as $key => $value)
+                if(in_array($key, $fields)){
+                    $object[$key] = $value;
+                }
+            $returnAccounts[] = $object;
+        }
+
+        return $returnAccounts;
+    }
+
+    /**
+     * Create and attach a new gateway to an existing thirdparty
+     *
+     * Possible fields for request_data (request body) are specified in <code>llx_societe_account</code> table.<br>
+     * See <a href="https://wiki.dolibarr.org/index.php/Table_llx_societe_account">Table llx_societe_account</a> wiki page for more information<br><br>
+     * <u>Example body payload :</u> <pre>{"key_account": "cus_DAVkLSs1LYyYI", "site": "stripe"}</pre>
+     *
+     * @param int $id ID of thirdparty
+     * @param array $request_data Request data
+     *
+     * @return SocieteAccount
+     * @throws 401 Unauthorized: User does not have permission to read thirdparties
+     * @throws 409 Conflict: A SocieteAccount entity (gateway) already exists for this company and site.
+     * @throws 422 Unprocessable Entity: You must pass the site attribute in your request data !
+     * @throws 500 Internal Server Error: Error creating SocieteAccount account
+     * @status 201
+     *
+     * @url POST {id}/gateways
+     */
+    function createSocieteAccount($id, $request_data = null)
+    {
+        global $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        if(!isset($request_data['site'])) {
+            throw new RestException(422, 'Unprocessable Entity: You must pass the site attribute in your request data !');
+        }
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            $account = new SocieteAccount($this->db);
+            if(!isset($request_data['login'])) {
+                $account->login = "";
+            }
+            $account->fk_soc = $id;
+
+            foreach($request_data as $field => $value) {
+                $account->$field = $value;
+            }
+
+            if ($account->create(DolibarrApiAccess::$user) < 0)
+                throw new RestException(500, 'Error creating SocieteAccount entity. Ensure that the ID of thirdparty provided does exist!');
+
+            $this->_cleanObjectDatas($account);
+
+            return $account;
+        } else {
+            throw new RestException(409, 'A SocieteAccount entity already exists for this company and site.');
+        }
+    }
+
+    /**
+     * Create and attach a new (or replace an existing) specific site gateway to a thirdparty
+     *
+     * You <strong>MUST</strong> pass all values to keep (otherwise, they will be deleted) !<br>
+     * If you just need to update specific fields prefer <code>PATCH /thirdparties/{id}/gateways/{site}</code> endpoint.<br><br>
+     * When a <strong>SocieteAccount</strong> entity does not exist for the <code>id</code> and <code>site</code>
+     * supplied, a new one will be created. In that case <code>fk_soc</code> and <code>site</code> members form
+     * request body payload will be ignored and <code>id</code> and <code>site</code> query strings parameters
+     * will be used instead.
+     *
+     * @param int $id ID of thirdparty
+     * @param string $site Site key
+     * @param array $request_data Request data
+     *
+     * @return SocieteAccount
+     * @throws 401 Unauthorized: User does not have permission to read thirdparties
+     * @throws 422 Unprocessable Entity: You must pass the site attribute in your request data !
+     * @throws 500 Internal Server Error: Error updating SocieteAccount entity
+     *
+     * @throws RestException
+     * @url PUT {id}/gateways/{site}
+     */
+    function putSocieteAccount($id, $site, $request_data = null)
     {
-		global $db, $conf;
-
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
-			throw new RestException(401);
-		}
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		/**
-		 * We select all the records that match the socid
-		 */
-
-		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
-
-
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			throw new RestException(404, 'Account not found');
-		}
-
-		$i=0;
-
-		$accounts =[];
-
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-				$account = new CompanyBankAccount($db);
-				if($account->fetch($obj->rowid)) {
-					$accounts[] = $account;
-				}
-				$i++;
-			}
-		}
-		else{
-			throw new RestException(404, 'Account not found');
-		}
-
-
-		$fields = ['socid', 'default_rib', 'frstrecur', '1000110000001', 'datec', 'datem', 'label', 'bank', 'bic', 'iban', 'id', 'rum'];
-
-		$returnAccounts = [];
-
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
-					$object[$key] = $value;
-				}
-			$returnAccounts[] = $object;
-		}
-
-		return $returnAccounts;
-	}
-
-	/**
-	 * Create CompanyBankAccount object for thirdparty
-	 * @param int  $id ID of thirdparty
-	 * @param array $request_data Request data
-	 *
-	 * @return object  ID of thirdparty
-	 *
-	 * @url POST {id}/bankaccounts
-	 */
-	function createCompanyBankAccount($id, $request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$account = new CompanyBankAccount($this->db);
-
-		$account->socid = $id;
-
-		foreach($request_data as $field => $value) {
-			$account->$field = $value;
-		}
-
-		if ($account->create(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error creating Company Bank account');
-
-
-		if ($account->update(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error updating values');
-
-		return $account;
-	}
-
-	/**
-	 * Update CompanyBankAccount object for thirdparty
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param int  $bankaccount_id ID of CompanyBankAccount
-	 * @param array $request_data Request data
-	 *
-	 * @return object  ID of thirdparty
-	 *
-	 * @url PUT {id}/bankaccounts/{bankaccount_id}
-	 */
-	function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$account = new CompanyBankAccount($this->db);
-
-		$account->fetch($bankaccount_id, $id, -1, '');
-
-		if($account->socid != $id){
-			throw new RestException(401);
-		}
-
-
-		foreach($request_data as $field => $value) {
-			$account->$field = $value;
-		}
-
-		if ($account->update(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error updating values');
-
-		return $account;
-	}
-
-	/**
-	 * Delete a bank account attached to a thirdparty
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param int $bankaccount_id ID of CompanyBankAccount
-	 *
-	 * @return int -1 if error 1 if correct deletion
-	 *
-	 * @url DELETE {id}/bankaccounts/{bankaccount_id}
-	 */
-	function deleteCompanyBankAccount($id, $bankaccount_id)
+        global $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid, fk_user_creat, date_creation FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '$site' ";
+        $result = $db->query($sql);
+
+        // We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
+        if($result->num_rows == 0 ){
+            if(!isset($request_data['key_account'])) {
+                throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
+            }
+            $account = new SocieteAccount($this->db);
+            if(!isset($request_data['login'])) {
+                $account->login = "";
+            }
+
+            foreach($request_data as $field => $value) {
+                $account->$field = $value;
+            }
+
+            $account->fk_soc = $id;
+            $account->site = $site;
+
+            if ($account->create(DolibarrApiAccess::$user) < 0)
+                throw new RestException(500, 'Error creating SocieteAccount entity.');
+        // We found an existing SocieteAccount entity, we are replacing it
+        } else {
+
+            if(isset($request_data['site']) && $request_data['site'] !== $site) {
+                $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+                $result = $db->query($sql);
+
+                if($result->num_rows !== 0)
+                    throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+            }
+
+            $obj = $db->fetch_object($result);
+
+            $account = new SocieteAccount($this->db);
+            $account->id = $obj->rowid;
+            $account->fk_soc = $id;
+            $account->site = $site;
+            if(!isset($request_data['login'])) {
+                $account->login = "";
+            }
+            $account->fk_user_creat = $obj->fk_user_creat;
+            $account->date_creation = $obj->date_creation;
+
+            foreach($request_data as $field => $value) {
+                $account->$field = $value;
+            }
+
+            if ($account->update(DolibarrApiAccess::$user) < 0)
+                throw new RestException(500, 'Error updating SocieteAccount entity.');
+        }
+
+        $this->_cleanObjectDatas($account);
+
+        return $account;
+    }
+
+    /**
+     * Update specified values of a specific site gateway attached to a thirdparty
+     *
+     * @param int $id Id of thirdparty
+     * @param string  $site Site key
+     * @param array $request_data Request data
+     *
+     * @return SocieteAccount
+     * @throws 401 Unauthorized: User does not have permission to read thirdparties
+     * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+     * @throws 409 Conflict: Another SocieteAccount entity already exists for this thirdparty with this site key.
+     * @throws 500 Internal Server Error: Error updating SocieteAccount entity
+     *
+     * @url PATCH {id}/gateways/{site}
+     */
+    function patchSocieteAccount($id, $site, $request_data = null)
     {
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$account = new CompanyBankAccount($this->db);
-
-		$account->fetch($bankaccount_id);
-
-		if(!$account->socid == $id)
-			throw new RestException(401);
-
-		return $account->delete(DolibarrApiAccess::$user);
-	}
-
-	/**
-	 * Generate a Document from a bank account record (like SEPA mandate)
-	 *
-	 * @param int 		$id 			Thirdparty id
-	 * @param int 		$companybankid 	Companybank id
-	 * @param string 	$model 			Model of document to generate
-	 * @return void
-	 *
-	 * @url GET {id}/generateBankAccountDocument/{companybankid}/{model}
-	 */
-	public function generateBankAccountDocument($id, $companybankid = null, $model = 'sepamandate')
-	{
-		global $conf;
-
-		$this->langs->loadLangs(array("main","dict","commercial","products","companies","banks","bills","withdrawals"));
-
-		$this->company->fetch($id);
-
-		$action = 'builddoc';
-		if(! DolibarrApiAccess::$user->rights->societe->creer)
-			throw new RestException(401);
-
-		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
-
-		$this->company->fk_bank = $this->company->fk_account;
-
-		$outputlangs = $this->langs;
-		$newlang='';
-
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang;  // for proposal, order, invoice, ...
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang;                  // for thirdparty
-		if (! empty($newlang)) {
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-
-		// To be sure vars is defined
-		$hidedetails = $hidedesc = $hideref = 0;
-		$moreparams=null;
-		if (empty($hidedetails)) $hidedetails=0;
-		if (empty($hidedesc)) $hidedesc=0;
-		if (empty($hideref)) $hideref=0;
-		if (empty($moreparams)) $moreparams=null;
-
-
-		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
-		if ($companybankid) $sql.= " AND id = ".$companybankid."";
-
-		$i=0;
-		$accounts=array();
-
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($result->num_rows == 0) {
-				throw new RestException(404, 'Bank account not found');
-			}
-
-			$num = $this->db->num_rows($result);
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($result);
-
-				$account = new CompanyBankAccount($this->db);
-				if ($account->fetch($obj->rowid)) {
-					$accounts[] = $account;
-				}
-				$i++;
-			}
-		}
-		else
-		{
-			throw new RestException(404, 'Bank account not found');
-		}
-
-		$moreparams = array(
-			'use_companybankid'=>$accounts[0]->id,
-			'force_dir_output'=>$this->conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName($this->company->id)
-		);
-
-		$result = 0;
-
-		$result = $this->company->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-
-		if ($result > 0)
-		{
-			return array("success" => $result);
-		}
-		else
-		{
-			throw new RestException(500);
-		}
+        global $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
+        } else {
+
+            // If the user tries to edit the site member, we check first if
+            if(isset($request_data['site']) && $request_data['site'] !== $site) {
+                $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+                $result = $db->query($sql);
+
+                if($result->num_rows !== 0)
+                    throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
+            }
+
+            $obj = $db->fetch_object($result);
+            $account = new SocieteAccount($this->db);
+            $account->fetch($obj->rowid);
+
+            foreach($request_data as $field => $value) {
+                $account->$field = $value;
+            }
+
+            if ($account->update(DolibarrApiAccess::$user) < 0)
+                throw new RestException(500, 'Error updating SocieteAccount account');
+
+            $this->_cleanObjectDatas($account);
+
+            return $account;
+        }
     }
 
-  /**
-	 * Get a specific gateway attached to a thirdparty (by specifying the site key)
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param string $site Site key
-	 *
-	 * @return SocieteAccount[]
-	 * @throws 401 Unauthorized: User does not have permission to read thirdparties
-	 * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 *
-	 * @url GET {id}/gateways/
-	 */
-	function getSocieteAccounts($id, $site=null)
+    /**
+     * Delete a specific site gateway attached to a thirdparty (by gateway id)
+     *
+     * @param int $id ID of thirdparty
+     * @param int $site Site key
+     *
+     * @return void
+     * @throws 401 Unauthorized: User does not have permission to delete thirdparties gateways
+     * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+     * @throws 500 Internal Server Error: Error deleting SocieteAccount entity
+     *
+     * @url DELETE {id}/gateways/{site}
+     */
+    function deleteSocieteAccount($id, $site)
     {
-		global $db, $conf;
-
-		if(!DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(!DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		/**
-		 * We select all the records that match the socid
-		 */
-		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
-		$sql.= " WHERE fk_soc = $id";
-		if($site) $sql .= " AND site ='$site'";
-
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0){
-			throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
-		}
-
-		$i=0;
-
-		$accounts =[];
-
-		$num = $db->num_rows($result);
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($result);
-			$account = new SocieteAccount($db);
-
-			if($account->fetch($obj->rowid)) {
-				$accounts[] = $account;
-			}
-			$i++;
-		}
-
-		$fields = ['id', 'fk_soc', 'key_account', 'site', 'date_creation', 'tms'];
-
-		$returnAccounts = [];
-
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
-					$object[$key] = $value;
-				}
-			$returnAccounts[] = $object;
-		}
-
-		return $returnAccounts;
-	}
-
-	/**
-	 * Create and attach a new gateway to an existing thirdparty
-	 *
-	 * Possible fields for request_data (request body) are specified in <code>llx_societe_account</code> table.<br>
-	 * See <a href="https://wiki.dolibarr.org/index.php/Table_llx_societe_account">Table llx_societe_account</a> wiki page for more information<br><br>
-	 * <u>Example body payload :</u> <pre>{"key_account": "cus_DAVkLSs1LYyYI", "site": "stripe"}</pre>
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param array $request_data Request data
-	 *
-	 * @return SocieteAccount
-	 * @throws 401 Unauthorized: User does not have permission to read thirdparties
-	 * @throws 409 Conflict: A SocieteAccount entity (gateway) already exists for this company and site.
-	 * @throws 422 Unprocessable Entity: You must pass the site attribute in your request data !
-	 * @throws 500 Internal Server Error: Error creating SocieteAccount account
-	 * @status 201
-	 *
-	 * @url POST {id}/gateways
-	 */
-	function createSocieteAccount($id, $request_data = null)
-	{
-		global $db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		if(!isset($request_data['site'])) {
-			throw new RestException(422, 'Unprocessable Entity: You must pass the site attribute in your request data !');
-		}
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
-				$account->login = "";
-			}
-			$account->fk_soc = $id;
-
-			foreach($request_data as $field => $value) {
-				$account->$field = $value;
-			}
-
-			if ($account->create(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error creating SocieteAccount entity. Ensure that the ID of thirdparty provided does exist!');
-
-			$this->_cleanObjectDatas($account);
-
-			return $account;
-		} else {
-			throw new RestException(409, 'A SocieteAccount entity already exists for this company and site.');
-		}
-	}
-
-	/**
-	 * Create and attach a new (or replace an existing) specific site gateway to a thirdparty
-	 *
-	 * You <strong>MUST</strong> pass all values to keep (otherwise, they will be deleted) !<br>
-	 * If you just need to update specific fields prefer <code>PATCH /thirdparties/{id}/gateways/{site}</code> endpoint.<br><br>
-	 * When a <strong>SocieteAccount</strong> entity does not exist for the <code>id</code> and <code>site</code>
-	 * supplied, a new one will be created. In that case <code>fk_soc</code> and <code>site</code> members form
-	 * request body payload will be ignored and <code>id</code> and <code>site</code> query strings parameters
-	 * will be used instead.
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param string $site Site key
-	 * @param array $request_data Request data
-	 *
-	 * @return SocieteAccount
-	 * @throws 401 Unauthorized: User does not have permission to read thirdparties
-	 * @throws 422 Unprocessable Entity: You must pass the site attribute in your request data !
-	 * @throws 500 Internal Server Error: Error updating SocieteAccount entity
-	 *
-	 * @throws RestException
-	 * @url PUT {id}/gateways/{site}
-	 */
-	function putSocieteAccount($id, $site, $request_data = null)
-	{
-		global $db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$sql = "SELECT rowid, fk_user_creat, date_creation FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '$site' ";
-		$result = $db->query($sql);
-
-		// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
-		if($result->num_rows == 0 ){
-			if(!isset($request_data['key_account'])) {
-				throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
-			}
-			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
-				$account->login = "";
-			}
-
-			foreach($request_data as $field => $value) {
-				$account->$field = $value;
-			}
-
-			$account->fk_soc = $id;
-			$account->site = $site;
-
-			if ($account->create(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error creating SocieteAccount entity.');
-		// We found an existing SocieteAccount entity, we are replacing it
-		} else {
-
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
-				$result = $db->query($sql);
-
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
-			}
-
-			$obj = $db->fetch_object($result);
-
-			$account = new SocieteAccount($this->db);
-			$account->id = $obj->rowid;
-			$account->fk_soc = $id;
-			$account->site = $site;
-			if(!isset($request_data['login'])) {
-				$account->login = "";
-			}
-			$account->fk_user_creat = $obj->fk_user_creat;
-			$account->date_creation = $obj->date_creation;
-
-			foreach($request_data as $field => $value) {
-				$account->$field = $value;
-			}
-
-			if ($account->update(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error updating SocieteAccount entity.');
-		}
-
-		$this->_cleanObjectDatas($account);
-
-		return $account;
-	}
-
-	/**
-	 * Update specified values of a specific site gateway attached to a thirdparty
-	 *
-	 * @param int $id Id of thirdparty
-	 * @param string  $site Site key
-	 * @param array $request_data Request data
-	 *
-	 * @return SocieteAccount
-	 * @throws 401 Unauthorized: User does not have permission to read thirdparties
-	 * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 * @throws 409 Conflict: Another SocieteAccount entity already exists for this thirdparty with this site key.
-	 * @throws 500 Internal Server Error: Error updating SocieteAccount entity
-	 *
-	 * @url PATCH {id}/gateways/{site}
-	 */
-	function patchSocieteAccount($id, $site, $request_data = null)
-	{
-		global $db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
-		} else {
-
-			// If the user tries to edit the site member, we check first if
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
-				$result = $db->query($sql);
-
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
-			}
-
-			$obj = $db->fetch_object($result);
-			$account = new SocieteAccount($this->db);
-			$account->fetch($obj->rowid);
-
-			foreach($request_data as $field => $value) {
-				$account->$field = $value;
-			}
-
-			if ($account->update(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error updating SocieteAccount account');
-
-			$this->_cleanObjectDatas($account);
-
-			return $account;
-		}
-	}
-
-	/**
-	 * Delete a specific site gateway attached to a thirdparty (by gateway id)
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param int $site Site key
-	 *
-	 * @return void
-	 * @throws 401 Unauthorized: User does not have permission to delete thirdparties gateways
-	 * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 * @throws 500 Internal Server Error: Error deleting SocieteAccount entity
-	 *
-	 * @url DELETE {id}/gateways/{site}
-	 */
-	function deleteSocieteAccount($id, $site)
+        global /** @var Database $db */
+        $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            throw new RestException(404);
+        } else {
+            $obj = $db->fetch_object($result);
+            $account = new SocieteAccount($this->db);
+            $account->fetch($obj->rowid);
+
+            if($account->delete(DolibarrApiAccess::$user) < 0) {
+                throw new RestException(500, "Error while deleting $site gateway attached to this third party");
+            }
+        }
+    }
+
+    /**
+     * Delete all gateways attached to a thirdparty
+     *
+     * @param int $id ID of thirdparty
+     *
+     * @return void
+     * @throws 401 Unauthorized: User does not have permission to delete thirdparties gateways
+     * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+     * @throws 500 Internal Server Error: Error deleting SocieteAccount entity
+     *
+     * @url DELETE {id}/gateways
+     */
+    function deleteSocieteAccounts($id)
     {
-		global /** @var Database $db */
-		$db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			throw new RestException(404);
-		} else {
-			$obj = $db->fetch_object($result);
-			$account = new SocieteAccount($this->db);
-			$account->fetch($obj->rowid);
-
-			if($account->delete(DolibarrApiAccess::$user) < 0) {
-				throw new RestException(500, "Error while deleting $site gateway attached to this third party");
-			}
-		}
-	}
-
-	/**
-	 * Delete all gateways attached to a thirdparty
-	 *
-	 * @param int $id ID of thirdparty
-	 *
-	 * @return void
-	 * @throws 401 Unauthorized: User does not have permission to delete thirdparties gateways
-	 * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 * @throws 500 Internal Server Error: Error deleting SocieteAccount entity
-	 *
-	 * @url DELETE {id}/gateways
-	 */
-	function deleteSocieteAccounts($id)
+        global /** @var Database $db */
+        $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        /**
+         * We select all the records that match the socid
+         */
+
+        $sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
+
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
+        } else {
+            $i=0;
+
+            $num = $db->num_rows($result);
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($result);
+                $account = new SocieteAccount($db);
+                $account->fetch($obj->rowid);
+
+                if($account->delete(DolibarrApiAccess::$user) < 0) {
+                    throw new RestException(500, 'Error while deleting gateways attached to this third party');
+                }
+                $i++;
+            }
+        }
+    }
+
+    /**
+     * Clean sensible object datas
+     *
+     * @param   object  $object    Object to clean
+     * @return    array    Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object)
     {
-		global /** @var Database $db */
-		$db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		/**
-		 * We select all the records that match the socid
-		 */
-
-		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
-
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
-		} else {
-			$i=0;
-
-			$num = $db->num_rows($result);
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-				$account = new SocieteAccount($db);
-				$account->fetch($obj->rowid);
-
-				if($account->delete(DolibarrApiAccess::$user) < 0) {
-					throw new RestException(500, 'Error while deleting gateways attached to this third party');
-				}
-				$i++;
-			}
-		}
-	}
-
-	/**
-	 * Clean sensible object datas
-	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
-	 */
-	function _cleanObjectDatas($object)
+        $object = parent::_cleanObjectDatas($object);
+
+        unset($object->nom);	// ->name already defined and nom deprecated
+
+        unset($object->total_ht);
+        unset($object->total_tva);
+        unset($object->total_localtax1);
+        unset($object->total_localtax2);
+        unset($object->total_ttc);
+
+        unset($object->lines);
+        unset($object->thirdparty);
+
+        return $object;
+    }
+
+    /**
+     * Validate fields before create or update object
+     *
+     * @param array $data   Datas to validate
+     * @return array
+     *
+     * @throws RestException
+     */
+    function _validate($data)
     {
-		$object = parent::_cleanObjectDatas($object);
-
-		unset($object->nom);	// ->name already defined and nom deprecated
-
-		unset($object->total_ht);
-		unset($object->total_tva);
-		unset($object->total_localtax1);
-		unset($object->total_localtax2);
-		unset($object->total_ttc);
-
-		unset($object->lines);
-		unset($object->thirdparty);
-
-		return $object;
-	}
-
-	/**
-	 * Validate fields before create or update object
-	 *
-	 * @param array $data   Datas to validate
-	 * @return array
-	 *
-	 * @throws RestException
-	 */
-	function _validate($data)
-	{
-		$thirdparty = array();
-		foreach (Thirdparties::$FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
-			$thirdparty[$field] = $data[$field];
-		}
-		return $thirdparty;
-	}
+        $thirdparty = array();
+        foreach (Thirdparties::$FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $thirdparty[$field] = $data[$field];
+        }
+        return $thirdparty;
+    }
 }

Spacing +195 added lines, -195 removed lines

@@ -56,7 +56,7 @@ 
 
 		$this->company = new Societe($this->db);
 
-		if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
+		if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
 			static::$FIELDS[] = 'email';
 		}
 	}
@@ -73,20 +73,20 @@ 
 	 */
 	function get($id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -117,7 +117,7 @@ 
 	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
 	 * @return  array               Array of thirdparty objects
 	 */
-	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $sqlfilters = '')
+	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $sqlfilters = '')
     {
 		global $db, $conf;
 
@@ -128,23 +128,23 @@ 
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
 		$sql = "SELECT t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as t";
-
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-		$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-		$sql.= " WHERE t.fk_stcomm = st.id";
-		if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-		if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-		if ($mode == 3) $sql.= " AND t.client IN (0)";
-		$sql.= ' AND t.entity IN ('.getEntity('societe').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as t";
+
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+		$sql .= " WHERE t.fk_stcomm = st.id";
+		if ($mode == 1) $sql .= " AND t.client IN (1, 3)";
+		if ($mode == 2) $sql .= " AND t.client IN (2, 3)";
+		if ($mode == 3) $sql .= " AND t.client IN (0)";
+		$sql .= ' AND t.entity IN ('.getEntity('societe').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc";
 		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-		if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
-		if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+		if ($socid) $sql .= " AND t.rowid IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 		// Insert sale filter
 		if ($search_sale > 0)
 		{
@@ -153,15 +153,15 @@ 
 		// Add sql filters
 		if ($sqlfilters)
 		{
-			if (! DolibarrApi::_checkFilters($sqlfilters))
+			if (!DolibarrApi::_checkFilters($sqlfilters))
 			{
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-			$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-		$sql.= $db->order($sortfield, $sortorder);
+		$sql .= $db->order($sortfield, $sortorder);
 
 		if ($limit) {
 			if ($page < 0)
@@ -170,7 +170,7 @@ 
 			}
 			$offset = $limit * $page;
 
-			$sql.= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 		}
 
 		$result = $db->query($sql);
@@ -182,7 +182,7 @@ 
 			{
 				$obj = $db->fetch_object($result);
 				$soc_static = new Societe($db);
-				if($soc_static->fetch($obj->rowid)) {
+				if ($soc_static->fetch($obj->rowid)) {
 					$obj_ret[] = $this->_cleanObjectDatas($soc_static);
 				}
 				$i++;
@@ -191,7 +191,7 @@ 
 		else {
 			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
 		}
-		if( ! count($obj_ret)) {
+		if (!count($obj_ret)) {
 			throw new RestException(404, 'Thirdparties not found');
 		}
 		return $obj_ret;
@@ -205,13 +205,13 @@ 
 	 */
 	function post($request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 		// Check mandatory fields
 		$result = $this->_validate($request_data);
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$this->company->$field = $value;
 		}
 		if ($this->company->create(DolibarrApiAccess::$user) < 0)
@@ -229,25 +229,25 @@ 
 	 */
 	function put($id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			if ($field == 'id') continue;
 			$this->company->$field = $value;
 		}
 
-		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
+		if ($this->company->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
 			return $this->get($id);
 
 		return false;
@@ -278,27 +278,27 @@ 
 			throw new RestException(400, 'Try to merge a thirdparty into itself');
 		}
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
-		$result = $this->company->fetch($id);	// include the fetch of extra fields
-		if( ! $result ) {
+		$result = $this->company->fetch($id); // include the fetch of extra fields
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$this->companytoremove = new Societe($db);
 
-		$result = $this->companytoremove->fetch($idtodelete);	// include the fetch of extra fields
-		if( ! $result ) {
+		$result = $this->companytoremove->fetch($idtodelete); // include the fetch of extra fields
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->companytoremove->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->companytoremove->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -315,7 +315,7 @@ 
 		// Recopy some data
 		$object->client = $object->client | $soc_origin->client;
 		$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
-		$listofproperties=array(
+		$listofproperties = array(
 			'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
 			'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
 			'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
@@ -329,7 +329,7 @@ 
 		}
 
 		// Concat some data
-		$listofproperties=array(
+		$listofproperties = array(
 			'note_public', 'note_private'
 		);
 		foreach ($listofproperties as $property)
@@ -373,7 +373,7 @@ 
 		}
 
 		// Move links
-		if (! $error)
+		if (!$error)
 		{
 			$objects = array(
 				'Adherent' => '/adherents/class/adherent.class.php',
@@ -428,12 +428,12 @@ 
 		}
 
 
-		if (! $error)
+		if (!$error)
 		{
-			$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
+			$object->context = array('merge'=>1, 'mergefromid'=>$soc_origin->id);
 
 			// Call trigger
-			$result=$object->call_trigger('COMPANY_MODIFY',$user);
+			$result = $object->call_trigger('COMPANY_MODIFY', $user);
 			if ($result < 0)
 			{
 				//setEventMessages($object->error, $object->errors, 'errors');
@@ -442,7 +442,7 @@ 
 			// End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			//We finally remove the old thirdparty
 			if ($soc_origin->delete($soc_origin->id, $user) < 1)
@@ -475,14 +475,14 @@ 
 	 */
 	function delete($id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
+		if (!DolibarrApiAccess::$user->rights->societe->supprimer) {
 			throw new RestException(401);
 		}
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		return $this->company->delete($id);
@@ -503,12 +503,12 @@ 
 	 */
 	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result )
+		if (!$result)
 		{
 			throw new RestException(404, 'Thirdparty not found');
 		}
@@ -542,28 +542,28 @@ 
 	 */
 	function addCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->add_type($this->company,'customer');
+		$category->add_type($this->company, 'customer');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -580,28 +580,28 @@ 
 	 */
 	function deleteCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->del_type($this->company,'customer');
+		$category->del_type($this->company, 'customer');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -621,12 +621,12 @@ 
 	 */
 	function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result )
+		if (!$result)
 		{
 			throw new RestException(404, 'Thirdparty not found');
 		}
@@ -660,28 +660,28 @@ 
 	 */
 	function addSupplierCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->add_type($this->company,'supplier');
+		$category->add_type($this->company, 'supplier');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -698,28 +698,28 @@ 
 	 */
 	function deleteSupplierCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->del_type($this->company,'supplier');
+		$category->del_type($this->company, 'supplier');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -739,24 +739,24 @@ 
 	 * @throws 401
 	 * @throws 404
 	 */
-	function getOutStandingProposals($id, $mode='customer')
+	function getOutStandingProposals($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -783,24 +783,24 @@ 
 	 * @throws 401
 	 * @throws 404
 	 */
-	function getOutStandingOrder($id, $mode='customer')
+	function getOutStandingOrder($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -826,24 +826,24 @@ 
 	 * @throws 401
 	 * @throws 404
 	 */
-	function getOutStandingInvoices($id, $mode='customer')
+	function getOutStandingInvoices($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -872,24 +872,24 @@ 
 	 * @throws 404
 	 * @throws 503
 	 */
-	function getFixedAmountDiscounts($id, $filter="none", $sortfield = "f.type", $sortorder = 'ASC')
+	function getFixedAmountDiscounts($id, $filter = "none", $sortfield = "f.type", $sortorder = 'ASC')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -900,14 +900,14 @@ 
 		if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
 		if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
 
-		$sql.= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
 		$result = $this->db->query($sql);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(503, $this->db->lasterror());
 		} else {
 			$num = $this->db->num_rows($result);
-			while ( $obj = $this->db->fetch_object($result) ) {
+			while ($obj = $this->db->fetch_object($result)) {
 				$obj_ret[] = $obj;
 			}
 		}
@@ -932,14 +932,14 @@ 
 	 */
 	function getInvoicesQualifiedForReplacement($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -950,7 +950,7 @@ 
 
 		$invoice = new Facture($this->db);
 		$result = $invoice->list_replacable_invoices($id);
-		if( $result < 0) {
+		if ($result < 0) {
 			throw new RestException(405, $this->thirdparty->error);
 		}
 
@@ -974,14 +974,14 @@ 
 	 */
 	function getInvoicesQualifiedForCreditNote($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -992,7 +992,7 @@ 
 
 		$invoice = new Facture($this->db);
 		$result = $invoice->list_qualified_avoir_invoices($id);
-		if( $result < 0) {
+		if ($result < 0) {
 			throw new RestException(405, $this->thirdparty->error);
 		}
 
@@ -1012,14 +1012,14 @@ 
     {
 		global $db, $conf;
 
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -1028,20 +1028,20 @@ 
 		 */
 
 		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
+		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
 
 
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, 'Account not found');
 		}
 
-		$i=0;
+		$i = 0;
 
-		$accounts =[];
+		$accounts = [];
 
 		if ($result)
 		{
@@ -1050,13 +1050,13 @@ 
 			{
 				$obj = $db->fetch_object($result);
 				$account = new CompanyBankAccount($db);
-				if($account->fetch($obj->rowid)) {
+				if ($account->fetch($obj->rowid)) {
 					$accounts[] = $account;
 				}
 				$i++;
 			}
 		}
-		else{
+		else {
 			throw new RestException(404, 'Account not found');
 		}
 
@@ -1065,10 +1065,10 @@ 
 
 		$returnAccounts = [];
 
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+		foreach ($accounts as $account) {
+			$object = [];
+			foreach ($account as $key => $value)
+				if (in_array($key, $fields)) {
 					$object[$key] = $value;
 				}
 			$returnAccounts[] = $object;
@@ -1088,7 +1088,7 @@ 
 	 */
 	function createCompanyBankAccount($id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1096,7 +1096,7 @@ 
 
 		$account->socid = $id;
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$account->$field = $value;
 		}
 
@@ -1123,7 +1123,7 @@ 
 	 */
 	function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1131,12 +1131,12 @@ 
 
 		$account->fetch($bankaccount_id, $id, -1, '');
 
-		if($account->socid != $id){
+		if ($account->socid != $id) {
 			throw new RestException(401);
 		}
 
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$account->$field = $value;
 		}
 
@@ -1158,7 +1158,7 @@ 
 	 */
 	function deleteCompanyBankAccount($id, $bankaccount_id)
     {
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1166,7 +1166,7 @@ 
 
 		$account->fetch($bankaccount_id);
 
-		if(!$account->socid == $id)
+		if (!$account->socid == $id)
 			throw new RestException(401);
 
 		return $account->delete(DolibarrApiAccess::$user);
@@ -1186,12 +1186,12 @@ 
 	{
 		global $conf;
 
-		$this->langs->loadLangs(array("main","dict","commercial","products","companies","banks","bills","withdrawals"));
+		$this->langs->loadLangs(array("main", "dict", "commercial", "products", "companies", "banks", "bills", "withdrawals"));
 
 		$this->company->fetch($id);
 
 		$action = 'builddoc';
-		if(! DolibarrApiAccess::$user->rights->societe->creer)
+		if (!DolibarrApiAccess::$user->rights->societe->creer)
 			throw new RestException(401);
 
 		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
@@ -1199,32 +1199,32 @@ 
 		$this->company->fk_bank = $this->company->fk_account;
 
 		$outputlangs = $this->langs;
-		$newlang='';
+		$newlang = '';
 
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang;  // for proposal, order, invoice, ...
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang;                  // for thirdparty
-		if (! empty($newlang)) {
-			$outputlangs = new Translate("",$conf);
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang = $this->company->thirdparty->default_lang; // for proposal, order, invoice, ...
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang = $this->company->default_lang; // for thirdparty
+		if (!empty($newlang)) {
+			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
 
 		// To be sure vars is defined
 		$hidedetails = $hidedesc = $hideref = 0;
-		$moreparams=null;
-		if (empty($hidedetails)) $hidedetails=0;
-		if (empty($hidedesc)) $hidedesc=0;
-		if (empty($hideref)) $hideref=0;
-		if (empty($moreparams)) $moreparams=null;
+		$moreparams = null;
+		if (empty($hidedetails)) $hidedetails = 0;
+		if (empty($hidedesc)) $hidedesc = 0;
+		if (empty($hideref)) $hideref = 0;
+		if (empty($moreparams)) $moreparams = null;
 
 
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
-		if ($companybankid) $sql.= " AND id = ".$companybankid."";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
+		if ($companybankid) $sql .= " AND id = ".$companybankid."";
 
-		$i=0;
-		$accounts=array();
+		$i = 0;
+		$accounts = array();
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -1281,15 +1281,15 @@ 
 	 *
 	 * @url GET {id}/gateways/
 	 */
-	function getSocieteAccounts($id, $site=null)
+	function getSocieteAccounts($id, $site = null)
     {
 		global $db, $conf;
 
-		if(!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(!DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -1297,18 +1297,18 @@ 
 		 * We select all the records that match the socid
 		 */
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
-		$sql.= " WHERE fk_soc = $id";
-		if($site) $sql .= " AND site ='$site'";
+		$sql .= " WHERE fk_soc = $id";
+		if ($site) $sql .= " AND site ='$site'";
 
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
 		}
 
-		$i=0;
+		$i = 0;
 
-		$accounts =[];
+		$accounts = [];
 
 		$num = $db->num_rows($result);
 		while ($i < $num)
@@ -1316,7 +1316,7 @@ 
 			$obj = $db->fetch_object($result);
 			$account = new SocieteAccount($db);
 
-			if($account->fetch($obj->rowid)) {
+			if ($account->fetch($obj->rowid)) {
 				$accounts[] = $account;
 			}
 			$i++;
@@ -1326,10 +1326,10 @@ 
 
 		$returnAccounts = [];
 
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+		foreach ($accounts as $account) {
+			$object = [];
+			foreach ($account as $key => $value)
+				if (in_array($key, $fields)) {
 					$object[$key] = $value;
 				}
 			$returnAccounts[] = $object;
@@ -1361,25 +1361,25 @@ 
 	{
 		global $db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
-		if(!isset($request_data['site'])) {
+		if (!isset($request_data['site'])) {
 			throw new RestException(422, 'Unprocessable Entity: You must pass the site attribute in your request data !');
 		}
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
+			if (!isset($request_data['login'])) {
 				$account->login = "";
 			}
 			$account->fk_soc = $id;
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1420,7 +1420,7 @@ 
 	{
 		global $db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1428,16 +1428,16 @@ 
 		$result = $db->query($sql);
 
 		// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
-		if($result->num_rows == 0 ){
-			if(!isset($request_data['key_account'])) {
+		if ($result->num_rows == 0) {
+			if (!isset($request_data['key_account'])) {
 				throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
 			}
 			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
+			if (!isset($request_data['login'])) {
 				$account->login = "";
 			}
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1449,12 +1449,12 @@ 
 		// We found an existing SocieteAccount entity, we are replacing it
 		} else {
 
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+			if (isset($request_data['site']) && $request_data['site'] !== $site) {
+				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+				if ($result->num_rows !== 0)
+					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key.");
 			}
 
 			$obj = $db->fetch_object($result);
@@ -1463,13 +1463,13 @@ 
 			$account->id = $obj->rowid;
 			$account->fk_soc = $id;
 			$account->site = $site;
-			if(!isset($request_data['login'])) {
+			if (!isset($request_data['login'])) {
 				$account->login = "";
 			}
 			$account->fk_user_creat = $obj->fk_user_creat;
 			$account->date_creation = $obj->date_creation;
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1501,31 +1501,31 @@ 
 	{
 		global $db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
 		} else {
 
 			// If the user tries to edit the site member, we check first if
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+			if (isset($request_data['site']) && $request_data['site'] !== $site) {
+				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
+				if ($result->num_rows !== 0)
+					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
 			}
 
 			$obj = $db->fetch_object($result);
 			$account = new SocieteAccount($this->db);
 			$account->fetch($obj->rowid);
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1556,21 +1556,21 @@ 
 		global /** @var Database $db */
 		$db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404);
 		} else {
 			$obj = $db->fetch_object($result);
 			$account = new SocieteAccount($this->db);
 			$account->fetch($obj->rowid);
 
-			if($account->delete(DolibarrApiAccess::$user) < 0) {
+			if ($account->delete(DolibarrApiAccess::$user) < 0) {
 				throw new RestException(500, "Error while deleting $site gateway attached to this third party");
 			}
 		}
@@ -1593,7 +1593,7 @@ 
 		global /** @var Database $db */
 		$db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1602,14 +1602,14 @@ 
 		 */
 
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
 
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
 		} else {
-			$i=0;
+			$i = 0;
 
 			$num = $db->num_rows($result);
 			while ($i < $num)
@@ -1618,7 +1618,7 @@ 
 				$account = new SocieteAccount($db);
 				$account->fetch($obj->rowid);
 
-				if($account->delete(DolibarrApiAccess::$user) < 0) {
+				if ($account->delete(DolibarrApiAccess::$user) < 0) {
 					throw new RestException(500, 'Error while deleting gateways attached to this third party');
 				}
 				$i++;
@@ -1636,7 +1636,7 @@ 
     {
 		$object = parent::_cleanObjectDatas($object);
 
-		unset($object->nom);	// ->name already defined and nom deprecated
+		unset($object->nom); // ->name already defined and nom deprecated
 
 		unset($object->total_ht);
 		unset($object->total_tva);

Braces +139 added lines, -69 removed lines

@@ -128,23 +128,44 @@ 
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+		    $search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+		    $sql .= ", sc.fk_soc, sc.fk_user";
+		}
+		// We need these fields in order to filter by sale (including the case where the user can only see his prospects)
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		// We need this table joined to the select in order to filter by sale
 		$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 		$sql.= " WHERE t.fk_stcomm = st.id";
-		if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-		if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-		if ($mode == 3) $sql.= " AND t.client IN (0)";
+		if ($mode == 1) {
+		    $sql.= " AND t.client IN (1, 3)";
+		}
+		if ($mode == 2) {
+		    $sql.= " AND t.client IN (2, 3)";
+		}
+		if ($mode == 3) {
+		    $sql.= " AND t.client IN (0)";
+		}
 		$sql.= ' AND t.entity IN ('.getEntity('societe').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+		    $sql.= " AND t.rowid = sc.fk_soc";
+		}
 		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-		if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
-		if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+		if ($socid) {
+		    $sql.= " AND t.rowid IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+		    $sql.= " AND t.rowid = sc.fk_soc";
+		}
+		// Join for the needed table to filter by sale
 		// Insert sale filter
 		if ($search_sale > 0)
 		{
@@ -187,8 +208,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
 		}
 		if( ! count($obj_ret)) {
@@ -214,8 +234,9 @@ 
 		foreach($request_data as $field => $value) {
 			$this->company->$field = $value;
 		}
-		if ($this->company->create(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+		if ($this->company->create(DolibarrApiAccess::$user) < 0) {
+					throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+		}
 
 		return $this->company->id;
 	}
@@ -243,12 +264,15 @@ 
 		}
 
 		foreach($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+			    continue;
+			}
 			$this->company->$field = $value;
 		}
 
-		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
-			return $this->get($id);
+		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update')) {
+					return $this->get($id);
+		}
 
 		return false;
 	}
@@ -325,7 +349,9 @@ 
 		);
 		foreach ($listofproperties as $property)
 		{
-			if (empty($object->$property)) $object->$property = $soc_origin->$property;
+			if (empty($object->$property)) {
+			    $object->$property = $soc_origin->$property;
+			}
 		}
 
 		// Concat some data
@@ -342,7 +368,9 @@ 
 		{
 			foreach ($soc_origin->array_options as $key => $val)
 			{
-				if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+				if (empty($object->array_options[$key])) {
+				    $object->array_options[$key] = $val;
+				}
 			}
 		}
 
@@ -458,8 +486,7 @@ 
 			$db->rollback();
 
 			throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
-		}
-		else
+		} else
 		{
 			$db->commit();
 		}
@@ -522,10 +549,12 @@ 
 			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
 		}
 
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+		if (is_numeric($result) && $result == 0) {
+		    // To fix a return of 0 instead of empty array of method getListForItem
 		{
 			return array();
 		}
+		}
 
 		return $result;
 	}
@@ -640,10 +669,12 @@ 
 			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
 		}
 
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+		if (is_numeric($result) && $result == 0) {
+		    // To fix a return of 0 instead of empty array of method getListForItem
 		{
 			return array();
 		}
+		}
 
 		return $result;
 	}
@@ -897,8 +928,12 @@ 
 		$sql = "SELECT f.ref, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE f.rowid = re.fk_facture_source AND re.fk_soc = ".$id;
-		if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
-		if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
+		if ($filter == "available") {
+		    $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
+		}
+		if ($filter == "used") {
+		    $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
+		}
 
 		$sql.= $this->db->order($sortfield, $sortorder);
 
@@ -1030,7 +1065,9 @@ 
 		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
 		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
+		if ($id) {
+		    $sql.= " WHERE fk_soc  = ".$id." ";
+		}
 
 
 		$result = $db->query($sql);
@@ -1055,8 +1092,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else{
+		} else{
 			throw new RestException(404, 'Account not found');
 		}
 
@@ -1067,9 +1103,10 @@ 
 
 		foreach($accounts as $account){
 			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+			foreach($account as $key => $value) {
+							if(in_array($key, $fields)){
 					$object[$key] = $value;
+			}
 				}
 			$returnAccounts[] = $object;
 		}
@@ -1100,12 +1137,14 @@ 
 			$account->$field = $value;
 		}
 
-		if ($account->create(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error creating Company Bank account');
+		if ($account->create(DolibarrApiAccess::$user) < 0) {
+					throw new RestException(500, 'Error creating Company Bank account');
+		}
 
 
-		if ($account->update(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error updating values');
+		if ($account->update(DolibarrApiAccess::$user) < 0) {
+					throw new RestException(500, 'Error updating values');
+		}
 
 		return $account;
 	}
@@ -1140,8 +1179,9 @@ 
 			$account->$field = $value;
 		}
 
-		if ($account->update(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error updating values');
+		if ($account->update(DolibarrApiAccess::$user) < 0) {
+					throw new RestException(500, 'Error updating values');
+		}
 
 		return $account;
 	}
@@ -1166,8 +1206,9 @@ 
 
 		$account->fetch($bankaccount_id);
 
-		if(!$account->socid == $id)
-			throw new RestException(401);
+		if(!$account->socid == $id) {
+					throw new RestException(401);
+		}
 
 		return $account->delete(DolibarrApiAccess::$user);
 	}
@@ -1191,8 +1232,9 @@ 
 		$this->company->fetch($id);
 
 		$action = 'builddoc';
-		if(! DolibarrApiAccess::$user->rights->societe->creer)
-			throw new RestException(401);
+		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+					throw new RestException(401);
+		}
 
 		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
 
@@ -1201,9 +1243,17 @@ 
 		$outputlangs = $this->langs;
 		$newlang='';
 
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang;  // for proposal, order, invoice, ...
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang;                  // for thirdparty
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+		    $newlang=GETPOST('lang_id','aZ09');
+		}
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) {
+		    $newlang=$this->company->thirdparty->default_lang;
+		}
+		// for proposal, order, invoice, ...
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) {
+		    $newlang=$this->company->default_lang;
+		}
+		// for thirdparty
 		if (! empty($newlang)) {
 			$outputlangs = new Translate("",$conf);
 			$outputlangs->setDefaultLang($newlang);
@@ -1212,16 +1262,28 @@ 
 		// To be sure vars is defined
 		$hidedetails = $hidedesc = $hideref = 0;
 		$moreparams=null;
-		if (empty($hidedetails)) $hidedetails=0;
-		if (empty($hidedesc)) $hidedesc=0;
-		if (empty($hideref)) $hideref=0;
-		if (empty($moreparams)) $moreparams=null;
+		if (empty($hidedetails)) {
+		    $hidedetails=0;
+		}
+		if (empty($hidedesc)) {
+		    $hidedesc=0;
+		}
+		if (empty($hideref)) {
+		    $hideref=0;
+		}
+		if (empty($moreparams)) {
+		    $moreparams=null;
+		}
 
 
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
-		if ($companybankid) $sql.= " AND id = ".$companybankid."";
+		if ($id) {
+		    $sql.= " WHERE fk_soc  = ".$id." ";
+		}
+		if ($companybankid) {
+		    $sql.= " AND id = ".$companybankid."";
+		}
 
 		$i=0;
 		$accounts=array();
@@ -1244,8 +1306,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			throw new RestException(404, 'Bank account not found');
 		}
@@ -1262,8 +1323,7 @@ 
 		if ($result > 0)
 		{
 			return array("success" => $result);
-		}
-		else
+		} else
 		{
 			throw new RestException(500);
 		}
@@ -1298,7 +1358,9 @@ 
 		 */
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
 		$sql.= " WHERE fk_soc = $id";
-		if($site) $sql .= " AND site ='$site'";
+		if($site) {
+		    $sql .= " AND site ='$site'";
+		}
 
 		$result = $db->query($sql);
 
@@ -1328,9 +1390,10 @@ 
 
 		foreach($accounts as $account){
 			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+			foreach($account as $key => $value) {
+							if(in_array($key, $fields)){
 					$object[$key] = $value;
+			}
 				}
 			$returnAccounts[] = $object;
 		}
@@ -1383,8 +1446,9 @@ 
 				$account->$field = $value;
 			}
 
-			if ($account->create(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error creating SocieteAccount entity. Ensure that the ID of thirdparty provided does exist!');
+			if ($account->create(DolibarrApiAccess::$user) < 0) {
+							throw new RestException(500, 'Error creating SocieteAccount entity. Ensure that the ID of thirdparty provided does exist!');
+			}
 
 			$this->_cleanObjectDatas($account);
 
@@ -1444,8 +1508,9 @@ 
 			$account->fk_soc = $id;
 			$account->site = $site;
 
-			if ($account->create(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error creating SocieteAccount entity.');
+			if ($account->create(DolibarrApiAccess::$user) < 0) {
+							throw new RestException(500, 'Error creating SocieteAccount entity.');
+			}
 		// We found an existing SocieteAccount entity, we are replacing it
 		} else {
 
@@ -1453,8 +1518,9 @@ 
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+				if($result->num_rows !== 0) {
+									throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+				}
 			}
 
 			$obj = $db->fetch_object($result);
@@ -1473,8 +1539,9 @@ 
 				$account->$field = $value;
 			}
 
-			if ($account->update(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error updating SocieteAccount entity.');
+			if ($account->update(DolibarrApiAccess::$user) < 0) {
+							throw new RestException(500, 'Error updating SocieteAccount entity.');
+			}
 		}
 
 		$this->_cleanObjectDatas($account);
@@ -1517,8 +1584,9 @@ 
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
+				if($result->num_rows !== 0) {
+									throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
+				}
 			}
 
 			$obj = $db->fetch_object($result);
@@ -1529,8 +1597,9 @@ 
 				$account->$field = $value;
 			}
 
-			if ($account->update(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error updating SocieteAccount account');
+			if ($account->update(DolibarrApiAccess::$user) < 0) {
+							throw new RestException(500, 'Error updating SocieteAccount account');
+			}
 
 			$this->_cleanObjectDatas($account);
 
@@ -1662,8 +1731,9 @@ 
 	{
 		$thirdparty = array();
 		foreach (Thirdparties::$FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
+			if (!isset($data[$field])) {
+							throw new RestException(400, "$field field missing");
+			}
 			$thirdparty[$field] = $data[$field];
 		}
 		return $thirdparty;

dolibarr/htdocs/societe/societecontact.php

Indentation +220 added lines, -220 removed lines

@@ -54,60 +54,60 @@ 
 
 if ($action == 'addcontact' && $user->rights->societe->creer)
 {
-	$result = $object->fetch($id);
+    $result = $object->fetch($id);
 
     if ($result > 0 && $id > 0)
     {
-    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+        $contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+            $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
     }
 
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
-			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
-		}
-	}
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+        {
+            $langs->load("errors");
+            $mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+        }
+        else
+        {
+            $mesg = '<div class="error">'.$object->error.'</div>';
+        }
+    }
 }
 
 // bascule du statut d'un contact
 else if ($action == 'swapstatut' && $user->rights->societe->creer)
 {
-	if ($object->fetch($id))
-	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if ($object->fetch($id))
+    {
+        $result=$object->swapContactStatus(GETPOST('ligne'));
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 // Efface un contact
 else if ($action == 'deletecontact' && $user->rights->societe->creer)
 {
-	$object->fetch($id);
-	$result = $object->delete_contact($_GET["lineid"]);
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else {
-		dol_print_error($db);
-	}
+    $object->fetch($id);
+    $result = $object->delete_contact($_GET["lineid"]);
+
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else {
+        dol_print_error($db);
+    }
 }
 /*
 else if ($action == 'setaddress' && $user->rights->societe->creer)
@@ -141,28 +141,28 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($object->fetch($id, $ref) > 0)
-	{
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
+    if ($object->fetch($id, $ref) > 0)
+    {
+        $soc = new Societe($db);
+        $soc->fetch($object->socid);
 
-		$head = societe_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"), -1, 'company');
+        $head = societe_prepare_head($object);
+        dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"), -1, 'company');
 
-		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
-    	print '<div class="fichecenter">';
+        print '<div class="fichecenter">';
 
         print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent">';
+        print '<table class="border centpercent">';
 
-    	// Prospect/Customer
-    	/*print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
+        // Prospect/Customer
+        /*print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
     	print $object->getLibCustProspStatut();
     	print '</td></tr>';
 
@@ -171,175 +171,175 @@ 
     	print yn($object->fournisseur);
     	print '</td></tr>';*/
 
-		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-		{
-		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-		}
-
-		if ($object->client)
-		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		    print $object->code_client;
-		    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		    print '</td></tr>';
-		}
-
-		if ($object->fournisseur)
-		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		    print $object->code_fournisseur;
-		    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		    print '</td></tr>';
-		}
-		print '</table>';
-
-		print '</div>';
-
-		print '</form>';
-		print '<br>';
-
-		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
-		{
-			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-			if ($res) break;
-		}
-
-		// additionnal list with adherents of company
-		if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-
-			$membertypestatic=new AdherentType($db);
-			$memberstatic=new Adherent($db);
-
-			$langs->load("members");
-			$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
-			$sql.= " d.datefin,";
-			$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
-			$sql.= " t.libelle as type, t.subscription";
-			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
-			$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql.= " WHERE d.fk_soc = ".$id;
-			$sql.= " AND d.fk_adherent_type = t.rowid";
-
-			dol_syslog("get list sql=".$sql);
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$num = $db->num_rows($resql);
-
-				if ($num  > 0 )
-				{
-					$titre=$langs->trans("MembersListOfTiers");
-					print '<br>';
-
-					print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
-
-					print "<table class=\"noborder\" width=\"100%\">";
-					print '<tr class="liste_titre">';
-					print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Login",$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Person",$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EndSubscription",$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
-					print "</tr>\n";
-
-					$i=0;
-					while ($i < $num && $i < $conf->liste_limit)
-					{
-						$objp = $db->fetch_object($resql);
-
-						$datefin=$db->jdate($objp->datefin);
-						$memberstatic->id=$objp->rowid;
-						$memberstatic->ref=$objp->rowid;
-						$memberstatic->lastname=$objp->lastname;
-						$memberstatic->firstname=$objp->firstname;
-						$memberstatic->statut=$objp->statut;
-						$memberstatic->datefin=$db->jdate($objp->datefin);
-
-						$companyname=$objp->company;
-
-						print '<tr class="oddeven">';
-
-						// Ref
-						print "<td>";
-						print $memberstatic->getNomUrl(1);
-						print "</td>\n";
-
-						// Lastname
-						print "<td><a href=\"card.php?rowid=$objp->rowid\">";
-						print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
-						print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
-						print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
-						print "</a></td>\n";
-
-						// Login
-						print "<td>".$objp->login."</td>\n";
-
-						// Type
-						$membertypestatic->id=$objp->type_id;
-						$membertypestatic->libelle=$objp->type;
-						print '<td class="nowrap">';
-						print $membertypestatic->getNomUrl(1,32);
-						print '</td>';
-
-						// Moral/Physique
-						print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
-
-						// EMail
-						print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
-
-						// Statut
-						print '<td class="nowrap">';
-						print $memberstatic->LibStatut($objp->statut,$objp->subscription,$datefin,2);
-						print "</td>";
-
-						// End of subscription date
-						if ($datefin)
-						{
-							print '<td align="center" class="nowrap">';
-							print dol_print_date($datefin,'day');
-							if ($memberstatic->hasDelay()) {
-								print " ".img_warning($langs->trans("SubscriptionLate"));
-							}
-							print '</td>';
-						}
-						else
-						{
-							print '<td align="left" class="nowrap">';
-							if ($objp->subscription == 'yes')
-							{
-								print $langs->trans("SubscriptionNotReceived");
-								if ($objp->statut > 0) print " ".img_warning();
-							}
-							else
-							{
-								print '&nbsp;';
-							}
-							print '</td>';
-						}
-
-						print "</tr>\n";
-						$i++;
-					}
-					print "</table>\n";
-				}
-			}
-		}
-	}
-	else
-	{
-		// Contrat non trouve
-		print "ErrorRecordNotFound";
-	}
+        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        {
+            print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+        }
+
+        if ($object->client)
+        {
+            print '<tr><td class="titlefield">';
+            print $langs->trans('CustomerCode').'</td><td colspan="3">';
+            print $object->code_client;
+            if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            print '</td></tr>';
+        }
+
+        if ($object->fournisseur)
+        {
+            print '<tr><td class="titlefield">';
+            print $langs->trans('SupplierCode').'</td><td colspan="3">';
+            print $object->code_fournisseur;
+            if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+            print '</td></tr>';
+        }
+        print '</table>';
+
+        print '</div>';
+
+        print '</form>';
+        print '<br>';
+
+        // Contacts lines (modules that overwrite templates must declare this into descriptor)
+        $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+        foreach($dirtpls as $reldir)
+        {
+            $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+            if ($res) break;
+        }
+
+        // additionnal list with adherents of company
+        if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+
+            $membertypestatic=new AdherentType($db);
+            $memberstatic=new Adherent($db);
+
+            $langs->load("members");
+            $sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
+            $sql.= " d.datefin,";
+            $sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
+            $sql.= " t.libelle as type, t.subscription";
+            $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
+            $sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
+            $sql.= " WHERE d.fk_soc = ".$id;
+            $sql.= " AND d.fk_adherent_type = t.rowid";
+
+            dol_syslog("get list sql=".$sql);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num = $db->num_rows($resql);
+
+                if ($num  > 0 )
+                {
+                    $titre=$langs->trans("MembersListOfTiers");
+                    print '<br>';
+
+                    print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
+
+                    print "<table class=\"noborder\" width=\"100%\">";
+                    print '<tr class="liste_titre">';
+                    print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("Login",$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("Person",$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("EndSubscription",$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
+                    print "</tr>\n";
+
+                    $i=0;
+                    while ($i < $num && $i < $conf->liste_limit)
+                    {
+                        $objp = $db->fetch_object($resql);
+
+                        $datefin=$db->jdate($objp->datefin);
+                        $memberstatic->id=$objp->rowid;
+                        $memberstatic->ref=$objp->rowid;
+                        $memberstatic->lastname=$objp->lastname;
+                        $memberstatic->firstname=$objp->firstname;
+                        $memberstatic->statut=$objp->statut;
+                        $memberstatic->datefin=$db->jdate($objp->datefin);
+
+                        $companyname=$objp->company;
+
+                        print '<tr class="oddeven">';
+
+                        // Ref
+                        print "<td>";
+                        print $memberstatic->getNomUrl(1);
+                        print "</td>\n";
+
+                        // Lastname
+                        print "<td><a href=\"card.php?rowid=$objp->rowid\">";
+                        print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+                        print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
+                        print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
+                        print "</a></td>\n";
+
+                        // Login
+                        print "<td>".$objp->login."</td>\n";
+
+                        // Type
+                        $membertypestatic->id=$objp->type_id;
+                        $membertypestatic->libelle=$objp->type;
+                        print '<td class="nowrap">';
+                        print $membertypestatic->getNomUrl(1,32);
+                        print '</td>';
+
+                        // Moral/Physique
+                        print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
+
+                        // EMail
+                        print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
+
+                        // Statut
+                        print '<td class="nowrap">';
+                        print $memberstatic->LibStatut($objp->statut,$objp->subscription,$datefin,2);
+                        print "</td>";
+
+                        // End of subscription date
+                        if ($datefin)
+                        {
+                            print '<td align="center" class="nowrap">';
+                            print dol_print_date($datefin,'day');
+                            if ($memberstatic->hasDelay()) {
+                                print " ".img_warning($langs->trans("SubscriptionLate"));
+                            }
+                            print '</td>';
+                        }
+                        else
+                        {
+                            print '<td align="left" class="nowrap">';
+                            if ($objp->subscription == 'yes')
+                            {
+                                print $langs->trans("SubscriptionNotReceived");
+                                if ($objp->statut > 0) print " ".img_warning();
+                            }
+                            else
+                            {
+                                print '&nbsp;';
+                            }
+                            print '</td>';
+                        }
+
+                        print "</tr>\n";
+                        $i++;
+                    }
+                    print "</table>\n";
+                }
+            }
+        }
+    }
+    else
+    {
+        // Contrat non trouve
+        print "ErrorRecordNotFound";
+    }
 }
 
 // End of page

Spacing +57 added lines, -57 removed lines

@@ -34,18 +34,18 @@ 
 
 $langs->loadLangs(array("orders", "companies"));
 
-$id=GETPOST('id','int')?GETPOST('id','int'):GETPOST('socid','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe', $id,'');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', $id, '');
 
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contactthirdparty','globalcard'));
+$hookmanager->initHooks(array('contactthirdparty', 'globalcard'));
 
 
 /*
@@ -58,7 +58,7 @@ 
 
     if ($result > 0 && $id > 0)
     {
-    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
     }
 
@@ -86,7 +86,7 @@ 
 {
 	if ($object->fetch($id))
 	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
+	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
 	else
 	{
@@ -122,15 +122,15 @@ 
  * View
  */
 
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $langs->trans("ThirdParty"), $help_url);
 
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 
 /* *************************************************************************** */
@@ -139,7 +139,7 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	if ($object->fetch($id, $ref) > 0)
 	{
@@ -154,7 +154,7 @@ 
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     	print '<div class="fichecenter">';
 
@@ -171,7 +171,7 @@ 
     	print yn($object->fournisseur);
     	print '</td></tr>';*/
 
-		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 		{
 		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
@@ -201,31 +201,31 @@ 
 		print '<br>';
 
 		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir)
 		{
-			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 			if ($res) break;
 		}
 
 		// additionnal list with adherents of company
-		if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+		if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-			$membertypestatic=new AdherentType($db);
-			$memberstatic=new Adherent($db);
+			$membertypestatic = new AdherentType($db);
+			$memberstatic = new Adherent($db);
 
 			$langs->load("members");
 			$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
-			$sql.= " d.datefin,";
-			$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
-			$sql.= " t.libelle as type, t.subscription";
-			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
-			$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql.= " WHERE d.fk_soc = ".$id;
-			$sql.= " AND d.fk_adherent_type = t.rowid";
+			$sql .= " d.datefin,";
+			$sql .= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
+			$sql .= " t.libelle as type, t.subscription";
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+			$sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
+			$sql .= " WHERE d.fk_soc = ".$id;
+			$sql .= " AND d.fk_adherent_type = t.rowid";
 
 			dol_syslog("get list sql=".$sql);
 			$resql = $db->query($sql);
@@ -233,39 +233,39 @@ 
 			{
 				$num = $db->num_rows($resql);
 
-				if ($num  > 0 )
+				if ($num > 0)
 				{
-					$titre=$langs->trans("MembersListOfTiers");
+					$titre = $langs->trans("MembersListOfTiers");
 					print '<br>';
 
-					print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
+					print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 
 					print "<table class=\"noborder\" width=\"100%\">";
 					print '<tr class="liste_titre">';
-					print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Login",$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Person",$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EndSubscription",$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
+					print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"), $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "t.libelle", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.statut,d.datefin", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", 'align="center"', $sortfield, $sortorder);
 					print "</tr>\n";
 
-					$i=0;
+					$i = 0;
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($resql);
 
-						$datefin=$db->jdate($objp->datefin);
-						$memberstatic->id=$objp->rowid;
-						$memberstatic->ref=$objp->rowid;
-						$memberstatic->lastname=$objp->lastname;
-						$memberstatic->firstname=$objp->firstname;
-						$memberstatic->statut=$objp->statut;
-						$memberstatic->datefin=$db->jdate($objp->datefin);
+						$datefin = $db->jdate($objp->datefin);
+						$memberstatic->id = $objp->rowid;
+						$memberstatic->ref = $objp->rowid;
+						$memberstatic->lastname = $objp->lastname;
+						$memberstatic->firstname = $objp->firstname;
+						$memberstatic->statut = $objp->statut;
+						$memberstatic->datefin = $db->jdate($objp->datefin);
 
-						$companyname=$objp->company;
+						$companyname = $objp->company;
 
 						print '<tr class="oddeven">';
 
@@ -276,37 +276,37 @@ 
 
 						// Lastname
 						print "<td><a href=\"card.php?rowid=$objp->rowid\">";
-						print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
-						print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
-						print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
+						print ((!empty($objp->lastname) || !empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+						print (((!empty($objp->lastname) || !empty($objp->firstname)) && !empty($companyname)) ? ' / ' : '');
+						print (!empty($companyname) ? dol_trunc($companyname, 32) : '');
 						print "</a></td>\n";
 
 						// Login
 						print "<td>".$objp->login."</td>\n";
 
 						// Type
-						$membertypestatic->id=$objp->type_id;
-						$membertypestatic->libelle=$objp->type;
+						$membertypestatic->id = $objp->type_id;
+						$membertypestatic->libelle = $objp->type;
 						print '<td class="nowrap">';
-						print $membertypestatic->getNomUrl(1,32);
+						print $membertypestatic->getNomUrl(1, 32);
 						print '</td>';
 
 						// Moral/Physique
 						print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
 
 						// EMail
-						print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
+						print "<td>".dol_print_email($objp->email, 0, 0, 1)."</td>\n";
 
 						// Statut
 						print '<td class="nowrap">';
-						print $memberstatic->LibStatut($objp->statut,$objp->subscription,$datefin,2);
+						print $memberstatic->LibStatut($objp->statut, $objp->subscription, $datefin, 2);
 						print "</td>";
 
 						// End of subscription date
 						if ($datefin)
 						{
 							print '<td align="center" class="nowrap">';
-							print dol_print_date($datefin,'day');
+							print dol_print_date($datefin, 'day');
 							if ($memberstatic->hasDelay()) {
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}

Braces +25 added lines, -20 removed lines

@@ -39,7 +39,9 @@ 
 $action=GETPOST('action','alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $id,'');
 
 $object = new Societe($db);
@@ -66,15 +68,13 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
+		} else
 		{
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
@@ -87,8 +87,7 @@ 
 	if ($object->fetch($id))
 	{
 	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -104,8 +103,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -171,17 +169,21 @@ 
     	print yn($object->fournisseur);
     	print '</td></tr>';*/
 
-		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+		    // Old not used prefix field
 		{
 		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
+		}
 
 		if ($object->client)
 		{
 		    print '<tr><td class="titlefield">';
 		    print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		    print $object->code_client;
-		    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		    if ($object->check_codeclient() <> 0) {
+		        print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		    }
 		    print '</td></tr>';
 		}
 
@@ -190,7 +192,9 @@ 
 		    print '<tr><td class="titlefield">';
 		    print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		    print $object->code_fournisseur;
-		    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		    if ($object->check_codefournisseur() <> 0) {
+		        print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		    }
 		    print '</td></tr>';
 		}
 		print '</table>';
@@ -205,7 +209,9 @@ 
 		foreach($dirtpls as $reldir)
 		{
 			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-			if ($res) break;
+			if ($res) {
+			    break;
+			}
 		}
 
 		// additionnal list with adherents of company
@@ -311,16 +317,16 @@ 
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}
 							print '</td>';
-						}
-						else
+						} else
 						{
 							print '<td align="left" class="nowrap">';
 							if ($objp->subscription == 'yes')
 							{
 								print $langs->trans("SubscriptionNotReceived");
-								if ($objp->statut > 0) print " ".img_warning();
-							}
-							else
+								if ($objp->statut > 0) {
+								    print " ".img_warning();
+								}
+							} else
 							{
 								print '&nbsp;';
 							}
@@ -334,8 +340,7 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		// Contrat non trouve
 		print "ErrorRecordNotFound";

dolibarr/htdocs/societe/project.php

Indentation +34 added lines, -34 removed lines

@@ -62,23 +62,23 @@ 
 
 if ($socid)
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-	$langs->load("companies");
+    $langs->load("companies");
 
 
-	$object = new Societe($db);
-	$result = $object->fetch($socid);
+    $object = new Societe($db);
+    $result = $object->fetch($socid);
 
-	$title=$langs->trans("Projects");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	llxHeader('',$title);
+    $title=$langs->trans("Projects");
+    if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+    llxHeader('',$title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
-	$head = societe_prepare_head($object);
+    if (! empty($conf->notification->enabled)) $langs->load("mails");
+    $head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
+    dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -87,36 +87,36 @@ 
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+    print '<table class="border centpercent">';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
 
-	if ($object->client)
-	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		print '</td></tr>';
-	}
+    if ($object->client)
+    {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('CustomerCode').'</td><td colspan="3">';
+        print $object->code_client;
+        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        print '</td></tr>';
+    }
 
-	if ($object->fournisseur)
-	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		print '</td></tr>';
-	}
+    if ($object->fournisseur)
+    {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('SupplierCode').'</td><td colspan="3">';
+        print $object->code_fournisseur;
+        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        print '</td></tr>';
+    }
 
-	print '</table>';
+    print '</table>';
 
-	print '</div>';
+    print '</div>';
 
-	dol_fiche_end();
+    dol_fiche_end();
 
 
     /*
@@ -129,7 +129,7 @@ 
     {
     	if (! empty($conf->projet->enabled) && ! empty($user->rights->projet->creer))
     	{*/
-        	$addbutton = '<a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
+            $addbutton = '<a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
     /*	}
     	else
     	{
@@ -142,8 +142,8 @@ 
     print '<br>';
 
 
-	// Projects list
-	$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
+    // Projects list
+    $result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
 }
 
 // End of page

Spacing +11 added lines, -11 removed lines

@@ -34,8 +34,8 @@ 
 $langs->loadLangs(array("companies", "projects"));
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -46,8 +46,8 @@ 
  *	Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$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');
 
 
@@ -71,25 +71,25 @@ 
 	$object = new Societe($db);
 	$result = $object->fetch($socid);
 
-	$title=$langs->trans("Projects");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	llxHeader('',$title);
+	$title = $langs->trans("Projects");
+	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+	llxHeader('', $title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
@@ -143,7 +143,7 @@ 
 
 
 	// Projects list
-	$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
+	$result = show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
 }
 
 // End of page

Braces +21 added lines, -7 removed lines

@@ -35,7 +35,9 @@ 
 
 // Security check
 $socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -48,7 +50,9 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 
@@ -72,10 +76,14 @@ 
 	$result = $object->fetch($socid);
 
 	$title=$langs->trans("Projects");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+	    $title=$object->name." - ".$title;
+	}
 	llxHeader('',$title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (! empty($conf->notification->enabled)) {
+	    $langs->load("mails");
+	}
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
@@ -89,17 +97,21 @@ 
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+        // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
+    }
 
 	if ($object->client)
 	{
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		if ($object->check_codeclient() <> 0) {
+		    print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 
@@ -108,7 +120,9 @@ 
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		if ($object->check_codefournisseur() <> 0) {
+		    print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 

dolibarr/htdocs/societe/notify/card.php

Indentation +16 added lines, -16 removed lines

@@ -78,12 +78,12 @@ 
     {
         if (empty($contactid))
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), null, 'errors');
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), null, 'errors');
             $error++;
         }
         if ($actionid <= 0)
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
             $error++;
         }
 
@@ -212,7 +212,7 @@ 
     print '<br>'.$langs->trans("NotificationsDescUser");
     print '<br>'.$langs->trans("NotificationsDescContact");
     print '<br>'.$langs->trans("NotificationsDescGlobal");
-	print '</div>';
+    print '</div>';
 
     print '<br><br>'."\n";
 
@@ -233,7 +233,7 @@ 
     print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
     print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
     print_liste_field_titre('');
-	print "</tr>\n";
+    print "</tr>\n";
 
     $var=false;
     $listofemails=$object->thirdparty_and_contact_email_array();
@@ -247,7 +247,7 @@ 
 
         foreach($listofmanagedeventfornotification as $managedeventfornotification)
         {
- 			$label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
+                $label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
             $actions[$managedeventfornotification['rowid']]=$label;
         }
         print '<tr class="oddeven"><td class="maxwidthonsmartphone">';
@@ -310,8 +310,8 @@ 
     print_liste_field_titre('','','');
     print '</tr>';
 
-	$langs->load("errors");
-	$langs->load("other");
+    $langs->load("errors");
+    $langs->load("other");
 
     if ($num)
     {
@@ -431,8 +431,8 @@ 
         $nbtotalofrecords = $db->num_rows($result);
         if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
         {
-        	$page = 0;
-        	$offset = 0;
+            $page = 0;
+            $offset = 0;
         }
     }
 
@@ -487,15 +487,15 @@ 
             print '<tr class="oddeven"><td>';
             if ($obj->id > 0)
             {
-	            $contactstatic->id=$obj->id;
-	            $contactstatic->lastname=$obj->lastname;
-	            $contactstatic->firstname=$obj->firstname;
-	            print $contactstatic->getNomUrl(1);
-	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
+                $contactstatic->id=$obj->id;
+                $contactstatic->lastname=$obj->lastname;
+                $contactstatic->firstname=$obj->firstname;
+                print $contactstatic->getNomUrl(1);
+                print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
             }
             else
-			{
-				print $obj->email;
+            {
+                print $obj->email;
             }
             print '</td>';
             print '<td>';

Spacing +91 added lines, -91 removed lines

@@ -32,32 +32,32 @@ 
 
 $langs->loadLangs(array("companies", "mails", "admin", "other"));
 
-$socid = GETPOST("socid",'int');
-$action = GETPOST('action','aZ09');
-$contactid=GETPOST('contactid');    // May be an int or 'thirdparty'
-$actionid=GETPOST('actionid');
+$socid = GETPOST("socid", 'int');
+$action = GETPOST('action', 'aZ09');
+$contactid = GETPOST('contactid'); // May be an int or 'thirdparty'
+$actionid = GETPOST('actionid');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe','','');
-
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield=GETPOST("sortfield",'alpha');
-$sortorder=GETPOST("sortorder",'alpha');
-$page=GETPOST("page",'int');
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="n.daten";
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', '', '');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "n.daten";
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$now=dol_now();
+$now = dol_now();
 
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartynotification','globalcard'));
+$hookmanager->initHooks(array('thirdpartynotification', 'globalcard'));
 
 
 
@@ -65,29 +65,29 @@ 
  * Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$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))
 {
-    $error=0;
+    $error = 0;
 
     // Add a notification
     if ($action == 'add')
     {
         if (empty($contactid))
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), null, 'errors');
+    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
             $error++;
         }
         if ($actionid <= 0)
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
+    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
             $db->begin();
 
@@ -98,7 +98,7 @@ 
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
                 $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
 
-                if (! $db->query($sql))
+                if (!$db->query($sql))
                 {
                     $error++;
                     dol_print_error($db);
@@ -109,7 +109,7 @@ 
                 dol_print_error($db);
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $db->commit();
             }
@@ -137,12 +137,12 @@ 
 $form = new Form($db);
 
 $object = new Societe($db);
-$result=$object->fetch($socid);
+$result = $object->fetch($socid);
 
-$title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$title = $langs->trans("ThirdParty").' - '.$langs->trans("Notification");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Notification");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 
 if ($result > 0)
@@ -155,7 +155,7 @@ 
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
@@ -163,7 +163,7 @@ 
     print '<table class="border centpercent">';
 
     // Prefix
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
@@ -177,7 +177,7 @@ 
         print '</td></tr>';
     }
 
-    if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
+    if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
     {
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
@@ -218,37 +218,37 @@ 
 
 
     // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"),'','');
+    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
     print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
 
-    $param="&socid=".$socid;
+    $param = "&socid=".$socid;
 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
     print_liste_field_titre('');
 	print "</tr>\n";
 
-    $var=false;
-    $listofemails=$object->thirdparty_and_contact_email_array();
+    $var = false;
+    $listofemails = $object->thirdparty_and_contact_email_array();
     if (count($listofemails) > 0)
     {
-        $actions=array();
+        $actions = array();
 
         // Load array of available notifications
-        $notificationtrigger=new InterfaceNotification($db);
-        $listofmanagedeventfornotification=$notificationtrigger->getListOfManagedEvents();
+        $notificationtrigger = new InterfaceNotification($db);
+        $listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
 
-        foreach($listofmanagedeventfornotification as $managedeventfornotification)
+        foreach ($listofmanagedeventfornotification as $managedeventfornotification)
         {
- 			$label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
-            $actions[$managedeventfornotification['rowid']]=$label;
+ 			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
+            $actions[$managedeventfornotification['rowid']] = $label;
         }
         print '<tr class="oddeven"><td class="maxwidthonsmartphone">';
         print $form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
@@ -257,8 +257,8 @@ 
         print $form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
         print '</td>';
         print '<td>';
-        $type=array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid",$type);
+        $type = array('email'=>$langs->trans("EMail"));
+        print $form->selectarray("typeid", $type);
         print '</td>';
         print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
@@ -279,16 +279,16 @@ 
 
     // List of notifications enabled for contacts
     $sql = "SELECT n.rowid, n.type,";
-    $sql.= " a.code, a.label,";
-    $sql.= " c.rowid as contactid, c.lastname, c.firstname, c.email";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql.= " ".MAIN_DB_PREFIX."socpeople c";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND c.rowid = n.fk_contact";
-    $sql.= " AND c.fk_soc = ".$object->id;
-
-    $resql=$db->query($sql);
+    $sql .= " a.code, a.label,";
+    $sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+    $sql .= " ".MAIN_DB_PREFIX."socpeople c";
+    $sql .= " WHERE a.rowid = n.fk_action";
+    $sql .= " AND c.rowid = n.fk_contact";
+    $sql .= " AND c.fk_soc = ".$object->id;
+
+    $resql = $db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
@@ -299,15 +299,15 @@ 
     }
 
     // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
+    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
-    print_liste_field_titre('','','');
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+    print_liste_field_titre('', '', '');
     print '</tr>';
 
 	$langs->load("errors");
@@ -317,15 +317,15 @@ 
     {
         $i = 0;
 
-        $contactstatic=new Contact($db);
+        $contactstatic = new Contact($db);
 
         while ($i < $num)
         {
             $obj = $db->fetch_object($resql);
 
-            $contactstatic->id=$obj->contactid;
-            $contactstatic->lastname=$obj->lastname;
-            $contactstatic->firstname=$obj->firstname;
+            $contactstatic->id = $obj->contactid;
+            $contactstatic->lastname = $obj->lastname;
+            $contactstatic->firstname = $obj->firstname;
             print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
             if ($obj->type == 'email')
             {
@@ -336,12 +336,12 @@ 
                 else
                 {
                     $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
+                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
             }
             print '</td>';
             print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
             print $label;
             print '</td>';
             print '<td>';
@@ -414,14 +414,14 @@ 
 
     // List
     $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql.= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql.= " a.code, a.label";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify as n ";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND n.fk_soc = ".$object->id;
-    $sql.= $db->order($sortfield, $sortorder);
+    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+    $sql .= " a.code, a.label";
+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql .= " ".MAIN_DB_PREFIX."notify as n ";
+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
+    $sql .= " WHERE a.rowid = n.fk_action";
+    $sql .= " AND n.fk_soc = ".$object->id;
+    $sql .= $db->order($sortfield, $sortorder);
 
     // Count total nb of records
     $nbtotalofrecords = '';
@@ -436,9 +436,9 @@ 
         }
     }
 
-    $sql.= $db->plimit($limit+1, $offset);
+    $sql .= $db->plimit($limit + 1, $offset);
 
-    $resql=$db->query($sql);
+    $resql = $db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
@@ -448,9 +448,9 @@ 
         dol_print_error($db);
     }
 
-    $param='&socid='.$object->id;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    $param = '&socid='.$object->id;
+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
     print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -467,18 +467,18 @@ 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'',$sortfield,$sortorder);
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
     //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"n.daten",'',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, 'align="right"', $sortfield, $sortorder);
     print '</tr>';
 
     if ($num > 0)
     {
         $i = 0;
 
-        $contactstatic=new Contact($db);
+        $contactstatic = new Contact($db);
 
         while ($i < $num)
         {
@@ -487,11 +487,11 @@ 
             print '<tr class="oddeven"><td>';
             if ($obj->id > 0)
             {
-	            $contactstatic->id=$obj->id;
-	            $contactstatic->lastname=$obj->lastname;
-	            $contactstatic->firstname=$obj->firstname;
+	            $contactstatic->id = $obj->id;
+	            $contactstatic->lastname = $obj->lastname;
+	            $contactstatic->firstname = $obj->firstname;
 	            print $contactstatic->getNomUrl(1);
-	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
+	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
             }
             else
 			{
@@ -499,7 +499,7 @@ 
             }
             print '</td>';
             print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
             print $label;
             print '</td>';
             print '<td>';
@@ -527,7 +527,7 @@ 
 
     print '</form>';
 }
-else dol_print_error('','RecordNotFound');
+else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();

Braces +57 added lines, -31 removed lines

@@ -38,15 +38,21 @@ 
 $actionid=GETPOST('actionid');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe','','');
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="n.daten";
+if (! $sortorder) {
+    $sortorder="DESC";
+}
+if (! $sortfield) {
+    $sortfield="n.daten";
+}
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -67,7 +73,9 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -103,8 +111,7 @@ 
                     $error++;
                     dol_print_error($db);
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($db);
             }
@@ -112,8 +119,7 @@ 
             if (! $error)
             {
                 $db->commit();
-            }
-            else
+            } else
             {
                 $db->rollback();
             }
@@ -140,7 +146,9 @@ 
 $result=$object->fetch($socid);
 
 $title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name.' - '.$langs->trans("Notification");
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -163,17 +171,21 @@ 
     print '<table class="border centpercent">';
 
     // Prefix
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+        // Old not used prefix field
     {
         print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
+    }
 
     if ($object->client)
     {
         print '<tr><td class="titlefield">';
         print $langs->trans('CustomerCode').'</td><td colspan="3">';
         print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        if ($object->check_codeclient() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -182,7 +194,9 @@ 
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
         print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        if ($object->check_codefournisseur() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -262,8 +276,7 @@ 
         print '</td>';
         print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
-    }
-    else
+    } else
     {
         print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
         print $langs->trans("YouMustCreateContactFirst");
@@ -292,8 +305,7 @@ 
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
@@ -332,8 +344,7 @@ 
                 if (isValidEmail($obj->email))
                 {
                     print ' &lt;'.$obj->email.'&gt;';
-                }
-                else
+                } else
                 {
                     $langs->load("errors");
                     print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
@@ -345,8 +356,12 @@ 
             print $label;
             print '</td>';
             print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
+            if ($obj->type == 'email') {
+                print $langs->trans("Email");
+            }
+            if ($obj->type == 'sms') {
+                print $langs->trans("SMS");
+            }
             print '</td>';
             print '<td align="right"><a href="card.php?socid='.$socid.'&action=delete&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
             print '</tr>';
@@ -429,9 +444,11 @@ 
     {
         $result = $db->query($sql);
         $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+        if (($page * $limit) > $nbtotalofrecords) {
+            // if total resultset is smaller then paging size (filtering), goto and load page 0
         {
         	$page = 0;
+        }
         	$offset = 0;
         }
     }
@@ -442,18 +459,23 @@ 
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
 
     $param='&socid='.$object->id;
-    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;
+    }
 
     print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    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="sortfield" value="'.$sortfield.'">';
@@ -492,8 +514,7 @@ 
 	            $contactstatic->firstname=$obj->firstname;
 	            print $contactstatic->getNomUrl(1);
 	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
-            }
-            else
+            } else
 			{
 				print $obj->email;
             }
@@ -503,8 +524,12 @@ 
             print $label;
             print '</td>';
             print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("Sms");
+            if ($obj->type == 'email') {
+                print $langs->trans("Email");
+            }
+            if ($obj->type == 'sms') {
+                print $langs->trans("Sms");
+            }
             print '</td>';
             // TODO Add link to object here for other types
             /*print '<td>';
@@ -526,8 +551,9 @@ 
     print '</table>';
 
     print '</form>';
+} else {
+    dol_print_error('','RecordNotFound');
 }
-else dol_print_error('','RecordNotFound');
 
 // End of page
 llxFooter();

dolibarr/htdocs/societe/notify/index.php

Indentation +31 added lines, -31 removed lines

@@ -28,17 +28,17 @@ 
 // S�curit� acc�s client
 if ($user->societe_id > 0)
 {
-	$action = '';
-	$socid = $user->societe_id;
+    $action = '';
+    $socid = $user->societe_id;
 }
 
 if ($sortorder == "")
 {
-  $sortorder="ASC";
+    $sortorder="ASC";
 }
 if ($sortfield == "")
 {
-  $sortfield="s.nom";
+    $sortfield="s.nom";
 }
 
 if ($page == -1 || $page == null) { $page = 0 ; }
@@ -72,36 +72,36 @@ 
 $result = $db->query($sql);
 if ($result)
 {
-	$num = $db->num_rows($result);
-	$i = 0;
-
-	$paramlist='';
-	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num);
-
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	while ($i < $num)
-	{
-		$obj = $db->fetch_object($result);
-
-		print '<tr class="oddeven">';
-		print "<td><a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
-		print "<td>".dolGetFirstLastname($obj->firstname, $obj->lastname)."</td>\n";
-		print "<td>".$obj->titre."</td>\n";
-		print "</tr>\n";
-		$i++;
-	}
-	print "</table>";
-	$db->free();
+    $num = $db->num_rows($result);
+    $i = 0;
+
+    $paramlist='';
+    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num);
+
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
+    print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
+    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
+    print "</tr>\n";
+
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($result);
+
+        print '<tr class="oddeven">';
+        print "<td><a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
+        print "<td>".dolGetFirstLastname($obj->firstname, $obj->lastname)."</td>\n";
+        print "<td>".$obj->titre."</td>\n";
+        print "</tr>\n";
+        $i++;
+    }
+    print "</table>";
+    $db->free();
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 // End of page

Spacing +21 added lines, -21 removed lines

@@ -34,16 +34,16 @@ 
 
 if ($sortorder == "")
 {
-  $sortorder="ASC";
+  $sortorder = "ASC";
 }
 if ($sortfield == "")
 {
-  $sortfield="s.nom";
+  $sortfield = "s.nom";
 }
 
-if ($page == -1 || $page == null) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0; }
 
-$offset = $conf->liste_limit * $page ;
+$offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -56,18 +56,18 @@ 
 llxHeader();
 
 $sql = "SELECT s.nom as name, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid";
-$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
-$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-$sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-$sql.= " WHERE n.fk_contact = c.rowid";
-$sql.= " AND a.rowid = n.fk_action";
-$sql.= " AND n.fk_soc = s.rowid";
-$sql.= " AND s.entity IN (".getEntity('societe').")";
-if ($socid > 0)	$sql.= " AND s.rowid = " . $user->societe_id;
-
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit, $offset);
+$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
+$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s";
+$sql .= " WHERE n.fk_contact = c.rowid";
+$sql .= " AND a.rowid = n.fk_action";
+$sql .= " AND n.fk_soc = s.rowid";
+$sql .= " AND s.entity IN (".getEntity('societe').")";
+if ($socid > 0)	$sql .= " AND s.rowid = ".$user->societe_id;
+
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($conf->liste_limit, $offset);
 
 $result = $db->query($sql);
 if ($result)
@@ -75,14 +75,14 @@ 
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	$paramlist='';
-	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num);
+	$paramlist = '';
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield, $sortorder, '', $num);
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "", 'valign="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Contact", $_SERVER["PHP_SELF"], "c.lastname", "", "", 'valign="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "a.titre", "", "", 'valign="center"', $sortfield, $sortorder);
 	print "</tr>\n";
 
 	while ($i < $num)

Braces +4 added lines, -3 removed lines

@@ -64,7 +64,9 @@ 
 $sql.= " AND a.rowid = n.fk_action";
 $sql.= " AND n.fk_soc = s.rowid";
 $sql.= " AND s.entity IN (".getEntity('societe').")";
-if ($socid > 0)	$sql.= " AND s.rowid = " . $user->societe_id;
+if ($socid > 0) {
+    $sql.= " AND s.rowid = " . $user->societe_id;
+}
 
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit, $offset);
@@ -98,8 +100,7 @@ 
 	}
 	print "</table>";
 	$db->free();
-}
-else
+} else
 {
 	dol_print_error($db);
 }