alxarafe / alixar

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

Spacing +22 added lines, -22 removed lines

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

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

Spacing +195 added lines, -195 removed lines

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

dolibarr/htdocs/societe/tpl/linesalesrepresentative.tpl.php

Spacing +13 added lines, -13 removed lines

@@ -16,7 +16,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;
@@ -28,21 +28,21 @@ 
 print '</td>';
 print '<td>';
 
-$listsalesrepresentatives=$object->getSalesRepresentatives($user);
-$nbofsalesrepresentative=count($listsalesrepresentatives);
+$listsalesrepresentatives = $object->getSalesRepresentatives($user);
+$nbofsalesrepresentative = count($listsalesrepresentatives);
 if ($nbofsalesrepresentative > 0)
 {
-	$userstatic=new User($db);
-	foreach($listsalesrepresentatives as $val)
+	$userstatic = new User($db);
+	foreach ($listsalesrepresentatives as $val)
 	{
-		$userstatic->id=$val['id'];
-		$userstatic->login=$val['login'];
-		$userstatic->lastname=$val['lastname'];
-		$userstatic->firstname=$val['firstname'];
-		$userstatic->statut=$val['statut'];
-		$userstatic->photo=$val['photo'];
-		$userstatic->email=$val['email'];
-		$userstatic->entity=$val['entity'];
+		$userstatic->id = $val['id'];
+		$userstatic->login = $val['login'];
+		$userstatic->lastname = $val['lastname'];
+		$userstatic->firstname = $val['firstname'];
+		$userstatic->statut = $val['statut'];
+		$userstatic->photo = $val['photo'];
+		$userstatic->email = $val['email'];
+		$userstatic->entity = $val['entity'];
 		print $userstatic->getNomUrl(-1);
 		print ' ';
 	}

dolibarr/htdocs/societe/canvas/company/tpl/card_create.tpl.php

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,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;
@@ -60,7 +60,7 @@ 
 <tr>
 	<td><span class="fieldrequired"><?php echo $langs->trans('ThirdPartyName'); ?></span></td>
 	<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
-	<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+	<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
     <td><?php echo $langs->trans('Prefix'); ?></td>
     <td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
     <?php } ?>
@@ -103,7 +103,7 @@ 
 </tr>
 <?php } }?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
@@ -140,7 +140,7 @@ 
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?></td>
+	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?></td>
 	<td><input type="text" name="email" size="32" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<td><?php echo $langs->trans('Web'); ?></td>
 	<td><input type="text" name="url" size="32" value="<?php echo $this->control->tpl['url']; ?>"></td>
@@ -152,17 +152,17 @@ 
 </tr>
 
 <?php
-for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-') {
-		if ($i==1 || $i==3) echo '<tr>';
+for ($i = 1; $i <= 4; $i++) {
+	if ($this->control->tpl['langprofid'.$i] != '-') {
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	} else {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	}
 }
 ?>
@@ -179,7 +179,7 @@ 
 	<td><?php echo $this->control->tpl['select_workforce']; echo $this->control->tpl['info_admin']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_lang']; ?></td>
@@ -193,7 +193,7 @@ 
 	<td class="nowrap"><?php echo $this->control->tpl['tva_intra']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
 
 <?php if ($user->rights->societe->client->voir) { ?>
 <tr>

dolibarr/htdocs/societe/canvas/company/tpl/card_view.tpl.php

Spacing +23 added lines, -23 removed lines

@@ -16,7 +16,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;
@@ -32,7 +32,7 @@ 
 
 $head = societe_prepare_head($soc);
 
-dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
+dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
 ?>
 
@@ -47,7 +47,7 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td>
@@ -76,7 +76,7 @@ 
 </tr>
 <?php } ?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>
@@ -120,9 +120,9 @@ 
 </tr>
 
 <?php
