alxarafe / alixar

dolibarr/htdocs/comm/propal/class/api_proposals.class.php

Indentation +568 added lines, -568 removed lines

@@ -30,243 +30,243 @@ 
 class Proposals extends DolibarrApi
 {
 
-	/**
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
-	 */
-	static $FIELDS = array(
-		'socid'
-	);
-
-	/**
-	 * @var Propal $propal {@type Propal}
-	 */
-	public $propal;
-
-	/**
-	 * Constructor
-	 */
-	function __construct()
-	{
-		global $db, $conf;
-		$this->db = $db;
-		$this->propal = new Propal($this->db);
-	}
-
-	/**
-	 * Get properties of a commercial proposal object
-	 *
-	 * Return an array with commercial proposal informations
-	 *
-	 * @param       int         $id         ID of commercial proposal
-	 * @return 	array|mixed data without useless information
-	 *
-	 * @throws 	RestException
-	 */
-	function get($id)
-	{
-		if(! DolibarrApiAccess::$user->rights->propal->lire) {
-			throw new RestException(401);
-		}
-
-		$result = $this->propal->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Commercial Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		// Add external contacts ids
-		$this->propal->contacts_ids = $this->propal->liste_contact(-1,'external',1);
-
-		$this->propal->fetchObjectLinked();
-		return $this->_cleanObjectDatas($this->propal);
-	}
-
-	/**
-	 * List commercial proposals
-	 *
-	 * Get a list of commercial proposals
-	 *
-	 * @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 commercial proposals. {@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.datec:<:'20160101')"
-	 * @return  array                       Array of order objects
-	 */
+    /**
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $FIELDS = array(
+        'socid'
+    );
+
+    /**
+     * @var Propal $propal {@type Propal}
+     */
+    public $propal;
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db, $conf;
+        $this->db = $db;
+        $this->propal = new Propal($this->db);
+    }
+
+    /**
+     * Get properties of a commercial proposal object
+     *
+     * Return an array with commercial proposal informations
+     *
+     * @param       int         $id         ID of commercial proposal
+     * @return 	array|mixed data without useless information
+     *
+     * @throws 	RestException
+     */
+    function get($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->propal->lire) {
+            throw new RestException(401);
+        }
+
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Commercial Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        // Add external contacts ids
+        $this->propal->contacts_ids = $this->propal->liste_contact(-1,'external',1);
+
+        $this->propal->fetchObjectLinked();
+        return $this->_cleanObjectDatas($this->propal);
+    }
+
+    /**
+     * List commercial proposals
+     *
+     * Get a list of commercial proposals
+     *
+     * @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 commercial proposals. {@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.datec:<:'20160101')"
+     * @return  array                       Array of order objects
+     */
     function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
     {
-		global $db, $conf;
-
-		$obj_ret = array();
-
-		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-		$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $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";
-		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."propal 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.= ' WHERE t.entity IN ('.getEntity('propal').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql.= " AND t.fk_soc 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);
-		}
+        global $db, $conf;
+
+        $obj_ret = array();
+
+        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+        $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $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";
+        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."propal 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.= ' WHERE t.entity IN ('.getEntity('propal').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
+        if ($socids) $sql.= " AND t.fk_soc 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);
+        }
 
         dol_syslog("API Rest request");
-		$result = $db->query($sql);
-
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			$min = min($num, ($limit <= 0 ? $num : $limit));
-			$i = 0;
-			while ($i < $min)
-			{
-				$obj = $db->fetch_object($result);
-				$proposal_static = new Propal($db);
-				if($proposal_static->fetch($obj->rowid)) {
-					// Add external contacts ids
-					$proposal_static->contacts_ids = $proposal_static->liste_contact(-1,'external',1);
-					$obj_ret[] = $this->_cleanObjectDatas($proposal_static);
-				}
-				$i++;
-			}
-		}
-		else {
-			throw new RestException(503, 'Error when retrieve propal list : '.$db->lasterror());
-		}
-		if( ! count($obj_ret)) {
-			throw new RestException(404, 'No proposal found');
-		}
-		return $obj_ret;
-	}
-
-	/**
-	 * Create commercial proposal object
-	 *
-	 * @param   array   $request_data   Request data
-	 * @return  int     ID of proposal
-	 */
-	function post($request_data = null)
-	{
-	  if(! DolibarrApiAccess::$user->rights->propal->creer) {
-			  throw new RestException(401, "Insuffisant rights");
-		  }
-		// Check mandatory fields
-		$result = $this->_validate($request_data);
-
-		foreach($request_data as $field => $value) {
-			$this->propal->$field = $value;
-		}
-		/*if (isset($request_data["lines"])) {
+        $result = $db->query($sql);
+
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            $i = 0;
+            while ($i < $min)
+            {
+                $obj = $db->fetch_object($result);
+                $proposal_static = new Propal($db);
+                if($proposal_static->fetch($obj->rowid)) {
+                    // Add external contacts ids
+                    $proposal_static->contacts_ids = $proposal_static->liste_contact(-1,'external',1);
+                    $obj_ret[] = $this->_cleanObjectDatas($proposal_static);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve propal list : '.$db->lasterror());
+        }
+        if( ! count($obj_ret)) {
+            throw new RestException(404, 'No proposal found');
+        }
+        return $obj_ret;
+    }
+
+    /**
+     * Create commercial proposal object
+     *
+     * @param   array   $request_data   Request data
+     * @return  int     ID of proposal
+     */
+    function post($request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->propal->creer) {
+                throw new RestException(401, "Insuffisant rights");
+            }
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+
+        foreach($request_data as $field => $value) {
+            $this->propal->$field = $value;
+        }
+        /*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->propal->lines = $lines;
         }*/
-		if ($this->propal->create(DolibarrApiAccess::$user) < 0) {
-			throw new RestException(500, "Error creating order", array_merge(array($this->propal->error), $this->propal->errors));
-		}
-
-		return $this->propal->id;
-	}
-
-	/**
-	 * Get lines of a commercial proposal
-	 *
-	 * @param int   $id             Id of commercial proposal
-	 *
-	 * @url	GET {id}/lines
-	 *
-	 * @return int
-	 */
+        if ($this->propal->create(DolibarrApiAccess::$user) < 0) {
+            throw new RestException(500, "Error creating order", array_merge(array($this->propal->error), $this->propal->errors));
+        }
+
+        return $this->propal->id;
+    }
+
+    /**
+     * Get lines of a commercial proposal
+     *
+     * @param int   $id             Id of commercial proposal
+     *
+     * @url	GET {id}/lines
+     *
+     * @return int
+     */
     function getLines($id)
     {
-	  if(! DolibarrApiAccess::$user->rights->propal->lire) {
-		  	throw new RestException(401);
-		  }
-
-	  $result = $this->propal->fetch($id);
-	  if( ! $result ) {
-		 throw new RestException(404, 'Commercial Proposal not found');
-	  }
-
-		  if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-	  }
-	  $this->propal->getLinesArray();
-	  $result = array();
-	  foreach ($this->propal->lines as $line) {
-		array_push($result,$this->_cleanObjectDatas($line));
-	  }
-	  return $result;
-	}
-
-	/**
-	 * Add a line to given commercial proposal
-	 *
-	 * @param int   $id             Id of commercial proposal to update
-	 * @param array $request_data   Commercial proposal line data
-	 *
-	 * @url	POST {id}/lines
-	 *
-	 * @return int
-	 */
-	function postLine($id, $request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
-		  	throw new RestException(401);
-		}
-
-		$result = $this->propal->fetch($id);
-		if (! $result) {
-		   throw new RestException(404, 'Commercial Proposal not found');
-		}
-
-		if (! DolibarrApi::_checkAccessToResource('propal',$this->propal->id))
-		{
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$request_data = (object) $request_data;
-
-      	$updateRes = $this->propal->addline(
+        if(! DolibarrApiAccess::$user->rights->propal->lire) {
+                throw new RestException(401);
+            }
+
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Commercial Proposal not found');
+        }
+
+            if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+                throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        $this->propal->getLinesArray();
+        $result = array();
+        foreach ($this->propal->lines as $line) {
+        array_push($result,$this->_cleanObjectDatas($line));
+        }
+        return $result;
+    }
+
+    /**
+     * Add a line to given commercial proposal
+     *
+     * @param int   $id             Id of commercial proposal to update
+     * @param array $request_data   Commercial proposal line data
+     *
+     * @url	POST {id}/lines
+     *
+     * @return int
+     */
+    function postLine($id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->propal->creer) {
+                throw new RestException(401);
+        }
+
+        $result = $this->propal->fetch($id);
+        if (! $result) {
+            throw new RestException(404, 'Commercial Proposal not found');
+        }
+
+        if (! DolibarrApi::_checkAccessToResource('propal',$this->propal->id))
+        {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $request_data = (object) $request_data;
+
+            $updateRes = $this->propal->addline(
                         $request_data->desc,
                         $request_data->subprice,
                         $request_data->qty,
@@ -281,7 +281,7 @@ 
                         $request_data->product_type,
                         $request_data->rang,
                         $request_data->special_code,
-      					$request_data->fk_parent_line,
+                            $request_data->fk_parent_line,
                         $request_data->fk_fournprice,
                         $request_data->pa_ht,
                         $request_data->label,
@@ -293,293 +293,293 @@ 
                         $request_data->origin_id,
                         $request_data->multicurrency_subprice,
                         $request_data->fk_remise_except
-      );
+        );
 