-for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-')	{
-		if ($i==1 || $i==3) echo '<tr>';
+for ($i = 1; $i <= 4; $i++) {
+	if ($this->control->tpl['langprofid'.$i] != '-') {
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['profid'.$i];
 		if ($this->control->tpl['profid'.$i]) {
@@ -130,12 +130,12 @@ 
 			else echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
 		}
 		echo '</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	} else {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	}
 }
 ?>
@@ -147,7 +147,7 @@ 
 	<td><?php echo $this->control->tpl['tva_intra']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
 
 <tr>
 	<td><?php echo $langs->trans('Capital'); ?></td>
@@ -171,7 +171,7 @@ 
 	<td><?php echo $this->control->tpl['effectif']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['default_lang']; ?></td>
@@ -225,10 +225,10 @@ 
 		</tr>
 	</table>
 	</td>
-	<td colspan="3"><?php echo $this->control->tpl['sales_representatives'];	?></td>
+	<td colspan="3"><?php echo $this->control->tpl['sales_representatives']; ?></td>
 </tr>
 
-<?php if (! empty($conf->adherent->enabled)) { ?>
+<?php if (!empty($conf->adherent->enabled)) { ?>
 <tr>
 	<td width="25%" valign="top"><?php echo $langs->trans("LinkedToDolibarrMember"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['linked_member']; ?></td>
@@ -247,7 +247,7 @@ 
 <?php if ($user->rights->societe->supprimer) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
-	<?php }	else { ?>
+	<?php } else { ?>
 		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>
@@ -262,12 +262,12 @@ 
 /*
  * Documents generes
  */
-$filedir=$conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
-$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
-$genallowed=$user->rights->societe->lire;
-$delallowed=$user->rights->societe->creer;
+$filedir = $conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
+$urlsource = $_SERVER["PHP_SELF"]."?socid=".$socid;
+$genallowed = $user->rights->societe->lire;
+$delallowed = $user->rights->societe->creer;
 
-print $formfile->showdocuments('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$objcanvas->control->object->default_lang);
+print $formfile->showdocuments('company', $socid, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $objcanvas->control->object->default_lang);
 ?>
 
 </td>
@@ -279,13 +279,13 @@ 
 
 <?php
 // Subsidiaries list
-$result=show_subsidiaries($conf,$langs,$db,$soc);
+$result = show_subsidiaries($conf, $langs, $db, $soc);
 
 // Contacts list
-$result=show_contacts($conf,$langs,$db,$soc);
+$result = show_contacts($conf, $langs, $db, $soc);
 
 // Projects list
-$result=show_projects($conf,$langs,$db,$soc);
+$result = show_projects($conf, $langs, $db, $soc);
 ?>
 
 <!-- END PHP TEMPLATE -->
\ No newline at end of file

dolibarr/htdocs/societe/canvas/company/tpl/card_edit.tpl.php

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,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;
@@ -53,7 +53,7 @@ 
 	<td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
 </tr>
 
-<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 <tr>
 	<td><?php echo $langs->trans("Prefix"); ?></td>
 	<td colspan="3">
@@ -118,7 +118,7 @@ 
 </tr>
 <?php } }?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
@@ -155,24 +155,24 @@ 
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?></td>
+	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?></td>
 	<td><input type="text" name="email" size="32" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<td><?php echo $langs->trans('Web'); ?></td>
 	<td><input type="text" name="url" size="32" value="<?php echo $this->control->tpl['url']; ?>"></td>
 </tr>
 
 <?php
-for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-') {
-		if ($i==1 || $i==3) echo '<tr>';
+for ($i = 1; $i <= 4; $i++) {
+	if ($this->control->tpl['langprofid'.$i] != '-') {
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	} else {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	}
 }
 ?>
@@ -201,14 +201,14 @@ 
 	<td><?php echo $this->control->tpl['select_workforce']; echo $this->control->tpl['info_admin']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_lang']; ?></td>
 </tr>
 <?php } ?>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
 
 </table>
 <br>

dolibarr/htdocs/societe/canvas/company/actions_card_company.class.php

Spacing +44 added lines, -44 removed lines

@@ -40,11 +40,11 @@ 
 	 */
 	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-        $this->db				= $db;
-        $this->dirmodule		= $dirmodule;
-        $this->targetmodule		= $targetmodule;
-        $this->canvas			= $canvas;
-        $this->card				= $card;
+        $this->db = $db;
+        $this->dirmodule = $dirmodule;
+        $this->targetmodule = $targetmodule;
+        $this->canvas = $canvas;
+        $this->card = $card;
 	}
 
     /**
@@ -57,11 +57,11 @@ 
     {
         global $langs;
 
-        $out='';
+        $out = '';
 
-        if ($action == 'view')      $out.= $langs->trans("ThirdParty");
-        if ($action == 'edit')      $out.= $langs->trans("EditCompany");
-        if ($action == 'create')    $out.= $langs->trans("NewCompany");
+        if ($action == 'view')      $out .= $langs->trans("ThirdParty");
+        if ($action == 'edit')      $out .= $langs->trans("EditCompany");
+        if ($action == 'create')    $out .= $langs->trans("NewCompany");
 
         return $out;
     }
@@ -76,19 +76,19 @@ 
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-	function assign_values(&$action, $id=0, $ref='')
+	function assign_values(&$action, $id = 0, $ref = '')
 	{
         // phpcs:enable
 		global $conf, $langs, $user, $mysoc;
 		global $form, $formadmin, $formcompany;
 
-		$ret = $this->getObject($id,$ref);
+		$ret = $this->getObject($id, $ref);
 
 		parent::assign_values($action);
 
         $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
-        $this->tpl['profid1'] 	= $this->object->idprof1;
+        $this->tpl['profid1'] = $this->object->idprof1;
 		$this->tpl['profid2'] 	= $this->object->idprof2;
 		$this->tpl['profid3'] 	= $this->object->idprof3;
 		$this->tpl['profid4'] 	= $this->object->idprof4;
@@ -96,46 +96,46 @@ 
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
 		{
 			$js = "\n";
-	        $js.= '<script language="JavaScript" type="text/javascript">';
-	        $js.= "function CheckVAT(a) {\n";
-	        $js.= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
-	        $js.= "}\n";
-	        $js.= '</script>';
-	        $js.= "\n";
+	        $js .= '<script language="JavaScript" type="text/javascript">';
+	        $js .= "function CheckVAT(a) {\n";
+	        $js .= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
+	        $js .= "}\n";
+	        $js .= '</script>';
+	        $js .= "\n";
 			$this->tpl['js_checkVatPopup'] = $js;
 		}
 
 		if ($action == 'create' || $action == 'edit')
 		{
-			for ($i=1; $i<=4; $i++)
+			for ($i = 1; $i <= 4; $i++)
 			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i,'idprof'.$i,$this->tpl['profid'.$i],$this->object->country_code);
+				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i, $this->object->country_code);
+				$this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i, 'idprof'.$i, $this->tpl['profid'.$i], $this->object->country_code);
 			}
 
 			// Type
-			$this->tpl['select_companytype']	= $form->selectarray("typent_id",$formcompany->typent_array(0), $this->object->typent_id);
+			$this->tpl['select_companytype'] = $form->selectarray("typent_id", $formcompany->typent_array(0), $this->object->typent_id);
 
 			// Juridical Status
-			$this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code,$this->object->country_code);
+			$this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code, $this->object->country_code);
 
 			// Workforce
-			$this->tpl['select_workforce'] = $form->selectarray("effectif_id",$formcompany->effectif_array(0), $this->object->effectif_id);
+			$this->tpl['select_workforce'] = $form->selectarray("effectif_id", $formcompany->effectif_array(0), $this->object->effectif_id);
 
 			// VAT intra
-			$s='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+			$s = '<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
 			if (empty($conf->global->MAIN_DISABLEVATCHECK))
 			{
-				$s.=' ';
+				$s .= ' ';
 
 				if ($conf->use_javascript_ajax)
 				{
-					$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-					$this->tpl['tva_intra'] =  $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+					$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+					$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
 				}
 				else
 				{
-					$this->tpl['tva_intra'] =  $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+					$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 				}
 			}
 			else
@@ -148,33 +148,33 @@ 
 			// Confirm delete third party
 			if ($action == 'delete')
 			{
-				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"1,action-delete");
+				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "1,action-delete");
 			}
 
-			for ($i=1; $i<=4; $i++)
+			for ($i = 1; $i <= 4; $i++)
 			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i,$this->object);
-				$this->tpl['urlprofid'.$i]		= $this->object->id_prof_url($i,$this->object);
+				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i, $this->object->country_code);
+				$this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i, $this->object);
+				$this->tpl['urlprofid'.$i] = $this->object->id_prof_url($i, $this->object);
 			}
 
 			// TVA intra
 			if ($this->object->tva_intra)
 			{
-				$s=$this->object->tva_intra;
-				$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+				$s = $this->object->tva_intra;
+				$s .= '<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
 				if (empty($conf->global->MAIN_DISABLEVATCHECK))
 				{
-					$s.=' &nbsp; ';
+					$s .= ' &nbsp; ';
 
 					if ($conf->use_javascript_ajax)
 					{
-						$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-						$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+						$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+						$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
 					}
 					else
 					{
-						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 					}
 				}
 				else
@@ -192,8 +192,8 @@ 
 			{
 				$socm = new Societe($this->db);
 				$socm->fetch($this->object->parent);
-				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client?"(".$socm->code_client.")":"");
-				$this->tpl['parent_company'].= ($socm->town ? ' - ' . $socm->town : '');
+				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client ? "(".$socm->code_client.")" : "");
+				$this->tpl['parent_company'] .= ($socm->town ? ' - '.$socm->town : '');
 			}
 			else
 			{
@@ -215,8 +215,8 @@ 
 	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
 	 *  @return		int						1
 	 */
-	function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
+	function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
 	{
-		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+		return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
 	}
 }

dolibarr/htdocs/societe/canvas/actions_card_common.class.php

Spacing +130 added lines, -130 removed lines

@@ -45,7 +45,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -61,12 +61,12 @@ 
      *  @param		ref		$ref		Object ref
      *  @return		object				Object loaded
      */
-    protected function getObject($id,$ref='')
+    protected function getObject($id, $ref = '')
     {
     	//$ret = $this->getInstanceDao();
 
     	$object = new Societe($this->db);
-    	if (! empty($id) || ! empty($ref)) $object->fetch($id,$ref);
+    	if (!empty($id) || !empty($ref)) $object->fetch($id, $ref);
     	$this->object = $object;
     }
 
@@ -79,7 +79,7 @@ 
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
      */
-    function assign_values(&$action, $id=0, $ref='')
+    function assign_values(&$action, $id = 0, $ref = '')
     {
         // phpcs:enable
         global $conf, $langs, $user, $mysoc, $canvas;
@@ -87,19 +87,19 @@ 
 
         if ($action == 'add' || $action == 'update') $this->assign_post($action);
 
-        if ($_GET["type"]=='f')  		{ $this->object->fournisseur=1; }
-        if ($_GET["type"]=='c')  		{ $this->object->client=1; }
-        if ($_GET["type"]=='p')  		{ $this->object->client=2; }
-        if ($_GET["type"]=='cp') 		{ $this->object->client=3; }
-        if ($_REQUEST["private"]==1) 	{ $this->object->particulier=1;	}
+        if ($_GET["type"] == 'f') { $this->object->fournisseur = 1; }
+        if ($_GET["type"] == 'c') { $this->object->client = 1; }
+        if ($_GET["type"] == 'p') { $this->object->client = 2; }
+        if ($_GET["type"] == 'cp') { $this->object->client = 3; }
+        if ($_REQUEST["private"] == 1) { $this->object->particulier = 1; }
 
-        foreach($this->object as $key => $value)
+        foreach ($this->object as $key => $value)
         {
             $this->tpl[$key] = $value;
         }
 
-        $this->tpl['error'] = get_htmloutput_errors($this->object->error,$this->object->errors);
-        if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('',$GLOBALS['errors'],'error');
+        $this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
+        if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('', $GLOBALS['errors'], 'error');
 
         if ($action == 'create')
         {
@@ -140,15 +140,15 @@ 
 			}
 
             // Load object modCodeClient
-            $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+            $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
             if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
             {
-                $module = substr($module, 0, dol_strlen($module)-4);
+                $module = substr($module, 0, dol_strlen($module) - 4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
             $modCodeClient = new $module($db);
@@ -166,25 +166,25 @@ 
 
             // Customer
             $this->tpl['customercode'] = $this->object->code_client;
-            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object,0);
+            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object, 0);
             $this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
-            $s=$modCodeClient->getToolTip($langs,$this->object,0);
-            $this->tpl['help_customercode'] = $form->textwithpicto('',$s,1);
+            $s = $modCodeClient->getToolTip($langs, $this->object, 0);
+            $this->tpl['help_customercode'] = $form->textwithpicto('', $s, 1);
 
-            if (! empty($conf->fournisseur->enabled))
+            if (!empty($conf->fournisseur->enabled))
             {
             	$this->tpl['supplier_enabled'] = 1;
 
             	// Load object modCodeFournisseur
-            	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+            	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
             	if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
             	{
-            		$module = substr($module, 0, dol_strlen($module)-4);
+            		$module = substr($module, 0, dol_strlen($module) - 4);
             	}
-                $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+                $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
                 foreach ($dirsociete as $dirroot)
                 {
-                    $res=dol_include_once($dirroot.$module.'.php');
+                    $res = dol_include_once($dirroot.$module.'.php');
                     if ($res) break;
                 }
             	$modCodeFournisseur = new $module;
@@ -193,69 +193,69 @@ 
             	if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
 
             	// Supplier
-            	$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur",$this->object->fournisseur,1);
+            	$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur", $this->object->fournisseur, 1);
             	$this->tpl['suppliercode'] = $this->object->code_fournisseur;
-            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
+            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object, 1);
             	$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
-            	$s=$modCodeFournisseur->getToolTip($langs,$this->object,1);
-            	$this->tpl['help_suppliercode'] = $form->textwithpicto('',$s,1);
+            	$s = $modCodeFournisseur->getToolTip($langs, $this->object, 1);
+            	$this->tpl['help_suppliercode'] = $form->textwithpicto('', $s, 1);
 
             	$this->object->LoadSupplierCateg();
             	$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
             }
 
             // Zip