-      if ($updateRes > 0) {
+        if ($updateRes > 0) {
         return $updateRes;
-	  }
-		else {
-			throw new RestException(400, $this->propal->error);
-		}
-	}
-
-	/**
-	 * Update a line of given commercial proposal
-	 *
-	 * @param int   $id             Id of commercial proposal to update
-	 * @param int   $lineid         Id of line to update
-	 * @param array $request_data   Commercial proposal line data
-	 *
-	 * @url	PUT {id}/lines/{lineid}
-	 *
-	 * @return object
-	 */
-	function putLine($id, $lineid, $request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->propal->fetch($id);
-		if($result <= 0) {
-			throw new RestException(404, 'Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-	  	}
-
-	  	$request_data = (object) $request_data;
-
-	  	$propalline = new PropaleLigne($this->db);
-	  	$result = $propalline->fetch($lineid);
-	  	if ($result <= 0) {
-	  		throw new RestException(404, 'Proposal line not found');
-	  	}
-
-	  	$updateRes = $this->propal->updateline(
-						$lineid,
-						isset($request_data->subprice)?$request_data->subprice:$propalline->subprice,
-						isset($request_data->qty)?$request_data->qty:$propalline->qty,
-						isset($request_data->remise_percent)?$request_data->remise_percent:$propalline->remise_percent,
-						isset($request_data->tva_tx)?$request_data->tva_tx:$propalline->tva_tx,
-						isset($request_data->localtax1_tx)?$request_data->localtax1_tx:$propalline->localtax1_tx,
-						isset($request_data->localtax2_tx)?$request_data->localtax2_tx:$propalline->localtax2_tx,
-						isset($request_data->desc)?$request_data->desc:$propalline->desc,
-	  					'HT',
-						isset($request_data->info_bits)?$request_data->info_bits:$propalline->info_bits,
-						isset($request_data->special_code)?$request_data->special_code:$propalline->special_code,
-						isset($request_data->fk_parent_line)?$request_data->fk_parent_line:$propalline->fk_parent_line,
-	  					0,
-	  					isset($request_data->fk_fournprice)?$request_data->fk_fournprice:$propalline->fk_fournprice,
-	  					isset($request_data->pa_ht)?$request_data->pa_ht:$propalline->pa_ht,
-	  					isset($request_data->label)?$request_data->label:$propalline->label,
-					  	isset($request_data->product_type)?$request_data->product_type:$propalline->product_type,
-	  					isset($request_data->date_start)?$request_data->date_start:$propalline->date_start,
-						isset($request_data->date_end)?$request_data->date_end:$propalline->date_end,
-						isset($request_data->array_options)?$request_data->array_options:$propalline->array_options,
-						isset($request_data->fk_unit)?$request_data->fk_unit:$propalline->fk_unit,
-	  					isset($request_data->multicurrency_subprice)?$request_data->multicurrency_subprice:$propalline->subprice
-	  );
-
-	  if ($updateRes > 0) {
-		$result = $this->get($id);
-		unset($result->line);
-		return $this->_cleanObjectDatas($result);
-	  }
-	  return false;
-	}
-
-	/**
-	 * Delete a line of given commercial proposal
-	 *
-	 *
-	 * @param int   $id             Id of commercial proposal to update
-	 * @param int   $lineid         Id of line to delete
-	 *
-	 * @url	DELETE {id}/lines/{lineid}
-	 *
-	 * @return int
+        }
+        else {
+            throw new RestException(400, $this->propal->error);
+        }
+    }
+
+    /**
+     * Update a line of given commercial proposal
+     *
+     * @param int   $id             Id of commercial proposal to update
+     * @param int   $lineid         Id of line to update
+     * @param array $request_data   Commercial proposal line data
+     *
+     * @url	PUT {id}/lines/{lineid}
+     *
+     * @return object
+     */
+    function putLine($id, $lineid, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->propal->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->propal->fetch($id);
+        if($result <= 0) {
+            throw new RestException(404, 'Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+            }
+
+            $request_data = (object) $request_data;
+
+            $propalline = new PropaleLigne($this->db);
+            $result = $propalline->fetch($lineid);
+            if ($result <= 0) {
+                throw new RestException(404, 'Proposal line not found');
+            }
+
+            $updateRes = $this->propal->updateline(
+                        $lineid,
+                        isset($request_data->subprice)?$request_data->subprice:$propalline->subprice,
+                        isset($request_data->qty)?$request_data->qty:$propalline->qty,
+                        isset($request_data->remise_percent)?$request_data->remise_percent:$propalline->remise_percent,
+                        isset($request_data->tva_tx)?$request_data->tva_tx:$propalline->tva_tx,
+                        isset($request_data->localtax1_tx)?$request_data->localtax1_tx:$propalline->localtax1_tx,
+                        isset($request_data->localtax2_tx)?$request_data->localtax2_tx:$propalline->localtax2_tx,
+                        isset($request_data->desc)?$request_data->desc:$propalline->desc,
+                            'HT',
+                        isset($request_data->info_bits)?$request_data->info_bits:$propalline->info_bits,
+                        isset($request_data->special_code)?$request_data->special_code:$propalline->special_code,
+                        isset($request_data->fk_parent_line)?$request_data->fk_parent_line:$propalline->fk_parent_line,
+                            0,
+                            isset($request_data->fk_fournprice)?$request_data->fk_fournprice:$propalline->fk_fournprice,
+                            isset($request_data->pa_ht)?$request_data->pa_ht:$propalline->pa_ht,
+                            isset($request_data->label)?$request_data->label:$propalline->label,
+                            isset($request_data->product_type)?$request_data->product_type:$propalline->product_type,
+                            isset($request_data->date_start)?$request_data->date_start:$propalline->date_start,
+                        isset($request_data->date_end)?$request_data->date_end:$propalline->date_end,
+                        isset($request_data->array_options)?$request_data->array_options:$propalline->array_options,
+                        isset($request_data->fk_unit)?$request_data->fk_unit:$propalline->fk_unit,
+                            isset($request_data->multicurrency_subprice)?$request_data->multicurrency_subprice:$propalline->subprice
+        );
+
+        if ($updateRes > 0) {
+        $result = $this->get($id);
+        unset($result->line);
+        return $this->_cleanObjectDatas($result);
+        }
+        return false;
+    }
+
+    /**
+     * Delete a line of given commercial proposal
+     *
+     *
+     * @param int   $id             Id of commercial proposal to update
+     * @param int   $lineid         Id of line to delete
+     *
+     * @url	DELETE {id}/lines/{lineid}
+     *
+     * @return int
      * @throws 401
      * @throws 404
-	 */
+     */
     function deleteLine($id, $lineid)
     {
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
-		  	throw new RestException(401);
-		}
-
-		$result = $this->propal->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		// TODO Check the lineid $lineid is a line of ojbect
-
-		$updateRes = $this->propal->deleteline($lineid);
-		if ($updateRes > 0) {
-			return $this->get($id);
-		}
-		else
-		{
-			throw new RestException(405, $this->propal->error);
-		}
-	}
-
-	/**
-	 * Update commercial proposal general fields (won't touch lines of commercial proposal)
-	 *
-	 * @param int   $id             Id of commercial proposal to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
-	 */
+        if(! DolibarrApiAccess::$user->rights->propal->creer) {
+                throw new RestException(401);
+        }
+
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        // TODO Check the lineid $lineid is a line of ojbect
+
+        $updateRes = $this->propal->deleteline($lineid);
+        if ($updateRes > 0) {
+            return $this->get($id);
+        }
+        else
+        {
+            throw new RestException(405, $this->propal->error);
+        }
+    }
+
+    /**
+     * Update commercial proposal general fields (won't touch lines of commercial proposal)
+     *
+     * @param int   $id             Id of commercial proposal to update
+     * @param array $request_data   Datas
+     *
+     * @return int
+     */
     function put($id, $request_data = null)
     {
-	  if(! DolibarrApiAccess::$user->rights->propal->creer) {
-		  	throw new RestException(401);
-		  }
-
-		$result = $this->propal->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		foreach($request_data as $field => $value) {
-			if ($field == 'id') continue;
-			$this->propal->$field = $value;
-		}
-
-		// update end of validity date
-		if (empty($this->propal->fin_validite) && !empty($this->propal->duree_validite) && !empty($this->propal->date_creation))
-		{
-			$this->propal->fin_validite = $this->propal->date_creation + ($this->propal->duree_validite * 24 * 3600);
-		}
-		if (!empty($this->propal->fin_validite))
-		{
-			if($this->propal->set_echeance(DolibarrApiAccess::$user, $this->propal->fin_validite)<0)
-			{
-				throw new RestException(500, $this->propal->error);
-			}
-		}
-
-		if ($this->propal->update(DolibarrApiAccess::$user) > 0)
-		{
-			return $this->get($id);
-		}
-		else
-		{
-			throw new RestException(500, $this->propal->error);
-		}
-	}
-
-	/**
-	 * Delete commercial proposal
-	 *
-	 * @param   int     $id         Commercial proposal ID
-	 *
-	 * @return  array
-	 */
-	function delete($id)
-	{
-		if(! DolibarrApiAccess::$user->rights->propal->supprimer) {
-			throw new RestException(401);
-		}
-		$result = $this->propal->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Commercial Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		if( ! $this->propal->delete(DolibarrApiAccess::$user)) {
-			throw new RestException(500, 'Error when delete Commercial Proposal : '.$this->propal->error);
-		}
-
-		return array(
-			'success' => array(
-				'code' => 200,
-				'message' => 'Commercial Proposal deleted'
-			)
-		);
-	}
-
-	/**
-	* Set a proposal to draft
-	*
-	* @param   int     $id             Order ID
-	*
-	* @url POST    {id}/settodraft
-	*
-	* @return  array
-	*/
-	function settodraft($id)
-	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
-			throw new RestException(401);
-		}
-		$result = $this->propal->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->propal->set_draft(DolibarrApiAccess::$user);
-		if ($result == 0) {
-			throw new RestException(304, 'Nothing done. May be object is already draft');
-		}
-		if ($result < 0) {
-			throw new RestException(500, 'Error : '.$this->propal->error);
-		}
-
-		$result = $this->propal->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$this->propal->fetchObjectLinked();
-
-		return $this->_cleanObjectDatas($this->propal);
-	}
-
-
-	/**
-	 * Validate a commercial proposal
-	 *
-	 * If you get a bad value for param notrigger check that ou provide this in body
-	 * {
-	 * "notrigger": 0
-	 * }
-	 *
-	 * @param   int     $id             Commercial proposal ID
-	 * @param   int     $notrigger      1=Does not execute triggers, 0= execute triggers
-	 *
-	 * @url POST    {id}/validate
-	 *
-	 * @throws 304
+        if(! DolibarrApiAccess::$user->rights->propal->creer) {
+                throw new RestException(401);
+            }
+
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        foreach($request_data as $field => $value) {
+            if ($field == 'id') continue;
+            $this->propal->$field = $value;
+        }
+
+        // update end of validity date
+        if (empty($this->propal->fin_validite) && !empty($this->propal->duree_validite) && !empty($this->propal->date_creation))
+        {
+            $this->propal->fin_validite = $this->propal->date_creation + ($this->propal->duree_validite * 24 * 3600);
+        }
+        if (!empty($this->propal->fin_validite))
+        {
+            if($this->propal->set_echeance(DolibarrApiAccess::$user, $this->propal->fin_validite)<0)
+            {
+                throw new RestException(500, $this->propal->error);
+            }
+        }
+
+        if ($this->propal->update(DolibarrApiAccess::$user) > 0)
+        {
+            return $this->get($id);
+        }
+        else
+        {
+            throw new RestException(500, $this->propal->error);
+        }
+    }
+
+    /**
+     * Delete commercial proposal
+     *
+     * @param   int     $id         Commercial proposal ID
+     *
+     * @return  array
+     */
+    function delete($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->propal->supprimer) {
+            throw new RestException(401);
+        }
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Commercial Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        if( ! $this->propal->delete(DolibarrApiAccess::$user)) {
+            throw new RestException(500, 'Error when delete Commercial Proposal : '.$this->propal->error);
+        }
+
+        return array(
+            'success' => array(
+                'code' => 200,
+                'message' => 'Commercial Proposal deleted'
+            )
+        );
+    }
+
+    /**
+     * Set a proposal to draft
+     *
+     * @param   int     $id             Order ID
+     *
+     * @url POST    {id}/settodraft
+     *
+     * @return  array
+     */
+    function settodraft($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->propal->creer) {
+            throw new RestException(401);
+        }
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->propal->set_draft(DolibarrApiAccess::$user);
+        if ($result == 0) {
+            throw new RestException(304, 'Nothing done. May be object is already draft');
+        }
+        if ($result < 0) {
+            throw new RestException(500, 'Error : '.$this->propal->error);
+        }
+
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $this->propal->fetchObjectLinked();
+
+        return $this->_cleanObjectDatas($this->propal);
+    }
+
+
+    /**
+     * Validate a commercial proposal
+     *
+     * If you get a bad value for param notrigger check that ou provide this in body
+     * {
+     * "notrigger": 0
+     * }
+     *
+     * @param   int     $id             Commercial proposal ID
+     * @param   int     $notrigger      1=Does not execute triggers, 0= execute triggers
+     *
+     * @url POST    {id}/validate
+     *
+     * @throws 304
      * @throws 401
      * @throws 404
      * @throws 500
      *
      * @return array
-	 */
-	function validate($id, $notrigger=0)
-	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
-			throw new RestException(401);
-		}
-		$result = $this->propal->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Commercial Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->propal->valid(DolibarrApiAccess::$user, $notrigger);
-		if ($result == 0) {
-			throw new RestException(304, 'Error nothing done. May be object is already validated');
-		}
-		if ($result < 0) {
-			throw new RestException(500, 'Error when validating Commercial Proposal: '.$this->propal->error);
-		}
+     */
+    function validate($id, $notrigger=0)
+    {
+        if(! DolibarrApiAccess::$user->rights->propal->creer) {
+            throw new RestException(401);
+        }
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Commercial Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->propal->valid(DolibarrApiAccess::$user, $notrigger);
+        if ($result == 0) {
+            throw new RestException(304, 'Error nothing done. May be object is already validated');
+        }
+        if ($result < 0) {
+            throw new RestException(500, 'Error when validating Commercial Proposal: '.$this->propal->error);
+        }
 
         $result = $this->propal->fetch($id);
         if( ! $result ) {
@@ -593,55 +593,55 @@ 
         $this->propal->fetchObjectLinked();
 
         return $this->_cleanObjectDatas($this->propal);
-	}
-
-	/**
-	 * Close (Accept or refuse) a quote / commercial proposal
-	 *
-	 * @param   int     $id             Commercial proposal ID
-	 * @param   int	    $status			Must be 2 (accepted) or 3 (refused)				{@min 2}{@max 3}
-	 * @param   string  $note_private   Add this mention at end of private note
-	 * @param   int     $notrigger      Disabled triggers
-	 *
-	 * @url POST    {id}/close
-	 *
-	 * @return  array
-	 */
-	function close($id, $status, $note_private='', $notrigger=0)
-	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
-			throw new RestException(401);
-		}
-		$result = $this->propal->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Commercial Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->propal->cloture(DolibarrApiAccess::$user, $status, $note_private, $notrigger);
-		if ($result == 0) {
-			throw new RestException(304, 'Error nothing done. May be object is already closed');
-		}
-		if ($result < 0) {
-			throw new RestException(500, 'Error when closing Commercial Proposal: '.$this->propal->error);
-		}
-
-		$result = $this->propal->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Proposal not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$this->propal->fetchObjectLinked();
-
-		return $this->_cleanObjectDatas($this->propal);
-	}
+    }
+
+    /**
+     * Close (Accept or refuse) a quote / commercial proposal
+     *
+     * @param   int     $id             Commercial proposal ID
+     * @param   int	    $status			Must be 2 (accepted) or 3 (refused)				{@min 2}{@max 3}
+     * @param   string  $note_private   Add this mention at end of private note
+     * @param   int     $notrigger      Disabled triggers
+     *
+     * @url POST    {id}/close
+     *
+     * @return  array
+     */
+    function close($id, $status, $note_private='', $notrigger=0)
+    {
+        if(! DolibarrApiAccess::$user->rights->propal->creer) {
+            throw new RestException(401);
+        }
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Commercial Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->propal->cloture(DolibarrApiAccess::$user, $status, $note_private, $notrigger);
+        if ($result == 0) {
+            throw new RestException(304, 'Error nothing done. May be object is already closed');
+        }
+        if ($result < 0) {
+            throw new RestException(500, 'Error when closing Commercial Proposal: '.$this->propal->error);
+        }
+
+        $result = $this->propal->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Proposal not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $this->propal->fetchObjectLinked();
+
+        return $this->_cleanObjectDatas($this->propal);
+    }
 
     /**
      * Set a commercial proposal billed. Could be also called setbilled
@@ -673,11 +673,11 @@ 
 
             $result = $this->propal->fetch($id);
             if( ! $result ) {
-            	throw new RestException(404, 'Proposal not found');
+                throw new RestException(404, 'Proposal not found');
             }
 
             if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
-            	throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+                throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
             }
 
             $this->propal->fetchObjectLinked();
@@ -686,23 +686,23 @@ 
     }
 
 
-	/**
-	 * Validate fields before create or update object
-	 *
-	 * @param   array           $data   Array with data to verify
-	 * @return  array
-	 * @throws  RestException
-	 */
-	function _validate($data)
-	{
-		$propal = array();
-		foreach (Proposals::$FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
-			$propal[$field] = $data[$field];
-		}
-		return $propal;
-	}
+    /**
+     * Validate fields before create or update object
+     *
+     * @param   array           $data   Array with data to verify
+     * @return  array
+     * @throws  RestException
+     */
+    function _validate($data)
+    {
+        $propal = array();
+        foreach (Proposals::$FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $propal[$field] = $data[$field];
+        }
+        return $propal;
+    }
 
 
     /**

Spacing +86 added lines, -86 removed lines

@@ -64,21 +64,21 @@ 
 	 */
 	function get($id)
 	{
-		if(! DolibarrApiAccess::$user->rights->propal->lire) {
+		if (!DolibarrApiAccess::$user->rights->propal->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->propal->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Commercial Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		// Add external contacts ids
-		$this->propal->contacts_ids = $this->propal->liste_contact(-1,'external',1);
+		$this->propal->contacts_ids = $this->propal->liste_contact(-1, 'external', 1);
 
 		$this->propal->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->propal);
@@ -108,18 +108,18 @@ 
 
 		// 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."propal as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."propal 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.= ' WHERE t.entity IN ('.getEntity('propal').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+		$sql .= ' WHERE t.entity IN ('.getEntity('propal').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc 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)
 		{
@@ -128,23 +128,23 @@ 
 		// 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);
-		if ($limit)	{
+		$sql .= $db->order($sortfield, $sortorder);
+		if ($limit) {
 			if ($page < 0)
 			{
 				$page = 0;
 			}
 			$offset = $limit * $page;
 
-			$sql.= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 		}
 
         dol_syslog("API Rest request");
@@ -159,9 +159,9 @@ 
 			{
 				$obj = $db->fetch_object($result);
 				$proposal_static = new Propal($db);
-				if($proposal_static->fetch($obj->rowid)) {
+				if ($proposal_static->fetch($obj->rowid)) {
 					// Add external contacts ids
-					$proposal_static->contacts_ids = $proposal_static->liste_contact(-1,'external',1);
+					$proposal_static->contacts_ids = $proposal_static->liste_contact(-1, 'external', 1);
 					$obj_ret[] = $this->_cleanObjectDatas($proposal_static);
 				}
 				$i++;
@@ -170,7 +170,7 @@ 
 		else {
 			throw new RestException(503, 'Error when retrieve propal list : '.$db->lasterror());
 		}
-		if( ! count($obj_ret)) {
+		if (!count($obj_ret)) {
 			throw new RestException(404, 'No proposal found');
 		}
 		return $obj_ret;
@@ -184,13 +184,13 @@ 
 	 */
 	function post($request_data = null)
 	{
-	  if(! DolibarrApiAccess::$user->rights->propal->creer) {
+	  if (!DolibarrApiAccess::$user->rights->propal->creer) {
 			  throw new RestException(401, "Insuffisant rights");
 		  }
 		// Check mandatory fields
 		$result = $this->_validate($request_data);
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$this->propal->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
@@ -218,22 +218,22 @@ 
 	 */
     function getLines($id)
     {
-	  if(! DolibarrApiAccess::$user->rights->propal->lire) {
+	  if (!DolibarrApiAccess::$user->rights->propal->lire) {
 		  	throw new RestException(401);
 		  }
 
 	  $result = $this->propal->fetch($id);
-	  if( ! $result ) {
+	  if (!$result) {
 		 throw new RestException(404, 'Commercial Proposal not found');
 	  }
 
-		  if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		  if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 	  }
 	  $this->propal->getLinesArray();
 	  $result = array();
 	  foreach ($this->propal->lines as $line) {
-		array_push($result,$this->_cleanObjectDatas($line));
+		array_push($result, $this->_cleanObjectDatas($line));
 	  }
 	  return $result;
 	}
@@ -250,16 +250,16 @@ 
 	 */
 	function postLine($id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
 		  	throw new RestException(401);
 		}
 
 		$result = $this->propal->fetch($id);
-		if (! $result) {
+		if (!$result) {
 		   throw new RestException(404, 'Commercial Proposal not found');
 		}
 
-		if (! DolibarrApi::_checkAccessToResource('propal',$this->propal->id))
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id))
 		{
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
@@ -316,16 +316,16 @@ 
 	 */
 	function putLine($id, $lineid, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->propal->fetch($id);
-		if($result <= 0) {
+		if ($result <= 0) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 	  	}
 
@@ -339,27 +339,27 @@ 
 
 	  	$updateRes = $this->propal->updateline(
 						$lineid,
-						isset($request_data->subprice)?$request_data->subprice:$propalline->subprice,
-						isset($request_data->qty)?$request_data->qty:$propalline->qty,
-						isset($request_data->remise_percent)?$request_data->remise_percent:$propalline->remise_percent,
-						isset($request_data->tva_tx)?$request_data->tva_tx:$propalline->tva_tx,
-						isset($request_data->localtax1_tx)?$request_data->localtax1_tx:$propalline->localtax1_tx,
-						isset($request_data->localtax2_tx)?$request_data->localtax2_tx:$propalline->localtax2_tx,
-						isset($request_data->desc)?$request_data->desc:$propalline->desc,
+						isset($request_data->subprice) ? $request_data->subprice : $propalline->subprice,
+						isset($request_data->qty) ? $request_data->qty : $propalline->qty,
+						isset($request_data->remise_percent) ? $request_data->remise_percent : $propalline->remise_percent,
+						isset($request_data->tva_tx) ? $request_data->tva_tx : $propalline->tva_tx,
+						isset($request_data->localtax1_tx) ? $request_data->localtax1_tx : $propalline->localtax1_tx,
+						isset($request_data->localtax2_tx) ? $request_data->localtax2_tx : $propalline->localtax2_tx,
+						isset($request_data->desc) ? $request_data->desc : $propalline->desc,
 	  					'HT',
-						isset($request_data->info_bits)?$request_data->info_bits:$propalline->info_bits,
-						isset($request_data->special_code)?$request_data->special_code:$propalline->special_code,
-						isset($request_data->fk_parent_line)?$request_data->fk_parent_line:$propalline->fk_parent_line,
+						isset($request_data->info_bits) ? $request_data->info_bits : $propalline->info_bits,
+						isset($request_data->special_code) ? $request_data->special_code : $propalline->special_code,
+						isset($request_data->fk_parent_line) ? $request_data->fk_parent_line : $propalline->fk_parent_line,
 	  					0,
-	  					isset($request_data->fk_fournprice)?$request_data->fk_fournprice:$propalline->fk_fournprice,
-	  					isset($request_data->pa_ht)?$request_data->pa_ht:$propalline->pa_ht,
-	  					isset($request_data->label)?$request_data->label:$propalline->label,
-					  	isset($request_data->product_type)?$request_data->product_type:$propalline->product_type,
-	  					isset($request_data->date_start)?$request_data->date_start:$propalline->date_start,
-						isset($request_data->date_end)?$request_data->date_end:$propalline->date_end,
-						isset($request_data->array_options)?$request_data->array_options:$propalline->array_options,
-						isset($request_data->fk_unit)?$request_data->fk_unit:$propalline->fk_unit,
-	  					isset($request_data->multicurrency_subprice)?$request_data->multicurrency_subprice:$propalline->subprice
+	  					isset($request_data->fk_fournprice) ? $request_data->fk_fournprice : $propalline->fk_fournprice,
+	  					isset($request_data->pa_ht) ? $request_data->pa_ht : $propalline->pa_ht,
+	  					isset($request_data->label) ? $request_data->label : $propalline->label,
+					  	isset($request_data->product_type) ? $request_data->product_type : $propalline->product_type,
+	  					isset($request_data->date_start) ? $request_data->date_start : $propalline->date_start,
+						isset($request_data->date_end) ? $request_data->date_end : $propalline->date_end,
+						isset($request_data->array_options) ? $request_data->array_options : $propalline->array_options,
+						isset($request_data->fk_unit) ? $request_data->fk_unit : $propalline->fk_unit,
+	  					isset($request_data->multicurrency_subprice) ? $request_data->multicurrency_subprice : $propalline->subprice
 	  );
 
 	  if ($updateRes > 0) {
@@ -385,16 +385,16 @@ 
 	 */
     function deleteLine($id, $lineid)
     {
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
 		  	throw new RestException(401);
 		}
 
 		$result = $this->propal->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -420,19 +420,19 @@ 
 	 */
     function put($id, $request_data = null)
     {
-	  if(! DolibarrApiAccess::$user->rights->propal->creer) {
+	  if (!DolibarrApiAccess::$user->rights->propal->creer) {
 		  	throw new RestException(401);
 		  }
 
 		$result = $this->propal->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->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->propal->$field = $value;
 		}
@@ -444,7 +444,7 @@ 
 		}
 		if (!empty($this->propal->fin_validite))
 		{
-			if($this->propal->set_echeance(DolibarrApiAccess::$user, $this->propal->fin_validite)<0)
+			if ($this->propal->set_echeance(DolibarrApiAccess::$user, $this->propal->fin_validite) < 0)
 			{
 				throw new RestException(500, $this->propal->error);
 			}
@@ -469,19 +469,19 @@ 
 	 */
 	function delete($id)
 	{
-		if(! DolibarrApiAccess::$user->rights->propal->supprimer) {
+		if (!DolibarrApiAccess::$user->rights->propal->supprimer) {
 			throw new RestException(401);
 		}
 		$result = $this->propal->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Commercial Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if( ! $this->propal->delete(DolibarrApiAccess::$user)) {
+		if (!$this->propal->delete(DolibarrApiAccess::$user)) {
 			throw new RestException(500, 'Error when delete Commercial Proposal : '.$this->propal->error);
 		}
 
@@ -504,15 +504,15 @@ 
 	*/
 	function settodraft($id)
 	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
 			throw new RestException(401);
 		}
 		$result = $this->propal->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -525,11 +525,11 @@ 
 		}
 
 		$result = $this->propal->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -559,17 +559,17 @@ 
      *
      * @return array
 	 */
-	function validate($id, $notrigger=0)
+	function validate($id, $notrigger = 0)
 	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
 			throw new RestException(401);
 		}
 		$result = $this->propal->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Commercial Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -582,11 +582,11 @@ 
 		}
 
         $result = $this->propal->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Commercial Proposal not found');
         }
 
-        if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
@@ -607,17 +607,17 @@ 
 	 *
 	 * @return  array
 	 */
-	function close($id, $status, $note_private='', $notrigger=0)
+	function close($id, $status, $note_private = '', $notrigger = 0)
 	{
-		if(! DolibarrApiAccess::$user->rights->propal->creer) {
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
 			throw new RestException(401);
 		}
 		$result = $this->propal->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Commercial Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -630,11 +630,11 @@ 
 		}
 
 		$result = $this->propal->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -654,29 +654,29 @@ 
      */
     function setinvoiced($id)
     {
-            if(! DolibarrApiAccess::$user->rights->propal->creer) {
+            if (!DolibarrApiAccess::$user->rights->propal->creer) {
                     throw new RestException(401);
             }
             $result = $this->propal->fetch($id);
-            if( ! $result ) {
+            if (!$result) {
                     throw new RestException(404, 'Commercial Proposal not found');
             }
 
-            if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
                     throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
             }
 
-            $result = $this->propal->classifyBilled(DolibarrApiAccess::$user );
+            $result = $this->propal->classifyBilled(DolibarrApiAccess::$user);
             if ($result < 0) {
                     throw new RestException(500, 'Error : '.$this->propal->error);
             }
 
             $result = $this->propal->fetch($id);
-            if( ! $result ) {
+            if (!$result) {
             	throw new RestException(404, 'Proposal not found');
             }
 
-            if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
+            if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
             	throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
             }
 

Braces +31 added lines, -17 removed lines

@@ -108,18 +108,33 @@ 
 
 		// 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."propal 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.= ' WHERE t.entity IN ('.getEntity('propal').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql.= " AND t.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 ($socids) {
+		    $sql.= " AND t.fk_soc 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)
 		{
@@ -166,8 +181,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve propal list : '.$db->lasterror());
 		}
 		if( ! count($obj_ret)) {
@@ -297,8 +311,7 @@ 
 
       if ($updateRes > 0) {
         return $updateRes;
-	  }
-		else {
+	  } else {
 			throw new RestException(400, $this->propal->error);
 		}
 	}
@@ -403,8 +416,7 @@ 
 		$updateRes = $this->propal->deleteline($lineid);
 		if ($updateRes > 0) {
 			return $this->get($id);
-		}
-		else
+		} else
 		{
 			throw new RestException(405, $this->propal->error);
 		}
@@ -433,7 +445,9 @@ 
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+			    continue;
+			}
 			$this->propal->$field = $value;
 		}
 
@@ -453,8 +467,7 @@ 
 		if ($this->propal->update(DolibarrApiAccess::$user) > 0)
 		{
 			return $this->get($id);
-		}
-		else
+		} else
 		{
 			throw new RestException(500, $this->propal->error);
 		}
@@ -697,8 +710,9 @@ 
 	{
 		$propal = array();
 		foreach (Proposals::$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");
+			}
 			$propal[$field] = $data[$field];
 		}
 		return $propal;

dolibarr/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php

Indentation +6 added lines, -6 removed lines

@@ -26,8 +26,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 ?>
@@ -65,10 +65,10 @@ 
     	<td class="linkedcol-ref" ><?php echo $objectlink->ref_client; ?></td>
     	<td class="linkedcol-date" align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
     	<td class="linkedcol-amount" align="right"><?php
-    		if ($user->rights->propale->lire) {
-    			$total = $total + $objectlink->total_ht;
-    			echo price($objectlink->total_ht);
-    		} ?></td>
+            if ($user->rights->propale->lire) {
+                $total = $total + $objectlink->total_ht;
+                echo price($objectlink->total_ht);
+            } ?></td>
     	<td class="linkedcol-statut" align="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="linkedcol-action" align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -44,17 +44,17 @@ 
 // Load translation files required by the page
 $langs->load("propal");
 
-$total=0; $ilink=0;
-foreach($linkedObjectBlock as $key => $objectlink)
+$total = 0; $ilink = 0;
+foreach ($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
 
-    $trclass='oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+    $trclass = 'oddeven';
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 ?>
     <tr class="<?php echo $trclass; ?>"  data-element="<?php echo $objectlink->element; ?>"  data-id="<?php echo $objectlink->id; ?>" >
         <td class="linkedcol-element" ><?php echo $langs->trans("Proposal"); ?>
-        <?php if(!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)
+        <?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)
             {
                 $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
                 print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
@@ -63,7 +63,7 @@ 
         </td>
         <td class="linkedcol-name" ><?php echo $objectlink->getNomUrl(1); ?></td>
     	<td class="linkedcol-ref" ><?php echo $objectlink->ref_client; ?></td>
-    	<td class="linkedcol-date" align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
+    	<td class="linkedcol-date" align="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
     	<td class="linkedcol-amount" align="right"><?php
     		if ($user->rights->propale->lire) {
     			$total = $total + $objectlink->total_ht;
@@ -77,7 +77,7 @@ 
 if (count($linkedObjectBlock) > 1)
 {
     ?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter)?'liste_sub_total':''); ?>">
+    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
     	<td align="center"></td>

Braces +4 added lines, -2 removed lines

@@ -50,8 +50,10 @@
     $ilink++;
 
     $trclass='oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
-?>
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+        $trclass.=' liste_sub_total';
+    }
+    ?>
     <tr class="<?php echo $trclass; ?>"  data-element="<?php echo $objectlink->element; ?>"  data-id="<?php echo $objectlink->id; ?>" >
         <td class="linkedcol-element" ><?php echo $langs->trans("Proposal"); ?>
         <?php if(!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)

dolibarr/htdocs/comm/propal/info.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page

Braces +6 added lines, -3 removed lines

@@ -40,7 +40,9 @@ 
 $socid=GETPOST('socid','int');
 
 // Security check
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'propal', $id);
 
 $object = new Propal($db);
@@ -86,9 +88,10 @@ 
     $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
     if ($user->rights->propal->creer)
     {
-        if ($action != 'classify')
-            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+        if ($action != 'classify') {
+                    //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
             $morehtmlref.=' : ';
+        }
             if ($action == 'classify') {
                 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

Spacing +30 added lines, -30 removed lines

@@ -27,27 +27,27 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('propal', 'compta'));
 
-$id=GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-$socid=GETPOST('socid','int');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$socid = GETPOST('socid', 'int');
 
 // Security check
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (!empty($user->societe_id)) $socid = $user->societe_id;
 $result = restrictedArea($user, 'propal', $id);
 
 $object = new Propal($db);
-if (! $object->fetch($id, $ref) > 0)
+if (!$object->fetch($id, $ref) > 0)
 {
     dol_print_error($db);
     exit;
@@ -61,7 +61,7 @@ 
 
 $form = new Form($db);
 
-llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
+llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
 
 $object->fetch_thirdparty();
 
@@ -73,49 +73,49 @@ 
 
 // Proposal card
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-$morehtmlref='<div class="refidno">';
+$morehtmlref = '<div class="refidno">';
 // Ref customer
-$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 // Thirdparty
-$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (! empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled))
 {
     $langs->load("projects");
-    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
     if ($user->rights->propal->creer)
     {
         if ($action != 'classify')
             //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-            $morehtmlref.=' : ';
+            $morehtmlref .= ' : ';
             if ($action == 'classify') {
                 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref.='</form>';
+                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                $morehtmlref .= '</form>';
             } else {
-                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
             }
     } else {
-        if (! empty($object->fk_project)) {
+        if (!empty($object->fk_project)) {
             $proj = new Project($db);
             $proj->fetch($object->fk_project);
-            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-            $morehtmlref.=$proj->ref;
-            $morehtmlref.='</a>';
+            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+            $morehtmlref .= $proj->ref;
+            $morehtmlref .= '</a>';
         } else {
-            $morehtmlref.='';
+            $morehtmlref .= '';
         }
     }
 }
-$morehtmlref.='</div>';
+$morehtmlref .= '</div>';
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 

dolibarr/htdocs/comm/propal/document.php

Indentation +87 added lines, -87 removed lines

@@ -33,7 +33,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -48,7 +48,7 @@ 
 $socid='';
 if (! empty($user->societe_id))
 {
-	$socid = $user->societe_id;
+    $socid = $user->societe_id;
 }
 $result = restrictedArea($user, 'propal', $id);
 
@@ -89,94 +89,94 @@ 
 
 if ($object->id > 0)
 {
-	$upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-
-	$head = propal_prepare_head($object);
-	dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
-
-	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
-	{
-		$totalsize+=$file['size'];
-	}
-
-
-	// Proposal card
-
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-
-
-	$morehtmlref='<div class="refidno">';
-	// Ref customer
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->propal->creer)
-	    {
-	        if ($action != 'classify')
-	            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-	            $morehtmlref.=' : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
-
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
-
-	print '<table class="border" width="100%">';
-
-	// Files infos
-	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize,1,1).'</td></tr>';
-
-	print "</table>\n";
-
-	print '</div>';
-
-
-	dol_fiche_end();
-
-	$modulepart = 'propal';
-	$permission = $user->rights->propal->creer;
-	$permtoedit = $user->rights->propal->creer;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    $upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+
+    $head = propal_prepare_head($object);
+    dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
+
+    // Build file list
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $totalsize=0;
+    foreach($filearray as $key => $file)
+    {
+        $totalsize+=$file['size'];
+    }
+
+
+    // Proposal card
+
+    $linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
+    $morehtmlref='<div class="refidno">';
+    // Ref customer
+    $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+    // Thirdparty
+    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+        if ($user->rights->propal->creer)
+        {
+            if ($action != 'classify')
+                //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+                $morehtmlref.=' : ';
+                if ($action == 'classify') {
+                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                    $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
+                    $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
+                $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
+
+    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
+
+    print '<table class="border" width="100%">';
+
+    // Files infos
+    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize,1,1).'</td></tr>';
+
+    print "</table>\n";
+
+    print '</div>';
+
+
+    dol_fiche_end();
+
+    $modulepart = 'propal';
+    $permission = $user->rights->propal->creer;
+    $permtoedit = $user->rights->propal->creer;
+    $param = '&id=' . $object->id;
+    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {
-	print $langs->trans("ErrorUnknown");
+    print $langs->trans("ErrorUnknown");
 }
 
 // End of page

Braces +10 added lines, -6 removed lines

@@ -60,8 +60,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="name";
+}
 
 $object = new Propal($db);
 $object->fetch($id,$ref);
@@ -121,9 +125,10 @@ 
 	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 	    if ($user->rights->propal->creer)
 	    {
-	        if ($action != 'classify')
-	            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+	        if ($action != 'classify') {
+	        	            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 	            $morehtmlref.=' : ';
+	        }
 	            if ($action == 'classify') {
 	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -173,8 +178,7 @@ 
 	$permtoedit = $user->rights->propal->creer;
 	$param = '&id=' . $object->id;
 	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
+} else
 {
 	print $langs->trans("ErrorUnknown");
 }

Spacing +45 added lines, -45 removed lines

@@ -29,45 +29,45 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'other', 'companies'));
 
-$action		= GETPOST('action','alpha');
-$confirm	= GETPOST('confirm','alpha');
-$id			= GETPOST('id','int');
-$ref		= GETPOST('ref','alpha');
+$action		= GETPOST('action', 'alpha');
+$confirm	= GETPOST('confirm', 'alpha');
+$id			= GETPOST('id', 'int');
+$ref		= GETPOST('ref', 'alpha');
 
 // Security check
-$socid='';
-if (! empty($user->societe_id))
+$socid = '';
+if (!empty($user->societe_id))
 {
 	$socid = $user->societe_id;
 }
 $result = restrictedArea($user, 'propal', $id);
 
 // Get parameters
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
 
 $object = new Propal($db);
-$object->fetch($id,$ref);
+$object->fetch($id, $ref);
 
 
 /*
@@ -78,7 +78,7 @@ 
 {
     $object->fetch_thirdparty();
     $upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 }
 
 
@@ -86,7 +86,7 @@ 
  * View
  */
 
-llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
+llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
 
 $form = new Form($db);
 
@@ -98,59 +98,59 @@ 
 	dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
 
 	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
 	{
-		$totalsize+=$file['size'];
+		$totalsize += $file['size'];
 	}
 
 
 	// Proposal card
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-	$morehtmlref='<div class="refidno">';
+	$morehtmlref = '<div class="refidno">';
 	// Ref customer
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	    if ($user->rights->propal->creer)
 	    {
 	        if ($action != 'classify')
 	            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-	            $morehtmlref.=' : ';
+	            $morehtmlref .= ' : ';
 	            if ($action == 'classify') {
 	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
+	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+	                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	                $morehtmlref .= '</form>';
 	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	            }
 	    } else {
-	        if (! empty($object->fk_project)) {
+	        if (!empty($object->fk_project)) {
 	            $proj = new Project($db);
 	            $proj->fetch($object->fk_project);
-	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
+	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+	            $morehtmlref .= $proj->ref;
+	            $morehtmlref .= '</a>';
 	        } else {
-	            $morehtmlref.='';
+	            $morehtmlref .= '';
 	        }
 	    }
 	}
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
@@ -162,7 +162,7 @@ 
 
 	// Files infos
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize,1,1).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
 	print "</table>\n";
 
@@ -174,8 +174,8 @@ 
 	$modulepart = 'propal';
 	$permission = $user->rights->propal->creer;
 	$permtoedit = $user->rights->propal->creer;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {

dolibarr/htdocs/comm/propal/note.php

Indentation +76 added lines, -76 removed lines

@@ -30,7 +30,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -67,81 +67,81 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($mesg) print $mesg;
-
-	$now=dol_now();
-
-	if ($object->fetch($id, $ref) > 0)
-	{
-		if ($object->fetch_thirdparty() > 0)
-		{
-		    $head = propal_prepare_head($object);
-			dol_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
-
-			$cssclass='titlefield';
-			//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
-			//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
-
-
-			// Proposal card
-
-			$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-
-
-			$morehtmlref='<div class="refidno">';
-			// Ref customer
-			$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-			$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-			// Thirdparty
-			$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-			// Project
-			if (! empty($conf->projet->enabled))
-			{
-			    $langs->load("projects");
-			    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-			    if ($user->rights->propal->creer)
-			    {
-			        if ($action != 'classify')
-			            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-			            $morehtmlref.=' : ';
-			            if ($action == 'classify') {
-			                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-			                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-			                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-			                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-			                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			                $morehtmlref.='</form>';
-			            } else {
-			                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-			            }
-			    } else {
-			        if (! empty($object->fk_project)) {
-			            $proj = new Project($db);
-			            $proj->fetch($object->fk_project);
-			            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-			            $morehtmlref.=$proj->ref;
-			            $morehtmlref.='</a>';
-			        } else {
-			            $morehtmlref.='';
-			        }
-			    }
-			}
-			$morehtmlref.='</div>';
-
-			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-			print '<div class="fichecenter">';
-			print '<div class="underbanner clearboth"></div>';
-
-			$cssclass="titlefield";
-			include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
-
-			print '</div>';
-
-			dol_fiche_end();
-		}
-	}
+    if ($mesg) print $mesg;
+
+    $now=dol_now();
+
+    if ($object->fetch($id, $ref) > 0)
+    {
+        if ($object->fetch_thirdparty() > 0)
+        {
+            $head = propal_prepare_head($object);
+            dol_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
+
+            $cssclass='titlefield';
+            //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
+            //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
+
+
+            // Proposal card
+
+            $linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
+            $morehtmlref='<div class="refidno">';
+            // Ref customer
+            $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+            $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+            // Thirdparty
+            $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+            // Project
+            if (! empty($conf->projet->enabled))
+            {
+                $langs->load("projects");
+                $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+                if ($user->rights->propal->creer)
+                {
+                    if ($action != 'classify')
+                        //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+                        $morehtmlref.=' : ';
+                        if ($action == 'classify') {
+                            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                            $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+                            $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                            $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                            $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                            $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                            $morehtmlref.='</form>';
+                        } else {
+                            $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                        }
+                } else {
+                    if (! empty($object->fk_project)) {
+                        $proj = new Project($db);
+                        $proj->fetch($object->fk_project);
+                        $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                        $morehtmlref.=$proj->ref;
+                        $morehtmlref.='</a>';
+                    } else {
+                        $morehtmlref.='';
+                    }
+                }
+            }
+            $morehtmlref.='</div>';
+
+            dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+            print '<div class="fichecenter">';
+            print '<div class="underbanner clearboth"></div>';
+
+            $cssclass="titlefield";
+            include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+            print '</div>';
+
+            dol_fiche_end();
+        }
+    }
 }
 
 // End of page

Braces +9 added lines, -4 removed lines

@@ -41,7 +41,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, 'propale', $id, 'propal');
 
 $object = new Propal($db);
@@ -67,7 +69,9 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($mesg) print $mesg;
+	if ($mesg) {
+	    print $mesg;
+	}
 
 	$now=dol_now();
 
@@ -101,9 +105,10 @@ 
 			    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 			    if ($user->rights->propal->creer)
 			    {
-			        if ($action != 'classify')
-			            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+			        if ($action != 'classify') {
+			        			            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 			            $morehtmlref.=' : ';
+			        }
 			            if ($action == 'classify') {
 			                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 			                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

Spacing +35 added lines, -35 removed lines

@@ -27,23 +27,23 @@ 
  *	\ingroup    propal
  *	\brief      Fiche d'information sur une proposition commerciale
  */
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('propal', 'compta', 'bills', 'companies'));
 
-$id = GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$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, 'propale', $id, 'propal');
 
 $object = new Propal($db);
@@ -53,9 +53,9 @@ 
  * Actions
  */
 
-$permissionnote=$user->rights->propale->creer;	// Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
 
@@ -63,15 +63,15 @@ 
  * View
  */
 
-llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
+llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
 
 $form = new Form($db);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	if ($mesg) print $mesg;
 
-	$now=dol_now();
+	$now = dol_now();
 
 	if ($object->fetch($id, $ref) > 0)
 	{
@@ -80,63 +80,63 @@ 
 		    $head = propal_prepare_head($object);
 			dol_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
 
-			$cssclass='titlefield';
+			$cssclass = 'titlefield';
 			//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
 			//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
 
 
 			// Proposal card
 
-			$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-			$morehtmlref='<div class="refidno">';
+			$morehtmlref = '<div class="refidno">';
 			// Ref customer
-			$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-			$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+			$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+			$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 			// Thirdparty
-			$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 			// Project
-			if (! empty($conf->projet->enabled))
+			if (!empty($conf->projet->enabled))
 			{
 			    $langs->load("projects");
-			    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			    if ($user->rights->propal->creer)
 			    {
 			        if ($action != 'classify')
 			            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-			            $morehtmlref.=' : ';
+			            $morehtmlref .= ' : ';
 			            if ($action == 'classify') {
 			                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-			                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-			                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-			                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-			                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			                $morehtmlref.='</form>';
+			                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			                $morehtmlref .= '</form>';
 			            } else {
-			                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			            }
 			    } else {
-			        if (! empty($object->fk_project)) {
+			        if (!empty($object->fk_project)) {
 			            $proj = new Project($db);
 			            $proj->fetch($object->fk_project);
-			            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-			            $morehtmlref.=$proj->ref;
-			            $morehtmlref.='</a>';
+			            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			            $morehtmlref .= $proj->ref;
+			            $morehtmlref .= '</a>';
 			        } else {
-			            $morehtmlref.='';
+			            $morehtmlref .= '';
 			        }
 			    }
 			}
-			$morehtmlref.='</div>';
+			$morehtmlref .= '</div>';
 
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
-			$cssclass="titlefield";
+			$cssclass = "titlefield";
 			include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 			print '</div>';

dolibarr/htdocs/comm/propal/index.php

Indentation +180 added lines, -180 removed lines

@@ -34,8 +34,8 @@ 
 $socid=GETPOST('socid','int');
 if (isset($user->societe_id) && $user->societe_id  > 0)
 {
-	$action = '';
-	$socid = $user->societe_id;
+    $action = '';
+    $socid = $user->societe_id;
 }
 $result = restrictedArea($user, 'propal');
 
@@ -117,7 +117,7 @@ 
     $listofstatus=array(0,1,2,3,4);
     foreach ($listofstatus as $status)
     {
-    	$dataseries[]=array($propalstatic->LibStatut($status,1), (isset($vals[$status])?(int) $vals[$status]:0));
+        $dataseries[]=array($propalstatic->LibStatut($status,1), (isset($vals[$status])?(int) $vals[$status]:0));
         if (! $conf->use_javascript_ajax)
         {
 
@@ -159,50 +159,50 @@ 
  */
 if (! empty($conf->propal->enabled))
 {
-	$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."propal as c";
-	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('propal').")";
-	$sql.= " AND c.fk_statut = 0";
-	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("DraftPropals").'</td></tr>';
-		$langs->load("propal");
-		$num = $db->num_rows($resql);
-		if ($num)
-		{
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($resql);
-				print '<tr class="oddeven">';
+    $sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
+    $sql.= " FROM ".MAIN_DB_PREFIX."propal as c";
+    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE c.fk_soc = s.rowid";
+    $sql.= " AND c.entity IN (".getEntity('propal').")";
+    $sql.= " AND c.fk_statut = 0";
+    if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        print '<div class="div-table-responsive-no-min">';
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td colspan="2">'.$langs->trans("DraftPropals").'</td></tr>';
+        $langs->load("propal");
+        $num = $db->num_rows($resql);
+        if ($num)
+        {
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                print '<tr class="oddeven">';
 
-				$propalstatic->id=$obj->rowid;
-				$propalstatic->ref=$obj->ref;
-				print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';
+                $propalstatic->id=$obj->rowid;
+                $propalstatic->ref=$obj->ref;
+                print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';
 
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->socname;
-				$companystatic->client=$obj->client;
-				$companystatic->canvas=$obj->canvas;
-				print '<td>'.$companystatic->getNomUrl(1,'customer',24).'</td>';
+                $companystatic->id=$obj->socid;
+                $companystatic->name=$obj->socname;
+                $companystatic->client=$obj->client;
+                $companystatic->canvas=$obj->canvas;
+                print '<td>'.$companystatic->getNomUrl(1,'customer',24).'</td>';
 
-				print '</tr>';
-				$i++;
-			}
-		}
-		print "</table>";
-		print "</div><br>";
-	}
+                print '</tr>';
+                $i++;
+            }
+        }
+        print "</table>";
+        print "</div><br>";
+    }
 }
 
 
@@ -232,57 +232,57 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td colspan="4">'.$langs->trans("LastModifiedProposals",$max).'</td></tr>';
+    print '<div class="div-table-responsive-no-min">';
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td colspan="4">'.$langs->trans("LastModifiedProposals",$max).'</td></tr>';
 
-	$num = $db->num_rows($resql);
-	if ($num)
-	{
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			print '<tr class="oddeven">';
-			print '<td width="20%" class="nowrap">';
-
-			$propalstatic->id=$obj->rowid;
-			$propalstatic->ref=$obj->ref;
-
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			print '<td width="96" class="nobordernopadding nowrap">';
-			print $propalstatic->getNomUrl(1);
-			print '</td>';
-
-			print '<td width="16" class="nobordernopadding nowrap">';
-			print '&nbsp;';
-			print '</td>';
-
-			print '<td width="16" align="right" class="nobordernopadding">';
-			$filename=dol_sanitizeFileName($obj->ref);
-			$filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
-			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-			print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
-			print '</td></tr></table>';
-
-			print '</td>';
-
-			$companystatic->id=$obj->socid;
-			$companystatic->name=$obj->socname;
-			$companystatic->client=$obj->client;
-			$companystatic->canvas=$obj->canvas;
-			print '<td>'.$companystatic->getNomUrl(1,'customer').'</td>';
-
-			print '<td>'.dol_print_date($db->jdate($obj->datec),'day').'</td>';
-			print '<td align="right">'.$propalstatic->LibStatut($obj->fk_statut,5).'</td>';
-			print '</tr>';
-			$i++;
-		}
-	}
-	print "</table>";
-	print "</div><br>";
+    $num = $db->num_rows($resql);
+    if ($num)
+    {
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            print '<tr class="oddeven">';
+            print '<td width="20%" class="nowrap">';
+
+            $propalstatic->id=$obj->rowid;
+            $propalstatic->ref=$obj->ref;
+
+            print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+            print '<td width="96" class="nobordernopadding nowrap">';
+            print $propalstatic->getNomUrl(1);
+            print '</td>';
+
+            print '<td width="16" class="nobordernopadding nowrap">';
+            print '&nbsp;';
+            print '</td>';
+
+            print '<td width="16" align="right" class="nobordernopadding">';
+            $filename=dol_sanitizeFileName($obj->ref);
+            $filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
+            $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+            print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
+            print '</td></tr></table>';
+
+            print '</td>';
+
+            $companystatic->id=$obj->socid;
+            $companystatic->name=$obj->socname;
+            $companystatic->client=$obj->client;
+            $companystatic->canvas=$obj->canvas;
+            print '<td>'.$companystatic->getNomUrl(1,'customer').'</td>';
+
+            print '<td>'.dol_print_date($db->jdate($obj->datec),'day').'</td>';
+            print '<td align="right">'.$propalstatic->LibStatut($obj->fk_statut,5).'</td>';
+            print '</tr>';
+            $i++;
+        }
+    }
+    print "</table>";
+    print "</div><br>";
 }
 else dol_print_error($db);
 
@@ -292,93 +292,93 @@ 
  */
 if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
-	$langs->load("propal");
-
-	$now=dol_now();
-
-	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
-	$sql.= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	$sql.= " AND p.fk_statut = 1";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY p.rowid DESC";
-
-	$result=$db->query($sql);
-	if ($result)
-	{
-		$total = 0;
-		$num = $db->num_rows($result);
-		$i = 0;
-		if ($num > 0)
-		{
-			print '<div class="div-table-responsive-no-min">';
-			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
-
-			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-			{
-				$obj = $db->fetch_object($result);
-
-				print '<tr class="oddeven">';
-
-				// Ref
-				print '<td class="nowrap" width="140">';
-
-				$propalstatic->id=$obj->propalid;
-				$propalstatic->ref=$obj->ref;
-
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				print '<td class="nobordernopadding nowrap">';
-				print $propalstatic->getNomUrl(1);
-				print '</td>';
-				print '<td width="18" class="nobordernopadding nowrap">';
-				if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
-				print '</td>';
-				print '<td width="16" align="center" class="nobordernopadding">';
-				$filename=dol_sanitizeFileName($obj->ref);
-				$filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
-				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
-				print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
-				print '</td></tr></table>';
-
-				print "</td>";
-
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->socname;
-				$companystatic->client=$obj->client;
-				$companystatic->canvas=$obj->canvas;
-				print '<td align="left">'.$companystatic->getNomUrl(1,'customer',44).'</td>'."\n";
+    $langs->load("propal");
+
+    $now=dol_now();
+
+    $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
+    $sql.= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
+    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+    $sql.= ", ".MAIN_DB_PREFIX."propal as p";
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE p.fk_soc = s.rowid";
+    $sql.= " AND p.entity IN (".getEntity('propal').")";
+    $sql.= " AND p.fk_statut = 1";
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    if ($socid) $sql.= " AND s.rowid = ".$socid;
+    $sql.= " ORDER BY p.rowid DESC";
+
+    $result=$db->query($sql);
+    if ($result)
+    {
+        $total = 0;
+        $num = $db->num_rows($result);
+        $i = 0;
+        if ($num > 0)
+        {
+            print '<div class="div-table-responsive-no-min">';
+            print '<table class="noborder" width="100%">';
+            print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
 
-				print '<td align="right">';
-				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
-				print '<td align="right">'.price($obj->total_ttc).'</td>';
-				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
-				print '</tr>'."\n";
-				$i++;
-				$total += $obj->total_ttc;
-			}
-			if ($num > $nbofloop)
-			{
-				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			else if ($total>0)
-			{
-				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
-			}
-			print "</table>";
-			print "</div><br>";
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+            $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
+            while ($i < $nbofloop)
+            {
+                $obj = $db->fetch_object($result);
+
+                print '<tr class="oddeven">';
+
+                // Ref
+                print '<td class="nowrap" width="140">';
+
+                $propalstatic->id=$obj->propalid;
+                $propalstatic->ref=$obj->ref;
+
+                print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+                print '<td class="nobordernopadding nowrap">';
+                print $propalstatic->getNomUrl(1);
+                print '</td>';
+                print '<td width="18" class="nobordernopadding nowrap">';
+                if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+                print '</td>';
+                print '<td width="16" align="center" class="nobordernopadding">';
+                $filename=dol_sanitizeFileName($obj->ref);
+                $filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
+                $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
+                print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
+                print '</td></tr></table>';
+
+                print "</td>";
+
+                $companystatic->id=$obj->socid;
+                $companystatic->name=$obj->socname;
+                $companystatic->client=$obj->client;
+                $companystatic->canvas=$obj->canvas;
+                print '<td align="left">'.$companystatic->getNomUrl(1,'customer',44).'</td>'."\n";
+
+                print '<td align="right">';
+                print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
+                print '<td align="right">'.price($obj->total_ttc).'</td>';
+                print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
+                print '</tr>'."\n";
+                $i++;
+                $total += $obj->total_ttc;
+            }
+            if ($num > $nbofloop)
+            {
+                print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
+            }
+            else if ($total>0)
+            {
+                print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
+            }
+            print "</table>";
+            print "</div><br>";
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 /*

Braces +47 added lines, -21 removed lines

@@ -59,9 +59,11 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
+    // This is useless due to the global search combo
 {
     print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';
+}
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
@@ -78,11 +80,17 @@ 
 $sql = "SELECT count(p.rowid), p.fk_statut";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."propal as p";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= " WHERE p.fk_soc = s.rowid";
 $sql.= " AND p.entity IN (".getEntity('propal').")";
-if ($user->societe_id) $sql.=' AND p.fk_soc = '.$user->societe_id;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($user->societe_id) {
+    $sql.=' AND p.fk_soc = '.$user->societe_id;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 $sql.= " AND p.fk_statut IN (0,1,2,3,4)";
 $sql.= " GROUP BY p.fk_statut";
 $resql = $db->query($sql);
@@ -147,8 +155,7 @@ 
     //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td align="right">'.$totalinprocess.'</td></tr>';
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">'.$total.'</td></tr>';
     print "</table><br>";
-}
-else
+} else
 {
     dol_print_error($db);
 }
@@ -162,12 +169,18 @@ 
 	$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql.= " FROM ".MAIN_DB_PREFIX."propal as c";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql.= " WHERE c.fk_soc = s.rowid";
 	$sql.= " AND c.entity IN (".getEntity('propal').")";
 	$sql.= " AND c.fk_statut = 0";
-	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid) {
+	    $sql.= " AND c.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	}
 
 	$resql=$db->query($sql);
 	if ($resql)
@@ -220,12 +233,18 @@ 
 $sql.= " date_cloture as datec";
 $sql.= " FROM ".MAIN_DB_PREFIX."propal as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= " WHERE c.fk_soc = s.rowid";
 $sql.= " AND c.entity IN (".getEntity('propal').")";
 //$sql.= " AND c.fk_statut > 2";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) {
+    $sql .= " AND c.fk_soc = ".$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 $sql.= " ORDER BY c.tms DESC";
 $sql.= $db->plimit($max, 0);
 
@@ -283,8 +302,9 @@ 
 	}
 	print "</table>";
 	print "</div><br>";
+} else {
+    dol_print_error($db);
 }
-else dol_print_error($db);
 
 
 /*
@@ -300,12 +320,18 @@ 
 	$sql.= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql.= " WHERE p.fk_soc = s.rowid";
 	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	$sql.= " AND p.fk_statut = 1";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	}
+	if ($socid) {
+	    $sql.= " AND s.rowid = ".$socid;
+	}
 	$sql.= " ORDER BY p.rowid DESC";
 
 	$result=$db->query($sql);
@@ -338,7 +364,9 @@ 
 				print $propalstatic->getNomUrl(1);
 				print '</td>';
 				print '<td width="18" class="nobordernopadding nowrap">';
-				if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+				if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
+				    print img_warning($langs->trans("Late"));
+				}
 				print '</td>';
 				print '<td width="16" align="center" class="nobordernopadding">';
 				$filename=dol_sanitizeFileName($obj->ref);
@@ -366,16 +394,14 @@ 
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			else if ($total>0)
+			} else if ($total>0)
 			{
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table>";
 			print "</div><br>";
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}

Spacing +102 added lines, -102 removed lines

@@ -26,16 +26,16 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT .'/comm/propal/class/propal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('propal', 'companies'));
 
 // Security check
-$socid=GETPOST('socid','int');
-if (isset($user->societe_id) && $user->societe_id  > 0)
+$socid = GETPOST('socid', 'int');
+if (isset($user->societe_id) && $user->societe_id > 0)
 {
 	$action = '';
 	$socid = $user->societe_id;
@@ -46,14 +46,14 @@ 
 /*
  * View
  */
-$now=dol_now();
-$propalstatic=new Propal($db);
-$companystatic=new Societe($db);
+$now = dol_now();
+$propalstatic = new Propal($db);
+$companystatic = new Societe($db);
 $form = new Form($db);
 $formfile = new FormFile($db);
-$help_url="EN:Module_Commercial_Proposals|FR:Module_Propositions_commerciales|ES:Módulo_Presupuestos";
+$help_url = "EN:Module_Commercial_Proposals|FR:Module_Propositions_commerciales|ES:Módulo_Presupuestos";
 
-llxHeader("",$langs->trans("ProspectionArea"),$help_url);
+llxHeader("", $langs->trans("ProspectionArea"), $help_url);
 
 print load_fiche_titre($langs->trans("ProspectionArea"));
 
@@ -62,7 +62,7 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
     print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -79,25 +79,25 @@ 
  */
 
 $sql = "SELECT count(p.rowid), p.fk_statut";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE p.fk_soc = s.rowid";
-$sql.= " AND p.entity IN (".getEntity('propal').")";
-if ($user->societe_id) $sql.=' AND p.fk_soc = '.$user->societe_id;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " AND p.fk_statut IN (0,1,2,3,4)";
-$sql.= " GROUP BY p.fk_statut";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE p.fk_soc = s.rowid";
+$sql .= " AND p.entity IN (".getEntity('propal').")";
+if ($user->societe_id) $sql .= ' AND p.fk_soc = '.$user->societe_id;
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+$sql .= " AND p.fk_statut IN (0,1,2,3,4)";
+$sql .= " GROUP BY p.fk_statut";
 $resql = $db->query($sql);
 if ($resql)
 {
     $num = $db->num_rows($resql);
     $i = 0;
 
-    $total=0;
-    $totalinprocess=0;
-    $dataseries=array();
-    $vals=array();
+    $total = 0;
+    $totalinprocess = 0;
+    $dataseries = array();
+    $vals = array();
     // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
     while ($i < $num)
     {
@@ -106,10 +106,10 @@ 
         {
             //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
             {
-                $vals[$row[1]]=$row[0];
-                $totalinprocess+=$row[0];
+                $vals[$row[1]] = $row[0];
+                $totalinprocess += $row[0];
             }
-            $total+=$row[0];
+            $total += $row[0];
         }
         $i++;
     }
@@ -117,16 +117,16 @@ 
 
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Proposals").'</td></tr>'."\n";
-    $listofstatus=array(0,1,2,3,4);
+    $listofstatus = array(0, 1, 2, 3, 4);
     foreach ($listofstatus as $status)
     {
-    	$dataseries[]=array($propalstatic->LibStatut($status,1), (isset($vals[$status])?(int) $vals[$status]:0));
-        if (! $conf->use_javascript_ajax)
+    	$dataseries[] = array($propalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+        if (!$conf->use_javascript_ajax)
         {
 
             print '<tr class="oddeven">';
-            print '<td>'.$propalstatic->LibStatut($status,0).'</td>';
-            print '<td align="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status])?$vals[$status]:0).'</a></td>';
+            print '<td>'.$propalstatic->LibStatut($status, 0).'</td>';
+            print '<td align="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
             print "</tr>\n";
         }
     }
@@ -142,7 +142,7 @@ 
         $dolgraph->SetType(array('pie'));
         $dolgraph->setWidth('100%');
         $dolgraph->draw('idgraphthirdparties');
-        print $dolgraph->show($total?0:1);
+        print $dolgraph->show($total ? 0 : 1);
 
         print '</td></tr>';
     }
@@ -160,19 +160,19 @@ 
 /*
  * Draft proposals
  */
-if (! empty($conf->propal->enabled))
+if (!empty($conf->propal->enabled))
 {
 	$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."propal as c";
-	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('propal').")";
-	$sql.= " AND c.fk_statut = 0";
-	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-
-	$resql=$db->query($sql);
+	$sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE c.fk_soc = s.rowid";
+	$sql .= " AND c.entity IN (".getEntity('propal').")";
+	$sql .= " AND c.fk_statut = 0";
+	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		print '<div class="div-table-responsive-no-min">';
@@ -189,15 +189,15 @@ 
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
 
-				$propalstatic->id=$obj->rowid;
-				$propalstatic->ref=$obj->ref;
+				$propalstatic->id = $obj->rowid;
+				$propalstatic->ref = $obj->ref;
 				print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';
 
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->socname;
-				$companystatic->client=$obj->client;
-				$companystatic->canvas=$obj->canvas;
-				print '<td>'.$companystatic->getNomUrl(1,'customer',24).'</td>';
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->socname;
+				$companystatic->client = $obj->client;
+				$companystatic->canvas = $obj->canvas;
+				print '<td>'.$companystatic->getNomUrl(1, 'customer', 24).'</td>';
 
 				print '</tr>';
 				$i++;
@@ -213,32 +213,32 @@ 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
-$max=5;
+$max = 5;
 
 /*
  * Last modified proposals
  */
 
 $sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
-$sql.= " date_cloture as datec";
-$sql.= " FROM ".MAIN_DB_PREFIX."propal as c";
-$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('propal').")";
+$sql .= " date_cloture as datec";
+$sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
+$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE c.fk_soc = s.rowid";
+$sql .= " AND c.entity IN (".getEntity('propal').")";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " ORDER BY c.tms DESC";
-$sql.= $db->plimit($max, 0);
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+$sql .= " ORDER BY c.tms DESC";
+$sql .= $db->plimit($max, 0);
 
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td colspan="4">'.$langs->trans("LastModifiedProposals",$max).'</td></tr>';
+	print '<td colspan="4">'.$langs->trans("LastModifiedProposals", $max).'</td></tr>';
 
 	$num = $db->num_rows($resql);
 	if ($num)
@@ -251,8 +251,8 @@ 
 			print '<tr class="oddeven">';
 			print '<td width="20%" class="nowrap">';
 
-			$propalstatic->id=$obj->rowid;
-			$propalstatic->ref=$obj->ref;
+			$propalstatic->id = $obj->rowid;
+			$propalstatic->ref = $obj->ref;
 
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 			print '<td width="96" class="nobordernopadding nowrap">';
@@ -264,22 +264,22 @@ 
 			print '</td>';
 
 			print '<td width="16" align="right" class="nobordernopadding">';
-			$filename=dol_sanitizeFileName($obj->ref);
-			$filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
-			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+			$filename = dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 			print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
 
 			print '</td>';
 
-			$companystatic->id=$obj->socid;
-			$companystatic->name=$obj->socname;
-			$companystatic->client=$obj->client;
-			$companystatic->canvas=$obj->canvas;
-			print '<td>'.$companystatic->getNomUrl(1,'customer').'</td>';
+			$companystatic->id = $obj->socid;
+			$companystatic->name = $obj->socname;
+			$companystatic->client = $obj->client;
+			$companystatic->canvas = $obj->canvas;
+			print '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
 
-			print '<td>'.dol_print_date($db->jdate($obj->datec),'day').'</td>';
-			print '<td align="right">'.$propalstatic->LibStatut($obj->fk_statut,5).'</td>';
+			print '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
+			print '<td align="right">'.$propalstatic->LibStatut($obj->fk_statut, 5).'</td>';
 			print '</tr>';
 			$i++;
 		}
@@ -293,25 +293,25 @@ 
 /*
  * Opened proposals
  */
-if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
 	$langs->load("propal");
 
-	$now=dol_now();
+	$now = dol_now();
 
 	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
-	$sql.= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	$sql.= " AND p.fk_statut = 1";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY p.rowid DESC";
-
-	$result=$db->query($sql);
+	$sql .= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE p.fk_soc = s.rowid";
+	$sql .= " AND p.entity IN (".getEntity('propal').")";
+	$sql .= " AND p.fk_statut = 1";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	$sql .= " ORDER BY p.rowid DESC";
+
+	$result = $db->query($sql);
 	if ($result)
 	{
 		$total = 0;
@@ -323,7 +323,7 @@ 
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
 
-			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
+			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
@@ -333,8 +333,8 @@ 
 				// Ref
 				print '<td class="nowrap" width="140">';
 
-				$propalstatic->id=$obj->propalid;
-				$propalstatic->ref=$obj->ref;
+				$propalstatic->id = $obj->propalid;
+				$propalstatic->ref = $obj->ref;
 
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 				print '<td class="nobordernopadding nowrap">';
@@ -344,24 +344,24 @@ 
 				if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
 				print '</td>';
 				print '<td width="16" align="center" class="nobordernopadding">';
-				$filename=dol_sanitizeFileName($obj->ref);
-				$filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
-				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;
 				print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
 				print '</td></tr></table>';
 
 				print "</td>";
 
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->socname;
-				$companystatic->client=$obj->client;
-				$companystatic->canvas=$obj->canvas;
-				print '<td align="left">'.$companystatic->getNomUrl(1,'customer',44).'</td>'."\n";
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->socname;
+				$companystatic->client = $obj->client;
+				$companystatic->canvas = $obj->canvas;
+				print '<td align="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>'."\n";
 
 				print '<td align="right">';
-				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
+				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
-				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
+				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>'."\n";
 				print '</tr>'."\n";
 				$i++;
 				$total += $obj->total_ttc;
@@ -370,7 +370,7 @@ 
 			{
 				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
 			}
-			else if ($total>0)
+			else if ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}

dolibarr/htdocs/comm/propal/stats/index.php

Indentation +34 added lines, -34 removed lines

@@ -221,9 +221,9 @@ 
 $data = $stats->getAllByYear();
 $arrayyears=array();
 foreach($data as $val) {
-	if (! empty($val['year'])) {
-		$arrayyears[$val['year']]=$val['year'];
-	}
+    if (! empty($val['year'])) {
+        $arrayyears[$val['year']]=$val['year'];
+    }
 }
 if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
 
@@ -245,35 +245,35 @@ 
 
 //if (empty($socid))
 //{
-	// Show filter box
-	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
-	// Company
-	print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
-	$filter='s.client in (1,2,3)';
-	print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
-	print '</td></tr>';
-	// User
-	print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
-	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	print '</td></tr>';
-	// Status
-	print '<tr><td align="left">'.$langs->trans("Status").'</td><td align="left">';
+    // Show filter box
+    print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+    print '<input type="hidden" name="mode" value="'.$mode.'">';
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+    // Company
+    print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
+    $filter='s.client in (1,2,3)';
+    print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
+    print '</td></tr>';
+    // User
+    print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
+    print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+    print '</td></tr>';
+    // Status
+    print '<tr><td align="left">'.$langs->trans("Status").'</td><td align="left">';
     $formpropal->selectProposalStatus(($object_status!=''?$object_status:-1),0,0,1,$mode,'object_status');
-	print '</td></tr>';
-	// Year
-	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
-	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
-	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
-	arsort($arrayyears);
-	print $form->selectarray('year',$arrayyears,$year,0);
-	print '</td></tr>';
-	print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
-	print '</table>';
-	print '</form>';
-	print '<br><br>';
+    print '</td></tr>';
+    // Year
+    print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
+    if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
+    if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+    arsort($arrayyears);
+    print $form->selectarray('year',$arrayyears,$year,0);
+    print '</td></tr>';
+    print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+    print '</table>';
+    print '</form>';
+    print '<br><br>';
 //}
 
 print '<div class="div-table-responsive-no-min">';
@@ -309,11 +309,11 @@ 
     print '<tr class="oddeven" height="24">';
     print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
     print '<td align="right">'.$val['nb'].'</td>';
-	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
+    print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
     print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
-	print '<td align="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['total_diff']).'</td>';
+    print '<td align="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['total_diff']).'</td>';
     print '<td align="right">'.price(price2num($val['avg'],'MT'),1).'</td>';
-	print '<td align="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['avg_diff']).'</td>';
+    print '<td align="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['avg_diff']).'</td>';
     print '</tr>';
     $oldyear=$year;
 }

Braces +35 added lines, -19 removed lines

@@ -34,8 +34,12 @@ 
 $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
 
 $mode=GETPOST("mode")?GETPOST("mode"):'customer';
-if ($mode == 'customer' && ! $user->rights->propale->lire) accessforbidden();
-if ($mode == 'supplier' && ! $user->rights->supplier_proposal->lire) accessforbidden();
+if ($mode == 'customer' && ! $user->rights->propale->lire) {
+    accessforbidden();
+}
+if ($mode == 'supplier' && ! $user->rights->supplier_proposal->lire) {
+    accessforbidden();
+}
 
 $object_status=GETPOST('object_status');
 
@@ -87,7 +91,9 @@ 
 
 
 $stats = new PropaleStats($db, $socid, ($userid>0?$userid:0), $mode);
-if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND p.fk_statut IN ('.$db->escape($object_status).')';
+if ($object_status != '' && $object_status >= 0) {
+    $stats->where .= ' AND p.fk_statut IN ('.$db->escape($object_status).')';
+}
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear,$startyear);
@@ -98,8 +104,7 @@ 
 {
     $filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
+} else
 {
     $filenamenb = $dir.'/proposalsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$year.'.png';
@@ -140,8 +145,7 @@ 
 {
     $filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
-}
-else
+} else
 {
     $filenameamount = $dir.'/proposalsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$year.'.png';
@@ -180,15 +184,22 @@ 
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else
+    if ($mode == 'customer') {
+        $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+    }
+    if ($mode == 'supplier') {
+        $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+    }
+    } else
 {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
-}
+    if ($mode == 'customer') {
+        $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+    }
+    if ($mode == 'supplier') {
+        $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+    }
+    }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
@@ -225,7 +236,9 @@ 
 		$arrayyears[$val['year']]=$val['year'];
 	}
 }
-if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+if (! count($arrayyears)) {
+    $arrayyears[$nowyear]=$nowyear;
+}
 
 
 $h=0;
@@ -265,8 +278,12 @@ 
 	print '</td></tr>';
 	// Year
 	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
-	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
-	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+	if (! in_array($year,$arrayyears)) {
+	    $arrayyears[$year]=$year;
+	}
+	if (! in_array($nowyear,$arrayyears)) {
+	    $arrayyears[$nowyear]=$nowyear;
+	}
 	arsort($arrayyears);
 	print $form->selectarray('year',$arrayyears,$year,0);
 	print '</td></tr>';
@@ -326,8 +343,7 @@ 
 
 // Show graphs
 print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();

Spacing +65 added lines, -65 removed lines

@@ -28,22 +28,22 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php';
 
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$mode=GETPOST("mode")?GETPOST("mode"):'customer';
-if ($mode == 'customer' && ! $user->rights->propale->lire) accessforbidden();
-if ($mode == 'supplier' && ! $user->rights->supplier_proposal->lire) accessforbidden();
+$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+if ($mode == 'customer' && !$user->rights->propale->lire) accessforbidden();
+if ($mode == 'supplier' && !$user->rights->supplier_proposal->lire) accessforbidden();
 
-$object_status=GETPOST('object_status');
+$object_status = GETPOST('object_status');
 
-$userid=GETPOST('userid','int');
-$socid=GETPOST('socid','int');
+$userid = GETPOST('userid', 'int');
+$socid = GETPOST('socid', 'int');
 // Security check
 if ($user->societe_id > 0)
 {
@@ -51,11 +51,11 @@ 
     $socid = $user->societe_id;
 }
 
-$nowyear=strftime("%Y", dol_now());
-$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
+$nowyear = strftime("%Y", dol_now());
+$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
 //$startyear=$year-2;
-$startyear=$year-1;
-$endyear=$year;
+$startyear = $year - 1;
+$endyear = $year;
 
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'companies', 'other', 'suppliers', 'supplier_proposal'));
@@ -65,35 +65,35 @@ 
  * View
  */
 
-$form=new Form($db);
-$formpropal=new FormPropal($db);
+$form = new Form($db);
+$formpropal = new FormPropal($db);
 
 $langs->loadLangs(array('propal', 'other', 'companies'));
 
 if ($mode == 'customer')
 {
-    $title=$langs->trans("ProposalsStatistics");
-    $dir=$conf->propale->dir_temp;
+    $title = $langs->trans("ProposalsStatistics");
+    $dir = $conf->propale->dir_temp;
 }
 if ($mode == 'supplier')
 {
-    $title=$langs->trans("ProposalsStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
-    $dir=$conf->supplier_proposal->dir_temp;
+    $title = $langs->trans("ProposalsStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
+    $dir = $conf->supplier_proposal->dir_temp;
 }
 
 llxHeader('', $title);
 
-print load_fiche_titre($title,'','title_commercial.png');
+print load_fiche_titre($title, '', 'title_commercial.png');
 
 
 dol_mkdir($dir);
 
 
-$stats = new PropaleStats($db, $socid, ($userid>0?$userid:0), $mode);
+$stats = new PropaleStats($db, $socid, ($userid > 0 ? $userid : 0), $mode);
 if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND p.fk_statut IN ('.$db->escape($object_status).')';
 
 // Build graphic number of object
-$data = $stats->getNbByMonthWithPrevYear($endyear,$startyear);
+$data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
@@ -110,33 +110,33 @@ 
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (! $mesg)
+if (!$mesg)
 {
     $px1->SetData($data);
     $px1->SetPrecisionY(0);
-    $i=$startyear;$legend=array();
+    $i = $startyear; $legend = array();
     while ($i <= $endyear)
     {
-        $legend[]=$i;
+        $legend[] = $i;
         $i++;
     }
     $px1->SetLegend($legend);
     $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0,$px1->GetFloorMinValue()));
+    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
     $px1->SetWidth($WIDTH);
     $px1->SetHeight($HEIGHT);
     $px1->SetYLabel($langs->trans("NbOfProposals"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
     $px1->SetPrecisionY(0);
-    $px1->mode='depth';
+    $px1->mode = 'depth';
     $px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
 
-    $px1->draw($filenamenb,$fileurlnb);
+    $px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
-$data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,0);
+$data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, 0);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 if (!$user->rights->societe->client->voir || $user->societe_id)
@@ -152,34 +152,34 @@ 
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (! $mesg)
+if (!$mesg)
 {
     $px2->SetData($data);
     $px2->SetPrecisionY(0);
-    $i=$startyear;$legend=array();
+    $i = $startyear; $legend = array();
     while ($i <= $endyear)
     {
-        $legend[]=$i;
+        $legend[] = $i;
         $i++;
     }
     $px2->SetLegend($legend);
     $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0,$px2->GetFloorMinValue()));
+    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
     $px2->SetWidth($WIDTH);
     $px2->SetHeight($HEIGHT);
     $px2->SetYLabel($langs->trans("AmountOfProposals"));
     $px2->SetShading(3);
     $px2->SetHorizTickIncrement(1);
     $px2->SetPrecisionY(0);
-    $px2->mode='depth';
+    $px2->mode = 'depth';
     $px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
 
-    $px2->draw($filenameamount,$fileurlamount);
+    $px2->draw($filenameamount, $fileurlamount);
 }
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-$fileurl_avg='';
+$fileurl_avg = '';
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
@@ -195,13 +195,13 @@ 
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
-if (! $mesg)
+if (!$mesg)
 {
     $px3->SetData($data);
-    $i=$startyear;$legend=array();
+    $i = $startyear; $legend = array();
     while ($i <= $endyear)
     {
-        $legend[]=$i;
+        $legend[] = $i;
         $i++;
     }
     $px3->SetLegend($legend);
@@ -213,32 +213,32 @@ 
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
     $px3->SetPrecisionY(0);
-    $px3->mode='depth';
+    $px3->mode = 'depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg,$fileurl_avg);
+    $px3->draw($filename_avg, $fileurl_avg);
 }
 
 
 // Show array
 $data = $stats->getAllByYear();
-$arrayyears=array();
-foreach($data as $val) {
-	if (! empty($val['year'])) {
-		$arrayyears[$val['year']]=$val['year'];
+$arrayyears = array();
+foreach ($data as $val) {
+	if (!empty($val['year'])) {
+		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
 
-$h=0;
+$h = 0;
 $head = array();
-$head[$h][0] = DOL_URL_ROOT . '/comm/propal/stats/index.php';
+$head[$h][0] = DOL_URL_ROOT.'/comm/propal/stats/index.php';
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
 
-complete_head_from_modules($conf,$langs,null,$head,$h,'propal_stats');
+complete_head_from_modules($conf, $langs, null, $head, $h, 'propal_stats');
 
 dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
@@ -255,8 +255,8 @@ 
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
-	$filter='s.client in (1,2,3)';
-	print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
+	$filter = 's.client in (1,2,3)';
+	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
 	print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
@@ -264,14 +264,14 @@ 
 	print '</td></tr>';
 	// Status
 	print '<tr><td align="left">'.$langs->trans("Status").'</td><td align="left">';
-    $formpropal->selectProposalStatus(($object_status!=''?$object_status:-1),0,0,1,$mode,'object_status');
+    $formpropal->selectProposalStatus(($object_status != '' ? $object_status : -1), 0, 0, 1, $mode, 'object_status');
 	print '</td></tr>';
 	// Year
 	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
-	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
-	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
+	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
 	arsort($arrayyears);
-	print $form->selectarray('year',$arrayyears,$year,0);
+	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';
 	print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
 	print '</table>';
@@ -291,16 +291,16 @@ 
 print '<td align="right">%</td>';
 print '</tr>';
 
-$oldyear=0;
+$oldyear = 0;
 foreach ($data as $val)
 {
     $year = $val['year'];
-    while (! empty($year) && $oldyear > $year+1)
+    while (!empty($year) && $oldyear > $year + 1)
     {	// If we have empty year
         $oldyear--;
 
         print '<tr class="oddeven" height="24">';
-        print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
+        print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
         print '<td align="right">0</td>';
         print '<td align="right"></td>';
         print '<td align="right">0</td>';
@@ -310,15 +310,15 @@ 
         print '</tr>';
     }
     print '<tr class="oddeven" height="24">';
-    print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
+    print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
     print '<td align="right">'.$val['nb'].'</td>';
-	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
-    print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
-	print '<td align="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['total_diff']).'</td>';
-    print '<td align="right">'.price(price2num($val['avg'],'MT'),1).'</td>';
-	print '<td align="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['avg_diff']).'</td>';
+	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'</td>';
+    print '<td align="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
+	print '<td align="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'</td>';
+    print '<td align="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
+	print '<td align="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'</td>';
     print '</tr>';
-    $oldyear=$year;
+    $oldyear = $year;
 }
 
 print '</table>';

dolibarr/htdocs/comm/contact.php

Indentation +49 added lines, -49 removed lines

@@ -59,13 +59,13 @@ 
 
 if ($type == "c" || $type == "p")
 {
-  $label = $langs->trans("Customers");
-  $urlfiche="card.php";
+    $label = $langs->trans("Customers");
+    $urlfiche="card.php";
 }
 if ($type == "f")
 {
-  $label = $langs->trans("Suppliers");
-  $urlfiche="card.php";
+    $label = $langs->trans("Suppliers");
+    $urlfiche="card.php";
 }
 
 /*
@@ -88,29 +88,29 @@ 
 
 if (dol_strlen($stcomm))
 {
-  $sql.= " AND s.fk_stcomm=".$db->escape($stcomm);
+    $sql.= " AND s.fk_stcomm=".$db->escape($stcomm);
 }
 
 if (! empty($search_lastname))
 {
-  $sql.= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
+    $sql.= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
 }
 
 if (! empty($search_firstname))
 {
-  $sql.= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
+    $sql.= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
 }
 
 if (! empty($search_company))
 {
-  $sql.= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
+    $sql.= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 }
 
 if (! empty($contactname)) // acces a partir du module de recherche
 {
-  $sql.= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
-  $sortfield = "p.name";
-  $sortorder = "ASC";
+    $sql.= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
+    $sortfield = "p.name";
+    $sortorder = "ASC";
 }
 
 $sql.= $db->order($sortfield,$sortorder);
@@ -119,57 +119,57 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);
 
-	$param="&type=".$type;
+    $param="&type=".$type;
 
-	$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
-	print_barre_liste($title.($label?" (".$label.")":""),$page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,"",$num);
+    $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
+    print_barre_liste($title.($label?" (".$label.")":""),$page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,"",$num);
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'?type='.GETPOST("type", "alpha").'" method="GET">';
+    print '<form action="'.$_SERVER["PHP_SELF"].'?type='.GETPOST("type", "alpha").'" method="GET">';
 
-	print '<table class="liste" width="100%">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Lastname",$_SERVER["PHP_SELF"],"p.name", $begin, $param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Firstname",$_SERVER["PHP_SELF"],"p.firstname", $begin, $param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom", $begin, $param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Email");
-	print_liste_field_titre("Phone");
-	print "</tr>\n";
+    print '<table class="liste" width="100%">';
+    print '<tr class="liste_titre">';
+    print_liste_field_titre("Lastname",$_SERVER["PHP_SELF"],"p.name", $begin, $param,"",$sortfield,$sortorder);
+    print_liste_field_titre("Firstname",$_SERVER["PHP_SELF"],"p.firstname", $begin, $param,"",$sortfield,$sortorder);
+    print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom", $begin, $param,"",$sortfield,$sortorder);
+    print_liste_field_titre("Email");
+    print_liste_field_titre("Phone");
+    print "</tr>\n";
 
-	print '<tr class="liste_titre">';
-	print '<td class="liste_titre"><input class="flat" name="search_lastname" size="12" value="'.$search_lastname.'"></td>';
-	print '<td class="liste_titre"><input class="flat" name="search_firstname" size="12"  value="'.$search_firstname.'"></td>';
-	print '<td class="liste_titre"><input class="flat" name="search_company" size="12"  value="'.$search_company.'"></td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
-	print "</tr>\n";
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre"><input class="flat" name="search_lastname" size="12" value="'.$search_lastname.'"></td>';
+    print '<td class="liste_titre"><input class="flat" name="search_firstname" size="12"  value="'.$search_firstname.'"></td>';
+    print '<td class="liste_titre"><input class="flat" name="search_company" size="12"  value="'.$search_company.'"></td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
+    print "</tr>\n";
 
-	$i = 0;
-	while ($i < min($num,$limit))
-	{
-		$obj = $db->fetch_object($resql);
+    $i = 0;
+    while ($i < min($num,$limit))
+    {
+        $obj = $db->fetch_object($resql);
 
-		print '<tr class="oddeven">';
-		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"),"contact");
-		print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
-		print "<td>$obj->firstname</TD>";
+        print '<tr class="oddeven">';
+        print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"),"contact");
+        print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
+        print "<td>$obj->firstname</TD>";
 
-		print '<td><a href="'.$_SERVER["PHP_SELF"].'?type='.$type.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").'</a>&nbsp;';
-		print "<a href=\"".$urlfiche."?socid=".$obj->rowid."\">$obj->name</a></td>\n";
+        print '<td><a href="'.$_SERVER["PHP_SELF"].'?type='.$type.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").'</a>&nbsp;';
+        print "<a href=\"".$urlfiche."?socid=".$obj->rowid."\">$obj->name</a></td>\n";
 
-		print '<td>'.dol_print_phone($obj->email,$obj->cidp,$obj->rowid,'AC_EMAIL').'</td>';
+        print '<td>'.dol_print_phone($obj->email,$obj->cidp,$obj->rowid,'AC_EMAIL').'</td>';
 
-		print '<td>'.dol_print_phone($obj->phone,$obj->country_code,$obj->cidp,$obj->rowid,'AC_TEL').'&nbsp;</td>';
+        print '<td>'.dol_print_phone($obj->phone,$obj->country_code,$obj->cidp,$obj->rowid,'AC_TEL').'&nbsp;</td>';
 
-		print "</tr>\n";
-		$i++;
-	}
-	print "</table>";
+        print "</tr>\n";
+        $i++;
+    }
+    print "</table>";
 
-	print '</form>';
+    print '</form>';
 
-	$db->free($resql);
+    $db->free($resql);
 }
 else
 {

Braces +31 added lines, -12 removed lines

@@ -32,8 +32,12 @@ 
 $sortfield=GETPOST('sortfield', 'alpha');
 $sortorder=GETPOST('sortorder', 'alpha');
 $page=GETPOST('page', 'int');
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="p.name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="p.name";
+}
 if ($page < 0) { $page = 0; }
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
@@ -47,7 +51,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,'');
 
 
@@ -75,16 +81,28 @@ 
 $sql = "SELECT s.rowid, s.nom as name, st.libelle as stcomm";
 $sql.= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,";
-if (! $user->rights->societe->client->voir && ! $socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+}
 $sql.= " ".MAIN_DB_PREFIX."socpeople as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND p.entity IN (".getEntity('socpeople').")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($type == "c") $sql.= " AND s.client IN (1, 3)";
-if ($type == "p") $sql.= " AND s.client IN (2, 3)";
-if ($type == "f") $sql.= " AND s.fournisseur = 1";
-if ($socid) $sql.= " AND s.rowid = ".$socid;
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($type == "c") {
+    $sql.= " AND s.client IN (1, 3)";
+}
+if ($type == "p") {
+    $sql.= " AND s.client IN (2, 3)";
+}
+if ($type == "f") {
+    $sql.= " AND s.fournisseur = 1";
+}
+if ($socid) {
+    $sql.= " AND s.rowid = ".$socid;
+}
 
 if (dol_strlen($stcomm))
 {
@@ -106,9 +124,11 @@ 
   $sql.= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 }
 
-if (! empty($contactname)) // acces a partir du module de recherche
+if (! empty($contactname)) {
+    // acces a partir du module de recherche
 {
   $sql.= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
+}
   $sortfield = "p.name";
   $sortorder = "ASC";
 }
@@ -170,8 +190,7 @@ 
 	print '</form>';
 
 	$db->free($resql);
-}
-else
+} else
 {
     dol_print_error($db);
 }

Spacing +55 added lines, -55 removed lines

@@ -27,49 +27,49 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 
 // Load translation files required by the page
 $langs->load("companies");
 
-$sortfield=GETPOST('sortfield', 'alpha');
-$sortorder=GETPOST('sortorder', 'alpha');
-$page=GETPOST('page', 'int');
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="p.name";
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "p.name";
 if ($page < 0) { $page = 0; }
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$offset = $limit * $page ;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$offset = $limit * $page;
 
-$type=GETPOST('type', 'alpha');
-$search_lastname=GETPOST('search_nom')?GETPOST('search_nom'):GETPOST('search_lastname');			// For backward compatibility
-$search_firstname=GETPOST('search_firstname')?GETPOST('search_firstname'):GETPOST('search_firstname');	// For backward compatibility
-$search_company=GETPOST('search_societe')?GETPOST('search_societe'):GETPOST('search_company');		// For backward compatibility
-$contactname=GETPOST('contactname');
-$begin=GETPOST('begin','alpha');
+$type = GETPOST('type', 'alpha');
+$search_lastname = GETPOST('search_nom') ?GETPOST('search_nom') : GETPOST('search_lastname'); // For backward compatibility
+$search_firstname = GETPOST('search_firstname') ?GETPOST('search_firstname') : GETPOST('search_firstname'); // For backward compatibility
+$search_company = GETPOST('search_societe') ?GETPOST('search_societe') : GETPOST('search_company'); // For backward compatibility
+$contactname = GETPOST('contactname');
+$begin = GETPOST('begin', 'alpha');
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe',$socid,'');
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', $socid, '');
 
 
 /*
  * View
  */
 
-llxHeader('',$langs->trans("Contacts"));
+llxHeader('', $langs->trans("Contacts"));
 
 if ($type == "c" || $type == "p")
 {
   $label = $langs->trans("Customers");
-  $urlfiche="card.php";
+  $urlfiche = "card.php";
 }
 if ($type == "f")
 {
   $label = $langs->trans("Suppliers");
-  $urlfiche="card.php";
+  $urlfiche = "card.php";
 }
 
 /*
@@ -77,66 +77,66 @@ 
  */
 
 $sql = "SELECT s.rowid, s.nom as name, st.libelle as stcomm";
-$sql.= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,";
-if (! $user->rights->societe->client->voir && ! $socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
-$sql.= " ".MAIN_DB_PREFIX."socpeople as p";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
-$sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND p.entity IN (".getEntity('socpeople').")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($type == "c") $sql.= " AND s.client IN (1, 3)";
-if ($type == "p") $sql.= " AND s.client IN (2, 3)";
-if ($type == "f") $sql.= " AND s.fournisseur = 1";
-if ($socid) $sql.= " AND s.rowid = ".$socid;
+$sql .= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone";
+$sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+$sql .= " ".MAIN_DB_PREFIX."socpeople as p";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
+$sql .= " WHERE s.fk_stcomm = st.id";
+$sql .= " AND p.entity IN (".getEntity('socpeople').")";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($type == "c") $sql .= " AND s.client IN (1, 3)";
+if ($type == "p") $sql .= " AND s.client IN (2, 3)";
+if ($type == "f") $sql .= " AND s.fournisseur = 1";
+if ($socid) $sql .= " AND s.rowid = ".$socid;
 
 if (dol_strlen($stcomm))
 {
-  $sql.= " AND s.fk_stcomm=".$db->escape($stcomm);
+  $sql .= " AND s.fk_stcomm=".$db->escape($stcomm);
 }
 
-if (! empty($search_lastname))
+if (!empty($search_lastname))
 {
-  $sql.= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
+  $sql .= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
 }
 
-if (! empty($search_firstname))
+if (!empty($search_firstname))
 {
-  $sql.= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
+  $sql .= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
 }
 
-if (! empty($search_company))
+if (!empty($search_company))
 {
-  $sql.= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
+  $sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 }
 
-if (! empty($contactname)) // acces a partir du module de recherche
+if (!empty($contactname)) // acces a partir du module de recherche
 {
-  $sql.= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
+  $sql .= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
   $sortfield = "p.name";
   $sortorder = "ASC";
 }
 
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 
-	$param="&type=".$type;
+	$param = "&type=".$type;
 
-	$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
-	print_barre_liste($title.($label?" (".$label.")":""),$page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,"",$num);
+	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
+	print_barre_liste($title.($label ? " (".$label.")" : ""), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num);
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'?type='.GETPOST("type", "alpha").'" method="GET">';
 
 	print '<table class="liste" width="100%">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Lastname",$_SERVER["PHP_SELF"],"p.name", $begin, $param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Firstname",$_SERVER["PHP_SELF"],"p.firstname", $begin, $param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom", $begin, $param,"",$sortfield,$sortorder);
+	print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "p.name", $begin, $param, "", $sortfield, $sortorder);
+	print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "p.firstname", $begin, $param, "", $sortfield, $sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", $begin, $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Email");
 	print_liste_field_titre("Phone");
 	print "</tr>\n";
@@ -146,25 +146,25 @@ 
 	print '<td class="liste_titre"><input class="flat" name="search_firstname" size="12"  value="'.$search_firstname.'"></td>';
 	print '<td class="liste_titre"><input class="flat" name="search_company" size="12"  value="'.$search_company.'"></td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
+	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
 	print "</tr>\n";
 
 	$i = 0;
-	while ($i < min($num,$limit))
+	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
-		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"),"contact");
+		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"), "contact");
 		print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
 		print "<td>$obj->firstname</TD>";
 
-		print '<td><a href="'.$_SERVER["PHP_SELF"].'?type='.$type.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").'</a>&nbsp;';
+		print '<td><a href="'.$_SERVER["PHP_SELF"].'?type='.$type.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"), "company").'</a>&nbsp;';
 		print "<a href=\"".$urlfiche."?socid=".$obj->rowid."\">$obj->name</a></td>\n";
 
-		print '<td>'.dol_print_phone($obj->email,$obj->cidp,$obj->rowid,'AC_EMAIL').'</td>';
+		print '<td>'.dol_print_phone($obj->email, $obj->cidp, $obj->rowid, 'AC_EMAIL').'</td>';
 
-		print '<td>'.dol_print_phone($obj->phone,$obj->country_code,$obj->cidp,$obj->rowid,'AC_TEL').'&nbsp;</td>';
+		print '<td>'.dol_print_phone($obj->phone, $obj->country_code, $obj->cidp, $obj->rowid, 'AC_TEL').'&nbsp;</td>';
 
 		print "</tr>\n";
 		$i++;

dolibarr/htdocs/comm/recap-client.php

Indentation +5 added lines, -5 removed lines

@@ -34,8 +34,8 @@ 
 $socid = $_GET["socid"];
 if ($user->societe_id > 0)
 {
-  $action = '';
-  $socid = $user->societe_id;
+    $action = '';
+    $socid = $user->societe_id;
 }
 
 
@@ -54,7 +54,7 @@ 
     /*
      * Affichage onglets
      */
-	$head = societe_prepare_head($societe);
+    $head = societe_prepare_head($societe);
 
     dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
 
@@ -82,11 +82,11 @@ 
     print '</div>';
 
 
-	print $langs->trans("FeatureNotYetAvailable");
+    print $langs->trans("FeatureNotYetAvailable");
 }
 else
 {
-  	dol_print_error($db);
+        dol_print_error($db);
 }
 
 // End of page

Braces +7 added lines, -4 removed lines

@@ -28,7 +28,9 @@ 
 
 // Load translation files required by the page
 $langs->load("companies");
-if (! empty($conf->facture->enabled)) $langs->load("bills");
+if (! empty($conf->facture->enabled)) {
+    $langs->load("bills");
+}
 
 // Security check
 $socid = $_GET["socid"];
@@ -68,9 +70,11 @@ 
     print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
     // 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>'.$langs->trans("Prefix").'</td><td colspan="3">';
+    }
         print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
         print '</td></tr>';
     }
@@ -83,8 +87,7 @@ 
 
 
 	print $langs->trans("FeatureNotYetAvailable");
-}
-else
+} else
 {
   	dol_print_error($db);
 }

Spacing +4 added lines, -4 removed lines

@@ -25,14 +25,14 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 // Load translation files required by the page
 $langs->load("companies");
-if (! empty($conf->facture->enabled)) $langs->load("bills");
+if (!empty($conf->facture->enabled)) $langs->load("bills");
 
 // Security check
 $socid = $_GET["socid"];
@@ -72,10 +72,10 @@ 
     print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
     // 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>'.$langs->trans("Prefix").'</td><td colspan="3">';
-        print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
+        print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
         print '</td></tr>';
     }