-            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
+            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 
             // Town
-            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town,'town',array('zipcode','selectcountry_id','state_id'));
+            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
             // Country
             $this->object->country_id = ($this->object->country_id ? $this->object->country_id : $mysoc->country_id);
             $this->object->country_code = ($this->object->country_code ? $this->object->country_code : $mysoc->country_code);
-            $this->tpl['select_country'] = $form->select_country($this->object->country_id,'country_id');
+            $this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
             $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
             // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id,$this->object->country_code);
+            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
             else $this->tpl['select_state'] = $countrynotdefined;
 
             // Language
-            if (! empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang?$this->object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
+            if (!empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang ? $this->object->default_lang : $conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1);
 
             // VAT
-            $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value',$this->tpl['tva_assuj'],1);	// Assujeti par defaut en creation
+            $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
 
             // Select users
             $this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 
             // Local Tax
             // TODO mettre dans une classe propre au pays
-            if($mysoc->country_code=='ES')
+            if ($mysoc->country_code == 'ES')
             {
                 $this->tpl['localtax'] = '';
 
-                if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-                    $this->tpl['localtax'].= $form->selectyesno('localtax1assuj_value',$this->object->localtax1_assuj,1);
-                    $this->tpl['localtax'].= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
-                    $this->tpl['localtax'].= $form->selectyesno('localtax2assuj_value',$this->object->localtax1_assuj,1);
-                    $this->tpl['localtax'].= '</td></tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
+                    $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
+                    $this->tpl['localtax'] .= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
+                    $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
+                    $this->tpl['localtax'] .= '</td></tr>';
                 }
-                elseif($mysoc->localtax1_assuj=="1")
+                elseif ($mysoc->localtax1_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-                    $this->tpl['localtax'].= $form->selectyesno('localtax1assuj_value',$this->object->localtax1_assuj,1);
-                    $this->tpl['localtax'].= '</td><tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
+                    $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
+                    $this->tpl['localtax'] .= '</td><tr>';
                 }
-                elseif($mysoc->localtax2_assuj=="1")
+                elseif ($mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-                    $this->tpl['localtax'].= $form->selectyesno('localtax2assuj_value',$this->object->localtax1_assuj,1);
-                    $this->tpl['localtax'].= '</td><tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
+                    $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
+                    $this->tpl['localtax'] .= '</td><tr>';
                 }
             }
         }
@@ -263,78 +263,78 @@ 
         {
             $head = societe_prepare_head($this->object);
 
-            $this->tpl['showhead']=dol_get_fiche_head($head, 'card', '', 0, 'company');
-            $this->tpl['showend']=dol_get_fiche_end();
+            $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
+            $this->tpl['showend'] = dol_get_fiche_end();
 
-            $this->tpl['showrefnav'] 		= $form->showrefnav($this->object,'socid','',($user->societe_id?0:1),'rowid','nom');
+            $this->tpl['showrefnav'] = $form->showrefnav($this->object, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
             $this->tpl['checkcustomercode'] = $this->object->check_codeclient();
             $this->tpl['checksuppliercode'] = $this->object->check_codefournisseur();
-            $this->tpl['address'] 			= dol_nl2br($this->object->address);
+            $this->tpl['address'] = dol_nl2br($this->object->address);
 
-            $img=picto_from_langcode($this->object->country_code);
-            if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img?$img.' ':'').$this->object->country,$langs->trans("CountryIsInEEC"),1,0);
-            $this->tpl['country'] = ($img?$img.' ':'').$this->object->country;
+            $img = picto_from_langcode($this->object->country_code);
+            if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 0);
+            $this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
-            $this->tpl['phone'] 	= dol_print_phone($this->object->phone,$this->object->country_code,0,$this->object->id,'AC_TEL');
-            $this->tpl['fax'] 		= dol_print_phone($this->object->fax,$this->object->country_code,0,$this->object->id,'AC_FAX');
-            $this->tpl['email'] 	= dol_print_email($this->object->email,0,$this->object->id,'AC_EMAIL');
+            $this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+            $this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
+            $this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
             $this->tpl['url'] 		= dol_print_url($this->object->url);
 
-            $this->tpl['tva_assuj']		= yn($this->object->tva_assuj);
+            $this->tpl['tva_assuj'] = yn($this->object->tva_assuj);
 
             // Third party type
             $arr = $formcompany->typent_array(1);
             $this->tpl['typent'] = $arr[$this->object->typent_code];
 
-            if (! empty($conf->global->MAIN_MULTILANGS))
+            if (!empty($conf->global->MAIN_MULTILANGS))
             {
                 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
                 //$s=picto_from_langcode($this->default_lang);
                 //print ($s?$s.' ':'');
                 $langs->load("languages");
-                $this->tpl['default_lang'] = ($this->default_lang?$langs->trans('Language_'.$this->object->default_lang):'');
+                $this->tpl['default_lang'] = ($this->default_lang ? $langs->trans('Language_'.$this->object->default_lang) : '');
             }
 
-            $this->tpl['image_edit']	= img_edit();
+            $this->tpl['image_edit'] = img_edit();
 
-            $this->tpl['display_rib']	= $this->object->display_rib();
+            $this->tpl['display_rib'] = $this->object->display_rib();
 
             // Sales representatives
             $this->tpl['sales_representatives'] = '';
-            $listsalesrepresentatives=$this->object->getSalesRepresentatives($user);
-            $nbofsalesrepresentative=count($listsalesrepresentatives);
+            $listsalesrepresentatives = $this->object->getSalesRepresentatives($user);
+            $nbofsalesrepresentative = count($listsalesrepresentatives);
             if ($nbofsalesrepresentative > 3)   // We print only number
             {
-            	$this->tpl['sales_representatives'].= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
-            	$this->tpl['sales_representatives'].= $nbofsalesrepresentative;
-            	$this->tpl['sales_representatives'].= '</a>';
+            	$this->tpl['sales_representatives'] .= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
+            	$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
+            	$this->tpl['sales_representatives'] .= '</a>';
             }
             else if ($nbofsalesrepresentative > 0)
             {
-            	$userstatic=new User($this->db);
-            	$i=0;
-            	foreach($listsalesrepresentatives as $val)
+            	$userstatic = new User($this->db);
+            	$i = 0;
+            	foreach ($listsalesrepresentatives as $val)
             	{
-            		$userstatic->id=$val['id'];
-            		$userstatic->lastname=$val['name'];
-            		$userstatic->firstname=$val['firstname'];
-            		$this->tpl['sales_representatives'].= $userstatic->getNomUrl(1);
+            		$userstatic->id = $val['id'];
+            		$userstatic->lastname = $val['name'];
+            		$userstatic->firstname = $val['firstname'];
+            		$this->tpl['sales_representatives'] .= $userstatic->getNomUrl(1);
             		$i++;
-            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'].= ', ';
+            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
             	}
             }
-            else $this->tpl['sales_representatives'].= $langs->trans("NoSalesRepresentativeAffected");
+            else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
 
             // Linked member
-            if (! empty($conf->adherent->enabled))
+            if (!empty($conf->adherent->enabled))
             {
                 $langs->load("members");
-                $adh=new Adherent($this->db);
-                $result=$adh->fetch('','',$this->object->id);
+                $adh = new Adherent($this->db);
+                $result = $adh->fetch('', '', $this->object->id);
                 if ($result > 0)
                 {
-                    $adh->ref=$adh->getFullName($langs);
+                    $adh->ref = $adh->getFullName($langs);
                     $this->tpl['linked_member'] = $adh->getNomUrl(1);
                 }
                 else
@@ -345,26 +345,26 @@ 
 
             // Local Tax
             // TODO mettre dans une classe propre au pays
-            if($mysoc->country_code=='ES')
+            if ($mysoc->country_code == 'ES')
             {
                 $this->tpl['localtax'] = '';
 
-                if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
-                    $this->tpl['localtax'].= '<td>'.yn($this->object->localtax1_assuj).'</td>';
-                    $this->tpl['localtax'].= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
-                    $this->tpl['localtax'].= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
+                    $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax1_assuj).'</td>';
+                    $this->tpl['localtax'] .= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
+                    $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
                 }
-                elseif($mysoc->localtax1_assuj=="1")
+                elseif ($mysoc->localtax1_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
-                    $this->tpl['localtax'].= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
+                    $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
                 }
-                elseif($mysoc->localtax2_assuj=="1")
+                elseif ($mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
-                    $this->tpl['localtax'].= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
+                    $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
                 }
             }
         }
@@ -382,47 +382,47 @@ 
         // phpcs:enable
         global $langs, $mysoc;
 
-        $this->object->id					=	$_POST["socid"];
-        $this->object->name					=	$_POST["nom"];
-        $this->object->prefix_comm			=	$_POST["prefix_comm"];
-        $this->object->client				=	$_POST["client"];
-        $this->object->code_client			=	$_POST["code_client"];
-        $this->object->fournisseur			=	$_POST["fournisseur"];
-        $this->object->code_fournisseur		=	$_POST["code_fournisseur"];
-        $this->object->address				=	$_POST["adresse"];
-        $this->object->zip					=	$_POST["zipcode"];
-        $this->object->town					=	$_POST["town"];
-        $this->object->country_id			=	$_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id;
-        $this->object->state_id		        =	$_POST["state_id"];
-        $this->object->phone				=	$_POST["tel"];
-        $this->object->fax					=	$_POST["fax"];
-        $this->object->email				=	$_POST["email"];
-        $this->object->url					=	$_POST["url"];
-        $this->object->capital				=	$_POST["capital"];
-        $this->object->idprof1				=	$_POST["idprof1"];
-        $this->object->idprof2				=	$_POST["idprof2"];
-        $this->object->idprof3				=	$_POST["idprof3"];
-        $this->object->idprof4				=	$_POST["idprof4"];
-        $this->object->typent_id			=	$_POST["typent_id"];
-        $this->object->effectif_id			=	$_POST["effectif_id"];
-        $this->object->barcode				=	$_POST["barcode"];
-        $this->object->forme_juridique_code	=	$_POST["forme_juridique_code"];
-        $this->object->default_lang			=	$_POST["default_lang"];
-        $this->object->commercial_id		=	$_POST["commercial_id"];
-
-        $this->object->tva_assuj 			= 	$_POST["assujtva_value"]?$_POST["assujtva_value"]:1;
-        $this->object->tva_intra			=	$_POST["tva_intra"];
+        $this->object->id = $_POST["socid"];
+        $this->object->name = $_POST["nom"];
+        $this->object->prefix_comm			= $_POST["prefix_comm"];
+        $this->object->client = $_POST["client"];
+        $this->object->code_client			= $_POST["code_client"];
+        $this->object->fournisseur			= $_POST["fournisseur"];
+        $this->object->code_fournisseur = $_POST["code_fournisseur"];
+        $this->object->address = $_POST["adresse"];
+        $this->object->zip = $_POST["zipcode"];
+        $this->object->town					= $_POST["town"];
+        $this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
+        $this->object->state_id = $_POST["state_id"];
+        $this->object->phone				= $_POST["tel"];
+        $this->object->fax					= $_POST["fax"];
+        $this->object->email				= $_POST["email"];
+        $this->object->url					= $_POST["url"];
+        $this->object->capital				= $_POST["capital"];
+        $this->object->idprof1				= $_POST["idprof1"];
+        $this->object->idprof2				= $_POST["idprof2"];
+        $this->object->idprof3				= $_POST["idprof3"];
+        $this->object->idprof4				= $_POST["idprof4"];
+        $this->object->typent_id = $_POST["typent_id"];
+        $this->object->effectif_id = $_POST["effectif_id"];
+        $this->object->barcode				= $_POST["barcode"];
+        $this->object->forme_juridique_code = $_POST["forme_juridique_code"];
+        $this->object->default_lang			= $_POST["default_lang"];
+        $this->object->commercial_id		= $_POST["commercial_id"];
+
+        $this->object->tva_assuj = $_POST["assujtva_value"] ? $_POST["assujtva_value"] : 1;
+        $this->object->tva_intra = $_POST["tva_intra"];
 
         //Local Taxes
-        $this->object->localtax1_assuj		= 	$_POST["localtax1assuj_value"];
-        $this->object->localtax2_assuj		= 	$_POST["localtax2assuj_value"];
+        $this->object->localtax1_assuj		= $_POST["localtax1assuj_value"];
+        $this->object->localtax2_assuj		= $_POST["localtax2assuj_value"];
 
         // We set country_id, and country_code label of the chosen country
         if ($this->object->country_id)
         {
-            $tmparray=getCountry($this->object->country_id,'all',$this->db,$langs,0);
-            $this->object->country_code	=	$tmparray['code'];
-            $this->object->country_label=	$tmparray['label'];
+            $tmparray = getCountry($this->object->country_id, 'all', $this->db, $langs, 0);
+            $this->object->country_code	= $tmparray['code'];
+            $this->object->country_label = $tmparray['label'];
         }
     }
 }

dolibarr/htdocs/societe/canvas/individual/tpl/card_create.tpl.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,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;
@@ -58,7 +58,7 @@ 
 <tr>
 	<td><span class="fieldrequired"><?php echo $langs->trans('LastName'); ?></span></td>
 	<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
-	<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+	<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
 	<?php } ?>
@@ -113,7 +113,7 @@ 
 </tr>
 <?php } }?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
@@ -150,13 +150,13 @@ 
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?></td>
+	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?></td>
 	<td><input type="text" name="email" size="32" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<td><?php echo $langs->trans('Web'); ?></td>
 	<td><input type="text" name="url" size="32" value="<?php echo $this->control->tpl['url']; ?>"></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_lang']; ?></td>
@@ -168,7 +168,7 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
 
 <?php if ($user->rights->societe->client->voir) { ?>
 <tr>