Dolibarr / dolibarr

htdocs/core/lib/geturl.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
  * @param	string    $param			    Parameters of URL (x=value1&y=value2) or may be a formated content with PUTALREADYFORMATED
  * @param	integer   $followlocation		1=Follow location, 0=Do not follow
  * @param	string[]  $addheaders			Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
- * @return	array						    Returns an associative array containing the response from the server array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
+ * @return	string						    Returns an associative array containing the response from the server array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
  */
 function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addheaders=array())
 {

Indentation +102 added lines, -102 removed lines

@@ -33,25 +33,25 @@ 
  */
 function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addheaders=array())
 {
-    //declaring of global variables
-    global $conf, $langs;
-    $USE_PROXY=empty($conf->global->MAIN_PROXY_USE)?0:$conf->global->MAIN_PROXY_USE;
-    $PROXY_HOST=empty($conf->global->MAIN_PROXY_HOST)?0:$conf->global->MAIN_PROXY_HOST;
-    $PROXY_PORT=empty($conf->global->MAIN_PROXY_PORT)?0:$conf->global->MAIN_PROXY_PORT;
-    $PROXY_USER=empty($conf->global->MAIN_PROXY_USER)?0:$conf->global->MAIN_PROXY_USER;
-    $PROXY_PASS=empty($conf->global->MAIN_PROXY_PASS)?0:$conf->global->MAIN_PROXY_PASS;
+	//declaring of global variables
+	global $conf, $langs;
+	$USE_PROXY=empty($conf->global->MAIN_PROXY_USE)?0:$conf->global->MAIN_PROXY_USE;
+	$PROXY_HOST=empty($conf->global->MAIN_PROXY_HOST)?0:$conf->global->MAIN_PROXY_HOST;
+	$PROXY_PORT=empty($conf->global->MAIN_PROXY_PORT)?0:$conf->global->MAIN_PROXY_PORT;
+	$PROXY_USER=empty($conf->global->MAIN_PROXY_USER)?0:$conf->global->MAIN_PROXY_USER;
+	$PROXY_PASS=empty($conf->global->MAIN_PROXY_PASS)?0:$conf->global->MAIN_PROXY_PASS;
 
 	dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
 
-    //setting the curl parameters.
-    $ch = curl_init();
+	//setting the curl parameters.
+	$ch = curl_init();
 
-    /*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
+	/*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
      print $USE_PROXY."-".$gv_ApiErrorURL."<br>";
      print $nvpStr;
      exit;*/
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_VERBOSE, 1);
+	curl_setopt($ch, CURLOPT_URL, $url);
+	curl_setopt($ch, CURLOPT_VERBOSE, 1);
 	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
 	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
@@ -64,99 +64,99 @@ 
 	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
-    //turning off the server and peer verification(TrustManager Concept).
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
-
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
-    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
-
-    //curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);		// We want response
-    if ($postorget == 'POST')
-    {
-    	curl_setopt($ch, CURLOPT_POST, 1);	// POST
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
-    }
-    else if ($postorget == 'PUT')
-    {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	if (! is_array($param)) parse_str($param, $array_param);
-    	else
-    	{
-    	    dol_syslog("parameter param must be a string", LOG_WARNING);
-    	    $array_param=$param;
-    	}
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
-    }
-    else if ($postorget == 'PUTALREADYFORMATED')
-    {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
-    }
-    else if ($postorget == 'HEAD')
-    {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
-    	curl_setopt($ch, CURLOPT_NOBODY, true);
-    }
-    else if ($postorget == 'DELETE')
-    {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
-    }
-    else
-    {
-    	curl_setopt($ch, CURLOPT_POST, 0);			// GET
-    }
-
-    //if USE_PROXY constant set at begin of this method.
-    if ($USE_PROXY)
-    {
-        dol_syslog("getURLContent set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
-        //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST. ":" . $PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
-    }
-
-    //getting response from server
-    $response = curl_exec($ch);
-
-    $request = curl_getinfo($ch, CURLINFO_HEADER_OUT);	// Reading of request must be done after sending request
-
-    dol_syslog("getURLContent request=".$request);
-    dol_syslog("getURLContent response=".$response);
-
-    $rep=array();
-    if (curl_errno($ch))
-    {
-        // Ad keys to $rep
-        $rep['content']=$response;
-
-        // moving to display page to display curl errors
+	//turning off the server and peer verification(TrustManager Concept).
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
+
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
+	curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+
+	//curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);		// We want response
+	if ($postorget == 'POST')
+	{
+		curl_setopt($ch, CURLOPT_POST, 1);	// POST
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
+	}
+	else if ($postorget == 'PUT')
+	{
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+		if (! is_array($param)) parse_str($param, $array_param);
+		else
+		{
+			dol_syslog("parameter param must be a string", LOG_WARNING);
+			$array_param=$param;
+		}
+		curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
+	}
+	else if ($postorget == 'PUTALREADYFORMATED')
+	{
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
+	}
+	else if ($postorget == 'HEAD')
+	{
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
+		curl_setopt($ch, CURLOPT_NOBODY, true);
+	}
+	else if ($postorget == 'DELETE')
+	{
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
+	}
+	else
+	{
+		curl_setopt($ch, CURLOPT_POST, 0);			// GET
+	}
+
+	//if USE_PROXY constant set at begin of this method.
+	if ($USE_PROXY)
+	{
+		dol_syslog("getURLContent set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
+		//curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
+		curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST. ":" . $PROXY_PORT);
+		if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+	}
+
+	//getting response from server
+	$response = curl_exec($ch);
+
+	$request = curl_getinfo($ch, CURLINFO_HEADER_OUT);	// Reading of request must be done after sending request
+
+	dol_syslog("getURLContent request=".$request);
+	dol_syslog("getURLContent response=".$response);
+
+	$rep=array();
+	if (curl_errno($ch))
+	{
+		// Ad keys to $rep
+		$rep['content']=$response;
+
+		// moving to display page to display curl errors
 		$rep['curl_error_no']=curl_errno($ch);
-        $rep['curl_error_msg']=curl_error($ch);
+		$rep['curl_error_msg']=curl_error($ch);
 
 		dol_syslog("getURLContent response array is ".join(',',$rep));
-    }
-    else
-    {
-    	$info = curl_getinfo($ch);
-
-    	// Ad keys to $rep
-    	$rep = $info;
-    	//$rep['header_size']=$info['header_size'];
-    	//$rep['http_code']=$info['http_code'];
-    	dol_syslog("getURLContent http_code=".$rep['http_code']);
-
-        // Add more keys to $rep
-        $rep['content']=$response;
-    	$rep['curl_error_no']='';
-    	$rep['curl_error_msg']='';
-
-    	//closing the curl
-        curl_close($ch);
-    }
-
-    return $rep;
+	}
+	else
+	{
+		$info = curl_getinfo($ch);
+
+		// Ad keys to $rep
+		$rep = $info;
+		//$rep['header_size']=$info['header_size'];
+		//$rep['http_code']=$info['http_code'];
+		dol_syslog("getURLContent http_code=".$rep['http_code']);
+
+		// Add more keys to $rep
+		$rep['content']=$response;
+		$rep['curl_error_no']='';
+		$rep['curl_error_msg']='';
+
+		//closing the curl
+		curl_close($ch);
+	}
+
+	return $rep;
 }
 
 

Spacing +36 added lines, -36 removed lines

@@ -31,15 +31,15 @@ 
  * @param	string[]  $addheaders			Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
  * @return	array						    Returns an associative array containing the response from the server array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
  */
-function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addheaders=array())
+function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array())
 {
     //declaring of global variables
     global $conf, $langs;
-    $USE_PROXY=empty($conf->global->MAIN_PROXY_USE)?0:$conf->global->MAIN_PROXY_USE;
-    $PROXY_HOST=empty($conf->global->MAIN_PROXY_HOST)?0:$conf->global->MAIN_PROXY_HOST;
-    $PROXY_PORT=empty($conf->global->MAIN_PROXY_PORT)?0:$conf->global->MAIN_PROXY_PORT;
-    $PROXY_USER=empty($conf->global->MAIN_PROXY_USER)?0:$conf->global->MAIN_PROXY_USER;
-    $PROXY_PASS=empty($conf->global->MAIN_PROXY_PASS)?0:$conf->global->MAIN_PROXY_PASS;
+    $USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ? 0 : $conf->global->MAIN_PROXY_USE;
+    $PROXY_HOST = empty($conf->global->MAIN_PROXY_HOST) ? 0 : $conf->global->MAIN_PROXY_HOST;
+    $PROXY_PORT = empty($conf->global->MAIN_PROXY_PORT) ? 0 : $conf->global->MAIN_PROXY_PORT;
+    $PROXY_USER = empty($conf->global->MAIN_PROXY_USER) ? 0 : $conf->global->MAIN_PROXY_USER;
+    $PROXY_PASS = empty($conf->global->MAIN_PROXY_PASS) ? 0 : $conf->global->MAIN_PROXY_PASS;
 
 	dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
 
@@ -54,45 +54,45 @@ 
     curl_setopt($ch, CURLOPT_VERBOSE, 1);
 	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
-	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
+	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation ?true:false)); // We use @ here because this may return warning if safe mode is on or open_basedir is on
 
 	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
-	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
+	curl_setopt($ch, CURLINFO_HEADER_OUT, true); // To be able to retrieve request header and log it
 
 	// By default use tls decied by PHP.
 	// You can force, if supported a version like TLSv1 or TLSv1.2
-	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+	if (!empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
     //turning off the server and peer verification(TrustManager Concept).
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
     curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
 
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
-    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
     //curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);		// We want response
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response
     if ($postorget == 'POST')
     {
-    	curl_setopt($ch, CURLOPT_POST, 1);	// POST
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
+    	curl_setopt($ch, CURLOPT_POST, 1); // POST
+    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
     }
     else if ($postorget == 'PUT')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	if (! is_array($param)) parse_str($param, $array_param);
+    	if (!is_array($param)) parse_str($param, $array_param);
     	else
     	{
     	    dol_syslog("parameter param must be a string", LOG_WARNING);
-    	    $array_param=$param;
+    	    $array_param = $param;
     	}
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
+    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
     }
     else if ($postorget == 'PUTALREADYFORMATED')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
+    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
     }
     else if ($postorget == 'HEAD')
     {
@@ -101,41 +101,41 @@ 
     }
     else if ($postorget == 'DELETE')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
+    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
     }
     else
     {
-    	curl_setopt($ch, CURLOPT_POST, 0);			// GET
+    	curl_setopt($ch, CURLOPT_POST, 0); // GET
     }
 
     //if USE_PROXY constant set at begin of this method.
     if ($USE_PROXY)
     {
-        dol_syslog("getURLContent set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
+        dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
         //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST. ":" . $PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
+        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
     }
 
     //getting response from server
     $response = curl_exec($ch);
 
-    $request = curl_getinfo($ch, CURLINFO_HEADER_OUT);	// Reading of request must be done after sending request
+    $request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
 
     dol_syslog("getURLContent request=".$request);
     dol_syslog("getURLContent response=".$response);
 
-    $rep=array();
+    $rep = array();
     if (curl_errno($ch))
     {
         // Ad keys to $rep
-        $rep['content']=$response;
+        $rep['content'] = $response;
 
         // moving to display page to display curl errors
-		$rep['curl_error_no']=curl_errno($ch);
-        $rep['curl_error_msg']=curl_error($ch);
+		$rep['curl_error_no'] = curl_errno($ch);
+        $rep['curl_error_msg'] = curl_error($ch);
 
-		dol_syslog("getURLContent response array is ".join(',',$rep));
+		dol_syslog("getURLContent response array is ".join(',', $rep));
     }
     else
     {
@@ -148,9 +148,9 @@ 
     	dol_syslog("getURLContent http_code=".$rep['http_code']);
 
         // Add more keys to $rep
-        $rep['content']=$response;
-    	$rep['curl_error_no']='';
-    	$rep['curl_error_msg']='';
+        $rep['content'] = $response;
+    	$rep['curl_error_no'] = '';
+    	$rep['curl_error_msg'] = '';
 
     	//closing the curl
         curl_close($ch);
@@ -169,9 +169,9 @@ 
  */
 function getDomainFromURL($url)
 {
-	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
-	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
-	$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)
-	$tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain);			// Remove part www. before domain name
+	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://
+	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after domain
+	$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove first level domain (.com, .net, ...)
+	$tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain); // Remove part www. before domain name
 	return $tmpdomain;
 }

Braces +18 added lines, -17 removed lines

@@ -56,12 +56,16 @@ 
 
 	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
 
-	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
+	if (count($addheaders)) {
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
+	}
 	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
 
 	// By default use tls decied by PHP.
 	// You can force, if supported a version like TLSv1 or TLSv1.2
-	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) {
+		curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+	}
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
     //turning off the server and peer verification(TrustManager Concept).
@@ -77,33 +81,29 @@ 
     {
     	curl_setopt($ch, CURLOPT_POST, 1);	// POST
     	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
-    }
-    else if ($postorget == 'PUT')
+    } else if ($postorget == 'PUT')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	if (! is_array($param)) parse_str($param, $array_param);
-    	else
+    	if (! is_array($param)) {
+    		parse_str($param, $array_param);
+    	} else
     	{
     	    dol_syslog("parameter param must be a string", LOG_WARNING);
     	    $array_param=$param;
     	}
     	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
-    }
-    else if ($postorget == 'PUTALREADYFORMATED')
+    } else if ($postorget == 'PUTALREADYFORMATED')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
     	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
-    }
-    else if ($postorget == 'HEAD')
+    } else if ($postorget == 'HEAD')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
     	curl_setopt($ch, CURLOPT_NOBODY, true);
-    }
-    else if ($postorget == 'DELETE')
+    } else if ($postorget == 'DELETE')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
-    }
-    else
+    } else
     {
     	curl_setopt($ch, CURLOPT_POST, 0);			// GET
     }
@@ -114,7 +114,9 @@ 
         dol_syslog("getURLContent set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
         //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
         curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST. ":" . $PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        if ($PROXY_USER) {
+        	curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        }
     }
 
     //getting response from server
@@ -136,8 +138,7 @@ 
         $rep['curl_error_msg']=curl_error($ch);
 
 		dol_syslog("getURLContent response array is ".join(',',$rep));
-    }
-    else
+    } else
     {
     	$info = curl_getinfo($ch);
 

htdocs/livraison/class/livraison.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -536,7 +536,7 @@
 	 * Update a livraison line (only extrafields)
 	 *
 	 * @param 	int		$id					Id of line (livraison line)
-	 * @param	array		$array_options		extrafields array
+	 * @param	integer		$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
 	function update_line($id, $array_options=0)

Indentation +76 added lines, -76 removed lines

@@ -86,7 +86,7 @@ 
 
 		$error = 0;
 
-        $now=dol_now();
+		$now=dol_now();
 
 		/* On positionne en mode brouillon le bon de livraison */
 		$this->brouillon = 1;
@@ -120,8 +120,8 @@ 
 		$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
 		$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
 		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", ".(int) $this->fk_incoterms;
+		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql.= ")";
 
 		dol_syslog("Livraison::create", LOG_DEBUG);
@@ -260,8 +260,8 @@ 
 		$sql.=" l.total_ht, l.fk_statut, l.fk_user_valid, l.note_private, l.note_public";
 		$sql.= ", l.date_delivery, l.fk_address, l.model_pdf";
 		$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
-        $sql.= ', l.fk_incoterms, l.location_incoterms';
-        $sql.= ", i.libelle as libelle_incoterms";
+		$sql.= ', l.fk_incoterms, l.location_incoterms';
+		$sql.= ", i.libelle as libelle_incoterms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."livraison as l";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
@@ -337,13 +337,13 @@ 
 	/**
 	 *        Validate object and update stock if option enabled
 	 *
-     *        @param 	User	$user        Object user that validate
-     *        @return   int
+	 *        @param 	User	$user        Object user that validate
+	 *        @return   int
 	 */
 	function valid($user)
 	{
 		global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		dol_syslog(get_class($this)."::valid begin");
 
@@ -351,8 +351,8 @@ 
 
 		$error = 0;
 
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison->creer))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
 		{
 			if (! empty($conf->global->LIVRAISON_ADDON_NUMBER))
 			{
@@ -371,14 +371,14 @@ 
 					$soc->fetch($this->socid);
 
 					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-		            {
-		                $numref = $objMod->livraison_get_num($soc,$this);
-		            }
-		            else
 					{
-		                $numref = $this->ref;
-		            }
-            		$this->newref = $numref;
+						$numref = $objMod->livraison_get_num($soc,$this);
+					}
+					else
+					{
+						$numref = $this->ref;
+					}
+					$this->newref = $numref;
 
 					// Tester si non deja au statut valide. Si oui, on arrete afin d'eviter
 					// de decrementer 2 fois le stock.
@@ -407,24 +407,24 @@ 
 					$sql.= " AND fk_statut = 0";
 
 					$resql=$this->db->query($sql);
-			        if (! $resql)
-			        {
-			            dol_print_error($this->db);
-			            $this->error=$this->db->lasterror();
-			            $error++;
-			        }
-
-			        if (! $error && ! $notrigger)
-			        {
-			            // Call trigger
-			            $result=$this->call_trigger('DELIVERY_VALIDATE',$user);
-			            if ($result < 0) $error++;
-			            // End call triggers
-			        }
+					if (! $resql)
+					{
+						dol_print_error($this->db);
+						$this->error=$this->db->lasterror();
+						$error++;
+					}
+
+					if (! $error && ! $notrigger)
+					{
+						// Call trigger
+						$result=$this->call_trigger('DELIVERY_VALIDATE',$user);
+						if ($result < 0) $error++;
+						// End call triggers
+					}
 
 					if (! $error)
 					{
-			            $this->oldref = $this->ref;
+						$this->oldref = $this->ref;
 
 						// Rename directory if dir was a temporary ref
 						if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -441,17 +441,17 @@ 
 
 								if (@rename($dirsource, $dirdest))
 								{
-			                        dol_syslog("Rename ok");
-			                        // Rename docs starting with $oldref with $newref
-			                        $listoffiles=dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-			                        foreach($listoffiles as $fileentry)
-			                        {
-			                        	$dirsource=$fileentry['name'];
-			                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-			                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-			                        	$dirdest=$fileentry['path'].'/'.$dirdest;
-			                        	@rename($dirsource, $dirdest);
-			                        }
+									dol_syslog("Rename ok");
+									// Rename docs starting with $oldref with $newref
+									$listoffiles=dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+									foreach($listoffiles as $fileentry)
+									{
+										$dirsource=$fileentry['name'];
+										$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+										$dirsource=$fileentry['path'].'/'.$dirsource;
+										$dirdest=$fileentry['path'].'/'.$dirdest;
+										@rename($dirsource, $dirdest);
+									}
 								}
 							}
 						}
@@ -466,16 +466,16 @@ 
 						dol_syslog(get_class($this)."::valid ok");
 					}
 
-			        if (! $error)
-			        {
-			            $this->db->commit();
-			            return 1;
-			        }
-			        else
+					if (! $error)
+					{
+						$this->db->commit();
+						return 1;
+					}
+					else
 					{
-			            $this->db->rollback();
-			            return -1;
-			        }
+						$this->db->rollback();
+						return -1;
+					}
 				}
 			}
 		}
@@ -616,7 +616,7 @@ 
 	{
 		global $conf, $langs, $user;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$this->db->begin();
 
 		$error=0;
@@ -660,14 +660,14 @@ 
 						}
 					}
 
-                    // Call trigger
-                    $result=$this->call_trigger('DELIVERY_DELETE',$user);
-                    if ($result < 0)
-                    {
-                        $this->db->rollback();
-                        return -4;
-                    }
-                    // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('DELIVERY_DELETE',$user);
+					if ($result < 0)
+					{
+						$this->db->rollback();
+						return -4;
+					}
+					// End call triggers
 
 					return 1;
 				}
@@ -697,7 +697,7 @@ 
 	 *	Return clicable name (with picto eventually)
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
 	function getNomUrl($withpicto=0, $save_lastsearch_value=-1)
@@ -711,16 +711,16 @@ 
 
 		$url=DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
 
-        //if ($option !== 'nolink')
-        //{
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-        //}
+		//if ($option !== 'nolink')
+		//{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		//}
 
 
-        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
 		if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
@@ -837,11 +837,11 @@ 
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	function initAsSpecimen()
 	{
@@ -849,7 +849,7 @@ 
 
 		$now=dol_now();
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";

Spacing +226 added lines, -226 removed lines

@@ -30,8 +30,8 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
 
 /**
@@ -39,16 +39,16 @@ 
  */
 class Livraison extends CommonObject
 {
-	public $element="delivery";
-	public $fk_element="fk_livraison";
-	public $table_element="livraison";
-	public $table_element_line="livraisondet";
+	public $element = "delivery";
+	public $fk_element = "fk_livraison";
+	public $table_element = "livraison";
+	public $table_element_line = "livraisondet";
 
 	var $brouillon;
 	var $socid;
 	var $ref_customer;
 
-	var $date_delivery;    // Date really received
+	var $date_delivery; // Date really received
 	var $date_creation;
 	var $date_valid;
 	var $model_pdf;
@@ -82,11 +82,11 @@ 
 
 		dol_syslog("Livraison::create");
 
-		if (empty($this->model_pdf)) $this->model_pdf=$conf->global->LIVRAISON_ADDON_PDF;
+		if (empty($this->model_pdf)) $this->model_pdf = $conf->global->LIVRAISON_ADDON_PDF;
 
 		$error = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
 		/* On positionne en mode brouillon le bon de livraison */
 		$this->brouillon = 1;
@@ -96,36 +96,36 @@ 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraison (";
-		$sql.= "ref";
-		$sql.= ", entity";
-		$sql.= ", fk_soc";
-		$sql.= ", ref_customer";
-		$sql.= ", date_creation";
-		$sql.= ", fk_user_author";
-		$sql.= ", date_delivery";
-		$sql.= ", fk_address";
-		$sql.= ", note_private";
-		$sql.= ", note_public";
-		$sql.= ", model_pdf";
-		$sql.= ", fk_incoterms, location_incoterms";
-		$sql.= ") VALUES (";
-		$sql.= "'(PROV)'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".$this->socid;
-		$sql.= ", '".$this->db->escape($this->ref_customer)."'";
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ".$user->id;
-		$sql.= ", ".($this->date_delivery?"'".$this->db->idate($this->date_delivery)."'":"null");
-		$sql.= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
-		$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ")";
+		$sql .= "ref";
+		$sql .= ", entity";
+		$sql .= ", fk_soc";
+		$sql .= ", ref_customer";
+		$sql .= ", date_creation";
+		$sql .= ", fk_user_author";
+		$sql .= ", date_delivery";
+		$sql .= ", fk_address";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", model_pdf";
+		$sql .= ", fk_incoterms, location_incoterms";
+		$sql .= ") VALUES (";
+		$sql .= "'(PROV)'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".$this->socid;
+		$sql .= ", '".$this->db->escape($this->ref_customer)."'";
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".$user->id;
+		$sql .= ", ".($this->date_delivery ? "'".$this->db->idate($this->date_delivery)."'" : "null");
+		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
+		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
+        $sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ")";
 
 		dol_syslog("Livraison::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."livraison");
@@ -133,14 +133,14 @@ 
 			$numref = "(PROV".$this->id.")";
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."livraison ";
-			$sql.= "SET ref = '".$this->db->escape($numref)."'";
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= "SET ref = '".$this->db->escape($numref)."'";
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog("Livraison::create", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				if (! $conf->expedition_bon->enabled)
+				if (!$conf->expedition_bon->enabled)
 				{
 					$commande = new Commande($this->db);
 					$commande->id = $this->commande_id;
@@ -151,19 +151,19 @@ 
 				/*
 				 *  Insertion des produits dans la base
 				 */
-				$num=count($this->lines);
+				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
-					$origin_id=$this->lines[$i]->origin_line_id;
-					if (! $origin_id) $origin_id=$this->lines[$i]->commande_ligne_id;	// For backward compatibility
+					$origin_id = $this->lines[$i]->origin_line_id;
+					if (!$origin_id) $origin_id = $this->lines[$i]->commande_ligne_id; // For backward compatibility
 
-					if (! $this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description))
+					if (!$this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description))
 					{
 						$error++;
 					}
 				}
 
-				if (! $error && $this->id && $this->origin_id)
+				if (!$error && $this->id && $this->origin_id)
 				{
 					$ret = $this->add_object_linked();
 					if (!$ret)
@@ -171,18 +171,18 @@ 
 						$error++;
 					}
 
-					if (! $conf->expedition_bon->enabled)
+					if (!$conf->expedition_bon->enabled)
 					{
 						// TODO uniformiser les statuts
-						$ret = $this->setStatut(2,$this->origin_id,$this->origin);
-						if (! $ret)
+						$ret = $this->setStatut(2, $this->origin_id, $this->origin);
+						if (!$ret)
 						{
 							$error++;
 						}
 					}
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					$this->db->commit();
 					return $this->id;
@@ -190,7 +190,7 @@ 
 				else
 				{
 					$error++;
-					$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
+					$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 					$this->db->rollback();
 					return -3;
 				}
@@ -198,7 +198,7 @@ 
 			else
 			{
 				$error++;
-				$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
+				$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 				$this->db->rollback();
 				return -2;
 			}
@@ -206,7 +206,7 @@ 
 		else
 		{
 			$error++;
-			$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
+			$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 			$this->db->rollback();
 			return -1;
 		}
@@ -228,19 +228,19 @@ 
 		$j = 0;
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraisondet (fk_livraison, fk_origin_line,";
-		$sql.= " fk_product, description, qty)";
-		$sql.= " VALUES (".$this->id.",".$origin_id.",";
-		$sql.= " ".($idprod>0?$idprod:"null").",";
-		$sql.= " ".($description?"'".$this->db->escape($description)."'":"null").",";
-		$sql.= $qty.")";
+		$sql .= " fk_product, description, qty)";
+		$sql .= " VALUES (".$this->id.",".$origin_id.",";
+		$sql .= " ".($idprod > 0 ? $idprod : "null").",";
+		$sql .= " ".($description ? "'".$this->db->escape($description)."'" : "null").",";
+		$sql .= $qty.")";
 
 		dol_syslog(get_class($this)."::create_line", LOG_DEBUG);
-		if (! $this->db->query($sql) )
+		if (!$this->db->query($sql))
 		{
 			$error++;
 		}
 
-		if ($error == 0 )
+		if ($error == 0)
 		{
 			return 1;
 		}
@@ -257,15 +257,15 @@ 
 		global $conf;
 
 		$sql = "SELECT l.rowid, l.fk_soc, l.date_creation, l.date_valid, l.ref, l.ref_customer, l.fk_user_author,";
-		$sql.=" l.total_ht, l.fk_statut, l.fk_user_valid, l.note_private, l.note_public";
-		$sql.= ", l.date_delivery, l.fk_address, l.model_pdf";
-		$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
-        $sql.= ', l.fk_incoterms, l.location_incoterms';
-        $sql.= ", i.libelle as libelle_incoterms";
-		$sql.= " FROM ".MAIN_DB_PREFIX."livraison as l";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
-		$sql.= " WHERE l.rowid = ".$id;
+		$sql .= " l.total_ht, l.fk_statut, l.fk_user_valid, l.note_private, l.note_public";
+		$sql .= ", l.date_delivery, l.fk_address, l.model_pdf";
+		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
+        $sql .= ', l.fk_incoterms, l.location_incoterms';
+        $sql .= ", i.libelle as libelle_incoterms";
+		$sql .= " FROM ".MAIN_DB_PREFIX."livraison as l";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
+		$sql .= " WHERE l.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -290,8 +290,8 @@ 
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
 				$this->modelpdf             = $obj->model_pdf;
-				$this->origin               = $obj->origin;		// May be 'shipping'
-				$this->origin_id            = $obj->origin_id;	// May be id of shipping
+				$this->origin               = $obj->origin; // May be 'shipping'
+				$this->origin_id            = $obj->origin_id; // May be id of shipping
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -305,14 +305,14 @@ 
 				// Retrieve all extrafields for delivery
 				// fetch optionals attributes and labels
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$extrafields = new ExtraFields($this->db);
+				$extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+				$this->fetch_optionals($this->id, $extralabels);
 
 				/*
 				 * Lignes
 				 */
-				$result=$this->fetch_lines();
+				$result = $this->fetch_lines();
 				if ($result < 0)
 				{
 					return -3;
@@ -322,14 +322,14 @@ 
 			}
 			else
 			{
-				$this->error='Delivery with id '.$id.' not found sql='.$sql;
+				$this->error = 'Delivery with id '.$id.' not found sql='.$sql;
 				dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -351,19 +351,19 @@ 
 
 		$error = 0;
 
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
+        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison_advance->validate)))
 		{
-			if (! empty($conf->global->LIVRAISON_ADDON_NUMBER))
+			if (!empty($conf->global->LIVRAISON_ADDON_NUMBER))
 			{
 				// Definition du nom de module de numerotation de commande
 				$modName = $conf->global->LIVRAISON_ADDON_NUMBER;
 
-				if (is_readable(DOL_DOCUMENT_ROOT .'/core/modules/livraison/'.$modName.'.php'))
+				if (is_readable(DOL_DOCUMENT_ROOT.'/core/modules/livraison/'.$modName.'.php'))
 				{
-					require_once DOL_DOCUMENT_ROOT .'/core/modules/livraison/'.$modName.'.php';
+					require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/'.$modName.'.php';
 
-					$now=dol_now();
+					$now = dol_now();
 
 					// Recuperation de la nouvelle reference
 					$objMod = new $modName($this->db);
@@ -372,7 +372,7 @@ 
 
 					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 		            {
-		                $numref = $objMod->livraison_get_num($soc,$this);
+		                $numref = $objMod->livraison_get_num($soc, $this);
 		            }
 		            else
 					{
@@ -383,12 +383,12 @@ 
 					// Tester si non deja au statut valide. Si oui, on arrete afin d'eviter
 					// de decrementer 2 fois le stock.
 					$sql = "SELECT ref";
-					$sql.= " FROM ".MAIN_DB_PREFIX."livraison";
-					$sql.= " WHERE ref = '".$this->db->escape($numref)."'";
-					$sql.= " AND fk_statut <> 0";
-					$sql.= " AND entity = ".$conf->entity;
+					$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+					$sql .= " WHERE ref = '".$this->db->escape($numref)."'";
+					$sql .= " AND fk_statut <> 0";
+					$sql .= " AND entity = ".$conf->entity;
 
-					$resql=$this->db->query($sql);
+					$resql = $this->db->query($sql);
 					if ($resql)
 					{
 						$num = $this->db->num_rows($resql);
@@ -399,30 +399,30 @@ 
 					}
 
 					$sql = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-					$sql.= " ref='".$this->db->escape($numref)."'";
-					$sql.= ", fk_statut = 1";
-					$sql.= ", date_valid = '".$this->db->idate($now)."'";
-					$sql.= ", fk_user_valid = ".$user->id;
-					$sql.= " WHERE rowid = ".$this->id;
-					$sql.= " AND fk_statut = 0";
-
-					$resql=$this->db->query($sql);
-			        if (! $resql)
+					$sql .= " ref='".$this->db->escape($numref)."'";
+					$sql .= ", fk_statut = 1";
+					$sql .= ", date_valid = '".$this->db->idate($now)."'";
+					$sql .= ", fk_user_valid = ".$user->id;
+					$sql .= " WHERE rowid = ".$this->id;
+					$sql .= " AND fk_statut = 0";
+
+					$resql = $this->db->query($sql);
+			        if (!$resql)
 			        {
 			            dol_print_error($this->db);
-			            $this->error=$this->db->lasterror();
+			            $this->error = $this->db->lasterror();
 			            $error++;
 			        }
 
-			        if (! $error && ! $notrigger)
+			        if (!$error && !$notrigger)
 			        {
 			            // Call trigger
-			            $result=$this->call_trigger('DELIVERY_VALIDATE',$user);
+			            $result = $this->call_trigger('DELIVERY_VALIDATE', $user);
 			            if ($result < 0) $error++;
 			            // End call triggers
 			        }
 
-					if (! $error)
+					if (!$error)
 					{
 			            $this->oldref = $this->ref;
 
@@ -443,13 +443,13 @@ 
 								{
 			                        dol_syslog("Rename ok");
 			                        // Rename docs starting with $oldref with $newref
-			                        $listoffiles=dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-			                        foreach($listoffiles as $fileentry)
+			                        $listoffiles = dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+			                        foreach ($listoffiles as $fileentry)
 			                        {
-			                        	$dirsource=$fileentry['name'];
-			                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-			                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-			                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+			                        	$dirsource = $fileentry['name'];
+			                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+			                        	$dirsource = $fileentry['path'].'/'.$dirsource;
+			                        	$dirdest = $fileentry['path'].'/'.$dirdest;
 			                        	@rename($dirsource, $dirdest);
 			                        }
 								}
@@ -457,7 +457,7 @@ 
 						}
 
 						// Set new ref and current status
-						if (! $error)
+						if (!$error)
 						{
 							$this->ref = $numref;
 							$this->statut = 1;
@@ -466,7 +466,7 @@ 
 						dol_syslog(get_class($this)."::valid ok");
 					}
 
-			        if (! $error)
+			        if (!$error)
 			        {
 			            $this->db->commit();
 			            return 1;
@@ -481,7 +481,7 @@ 
 		}
 		else
 		{
-			$this->error="Non autorise";
+			$this->error = "Non autorise";
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -497,11 +497,11 @@ 
 	function create_from_sending($user, $sending_id)
 	{
 		$expedition = new Expedition($this->db);
-		$result=$expedition->fetch($sending_id);
+		$result = $expedition->fetch($sending_id);
 
 		$this->lines = array();
 
-		$num=count($expedition->lines);
+		$num = count($expedition->lines);
 		for ($i = 0; $i < $num; $i++)
 		{
 			$line = new LivraisonLigne($this->db);
@@ -523,10 +523,10 @@ 
 		$this->date_delivery        = $expedition->date_delivery;
 		$this->fk_delivery_address  = $expedition->fk_delivery_address;
 		$this->socid                = $expedition->socid;
-		$this->ref_customer			= $expedition->ref_customer;
+		$this->ref_customer = $expedition->ref_customer;
 
 		//Incoterms
-		$this->fk_incoterms		= $expedition->fk_incoterms;
+		$this->fk_incoterms = $expedition->fk_incoterms;
 		$this->location_incoterms = $expedition->location_incoterms;
 
 		return $this->create($user);
@@ -539,26 +539,26 @@ 
 	 * @param	array		$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	function update_line($id, $array_options=0)
+	function update_line($id, $array_options = 0)
 	{
 		global $conf;
 		$error = 0;
 
-		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 		{
 			$livraisonline = new LivraisonLigne($this->db);
-			$livraisonline->array_options=$array_options;
-			$livraisonline->id=$id;
-			$result=$livraisonline->insertExtraFields();
+			$livraisonline->array_options = $array_options;
+			$livraisonline->id = $id;
+			$result = $livraisonline->insertExtraFields();
 
 			if ($result < 0)
 			{
-				$this->error[]=$livraisonline->error;
+				$this->error[] = $livraisonline->error;
 				$error++;
 			}
 		}
 
-		if (! $error) return 1;
+		if (!$error) return 1;
 		else return -1;
 	}
 
@@ -592,9 +592,9 @@ 
 		if ($this->statut == 0)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."commandedet";
-			$sql.= " WHERE rowid = ".$lineid;
+			$sql .= " WHERE rowid = ".$lineid;
 
-			if ($this->db->query($sql) )
+			if ($this->db->query($sql))
 			{
 				$this->update_price();
 
@@ -619,30 +619,30 @@ 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$this->db->begin();
 
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraisondet";
-		$sql.= " WHERE fk_livraison = ".$this->id;
+		$sql .= " WHERE fk_livraison = ".$this->id;
 		if ($this->db->query($sql))
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
 			if ($res < 0) $error++;
 
-			if (! $error)
+			if (!$error)
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraison";
-				$sql.= " WHERE rowid = ".$this->id;
+				$sql .= " WHERE rowid = ".$this->id;
 				if ($this->db->query($sql))
 				{
 					$this->db->commit();
 
 					// On efface le repertoire de pdf provisoire
 					$ref = dol_sanitizeFileName($this->ref);
-					if (! empty($conf->expedition->dir_output))
+					if (!empty($conf->expedition->dir_output))
 					{
-						$dir = $conf->expedition->dir_output . '/receipt/' . $ref ;
-						$file = $dir . '/' . $ref . '.pdf';
+						$dir = $conf->expedition->dir_output.'/receipt/'.$ref;
+						$file = $dir.'/'.$ref.'.pdf';
 						if (file_exists($file))
 						{
 							if (!dol_delete_file($file))
@@ -654,14 +654,14 @@ 
 						{
 							if (!dol_delete_dir($dir))
 							{
-								$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+								$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 								return 0;
 							}
 						}
 					}
 
                     // Call trigger
-                    $result=$this->call_trigger('DELIVERY_DELETE',$user);
+                    $result = $this->call_trigger('DELIVERY_DELETE', $user);
                     if ($result < 0)
                     {
                         $this->db->rollback();
@@ -673,21 +673,21 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror()." - sql=$sql";
+					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
 			}
 			else
 			{
-				$this->error=$this->db->lasterror()." - sql=$sql";
+				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror()." - sql=$sql";
+			$this->error = $this->db->lasterror()." - sql=$sql";
 			$this->db->rollback();
 			return -1;
 		}
@@ -700,32 +700,32 @@ 
      *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
 	{
 		global $langs;
 
-		$result='';
-		$picto='sending';
+		$result = '';
+		$picto = 'sending';
 
-		$label=$langs->trans("ShowReceiving").': '.$this->ref;
+		$label = $langs->trans("ShowReceiving").': '.$this->ref;
 
-		$url=DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
 
         //if ($option !== 'nolink')
         //{
         	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         //}
 
 
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+		$linkend = '</a>';
 
-		if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		$result.=$linkstart.$this->ref.$linkend;
+		if ($withpicto) $result .= ($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
 	}
 
@@ -739,12 +739,12 @@ 
 		$this->lines = array();
 
 		$sql = "SELECT ld.rowid, ld.fk_product, ld.description, ld.subprice, ld.total_ht, ld.qty as qty_shipped, ld.fk_origin_line, ";
-		$sql.= " cd.qty as qty_asked, cd.label as custom_label,";
-		$sql.= " p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on p.rowid = ld.fk_product";
-		$sql.= " WHERE ld.fk_origin_line = cd.rowid";
-		$sql.= " AND ld.fk_livraison = ".$this->id;
+		$sql .= " cd.qty as qty_asked, cd.label as custom_label,";
+		$sql .= " p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on p.rowid = ld.fk_product";
+		$sql .= " WHERE ld.fk_origin_line = cd.rowid";
+		$sql .= " AND ld.fk_livraison = ".$this->id;
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -758,23 +758,23 @@ 
 
 				$obj = $this->db->fetch_object($resql);
 
-				$line->id					= $obj->rowid;
-				$line->label			= $obj->custom_label;
+				$line->id = $obj->rowid;
+				$line->label = $obj->custom_label;
 				$line->description		= $obj->description;
-				$line->fk_product		= $obj->fk_product;
-				$line->qty_asked		= $obj->qty_asked;
+				$line->fk_product = $obj->fk_product;
+				$line->qty_asked = $obj->qty_asked;
 				$line->qty_shipped		= $obj->qty_shipped;
 
-				$line->ref				= $obj->product_ref;		// deprecated
-				$line->libelle			= $obj->product_label;		// deprecated
-				$line->product_label	= $obj->product_label;		// Product label
-				$line->product_ref		= $obj->product_ref;		// Product ref
-				$line->product_desc		= $obj->product_desc;		// Product description
+				$line->ref = $obj->product_ref; // deprecated
+				$line->libelle = $obj->product_label; // deprecated
+				$line->product_label	= $obj->product_label; // Product label
+				$line->product_ref = $obj->product_ref; // Product ref
+				$line->product_desc		= $obj->product_desc; // Product description
 				$line->product_type		= $obj->fk_product_type;
-				$line->fk_origin_line 	= $obj->fk_origin_line;
+				$line->fk_origin_line = $obj->fk_origin_line;
 
-				$line->price			= $obj->price;
-				$line->total_ht			= $obj->total_ht;
+				$line->price = $obj->price;
+				$line->total_ht = $obj->total_ht;
 
 				$this->lines[$i] = $line;
 
@@ -793,9 +793,9 @@ 
 	 *  @param	int			$mode		Mode
 	 *  @return string      			Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	/**
@@ -805,33 +805,33 @@ 
 	 *  @param  int			$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string					Label
 	 */
-	function LibStatut($statut,$mode)
+	function LibStatut($statut, $mode)
 	{
 		global $langs;
 
-		if ($mode==0)
+		if ($mode == 0)
 		{
-			if ($statut==-1) return $langs->trans('StatusDeliveryCanceled');
-			if ($statut==0)  return $langs->trans('StatusDeliveryDraft');
-			if ($statut==1)  return $langs->trans('StatusDeliveryValidated');
+			if ($statut == -1) return $langs->trans('StatusDeliveryCanceled');
+			if ($statut == 0)  return $langs->trans('StatusDeliveryDraft');
+			if ($statut == 1)  return $langs->trans('StatusDeliveryValidated');
 		}
-		if ($mode==1)
+		if ($mode == 1)
 		{
-			if ($statut==-1) return $langs->trans($this->statuts[$statut]);
-			if ($statut==0)  return $langs->trans($this->statuts[$statut]);
-			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
+			if ($statut == -1) return $langs->trans($this->statuts[$statut]);
+			if ($statut == 0)  return $langs->trans($this->statuts[$statut]);
+			if ($statut == 1)  return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 4)
 		{
-			if ($statut==-1) return img_picto($langs->trans('StatusDeliveryCanceled'),'statut5').' '.$langs->trans('StatusDeliveryCanceled');
-			if ($statut==0)  return img_picto($langs->trans('StatusDeliveryDraft'),'statut0').' '.$langs->trans('StatusDeliveryDraft');
-			if ($statut==1)  return img_picto($langs->trans('StatusDeliveryValidated'),'statut4').' '.$langs->trans('StatusDeliveryValidated');
+			if ($statut == -1) return img_picto($langs->trans('StatusDeliveryCanceled'), 'statut5').' '.$langs->trans('StatusDeliveryCanceled');
+			if ($statut == 0)  return img_picto($langs->trans('StatusDeliveryDraft'), 'statut0').' '.$langs->trans('StatusDeliveryDraft');
+			if ($statut == 1)  return img_picto($langs->trans('StatusDeliveryValidated'), 'statut4').' '.$langs->trans('StatusDeliveryValidated');
 		}
 		if ($mode == 6)
 		{
-			if ($statut==-1) return $langs->trans('StatusDeliveryCanceled').' '.img_picto($langs->trans('StatusDeliveryCanceled'),'statut5');
-			if ($statut==0)  return $langs->trans('StatusDeliveryDraft').' '.img_picto($langs->trans('StatusDeliveryDraft'),'statut0');
-			if ($statut==1)  return $langs->trans('StatusDeliveryValidated').' '.img_picto($langs->trans('StatusDeliveryValidated'),'statut4');
+			if ($statut == -1) return $langs->trans('StatusDeliveryCanceled').' '.img_picto($langs->trans('StatusDeliveryCanceled'), 'statut5');
+			if ($statut == 0)  return $langs->trans('StatusDeliveryDraft').' '.img_picto($langs->trans('StatusDeliveryDraft'), 'statut0');
+			if ($statut == 1)  return $langs->trans('StatusDeliveryValidated').' '.img_picto($langs->trans('StatusDeliveryValidated'), 'statut4');
 		}
 	}
 
@@ -845,17 +845,17 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		$now=dol_now();
+		$now = dol_now();
 
         // Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product').")";
-		$sql.= " AND tosell = 1";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= " AND tosell = 1";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -870,16 +870,16 @@ 
 		}
 
 		// Initialise parametres
-		$this->id=0;
+		$this->id = 0;
 		$this->ref = 'SPECIMEN';
-		$this->specimen=1;
+		$this->specimen = 1;
 		$this->socid = 1;
 		$this->date_delivery = $now;
-		$this->note_public='Public note';
-		$this->note_private='Private note';
+		$this->note_public = 'Public note';
+		$this->note_private = 'Private note';
 
-		$i=0;
-		$line=new LivraisonLigne($this->db);
+		$i = 0;
+		$line = new LivraisonLigne($this->db);
 		$line->fk_product     = $prodids[0];
 		$line->qty_asked      = 10;
 		$line->qty_shipped    = 9;
@@ -903,14 +903,14 @@ 
 		global $langs;
 
 		// Get the linked object
-		$this->fetchObjectLinked('','',$this->id,$this->element);
+		$this->fetchObjectLinked('', '', $this->id, $this->element);
 		//var_dump($this->linkedObjectIds);
 		// Get the product ref and qty in source
 		$sqlSourceLine = "SELECT st.rowid, st.description, st.qty";
-		$sqlSourceLine.= ", p.ref, p.label";
-		$sqlSourceLine.= " FROM ".MAIN_DB_PREFIX.$this->linkedObjectIds[0]['type']."det as st";
-		$sqlSourceLine.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON st.fk_product = p.rowid";
-		$sqlSourceLine.= " WHERE fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
+		$sqlSourceLine .= ", p.ref, p.label";
+		$sqlSourceLine .= " FROM ".MAIN_DB_PREFIX.$this->linkedObjectIds[0]['type']."det as st";
+		$sqlSourceLine .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON st.fk_product = p.rowid";
+		$sqlSourceLine .= " WHERE fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
 
 		$resultSourceLine = $this->db->query($sqlSourceLine);
 		if ($resultSourceLine)
@@ -924,15 +924,15 @@ 
 
 				// Recupere les lignes de la source deja livrees
 				$sql = "SELECT ld.fk_origin_line, sum(ld.qty) as qty";
-				$sql.= " FROM ".MAIN_DB_PREFIX."livraisondet as ld, ".MAIN_DB_PREFIX."livraison as l,";
-				$sql.= " ".MAIN_DB_PREFIX.$this->linked_object[0]['type']." as c";
-				$sql.= ", ".MAIN_DB_PREFIX.$this->linked_object[0]['type']."det as cd";
-				$sql.= " WHERE ld.fk_livraison = l.rowid";
-				$sql.= " AND ld.fk_origin_line = cd.rowid";
-				$sql.= " AND cd.fk_".$this->linked_object[0]['type']." = c.rowid";
-				$sql.= " AND cd.fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
-				$sql.= " AND ld.fk_origin_line = ".$objSourceLine->rowid;
-				$sql.= " GROUP BY ld.fk_origin_line";
+				$sql .= " FROM ".MAIN_DB_PREFIX."livraisondet as ld, ".MAIN_DB_PREFIX."livraison as l,";
+				$sql .= " ".MAIN_DB_PREFIX.$this->linked_object[0]['type']." as c";
+				$sql .= ", ".MAIN_DB_PREFIX.$this->linked_object[0]['type']."det as cd";
+				$sql .= " WHERE ld.fk_livraison = l.rowid";
+				$sql .= " AND ld.fk_origin_line = cd.rowid";
+				$sql .= " AND cd.fk_".$this->linked_object[0]['type']." = c.rowid";
+				$sql .= " AND cd.fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
+				$sql .= " AND ld.fk_origin_line = ".$objSourceLine->rowid;
+				$sql .= " GROUP BY ld.fk_origin_line";
 
 				$result = $this->db->query($sql);
 				$row = $this->db->fetch_row($result);
@@ -949,13 +949,13 @@ 
 					}
 
 					$array[$i]['ref'] = $objSourceLine->ref;
-					$array[$i]['label'] = $objSourceLine->label?$objSourceLine->label:$objSourceLine->description;
+					$array[$i]['label'] = $objSourceLine->label ? $objSourceLine->label : $objSourceLine->description;
 				}
-				elseif($objSourceLine->qty - $row[1] < 0)
+				elseif ($objSourceLine->qty - $row[1] < 0)
 				{
-					$array[$i]['qty'] = $objSourceLine->qty - $row[1]. " Erreur livraison !";
+					$array[$i]['qty'] = $objSourceLine->qty - $row[1]." Erreur livraison !";
 					$array[$i]['ref'] = $objSourceLine->ref;
-					$array[$i]['label'] = $objSourceLine->label?$objSourceLine->label:$objSourceLine->description;
+					$array[$i]['label'] = $objSourceLine->label ? $objSourceLine->label : $objSourceLine->description;
 				}
 
 					$i++;
@@ -964,7 +964,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error()." - sql=$sqlSourceLine";
+			$this->error = $this->db->error()." - sql=$sqlSourceLine";
 			return -1;
 		}
 	}
@@ -981,11 +981,11 @@ 
 		if ($user->rights->expedition->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."livraison";
-			$sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->date_delivery = $date_livraison;
@@ -993,7 +993,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
@@ -1013,19 +1013,19 @@ 
 	 *  @param     int			$hideref        Hide ref
 	 *  @return    int             				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs='',$hidedetails=0,$hidedesc=0,$hideref=0)
+	public function generateDocument($modele, $outputlangs = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
 		$langs->load("deliveries");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'typhon';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->LIVRAISON_ADDON_PDF)) {
+			} elseif (!empty($conf->global->LIVRAISON_ADDON_PDF)) {
 				$modele = $conf->global->LIVRAISON_ADDON_PDF;
 			}
 		}
@@ -1070,8 +1070,8 @@ 
 	var $price;
 	var $fk_product;
 	var $origin_id;
-	var $label;       // Label produit
-	var $description;  // Description produit
+	var $label; // Label produit
+	var $description; // Description produit
 	/**
 	 * @deprecated
 	 * @see product_ref
@@ -1086,8 +1086,8 @@ 
 	public $product_ref;
 	public $product_label;
 
-	public $element='livraisondet';
-	public $table_element='livraisondet';
+	public $element = 'livraisondet';
+	public $table_element = 'livraisondet';
 
 	/**
 	 *	Constructor
@@ -1096,7 +1096,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 }

Braces +98 added lines, -61 removed lines

@@ -30,8 +30,12 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (! empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
 
 
 /**
@@ -82,7 +86,9 @@ 
 
 		dol_syslog("Livraison::create");
 
-		if (empty($this->model_pdf)) $this->model_pdf=$conf->global->LIVRAISON_ADDON_PDF;
+		if (empty($this->model_pdf)) {
+			$this->model_pdf=$conf->global->LIVRAISON_ADDON_PDF;
+		}
 
 		$error = 0;
 
@@ -155,7 +161,10 @@ 
 				for ($i = 0; $i < $num; $i++)
 				{
 					$origin_id=$this->lines[$i]->origin_line_id;
-					if (! $origin_id) $origin_id=$this->lines[$i]->commande_ligne_id;	// For backward compatibility
+					if (! $origin_id) {
+						$origin_id=$this->lines[$i]->commande_ligne_id;
+					}
+					// For backward compatibility
 
 					if (! $this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description))
 					{
@@ -186,24 +195,21 @@ 
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
@@ -299,7 +305,9 @@ 
 				$this->libelle_incoterms = $obj->libelle_incoterms;
 				$this->db->free($result);
 
-				if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) {
+					$this->brouillon = 1;
+				}
 
 
 				// Retrieve all extrafields for delivery
@@ -319,15 +327,13 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error='Delivery with id '.$id.' not found sql='.$sql;
 				dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -370,11 +376,12 @@ 
 					$soc = new Societe($this->db);
 					$soc->fetch($this->socid);
 
-					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) {
+						// empty should not happened, but when it occurs, the test save life
 		            {
 		                $numref = $objMod->livraison_get_num($soc,$this);
-		            }
-		            else
+					}
+		            } else
 					{
 		                $numref = $this->ref;
 		            }
@@ -418,7 +425,9 @@ 
 			        {
 			            // Call trigger
 			            $result=$this->call_trigger('DELIVERY_VALIDATE',$user);
-			            if ($result < 0) $error++;
+			            if ($result < 0) {
+			            	$error++;
+			            }
 			            // End call triggers
 			        }
 
@@ -470,16 +479,14 @@ 
 			        {
 			            $this->db->commit();
 			            return 1;
-			        }
-			        else
+			        } else
 					{
 			            $this->db->rollback();
 			            return -1;
 			        }
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->error="Non autorise";
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -544,9 +551,11 @@ 
 		global $conf;
 		$error = 0;
 
-		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+			// For avoid conflicts if trigger used
 		{
 			$livraisonline = new LivraisonLigne($this->db);
+		}
 			$livraisonline->array_options=$array_options;
 			$livraisonline->id=$id;
 			$result=$livraisonline->insertExtraFields();
@@ -558,8 +567,11 @@ 
 			}
 		}
 
-		if (! $error) return 1;
-		else return -1;
+		if (! $error) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -599,8 +611,7 @@ 
 				$this->update_price();
 
 				return 1;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
@@ -627,7 +638,9 @@ 
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 
 			if (! $error)
 			{
@@ -670,22 +683,19 @@ 
                     // End call triggers
 
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror()." - sql=$sql";
 			$this->db->rollback();
@@ -715,16 +725,24 @@ 
         //{
         	// Add param to save lastsearch_values or not
         	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+        		$add_save_lastsearch_values=1;
+        	}
+        	if ($add_save_lastsearch_values) {
+        		$url.='&save_lastsearch_values=1';
+        	}
         //}
 
 
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
-		if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto) {
+			$result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result.=' ';
+		}
 		$result.=$linkstart.$this->ref.$linkend;
 		return $result;
 	}
@@ -811,27 +829,51 @@ 
 
 		if ($mode==0)
 		{
-			if ($statut==-1) return $langs->trans('StatusDeliveryCanceled');
-			if ($statut==0)  return $langs->trans('StatusDeliveryDraft');
-			if ($statut==1)  return $langs->trans('StatusDeliveryValidated');
+			if ($statut==-1) {
+				return $langs->trans('StatusDeliveryCanceled');
+			}
+			if ($statut==0) {
+				return $langs->trans('StatusDeliveryDraft');
+			}
+			if ($statut==1) {
+				return $langs->trans('StatusDeliveryValidated');
+			}
 		}
 		if ($mode==1)
 		{
-			if ($statut==-1) return $langs->trans($this->statuts[$statut]);
-			if ($statut==0)  return $langs->trans($this->statuts[$statut]);
-			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
+			if ($statut==-1) {
+				return $langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==0) {
+				return $langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==1) {
+				return $langs->trans($this->statuts[$statut]);
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut==-1) return img_picto($langs->trans('StatusDeliveryCanceled'),'statut5').' '.$langs->trans('StatusDeliveryCanceled');
-			if ($statut==0)  return img_picto($langs->trans('StatusDeliveryDraft'),'statut0').' '.$langs->trans('StatusDeliveryDraft');
-			if ($statut==1)  return img_picto($langs->trans('StatusDeliveryValidated'),'statut4').' '.$langs->trans('StatusDeliveryValidated');
+			if ($statut==-1) {
+				return img_picto($langs->trans('StatusDeliveryCanceled'),'statut5').' '.$langs->trans('StatusDeliveryCanceled');
+			}
+			if ($statut==0) {
+				return img_picto($langs->trans('StatusDeliveryDraft'),'statut0').' '.$langs->trans('StatusDeliveryDraft');
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans('StatusDeliveryValidated'),'statut4').' '.$langs->trans('StatusDeliveryValidated');
+			}
 		}
 		if ($mode == 6)
 		{
-			if ($statut==-1) return $langs->trans('StatusDeliveryCanceled').' '.img_picto($langs->trans('StatusDeliveryCanceled'),'statut5');
-			if ($statut==0)  return $langs->trans('StatusDeliveryDraft').' '.img_picto($langs->trans('StatusDeliveryDraft'),'statut0');
-			if ($statut==1)  return $langs->trans('StatusDeliveryValidated').' '.img_picto($langs->trans('StatusDeliveryValidated'),'statut4');
+			if ($statut==-1) {
+				return $langs->trans('StatusDeliveryCanceled').' '.img_picto($langs->trans('StatusDeliveryCanceled'),'statut5');
+			}
+			if ($statut==0) {
+				return $langs->trans('StatusDeliveryDraft').' '.img_picto($langs->trans('StatusDeliveryDraft'),'statut0');
+			}
+			if ($statut==1) {
+				return $langs->trans('StatusDeliveryValidated').' '.img_picto($langs->trans('StatusDeliveryValidated'),'statut4');
+			}
 		}
 	}
 
@@ -942,16 +984,14 @@ 
 					if ($row[0] == $objSourceLine->rowid)
 					{
 						$array[$i]['qty'] = $objSourceLine->qty - $row[1];
-					}
-					else
+					} else
 					{
 						$array[$i]['qty'] = $objSourceLine->qty;
 					}
 
 					$array[$i]['ref'] = $objSourceLine->ref;
 					$array[$i]['label'] = $objSourceLine->label?$objSourceLine->label:$objSourceLine->description;
-				}
-				elseif($objSourceLine->qty - $row[1] < 0)
+				} elseif($objSourceLine->qty - $row[1] < 0)
 				{
 					$array[$i]['qty'] = $objSourceLine->qty - $row[1]. " Erreur livraison !";
 					$array[$i]['ref'] = $objSourceLine->ref;
@@ -961,8 +1001,7 @@ 
 					$i++;
 			}
 			return $array;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error()." - sql=$sqlSourceLine";
 			return -1;
@@ -990,14 +1029,12 @@ 
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}

htdocs/core/class/html.formadmin.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -334,7 +334,7 @@
 	 *
 	 *    	@param      string	$selected       Paper format pre-selected
 	 *    	@param      string	$htmlname       Name of HTML select field
-	 * 		@param		string	$filter			Value to filter on code
+	 * 		@param		integer	$filter			Value to filter on code
 	 * 		@param		int		$showempty		Add empty value
 	 * 		@return		string					Return HTML output
 	 */

Indentation +138 added lines, -138 removed lines

@@ -87,8 +87,8 @@ 
 
 		foreach ($langs_available as $key => $value)
 		{
-		    $valuetoshow=$value;
-		    if ($showcode) $valuetoshow=$key.' - '.$value;
+			$valuetoshow=$value;
+			if ($showcode) $valuetoshow=$key.' - '.$value;
 
 			if ($filter && is_array($filter))
 			{
@@ -109,79 +109,79 @@ 
 		$out.= '</select>';
 
 		// Make select dynamic
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-        $out.= ajax_combobox($htmlname);
+		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+		$out.= ajax_combobox($htmlname);
 
 		return $out;
 	}
 
 	/**
-     *    Return list of available menus (eldy_backoffice, ...)
-     *
-     *    @param	string		$selected        Preselected menu value
-     *    @param    string		$htmlname        Name of html select
-     *    @param    array		$dirmenuarray    Array of directories to scan
-     *    @param    string		$moreattrib      More attributes on html select tag
-     *    @return	integer|null
-     */
-    function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib='')
-    {
-        global $langs,$conf;
+	 *    Return list of available menus (eldy_backoffice, ...)
+	 *
+	 *    @param	string		$selected        Preselected menu value
+	 *    @param    string		$htmlname        Name of html select
+	 *    @param    array		$dirmenuarray    Array of directories to scan
+	 *    @param    string		$moreattrib      More attributes on html select tag
+	 *    @return	integer|null
+	 */
+	function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib='')
+	{
+		global $langs,$conf;
 
-        // Clean parameters
+		// Clean parameters
 
 
-        // Check parameters
-        if (! is_array($dirmenuarray)) return -1;
+		// Check parameters
+		if (! is_array($dirmenuarray)) return -1;
 
 		$menuarray=array();
-        foreach ($conf->file->dol_document_root as $dirroot)
-        {
-            foreach($dirmenuarray as $dirtoscan)
-            {
-                $dir=$dirroot.$dirtoscan;
-                //print $dir.'<br>';
-                if (is_dir($dir))
-                {
-    	            $handle=opendir($dir);
-    	            if (is_resource($handle))
-    	            {
-    	                while (($file = readdir($handle))!==false)
-    	                {
-    	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
-    	                    {
-    	                        if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
-    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
-    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-
-    	                        $filelib=preg_replace('/\.php$/i','',$file);
-    	        				$prefix='';
-    	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-    	        				if (preg_match('/^eldy/i',$file)) $prefix='0';
-                                else if (preg_match('/^smartphone/i',$file)) $prefix='2';
-    	        				else $prefix='3';
-
-    	                        if ($file == $selected)
-    	                        {
-    	        					$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        }
-    	                        else
-    	                        {
-    	                            $menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
-    	                        }
-    	                    }
-    	                }
-    	                closedir($handle);
-    	            }
-                }
-            }
-        }
+		foreach ($conf->file->dol_document_root as $dirroot)
+		{
+			foreach($dirmenuarray as $dirtoscan)
+			{
+				$dir=$dirroot.$dirtoscan;
+				//print $dir.'<br>';
+				if (is_dir($dir))
+				{
+					$handle=opendir($dir);
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle))!==false)
+						{
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
+							{
+								if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
+								if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
+								if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+								if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+
+								$filelib=preg_replace('/\.php$/i','',$file);
+								$prefix='';
+								// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
+								if (preg_match('/^eldy/i',$file)) $prefix='0';
+								else if (preg_match('/^smartphone/i',$file)) $prefix='2';
+								else $prefix='3';
+
+								if ($file == $selected)
+								{
+									$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
+								}
+								else
+								{
+									$menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
+								}
+							}
+						}
+						closedir($handle);
+					}
+				}
+			}
+		}
 		ksort($menuarray);
 
 		// Output combo list of menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-        $oldprefix='';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+		$oldprefix='';
 		foreach ($menuarray as $key => $val)
 		{
 			$tab=explode('_',$key);
@@ -193,7 +193,7 @@ 
 				// Affiche titre
 				print '<option value="-1" disabled>';
 				if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
-                if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
+				if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
 				if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
 				if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
 				print '</option>';
@@ -202,67 +202,67 @@ 
 			print $val."\n";	// Show menu entry
 		}
 		print '</select>';
-    }
-
-    /**
-     *  Return combo list of available menu families
-     *
-     *  @param	string		$selected        Menu pre-selected
-     *  @param	string		$htmlname        Name of html select
-     *  @param	string[]	$dirmenuarray    Directories to scan
-     *  @return	void
-     */
-    function select_menu_families($selected, $htmlname, $dirmenuarray)
-    {
+	}
+
+	/**
+	 *  Return combo list of available menu families
+	 *
+	 *  @param	string		$selected        Menu pre-selected
+	 *  @param	string		$htmlname        Name of html select
+	 *  @param	string[]	$dirmenuarray    Directories to scan
+	 *  @return	void
+	 */
+	function select_menu_families($selected, $htmlname, $dirmenuarray)
+	{
 		global $langs,$conf;
 
-        //$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
+		//$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
 		$expdevmenu=array();
 
 		$menuarray=array();
 
 		foreach($dirmenuarray as $dirmenu)
 		{
-            foreach ($conf->file->dol_document_root as $dirroot)
-            {
-                $dir=$dirroot.$dirmenu;
-                if (is_dir($dir))
-                {
-	                $handle=opendir($dir);
-	                if (is_resource($handle))
-	                {
-	        			while (($file = readdir($handle))!==false)
-	        			{
-	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-	        				{
-	        					$filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
-	        					if (preg_match('/^index/i',$filelib)) continue;
-	        					if (preg_match('/^default/i',$filelib)) continue;
-	        					if (preg_match('/^empty/i',$filelib)) continue;
-	        					if (preg_match('/\.lib/i',$filelib)) continue;
-	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
-
-	        					$menuarray[$filelib]=1;
-	        				}
-	        				$menuarray['all']=1;
-	        			}
-	        			closedir($handle);
-	                }
-                }
-            }
+			foreach ($conf->file->dol_document_root as $dirroot)
+			{
+				$dir=$dirroot.$dirmenu;
+				if (is_dir($dir))
+				{
+					$handle=opendir($dir);
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle))!==false)
+						{
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+							{
+								$filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
+								if (preg_match('/^index/i',$filelib)) continue;
+								if (preg_match('/^default/i',$filelib)) continue;
+								if (preg_match('/^empty/i',$filelib)) continue;
+								if (preg_match('/\.lib/i',$filelib)) continue;
+								if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
+
+								$menuarray[$filelib]=1;
+							}
+							$menuarray['all']=1;
+						}
+						closedir($handle);
+					}
+				}
+			}
 		}
 
 		ksort($menuarray);
 
 		// Affichage liste deroulante des menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-        $oldprefix='';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		$oldprefix='';
 		foreach ($menuarray as $key => $val)
 		{
 			$tab=explode('_',$key);
 			$newprefix=$tab[0];
 			print '<option value="'.$key.'"';
-            if ($key == $selected)
+			if ($key == $selected)
 			{
 				print '	selected';
 			}
@@ -272,21 +272,21 @@ 
 			print '</option>'."\n";
 		}
 		print '</select>';
-    }
-
-
-    /**
-     *  Return a HTML select list of timezones
-     *
-     *  @param	string		$selected        Menu pre-selectionnee
-     *  @param  string		$htmlname        Nom de la zone select
-     *  @return	void
-     */
-    function select_timezone($selected,$htmlname)
-    {
+	}
+
+
+	/**
+	 *  Return a HTML select list of timezones
+	 *
+	 *  @param	string		$selected        Menu pre-selectionnee
+	 *  @param  string		$htmlname        Nom de la zone select
+	 *  @return	void
+	 */
+	function select_timezone($selected,$htmlname)
+	{
 		global $langs,$conf;
 
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 		print '<option value="-1">&nbsp;</option>';
 
 		$arraytz=array(
@@ -345,24 +345,24 @@ 
 		$sql = "SELECT code, label, width, height, unit";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_paper_format";
 		$sql.= " WHERE active=1";
-        if ($filter) $sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $num=$this->db->num_rows($resql);
-            $i=0;
-            while ($i < $num)
-            {
-                $obj=$this->db->fetch_object($resql);
-                $unitKey = $langs->trans('SizeUnit'.$obj->unit);
-
-                $paperformat[$obj->code]= $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
-
-                $i++;
-            }
-        }
-        else
+		if ($filter) $sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num=$this->db->num_rows($resql);
+			$i=0;
+			while ($i < $num)
+			{
+				$obj=$this->db->fetch_object($resql);
+				$unitKey = $langs->trans('SizeUnit'.$obj->unit);
+
+				$paperformat[$obj->code]= $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
+
+				$i++;
+			}
+		}
+		else
 		{
 			dol_print_error($this->db);
 			return '';
@@ -378,7 +378,7 @@ 
 		}
 		foreach ($paperformat as $key => $value)
 		{
-            if ($selected == $key)
+			if ($selected == $key)
 			{
 				$out.= '<option value="'.$key.'" selected>'.$value.'</option>';
 			}

Spacing +92 added lines, -92 removed lines

@@ -58,59 +58,59 @@ 
 	 *      @param      int         $showcode       Add language code into label
 	 *      @return		string						Return HTML select string with list of languages
 	 */
-	function select_language($selected='', $htmlname='lang_id', $showauto=0, $filter=null, $showempty='', $showwarning=0, $disabled=0, $morecss='', $showcode=0)
+	function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0)
 	{
 		global $langs;
 
-		$langs_available=$langs->get_available_languages(DOL_DOCUMENT_ROOT,12);
+		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
 
-		$out='';
+		$out = '';
 
-		$out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').'>';
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled ? ' disabled' : '').'>';
 		if ($showempty)
 		{
-			$out.= '<option value="0"';
-			if ($selected == '') $out.= ' selected';
-			$out.= '>';
-			if ($showempty != '1') $out.=$showempty;
-			else $out.='&nbsp;';
-			$out.='</option>';
+			$out .= '<option value="0"';
+			if ($selected == '') $out .= ' selected';
+			$out .= '>';
+			if ($showempty != '1') $out .= $showempty;
+			else $out .= '&nbsp;';
+			$out .= '</option>';
 		}
 		if ($showauto)
 		{
-			$out.= '<option value="auto"';
-			if ($selected == 'auto') $out.= ' selected';
-			$out.= '>'.$langs->trans("AutoDetectLang").'</option>';
+			$out .= '<option value="auto"';
+			if ($selected == 'auto') $out .= ' selected';
+			$out .= '>'.$langs->trans("AutoDetectLang").'</option>';
 		}
 
 		asort($langs_available);
 
 		foreach ($langs_available as $key => $value)
 		{
-		    $valuetoshow=$value;
-		    if ($showcode) $valuetoshow=$key.' - '.$value;
+		    $valuetoshow = $value;
+		    if ($showcode) $valuetoshow = $key.' - '.$value;
 
 			if ($filter && is_array($filter))
 			{
-				if ( ! array_key_exists($key, $filter))
+				if (!array_key_exists($key, $filter))
 				{
-					$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
+					$out .= '<option value="'.$key.'">'.$valuetoshow.'</option>';
 				}
 			}
 			else if ($selected == $key)
 			{
-				$out.= '<option value="'.$key.'" selected>'.$valuetoshow.'</option>';
+				$out .= '<option value="'.$key.'" selected>'.$valuetoshow.'</option>';
 			}
 			else
 			{
-				$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
+				$out .= '<option value="'.$key.'">'.$valuetoshow.'</option>';
 			}
 		}
-		$out.= '</select>';
+		$out .= '</select>';
 
 		// Make select dynamic
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-        $out.= ajax_combobox($htmlname);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+        $out .= ajax_combobox($htmlname);
 
 		return $out;
 	}
@@ -124,51 +124,51 @@ 
      *    @param    string		$moreattrib      More attributes on html select tag
      *    @return	integer|null
      */
-    function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib='')
+    function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
         // Clean parameters
 
 
         // Check parameters
-        if (! is_array($dirmenuarray)) return -1;
+        if (!is_array($dirmenuarray)) return -1;
 
-		$menuarray=array();
+		$menuarray = array();
         foreach ($conf->file->dol_document_root as $dirroot)
         {
-            foreach($dirmenuarray as $dirtoscan)
+            foreach ($dirmenuarray as $dirtoscan)
             {
-                $dir=$dirroot.$dirtoscan;
+                $dir = $dirroot.$dirtoscan;
                 //print $dir.'<br>';
                 if (is_dir($dir))
                 {
-    	            $handle=opendir($dir);
+    	            $handle = opendir($dir);
     	            if (is_resource($handle))
     	            {
-    	                while (($file = readdir($handle))!==false)
+    	                while (($file = readdir($handle)) !== false)
     	                {
     	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
     	                    {
-    	                        if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
-    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
-    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+    	                        if (preg_match('/lib\.php$/i', $file)) continue; // We exclude library files
+    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
 
-    	                        $filelib=preg_replace('/\.php$/i','',$file);
-    	        				$prefix='';
+    	                        $filelib = preg_replace('/\.php$/i', '', $file);
+    	        				$prefix = '';
     	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-    	        				if (preg_match('/^eldy/i',$file)) $prefix='0';
-                                else if (preg_match('/^smartphone/i',$file)) $prefix='2';
-    	        				else $prefix='3';
+    	        				if (preg_match('/^eldy/i', $file)) $prefix = '0';
+                                else if (preg_match('/^smartphone/i', $file)) $prefix = '2';
+    	        				else $prefix = '3';
 
     	                        if ($file == $selected)
     	                        {
-    	        					$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
+    	        					$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
     	                        }
     	                        else
     	                        {
-    	                            $menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
+    	                            $menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
     	                        }
     	                    }
     	                }
@@ -180,26 +180,26 @@ 
 		ksort($menuarray);
 
 		// Output combo list of menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-        $oldprefix='';
+        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+        $oldprefix = '';
 		foreach ($menuarray as $key => $val)
 		{
-			$tab=explode('_',$key);
-			$newprefix=$tab[0];
-			if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
-			if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
+			$tab = explode('_', $key);
+			$newprefix = $tab[0];
+			if ($newprefix == '1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
+			if ($newprefix == '2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
 			if ($newprefix != $oldprefix)	// Add separators
 			{
 				// Affiche titre
 				print '<option value="-1" disabled>';
-				if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
-                if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
-				if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
-				if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
+				if ($newprefix == '0') print '-- '.$langs->trans("VersionRecommanded").' --';
+                if ($newprefix == '1') print '-- '.$langs->trans("VersionExperimental").' --';
+				if ($newprefix == '2') print '-- '.$langs->trans("VersionDevelopment").' --';
+				if ($newprefix == '3') print '-- '.$langs->trans("Other").' --';
 				print '</option>';
-				$oldprefix=$newprefix;
+				$oldprefix = $newprefix;
 			}
-			print $val."\n";	// Show menu entry
+			print $val."\n"; // Show menu entry
 		}
 		print '</select>';
     }
@@ -214,37 +214,37 @@ 
      */
     function select_menu_families($selected, $htmlname, $dirmenuarray)
     {
-		global $langs,$conf;
+		global $langs, $conf;
 
         //$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
-		$expdevmenu=array();
+		$expdevmenu = array();
 
-		$menuarray=array();
+		$menuarray = array();
 
-		foreach($dirmenuarray as $dirmenu)
+		foreach ($dirmenuarray as $dirmenu)
 		{
             foreach ($conf->file->dol_document_root as $dirroot)
             {
-                $dir=$dirroot.$dirmenu;
+                $dir = $dirroot.$dirmenu;
                 if (is_dir($dir))
                 {
-	                $handle=opendir($dir);
+	                $handle = opendir($dir);
 	                if (is_resource($handle))
 	                {
-	        			while (($file = readdir($handle))!==false)
+	        			while (($file = readdir($handle)) !== false)
 	        			{
 	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
 	        				{
-	        					$filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
-	        					if (preg_match('/^index/i',$filelib)) continue;
-	        					if (preg_match('/^default/i',$filelib)) continue;
-	        					if (preg_match('/^empty/i',$filelib)) continue;
-	        					if (preg_match('/\.lib/i',$filelib)) continue;
-	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
-
-	        					$menuarray[$filelib]=1;
+	        					$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);
+	        					if (preg_match('/^index/i', $filelib)) continue;
+	        					if (preg_match('/^default/i', $filelib)) continue;
+	        					if (preg_match('/^empty/i', $filelib)) continue;
+	        					if (preg_match('/\.lib/i', $filelib)) continue;
+	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) continue;
+
+	        					$menuarray[$filelib] = 1;
 	        				}
-	        				$menuarray['all']=1;
+	        				$menuarray['all'] = 1;
 	        			}
 	        			closedir($handle);
 	                }
@@ -256,11 +256,11 @@ 
 
 		// Affichage liste deroulante des menus
         print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-        $oldprefix='';
+        $oldprefix = '';
 		foreach ($menuarray as $key => $val)
 		{
-			$tab=explode('_',$key);
-			$newprefix=$tab[0];
+			$tab = explode('_', $key);
+			$newprefix = $tab[0];
 			print '<option value="'.$key.'"';
             if ($key == $selected)
 			{
@@ -282,14 +282,14 @@ 
      *  @param  string		$htmlname        Nom de la zone select
      *  @return	void
      */
-    function select_timezone($selected,$htmlname)
+    function select_timezone($selected, $htmlname)
     {
-		global $langs,$conf;
+		global $langs, $conf;
 
         print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 		print '<option value="-1">&nbsp;</option>';
 
-		$arraytz=array(
+		$arraytz = array(
 			"Pacific/Midway"=>"GMT-11:00",
 			"Pacific/Fakaofo"=>"GMT-10:00",
 			"America/Anchorage"=>"GMT-09:00",
@@ -336,28 +336,28 @@ 
 	 * 		@param		int		$showempty		Add empty value
 	 * 		@return		string					Return HTML output
 	 */
-	function select_paper_format($selected='',$htmlname='paperformat_id',$filter=0,$showempty=0)
+	function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = 0, $showempty = 0)
 	{
 		global $langs;
 
 		$langs->load("dict");
 
 		$sql = "SELECT code, label, width, height, unit";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_paper_format";
-		$sql.= " WHERE active=1";
-        if ($filter) $sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_paper_format";
+		$sql .= " WHERE active=1";
+        if ($filter) $sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $num=$this->db->num_rows($resql);
-            $i=0;
+            $num = $this->db->num_rows($resql);
+            $i = 0;
             while ($i < $num)
             {
-                $obj=$this->db->fetch_object($resql);
+                $obj = $this->db->fetch_object($resql);
                 $unitKey = $langs->trans('SizeUnit'.$obj->unit);
 
-                $paperformat[$obj->code]= $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
+                $paperformat[$obj->code] = $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
 
                 $i++;
             }
@@ -367,27 +367,27 @@ 
 			dol_print_error($this->db);
 			return '';
 		}
-		$out='';
+		$out = '';
 
-		$out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		$out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 		if ($showempty)
 		{
-			$out.= '<option value=""';
-			if ($selected == '') $out.= ' selected';
-			$out.= '>&nbsp;</option>';
+			$out .= '<option value=""';
+			if ($selected == '') $out .= ' selected';
+			$out .= '>&nbsp;</option>';
 		}
 		foreach ($paperformat as $key => $value)
 		{
             if ($selected == $key)
 			{
-				$out.= '<option value="'.$key.'" selected>'.$value.'</option>';
+				$out .= '<option value="'.$key.'" selected>'.$value.'</option>';
 			}
 			else
 			{
-				$out.= '<option value="'.$key.'">'.$value.'</option>';
+				$out .= '<option value="'.$key.'">'.$value.'</option>';
 			}
 		}
-		$out.= '</select>';
+		$out .= '</select>';
 
 		return $out;
 	}

Braces +95 added lines, -40 removed lines

@@ -70,16 +70,23 @@ 
 		if ($showempty)
 		{
 			$out.= '<option value="0"';
-			if ($selected == '') $out.= ' selected';
+			if ($selected == '') {
+				$out.= ' selected';
+			}
 			$out.= '>';
-			if ($showempty != '1') $out.=$showempty;
-			else $out.='&nbsp;';
+			if ($showempty != '1') {
+				$out.=$showempty;
+			} else {
+				$out.='&nbsp;';
+			}
 			$out.='</option>';
 		}
 		if ($showauto)
 		{
 			$out.= '<option value="auto"';
-			if ($selected == 'auto') $out.= ' selected';
+			if ($selected == 'auto') {
+				$out.= ' selected';
+			}
 			$out.= '>'.$langs->trans("AutoDetectLang").'</option>';
 		}
 
@@ -88,7 +95,9 @@ 
 		foreach ($langs_available as $key => $value)
 		{
 		    $valuetoshow=$value;
-		    if ($showcode) $valuetoshow=$key.' - '.$value;
+		    if ($showcode) {
+		    	$valuetoshow=$key.' - '.$value;
+		    }
 
 			if ($filter && is_array($filter))
 			{
@@ -96,12 +105,10 @@ 
 				{
 					$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
 				}
-			}
-			else if ($selected == $key)
+			} else if ($selected == $key)
 			{
 				$out.= '<option value="'.$key.'" selected>'.$valuetoshow.'</option>';
-			}
-			else
+			} else
 			{
 				$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
 			}
@@ -132,7 +139,9 @@ 
 
 
         // Check parameters
-        if (! is_array($dirmenuarray)) return -1;
+        if (! is_array($dirmenuarray)) {
+        	return -1;
+        }
 
 		$menuarray=array();
         foreach ($conf->file->dol_document_root as $dirroot)
@@ -150,23 +159,38 @@ 
     	                {
     	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
     	                    {
-    	                        if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
-    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
-    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+    	                        if (preg_match('/lib\.php$/i',$file)) {
+    	                        	continue;
+    	                        }
+    	                        // We exclude library files
+    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) {
+    	                        	continue;
+    	                        }
+    	                        // We exclude all menu manager files
+    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) {
+    	                        	continue;
+    	                        }
+    	                        // We exclude all menu manager files
+    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) {
+    	                        	continue;
+    	                        }
+    	                        // We exclude all menu manager files
 
     	                        $filelib=preg_replace('/\.php$/i','',$file);
     	        				$prefix='';
     	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-    	        				if (preg_match('/^eldy/i',$file)) $prefix='0';
-                                else if (preg_match('/^smartphone/i',$file)) $prefix='2';
-    	        				else $prefix='3';
+    	        				if (preg_match('/^eldy/i',$file)) {
+    	        					$prefix='0';
+    	        				} else if (preg_match('/^smartphone/i',$file)) {
+                                	$prefix='2';
+                                } else {
+    	        					$prefix='3';
+    	        				}
 
     	                        if ($file == $selected)
     	                        {
     	        					$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        }
-    	                        else
+    	                        } else
     	                        {
     	                            $menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
     	                        }
@@ -186,16 +210,30 @@ 
 		{
 			$tab=explode('_',$key);
 			$newprefix=$tab[0];
-			if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
-			if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
-			if ($newprefix != $oldprefix)	// Add separators
+			if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) {
+				continue;
+			}
+			if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) {
+				continue;
+			}
+			if ($newprefix != $oldprefix) {
+				// Add separators
 			{
 				// Affiche titre
 				print '<option value="-1" disabled>';
-				if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
-                if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
-				if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
-				if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
+			}
+				if ($newprefix=='0') {
+					print '-- '.$langs->trans("VersionRecommanded").' --';
+				}
+                if ($newprefix=='1') {
+                	print '-- '.$langs->trans("VersionExperimental").' --';
+                }
+				if ($newprefix=='2') {
+					print '-- '.$langs->trans("VersionDevelopment").' --';
+				}
+				if ($newprefix=='3') {
+					print '-- '.$langs->trans("Other").' --';
+				}
 				print '</option>';
 				$oldprefix=$newprefix;
 			}
@@ -236,11 +274,21 @@ 
 	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
 	        				{
 	        					$filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
-	        					if (preg_match('/^index/i',$filelib)) continue;
-	        					if (preg_match('/^default/i',$filelib)) continue;
-	        					if (preg_match('/^empty/i',$filelib)) continue;
-	        					if (preg_match('/\.lib/i',$filelib)) continue;
-	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
+	        					if (preg_match('/^index/i',$filelib)) {
+	        						continue;
+	        					}
+	        					if (preg_match('/^default/i',$filelib)) {
+	        						continue;
+	        					}
+	        					if (preg_match('/^empty/i',$filelib)) {
+	        						continue;
+	        					}
+	        					if (preg_match('/\.lib/i',$filelib)) {
+	        						continue;
+	        					}
+	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) {
+	        						continue;
+	        					}
 
 	        					$menuarray[$filelib]=1;
 	        				}
@@ -267,8 +315,11 @@ 
 				print '	selected';
 			}
 			print '>';
-			if ($key == 'all') print $langs->trans("AllMenus");
-			else print $key;
+			if ($key == 'all') {
+				print $langs->trans("AllMenus");
+			} else {
+				print $key;
+			}
 			print '</option>'."\n";
 		}
 		print '</select>';
@@ -319,7 +370,9 @@ 
 		foreach ($arraytz as $lib => $gmt)
 		{
 			print '<option value="'.$lib.'"';
-			if ($selected == $lib || $selected == $gmt) print ' selected';
+			if ($selected == $lib || $selected == $gmt) {
+				print ' selected';
+			}
 			print '>'.$gmt.'</option>'."\n";
 		}
 		print '</select>';
@@ -345,7 +398,9 @@ 
 		$sql = "SELECT code, label, width, height, unit";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_paper_format";
 		$sql.= " WHERE active=1";
-        if ($filter) $sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
+        if ($filter) {
+        	$sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -361,8 +416,7 @@ 
 
                 $i++;
             }
-        }
-        else
+        } else
 		{
 			dol_print_error($this->db);
 			return '';
@@ -373,7 +427,9 @@ 
 		if ($showempty)
 		{
 			$out.= '<option value=""';
-			if ($selected == '') $out.= ' selected';
+			if ($selected == '') {
+				$out.= ' selected';
+			}
 			$out.= '>&nbsp;</option>';
 		}
 		foreach ($paperformat as $key => $value)
@@ -381,8 +437,7 @@ 
             if ($selected == $key)
 			{
 				$out.= '<option value="'.$key.'" selected>'.$value.'</option>';
-			}
-			else
+			} else
 			{
 				$out.= '<option value="'.$key.'">'.$value.'</option>';
 			}

htdocs/core/class/html.formcompany.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -416,7 +416,7 @@
 	 *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays.
 	 *
 	 *    @param	string		$selected        	Code forme juridique a pre-selectionne
-	 *    @param    mixed		$country_codeid		0=liste tous pays confondus, sinon code du pays a afficher
+	 *    @param    integer		$country_codeid		0=liste tous pays confondus, sinon code du pays a afficher
 	 *    @param    string		$filter          	Add a SQL filter on list
 	 *    @return	void
 	 *    @deprecated Use print xxx->select_juridicalstatus instead

Indentation +113 added lines, -113 removed lines

@@ -279,9 +279,9 @@ 
 			dol_print_error($this->db);
 		}
 
-        // Make select dynamic
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-        $out .= ajax_combobox($htmlname);
+		// Make select dynamic
+		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+		$out .= ajax_combobox($htmlname);
 
 		return $out;
 	}
@@ -431,9 +431,9 @@ 
 	 *
 	 *    @param	string		$selected        	Preselected code of juridical type
 	 *    @param    int			$country_codeid     0=list for all countries, otherwise list only country requested
-     *    @param    string		$filter          	Add a SQL filter on list
-     *    @param	string		$htmlname			HTML name of select
-     *    @return	string							String with HTML select
+	 *    @param    string		$filter          	Add a SQL filter on list
+	 *    @param	string		$htmlname			HTML name of select
+	 *    @return	string							String with HTML select
 	 */
 	function select_juridicalstatus($selected='', $country_codeid=0, $filter='', $htmlname='forme_juridique_code')
 	{
@@ -511,9 +511,9 @@ 
 			$out.= '</select>';
 			if ($user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 
-		    // Make select dynamic
-        	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-	        $out .= ajax_combobox($htmlname);
+			// Make select dynamic
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname);
 
 			$out.= '</div>';
 		}
@@ -535,7 +535,7 @@ 
 	 *  @param  string		$htmlname       Name of HTML form
 	 * 	@param	array		$limitto		Disable answers that are not id in this array list
 	 *  @param	int			$forceid		This is to force another object id than object->id
-     *  @param	string		$moreparam		String with more param to add into url when noajax search is used.
+	 *  @param	string		$moreparam		String with more param to add into url when noajax search is used.
 	 * 	@return int 						The selected third party ID
 	 */
 	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='')
@@ -684,21 +684,21 @@ 
 		}
 	}
 
-    /**
-     *  Return a select list with types of contacts
-     *
-     *  @param	object		$object         Object to use to find type of contact
-     *  @param  string		$selected       Default selected value
-     *  @param  string		$htmlname		HTML select name
-     *  @param  string		$source			Source ('internal' or 'external')
-     *  @param  string		$sortorder		Sort criteria ('position', 'code', ...)
-     *  @param  int			$showempty      1=Add en empty line
-     *  @param  string      $morecss        Add more css to select component
-     *  @return	void
-     */
+	/**
+	 *  Return a select list with types of contacts
+	 *
+	 *  @param	object		$object         Object to use to find type of contact
+	 *  @param  string		$selected       Default selected value
+	 *  @param  string		$htmlname		HTML select name
+	 *  @param  string		$source			Source ('internal' or 'external')
+	 *  @param  string		$sortorder		Sort criteria ('position', 'code', ...)
+	 *  @param  int			$showempty      1=Add en empty line
+	 *  @param  string      $morecss        Add more css to select component
+	 *  @return	void
+	 */
 	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
 	{
-	    global $user, $langs;
+		global $user, $langs;
 
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
@@ -748,96 +748,96 @@ 
 		return $out;
 	}
 
-    /**
-     *  Return HTML string to use as input of professional id into a HTML page (siren, siret, etc...)
-     *
-     *  @param	int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
-     *  @param  string	$htmlname       Name of HTML select
-     *  @param  string	$preselected    Default value to show
-     *  @param  string	$country_code   FR, IT, ...
-     *  @param  string  $morecss        More css
-     *  @return	string					HTML string with prof id
-     */
-    function get_input_id_prof($idprof,$htmlname,$preselected,$country_code,$morecss='maxwidth100onsmartphone quatrevingtpercent')
-    {
-        global $conf,$langs;
-
-        $formlength=0;
-        if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
-        	if ($country_code == 'FR')
-        	{
-        		if (isset($idprof)) {
-        			if ($idprof==1) $formlength=9;
-        			else if ($idprof==2) $formlength=14;
-        			else if ($idprof==3) $formlength=5;      // 4 chiffres et 1 lettre depuis janvier
-        			else if ($idprof==4) $formlength=32;     // No maximum as we need to include a town name in this id
-        		}
-        	}
-        	else if ($country_code == 'ES')
-        	{
-        		if ($idprof==1) $formlength=9;  //CIF/NIF/NIE 9 digits
-        		if ($idprof==2) $formlength=12; //NASS 12 digits without /
-        		if ($idprof==3) $formlength=5;  //CNAE 5 digits
-        		if ($idprof==4) $formlength=32; //depend of college
-        	}
-        }
-
-        $selected=$preselected;
-        if (! $selected && isset($idprof)) {
-        	if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
-        	else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
-        	else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
-        	else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
-        }
-
-        $maxlength=$formlength;
-        if (empty($formlength)) { $formlength=24; $maxlength=128; }
-
-        $out = '<input type="text" '.($morecss?'class="'.$morecss.'" ':'').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
-
-        return $out;
-    }
-
-    /**
-     * Return a HTML select with localtax values for thirdparties
-     *
-     * @param 	int 		$local			LocalTax
-     * @param 	int 		$selected		Preselected value
-     * @param 	string      $htmlname		HTML select name
-     * @return	void
-     */
-    function select_localtax($local, $selected, $htmlname)
-    {
-    	$tax=get_localtax_by_third($local);
-
-    	$num = $this->db->num_rows($tax);
-    	$i = 0;
-    	if ($num)
-    	{
-    		$valors=explode(":", $tax);
-
-    		if (count($valors) > 1)
-    		{
-    			//montar select
-    			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-    			while ($i <= (count($valors))-1)
-    			{
-    				if ($selected == $valors[$i])
-    				{
-    					print '<option value="'.$valors[$i].'" selected>';
-    				}
-    				else
-    				{
-    					print '<option value="'.$valors[$i].'">';
-    				}
-    				print $valors[$i];
-    				print '</option>';
-    				$i++;
-    			}
-    			print'</select>';
-    		}
-    	}
-    }
+	/**
+	 *  Return HTML string to use as input of professional id into a HTML page (siren, siret, etc...)
+	 *
+	 *  @param	int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
+	 *  @param  string	$htmlname       Name of HTML select
+	 *  @param  string	$preselected    Default value to show
+	 *  @param  string	$country_code   FR, IT, ...
+	 *  @param  string  $morecss        More css
+	 *  @return	string					HTML string with prof id
+	 */
+	function get_input_id_prof($idprof,$htmlname,$preselected,$country_code,$morecss='maxwidth100onsmartphone quatrevingtpercent')
+	{
+		global $conf,$langs;
+
+		$formlength=0;
+		if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			if ($country_code == 'FR')
+			{
+				if (isset($idprof)) {
+					if ($idprof==1) $formlength=9;
+					else if ($idprof==2) $formlength=14;
+					else if ($idprof==3) $formlength=5;      // 4 chiffres et 1 lettre depuis janvier
+					else if ($idprof==4) $formlength=32;     // No maximum as we need to include a town name in this id
+				}
+			}
+			else if ($country_code == 'ES')
+			{
+				if ($idprof==1) $formlength=9;  //CIF/NIF/NIE 9 digits
+				if ($idprof==2) $formlength=12; //NASS 12 digits without /
+				if ($idprof==3) $formlength=5;  //CNAE 5 digits
+				if ($idprof==4) $formlength=32; //depend of college
+			}
+		}
+
+		$selected=$preselected;
+		if (! $selected && isset($idprof)) {
+			if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
+			else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
+			else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
+			else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
+		}
+
+		$maxlength=$formlength;
+		if (empty($formlength)) { $formlength=24; $maxlength=128; }
+
+		$out = '<input type="text" '.($morecss?'class="'.$morecss.'" ':'').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
+
+		return $out;
+	}
+
+	/**
+	 * Return a HTML select with localtax values for thirdparties
+	 *
+	 * @param 	int 		$local			LocalTax
+	 * @param 	int 		$selected		Preselected value
+	 * @param 	string      $htmlname		HTML select name
+	 * @return	void
+	 */
+	function select_localtax($local, $selected, $htmlname)
+	{
+		$tax=get_localtax_by_third($local);
+
+		$num = $this->db->num_rows($tax);
+		$i = 0;
+		if ($num)
+		{
+			$valors=explode(":", $tax);
+
+			if (count($valors) > 1)
+			{
+				//montar select
+				print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+				while ($i <= (count($valors))-1)
+				{
+					if ($selected == $valors[$i])
+					{
+						print '<option value="'.$valors[$i].'" selected>';
+					}
+					else
+					{
+						print '<option value="'.$valors[$i].'">';
+					}
+					print $valors[$i];
+					print '</option>';
+					$i++;
+				}
+				print'</select>';
+			}
+		}
+	}
 
 }
 

Spacing +155 added lines, -155 removed lines

@@ -56,19 +56,19 @@ 
 	 *      @param  string	$filter     Add a SQL filter to select
 	 *    	@return array      			Array of types
 	 */
-	function typent_array($mode=0, $filter='')
+	function typent_array($mode = 0, $filter = '')
 	{
-		global $langs,$mysoc;
+		global $langs, $mysoc;
 
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
-		if ($filter) $sql.=" ".$filter;
-		$sql.= " ORDER by position, id";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_typent";
+		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id) ? '0' : $mysoc->country_id).")";
+		if ($filter) $sql .= " ".$filter;
+		$sql .= " ORDER by position, id";
 		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -77,11 +77,11 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
+				if (!$mode) $key = $objp->id;
+				else $key = $objp->code;
 				if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);
 				else $effs[$key] = $objp->libelle;
-				if ($effs[$key]=='-') $effs[$key]='';
+				if ($effs[$key] == '-') $effs[$key] = '';
 				$i++;
 			}
 			$this->db->free($resql);
@@ -97,17 +97,17 @@ 
 	 *	@param  string	$filter     Add a SQL filter to select
 	 *  @return array				Array of types d'effectifs
 	 */
-	function effectif_array($mode=0, $filter='')
+	function effectif_array($mode = 0, $filter = '')
 	{
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
-		$sql.= " WHERE active = 1";
-		if ($filter) $sql.=" ".$filter;
+		$sql .= " WHERE active = 1";
+		if ($filter) $sql .= " ".$filter;
 		$sql .= " ORDER BY id ASC";
 		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -116,10 +116,10 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
+				if (!$mode) $key = $objp->id;
+				else $key = $objp->code;
 
-				$effs[$key] = $objp->libelle!='-'?$objp->libelle:'';
+				$effs[$key] = $objp->libelle != '-' ? $objp->libelle : '';
 				$i++;
 			}
 			$this->db->free($resql);
@@ -137,7 +137,7 @@ 
 	 *	@param	int		$empty			Add empty value in list
 	 *	@return	void
 	 */
-	function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0)
+	function form_prospect_level($page, $selected = '', $htmlname = 'prospect_level_id', $empty = 0)
 	{
 		global $user, $langs;
 
@@ -145,11 +145,11 @@ 
 		print '<input type="hidden" name="action" value="setprospectlevel">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-		dol_syslog(get_class($this).'::form_prospect_level',LOG_DEBUG);
+		dol_syslog(get_class($this).'::form_prospect_level', LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY sortorder";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+		$sql .= " WHERE active > 0";
+		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -172,7 +172,7 @@ 
 			print Form::selectarray($htmlname, $options, $selected);
 		}
 		else dol_print_error($this->db);
-		if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		if (!empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
@@ -189,9 +189,9 @@ 
 	 *   @param     string	$htmlname			Id of department
 	 *   @return	void
 	 */
-	function select_departement($selected='',$country_codeid=0, $htmlname='state_id')
+	function select_departement($selected = '', $country_codeid = 0, $htmlname = 'state_id')
 	{
-		print $this->select_state($selected,$country_codeid, $htmlname);
+		print $this->select_state($selected, $country_codeid, $htmlname);
 	}
 
 	/**
@@ -207,81 +207,81 @@ 
 	 * 	  @return	string						String with HTML select
 	 *    @see select_country
 	 */
-	function select_state($selected='',$country_codeid=0, $htmlname='state_id')
+	function select_state($selected = '', $country_codeid = 0, $htmlname = 'state_id')
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid,LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid, LOG_DEBUG);
 
 		$langs->load("dict");
 
-		$out='';
+		$out = '';
 
 		// On recherche les departements/cantons/province active d'une region et pays actif
 		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
-		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
 		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$country_codeid."'";
-		if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND c.code = '".$country_codeid."'";
+		if ($country_codeid && !is_numeric($country_codeid)) $sql .= " AND c.code = '".$country_codeid."'";
 		$sql .= " ORDER BY c.code, d.code_departement";
 
 		dol_syslog(get_class($this)."::select_departement", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
-			if (!empty($htmlname)) $out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';
+			if (!empty($htmlname)) $out .= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
+			if ($country_codeid) $out .= '<option value="0">&nbsp;</option>';
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			dol_syslog(get_class($this)."::select_departement num=".$num,LOG_DEBUG);
+			dol_syslog(get_class($this)."::select_departement num=".$num, LOG_DEBUG);
 			if ($num)
 			{
-				$country='';
+				$country = '';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($result);
 					if ($obj->code == '0')		// Le code peut etre une chaine
 					{
-						$out.= '<option value="0">&nbsp;</option>';
+						$out .= '<option value="0">&nbsp;</option>';
 					}
 					else {
-						if (! $country || $country != $obj->country)
+						if (!$country || $country != $obj->country)
 						{
 							// Affiche la rupture si on est en mode liste multipays
-							if (! $country_codeid && $obj->country_code)
+							if (!$country_codeid && $obj->country_code)
 							{
-								$out.= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
-								$country=$obj->country;
+								$out .= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
+								$country = $obj->country;
 							}
 						}
 
-						if ((! empty($selected) && $selected == $obj->rowid)
-						 || (empty($selected) && ! empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
+						if ((!empty($selected) && $selected == $obj->rowid)
+						 || (empty($selected) && !empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
 						{
-							$out.= '<option value="'.$obj->rowid.'" selected>';
+							$out .= '<option value="'.$obj->rowid.'" selected>';
 						}
 						else
 						{
-							$out.= '<option value="'.$obj->rowid.'">';
+							$out .= '<option value="'.$obj->rowid.'">';
 						}
 						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-						if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 2) {
-							$out.= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+						if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 2) {
+							$out .= $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 						}
-						else if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 1) {
-							$out.= $obj->region_name . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+						else if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 1) {
+							$out .= $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 						}
 						else {
-							$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+							$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 						}
-						$out.= '</option>';
+						$out .= '</option>';
 					}
 					$i++;
 				}
 			}
-			if (! empty($htmlname)) $out.= '</select>';
-			if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if (!empty($htmlname)) $out .= '</select>';
+			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
 		else
 		{
@@ -289,7 +289,7 @@ 
 		}
 
         // Make select dynamic
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
         $out .= ajax_combobox($htmlname);
 
 		return $out;
@@ -306,18 +306,18 @@ 
 	 *   @param		string		$htmlname		Name of HTML select field
 	 *   @return	void
 	 */
-	function select_region($selected='',$htmlname='region_id')
+	function select_region($selected = '', $htmlname = 'region_id')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 		$langs->load("dict");
 
 		$sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
-		$sql.= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
-		$sql.= " ORDER BY c.code, c.label ASC";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
+		$sql .= " ORDER BY c.code, c.label ASC";
 
 		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
@@ -325,7 +325,7 @@ 
 			$i = 0;
 			if ($num)
 			{
-				$country='';
+				$country = '';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
@@ -336,10 +336,10 @@ 
 						if ($country == '' || $country != $obj->country)
 						{
 							// Show break
-							$key=$langs->trans("Country".strtoupper($obj->country_code));
-							$valuetoshow=($key != "Country".strtoupper($obj->country_code))?$obj->country_code." - ".$key:$obj->country;
+							$key = $langs->trans("Country".strtoupper($obj->country_code));
+							$valuetoshow = ($key != "Country".strtoupper($obj->country_code)) ? $obj->country_code." - ".$key : $obj->country;
 							print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n";
-							$country=$obj->country;
+							$country = $obj->country;
 						}
 
 						if ($selected > 0 && $selected == $obj->code)
@@ -370,22 +370,22 @@ 
 	 *  @param  string  $morecss        Add more css on SELECT element
 	 *  @return	string					String with HTML select
 	 */
-	function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
+	function select_civility($selected = '', $htmlname = 'civility_id', $morecss = 'maxwidth100')
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 		$langs->load("dict");
 
-		$out='';
+		$out = '';
 
 		$sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";
-		$sql.= " WHERE active = 1";
+		$sql .= " WHERE active = 1";
 
 		dol_syslog("Form::select_civility", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$out.= '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			$out.= '<option value="">&nbsp;</option>';
+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			$out .= '<option value="">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -395,20 +395,20 @@ 
 					$obj = $this->db->fetch_object($resql);
 					if ($selected == $obj->code)
 					{
-						$out.= '<option value="'.$obj->code.'" selected>';
+						$out .= '<option value="'.$obj->code.'" selected>';
 					}
 					else
 					{
-						$out.= '<option value="'.$obj->code.'">';
+						$out .= '<option value="'.$obj->code.'">';
 					}
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-					$out.= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label!='-'?$obj->label:''));
-					$out.= '</option>';
+					$out .= ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+					$out .= '</option>';
 					$i++;
 				}
 			}
-			$out.= '</select>';
-			if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			$out .= '</select>';
+			if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
 		else
 		{
@@ -429,7 +429,7 @@ 
 	 *    @deprecated Use print xxx->select_juridicalstatus instead
 	 *    @see select_juridicalstatus()
 	 */
-	function select_forme_juridique($selected='', $country_codeid=0, $filter='')
+	function select_forme_juridique($selected = '', $country_codeid = 0, $filter = '')
 	{
 		print $this->select_juridicalstatus($selected, $country_codeid, $filter);
 	}
@@ -444,12 +444,12 @@ 
      *    @param	string		$htmlname			HTML name of select
      *    @return	string							String with HTML select
 	 */
-	function select_juridicalstatus($selected='', $country_codeid=0, $filter='', $htmlname='forme_juridique_code')
+	function select_juridicalstatus($selected = '', $country_codeid = 0, $filter = '', $htmlname = 'forme_juridique_code')
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 		$langs->load("dict");
 
-		$out='';
+		$out = '';
 
 		// On recherche les formes juridiques actives des pays actifs
 		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
@@ -461,70 +461,70 @@ 
 		$sql .= " ORDER BY c.code";
 
 		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$out.= '<div id="particulier2" class="visible">';
-			$out.= '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';	// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
+			$out .= '<div id="particulier2" class="visible">';
+			$out .= '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($country_codeid) $out .= '<option value="0">&nbsp;</option>'; // When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
 
 			$num = $this->db->num_rows($resql);
 			if ($num)
 			{
 				$i = 0;
-				$country=''; $arraydata=array();
+				$country = ''; $arraydata = array();
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
 
 					if ($obj->code)		// We exclude empty line, we will add it later
 					{
-						$labelcountry=(($langs->trans("Country".$obj->country_code)!="Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
-						$labeljs=(($langs->trans("JuridicalStatus".$obj->code)!="JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label!='-'?$obj->label:''));	// $obj->label is already in output charset (converted by database driver)
-						$arraydata[$obj->code]=array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
+						$labelcountry = (($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
+						$labeljs = (($langs->trans("JuridicalStatus".$obj->code) != "JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label != '-' ? $obj->label : '')); // $obj->label is already in output charset (converted by database driver)
+						$arraydata[$obj->code] = array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
 					}
 					$i++;
 				}
 
-				$arraydata=dol_sort_array($arraydata, 'label_sort', 'ASC');
+				$arraydata = dol_sort_array($arraydata, 'label_sort', 'ASC');
 				if (empty($country_codeid))	// Introduce empty value (if $country_codeid not empty, empty value was already added)
 				{
-					$arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
+					$arraydata[0] = array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
 				}
 
-				foreach($arraydata as $key => $val)
+				foreach ($arraydata as $key => $val)
 				{
-					if (! $country || $country != $val['country'])
+					if (!$country || $country != $val['country'])
 					{
 						// Show break when we are in multi country mode
 						if (empty($country_codeid) && $val['country_code'])
 						{
-							$out.= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
-							$country=$val['country'];
+							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
+							$country = $val['country'];
 						}
 					}
 
 					if ($selected > 0 && $selected == $val['code'])
 					{
-						$out.= '<option value="'.$val['code'].'" selected>';
+						$out .= '<option value="'.$val['code'].'" selected>';
 					}
 					else
 					{
-						$out.= '<option value="'.$val['code'].'">';
+						$out .= '<option value="'.$val['code'].'">';
 					}
 					// If translation exists, we use it, otherwise we use default label in database
-					$out.= $val['label'];
-					$out.= '</option>';
+					$out .= $val['label'];
+					$out .= '</option>';
 				}
 			}
-			$out.= '</select>';
-			if ($user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			$out .= '</select>';
+			if ($user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
 		    // Make select dynamic
-        	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	        $out .= ajax_combobox($htmlname);
 
-			$out.= '</div>';
+			$out .= '</div>';
 		}
 		else
 		{
@@ -547,19 +547,19 @@ 
      *  @param	string		$moreparam		String with more param to add into url when noajax search is used.
 	 * 	@return int 						The selected third party ID
 	 */
-	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='')
+	function selectCompaniesForNewContact($object, $var_id, $selected = '', $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '')
 	{
 		global $conf, $langs;
 
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
 		{
 			// Use Ajax search
-			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
+			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT) ? $conf->global->COMPANY_USE_SEARCH_TO_SELECT : 2);
 
-			$socid=0; $name='';
+			$socid = 0; $name = '';
 			if ($selected > 0)
 			{
-				$tmpthirdparty=new Societe($this->db);
+				$tmpthirdparty = new Societe($this->db);
 				$result = $tmpthirdparty->fetch($selected);
 				if ($result > 0)
 				{
@@ -569,13 +569,13 @@ 
 			}
 
 
-			$events=array();
+			$events = array();
 			// Add an entry 'method' to say 'yes, we must execute url with param action = method';
 			// Add an entry 'url' to say which url to execute
 			// Add an entry htmlname to say which element we must change once url is called
 			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines
 			// To refresh contacts list on thirdparty list change
-			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
+			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 
 			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
 			{
@@ -630,21 +630,21 @@ 
 
 			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
 			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
-			print ajax_autocompleter(($socid?$socid:-1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
+			print ajax_autocompleter(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
 		}
 		else
 		{
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
-			$sql.= " ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " WHERE s.entity IN (".getEntity('societe').")";
+			$sql .= " ".MAIN_DB_PREFIX."societe as s";
+			$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 			// For ajax search we limit here. For combo list, we limit later
 			if (is_array($limitto) && count($limitto))
 			{
-				$sql.= " AND s.rowid IN (".join(',',$limitto).")";
+				$sql .= " AND s.rowid IN (".join(',', $limitto).")";
 			}
-			$sql.= " ORDER BY s.nom ASC";
+			$sql .= " ORDER BY s.nom ASC";
 
 			$resql = $this->db->query($sql);
 			if ($resql)
@@ -652,7 +652,7 @@ 
 				print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"';
 				if ($conf->use_javascript_ajax)
 				{
-					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid>0?$forceid:$object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
+					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid > 0 ? $forceid : $object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
 					print ' onChange="'.$javaScript.'"';
 				}
 				print '>';
@@ -664,22 +664,22 @@ 
 					{
 						$obj = $this->db->fetch_object($resql);
 						if ($i == 0) $firstCompany = $obj->rowid;
-						$disabled=0;
-						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
+						$disabled = 0;
+						if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) $disabled = 1;
 						if ($selected > 0 && $selected == $obj->rowid)
 						{
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled';
-							print ' selected>'.dol_trunc($obj->name,24).'</option>';
+							print ' selected>'.dol_trunc($obj->name, 24).'</option>';
 							$firstCompany = $obj->rowid;
 						}
 						else
 						{
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled';
-							print '>'.dol_trunc($obj->name,24).'</option>';
+							print '>'.dol_trunc($obj->name, 24).'</option>';
 						}
-						$i ++;
+						$i++;
 					}
 				}
 				print "</select>\n";
@@ -705,23 +705,23 @@ 
      *  @param  string      $morecss        Add more css to select component
      *  @return	void
      */
-	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
+	function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '')
 	{
 	    global $user, $langs;
 
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
-			print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			print '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($showempty) print '<option value="0"></option>';
-			foreach($lesTypes as $key=>$value)
+			foreach ($lesTypes as $key=>$value)
 			{
 				print '<option value="'.$key.'"';
 				if ($key == $selected) print ' selected';
 				print '>'.$value.'</option>';
 			}
 			print "</select>";
-			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print "\n";
 		}
 	}
@@ -738,21 +738,21 @@ 
 	 *    @param    string      $morecss                More css
 	 *    @return	string
 	 */
-	function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='')
+	function select_ziptown($selected = '', $htmlname = 'zipcode', $fields = '', $fieldsize = 0, $disableautocomplete = 0, $moreattrib = '', $morecss = '')
 	{
 		global $conf;
 
-		$out='';
+		$out = '';
 
-		$size='';
-		if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
+		$size = '';
+		if (!empty($fieldsize)) $size = 'size="'.$fieldsize.'"';
 
 		if ($conf->use_javascript_ajax && empty($disableautocomplete))
 		{
-			$out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
-			$moreattrib.=' autocomplete="off"';
+			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
+			$moreattrib .= ' autocomplete="off"';
 		}
-		$out.= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss?' '.$morecss:'').'" type="text"'.($moreattrib?' '.$moreattrib:'').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
+		$out .= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" type="text"'.($moreattrib ? ' '.$moreattrib : '').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
 
 		return $out;
 	}
@@ -767,42 +767,42 @@ 
      *  @param  string  $morecss        More css
      *  @return	string					HTML string with prof id
      */
-    function get_input_id_prof($idprof,$htmlname,$preselected,$country_code,$morecss='maxwidth100onsmartphone quatrevingtpercent')
+    function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent')
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
-        $formlength=0;
+        $formlength = 0;
         if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
         	if ($country_code == 'FR')
         	{
         		if (isset($idprof)) {
-        			if ($idprof==1) $formlength=9;
-        			else if ($idprof==2) $formlength=14;
-        			else if ($idprof==3) $formlength=5;      // 4 chiffres et 1 lettre depuis janvier
-        			else if ($idprof==4) $formlength=32;     // No maximum as we need to include a town name in this id
+        			if ($idprof == 1) $formlength = 9;
+        			else if ($idprof == 2) $formlength = 14;
+        			else if ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier
+        			else if ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id
         		}
         	}
         	else if ($country_code == 'ES')
         	{
-        		if ($idprof==1) $formlength=9;  //CIF/NIF/NIE 9 digits
-        		if ($idprof==2) $formlength=12; //NASS 12 digits without /
-        		if ($idprof==3) $formlength=5;  //CNAE 5 digits
-        		if ($idprof==4) $formlength=32; //depend of college
+        		if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits
+        		if ($idprof == 2) $formlength = 12; //NASS 12 digits without /
+        		if ($idprof == 3) $formlength = 5; //CNAE 5 digits
+        		if ($idprof == 4) $formlength = 32; //depend of college
         	}
         }
 
-        $selected=$preselected;
-        if (! $selected && isset($idprof)) {
-        	if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
-        	else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
-        	else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
-        	else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
+        $selected = $preselected;
+        if (!$selected && isset($idprof)) {
+        	if ($idprof == 1 && !empty($this->idprof1)) $selected = $this->idprof1;
+        	else if ($idprof == 2 && !empty($this->idprof2)) $selected = $this->idprof2;
+        	else if ($idprof == 3 && !empty($this->idprof3)) $selected = $this->idprof3;
+        	else if ($idprof == 4 && !empty($this->idprof4)) $selected = $this->idprof4;
         }
 
-        $maxlength=$formlength;
-        if (empty($formlength)) { $formlength=24; $maxlength=128; }
+        $maxlength = $formlength;
+        if (empty($formlength)) { $formlength = 24; $maxlength = 128; }
 
-        $out = '<input type="text" '.($morecss?'class="'.$morecss.'" ':'').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
+        $out = '<input type="text" '.($morecss ? 'class="'.$morecss.'" ' : '').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 
         return $out;
     }
@@ -817,19 +817,19 @@ 
      */
     function select_localtax($local, $selected, $htmlname)
     {
-    	$tax=get_localtax_by_third($local);
+    	$tax = get_localtax_by_third($local);
 
     	$num = $this->db->num_rows($tax);
     	$i = 0;
     	if ($num)
     	{
-    		$valors=explode(":", $tax);
+    		$valors = explode(":", $tax);
 
     		if (count($valors) > 1)
     		{
     			//montar select
     			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-    			while ($i <= (count($valors))-1)
+    			while ($i <= (count($valors)) - 1)
     			{
     				if ($selected == $valors[$i])
     				{

Braces +152 added lines, -79 removed lines

@@ -65,7 +65,9 @@ 
 		$sql = "SELECT id, code, libelle";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
 		$sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
-		if ($filter) $sql.=" ".$filter;
+		if ($filter) {
+			$sql.=" ".$filter;
+		}
 		$sql.= " ORDER by position, id";
 		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -77,11 +79,19 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
-				if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);
-				else $effs[$key] = $objp->libelle;
-				if ($effs[$key]=='-') $effs[$key]='';
+				if (! $mode) {
+					$key=$objp->id;
+				} else {
+					$key=$objp->code;
+				}
+				if ($langs->trans($objp->code) != $objp->code) {
+					$effs[$key] = $langs->trans($objp->code);
+				} else {
+					$effs[$key] = $objp->libelle;
+				}
+				if ($effs[$key]=='-') {
+					$effs[$key]='';
+				}
 				$i++;
 			}
 			$this->db->free($resql);
@@ -104,7 +114,9 @@ 
 		$sql = "SELECT id, code, libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
 		$sql.= " WHERE active = 1";
-		if ($filter) $sql.=" ".$filter;
+		if ($filter) {
+			$sql.=" ".$filter;
+		}
 		$sql .= " ORDER BY id ASC";
 		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -116,8 +128,11 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
+				if (! $mode) {
+					$key=$objp->id;
+				} else {
+					$key=$objp->code;
+				}
 
 				$effs[$key] = $objp->libelle!='-'?$objp->libelle:'';
 				$i++;
@@ -170,9 +185,12 @@ 
 			}
 
 			print Form::selectarray($htmlname, $options, $selected);
+		} else {
+			dol_print_error($this->db);
+		}
+		if (! empty($htmlname) && $user->admin) {
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		}
-		else dol_print_error($this->db);
-		if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
@@ -222,16 +240,24 @@ 
 		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
-		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$country_codeid."'";
-		if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND c.code = '".$country_codeid."'";
+		if ($country_codeid && is_numeric($country_codeid)) {
+			$sql .= " AND c.rowid = '".$country_codeid."'";
+		}
+		if ($country_codeid && ! is_numeric($country_codeid)) {
+			$sql .= " AND c.code = '".$country_codeid."'";
+		}
 		$sql .= " ORDER BY c.code, d.code_departement";
 
 		dol_syslog(get_class($this)."::select_departement", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
-			if (!empty($htmlname)) $out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';
+			if (!empty($htmlname)) {
+				$out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
+			}
+			if ($country_codeid) {
+				$out.= '<option value="0">&nbsp;</option>';
+			}
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			dol_syslog(get_class($this)."::select_departement num=".$num,LOG_DEBUG);
@@ -241,11 +267,12 @@ 
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($result);
-					if ($obj->code == '0')		// Le code peut etre une chaine
+					if ($obj->code == '0') {
+						// Le code peut etre une chaine
 					{
 						$out.= '<option value="0">&nbsp;</option>';
 					}
-					else {
+					} else {
 						if (! $country || $country != $obj->country)
 						{
 							// Affiche la rupture si on est en mode liste multipays
@@ -260,19 +287,16 @@ 
 						 || (empty($selected) && ! empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
 						{
 							$out.= '<option value="'.$obj->rowid.'" selected>';
-						}
-						else
+						} else
 						{
 							$out.= '<option value="'.$obj->rowid.'">';
 						}
 						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 						if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 2) {
 							$out.= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-						}
-						else if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 1) {
+						} else if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 1) {
 							$out.= $obj->region_name . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-						}
-						else {
+						} else {
 							$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
 						}
 						$out.= '</option>';
@@ -280,10 +304,13 @@ 
 					$i++;
 				}
 			}
-			if (! empty($htmlname)) $out.= '</select>';
-			if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
+			if (! empty($htmlname)) {
+				$out.= '</select>';
+			}
+			if (! empty($htmlname) && $user->admin) {
+				$out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -331,8 +358,7 @@ 
 					$obj = $this->db->fetch_object($resql);
 					if ($obj->code == 0) {
 						print '<option value="0">&nbsp;</option>';
-					}
-					else {
+					} else {
 						if ($country == '' || $country != $obj->country)
 						{
 							// Show break
@@ -345,8 +371,7 @@ 
 						if ($selected > 0 && $selected == $obj->code)
 						{
 							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
-						}
-						else
+						} else
 						{
 							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
@@ -355,8 +380,7 @@ 
 				}
 			}
 			print '</select>';
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -396,8 +420,7 @@ 
 					if ($selected == $obj->code)
 					{
 						$out.= '<option value="'.$obj->code.'" selected>';
-					}
-					else
+					} else
 					{
 						$out.= '<option value="'.$obj->code.'">';
 					}
@@ -408,9 +431,10 @@ 
 				}
 			}
 			$out.= '</select>';
-			if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
+			if ($user->admin) {
+				$out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -456,8 +480,12 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE f.fk_pays=c.rowid";
 		$sql .= " AND f.active = 1 AND c.active = 1";
-		if ($country_codeid) $sql .= " AND c.code = '".$country_codeid."'";
-		if ($filter) $sql .= " ".$filter;
+		if ($country_codeid) {
+			$sql .= " AND c.code = '".$country_codeid."'";
+		}
+		if ($filter) {
+			$sql .= " ".$filter;
+		}
 		$sql .= " ORDER BY c.code";
 
 		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
@@ -466,7 +494,10 @@ 
 		{
 			$out.= '<div id="particulier2" class="visible">';
 			$out.= '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';	// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
+			if ($country_codeid) {
+				$out.= '<option value="0">&nbsp;</option>';
+			}
+			// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
 
 			$num = $this->db->num_rows($resql);
 			if ($num)
@@ -477,9 +508,11 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 
-					if ($obj->code)		// We exclude empty line, we will add it later
+					if ($obj->code) {
+						// We exclude empty line, we will add it later
 					{
 						$labelcountry=(($langs->trans("Country".$obj->country_code)!="Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
+					}
 						$labeljs=(($langs->trans("JuridicalStatus".$obj->code)!="JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label!='-'?$obj->label:''));	// $obj->label is already in output charset (converted by database driver)
 						$arraydata[$obj->code]=array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
 					}
@@ -487,10 +520,12 @@ 
 				}
 
 				$arraydata=dol_sort_array($arraydata, 'label_sort', 'ASC');
-				if (empty($country_codeid))	// Introduce empty value (if $country_codeid not empty, empty value was already added)
+				if (empty($country_codeid)) {
+					// Introduce empty value (if $country_codeid not empty, empty value was already added)
 				{
 					$arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
 				}
+				}
 
 				foreach($arraydata as $key => $val)
 				{
@@ -507,8 +542,7 @@ 
 					if ($selected > 0 && $selected == $val['code'])
 					{
 						$out.= '<option value="'.$val['code'].'" selected>';
-					}
-					else
+					} else
 					{
 						$out.= '<option value="'.$val['code'].'">';
 					}
@@ -518,15 +552,16 @@ 
 				}
 			}
 			$out.= '</select>';
-			if ($user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) {
+				$out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
 
 		    // Make select dynamic
         	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 	        $out .= ajax_combobox($htmlname);
 
 			$out.= '</div>';
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -577,7 +612,8 @@ 
 			// To refresh contacts list on thirdparty list change
 			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 
-			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
+			if (count($events)) {
+				// If there is some ajax events to run once selection is done, we add code here to run events
 			{
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
@@ -627,13 +663,13 @@ 
 				});
 				</script>';
 			}
+			}
 
 			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
 			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
 			print ajax_autocompleter(($socid?$socid:-1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
-		}
-		else
+		} else
 		{
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
@@ -663,20 +699,27 @@ 
 					while ($i < $num)
 					{
 						$obj = $this->db->fetch_object($resql);
-						if ($i == 0) $firstCompany = $obj->rowid;
+						if ($i == 0) {
+							$firstCompany = $obj->rowid;
+						}
 						$disabled=0;
-						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
+						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) {
+							$disabled=1;
+						}
 						if ($selected > 0 && $selected == $obj->rowid)
 						{
 							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
+							if ($disabled) {
+								print ' disabled';
+							}
 							print ' selected>'.dol_trunc($obj->name,24).'</option>';
 							$firstCompany = $obj->rowid;
-						}
-						else
+						} else
 						{
 							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
+							if ($disabled) {
+								print ' disabled';
+							}
 							print '>'.dol_trunc($obj->name,24).'</option>';
 						}
 						$i ++;
@@ -684,8 +727,7 @@ 
 				}
 				print "</select>\n";
 				return $firstCompany;
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 				print 'Error sql';
@@ -713,15 +755,21 @@ 
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
 			print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($showempty) print '<option value="0"></option>';
+			if ($showempty) {
+				print '<option value="0"></option>';
+			}
 			foreach($lesTypes as $key=>$value)
 			{
 				print '<option value="'.$key.'"';
-				if ($key == $selected) print ' selected';
+				if ($key == $selected) {
+					print ' selected';
+				}
 				print '>'.$value.'</option>';
 			}
 			print "</select>";
-			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) {
+				print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
 			print "\n";
 		}
 	}
@@ -745,7 +793,9 @@ 
 		$out='';
 
 		$size='';
-		if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
+		if (!empty($fieldsize)) {
+			$size='size="'.$fieldsize.'"';
+		}
 
 		if ($conf->use_javascript_ajax && empty($disableautocomplete))
 		{
@@ -776,27 +826,51 @@ 
         	if ($country_code == 'FR')
         	{
         		if (isset($idprof)) {
-        			if ($idprof==1) $formlength=9;
-        			else if ($idprof==2) $formlength=14;
-        			else if ($idprof==3) $formlength=5;      // 4 chiffres et 1 lettre depuis janvier
-        			else if ($idprof==4) $formlength=32;     // No maximum as we need to include a town name in this id
+        			if ($idprof==1) {
+        				$formlength=9;
+        			} else if ($idprof==2) {
+        				$formlength=14;
+        			} else if ($idprof==3) {
+        				$formlength=5;
+        			}
+        			// 4 chiffres et 1 lettre depuis janvier
+        			else if ($idprof==4) {
+        				$formlength=32;
+        			}
+        			// No maximum as we need to include a town name in this id
         		}
-        	}
-        	else if ($country_code == 'ES')
+        	} else if ($country_code == 'ES')
         	{
-        		if ($idprof==1) $formlength=9;  //CIF/NIF/NIE 9 digits
-        		if ($idprof==2) $formlength=12; //NASS 12 digits without /
-        		if ($idprof==3) $formlength=5;  //CNAE 5 digits
-        		if ($idprof==4) $formlength=32; //depend of college
+        		if ($idprof==1) {
+        			$formlength=9;
+        		}
+        		//CIF/NIF/NIE 9 digits
+        		if ($idprof==2) {
+        			$formlength=12;
+        		}
+        		//NASS 12 digits without /
+        		if ($idprof==3) {
+        			$formlength=5;
+        		}
+        		//CNAE 5 digits
+        		if ($idprof==4) {
+        			$formlength=32;
+        		}
+        		//depend of college
         	}
         }
 
         $selected=$preselected;
         if (! $selected && isset($idprof)) {
-        	if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
-        	else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
-        	else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
-        	else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
+        	if ($idprof==1 && ! empty($this->idprof1)) {
+        		$selected=$this->idprof1;
+        	} else if ($idprof==2 && ! empty($this->idprof2)) {
+        		$selected=$this->idprof2;
+        	} else if ($idprof==3 && ! empty($this->idprof3)) {
+        		$selected=$this->idprof3;
+        	} else if ($idprof==4 && ! empty($this->idprof4)) {
+        		$selected=$this->idprof4;
+        	}
         }
 
         $maxlength=$formlength;
@@ -834,8 +908,7 @@ 
     				if ($selected == $valors[$i])
     				{
     					print '<option value="'.$valors[$i].'" selected>';
-    				}
-    				else
+    				} else
     				{
     					print '<option value="'.$valors[$i].'">';
     				}

htdocs/holiday/class/holiday.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -1067,7 +1067,7 @@
      *  Supprime un utilisateur du module Congés Payés
      *
      *  @param	int		$user_id        ID de l'utilisateur à supprimer
-     *  @return boolean      			Vrai si pas d'erreur, faut si Erreur
+     *  @return boolean|null      			Vrai si pas d'erreur, faut si Erreur
      */
     function deleteCPuser($user_id) {
 

Indentation +1603 added lines, -1603 removed lines

@@ -36,277 +36,403 @@ 
 	public $table_element='holiday';
 	protected $isnolinkedbythird = 1;     // No field fk_soc
 	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto = 'holiday';
+	public $picto = 'holiday';
 
 	/**
 	 * @deprecated
 	 * @see id
 	 */
-    var $rowid;
-
-    var $fk_user;
-    var $date_create='';
-    var $description;
-    var $date_debut='';			// Date start in PHP server TZ
-    var $date_fin='';			// Date end in PHP server TZ
-    var $date_debut_gmt='';		// Date start in GMT
-    var $date_fin_gmt='';		// Date end in GMT
-    var $halfday='';
-    var $statut='';				// 1=draft, 2=validated, 3=approved
-    var $fk_validator;
-    var $date_valid='';
-    var $fk_user_valid;
-    var $date_refuse='';
-    var $fk_user_refuse;
-    var $date_cancel='';
-    var $fk_user_cancel;
-    var $detail_refuse='';
-    var $fk_type;
-
-    var $holiday = array();
-    var $events = array();
-    var $logs = array();
-
-    var $optName = '';
-    var $optValue = '';
-    var $optRowid = '';
-
-
-    /**
-     *   Constructor
-     *
-     *   @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-    }
-
-
-    /**
-     * Update balance of vacations and check table of users for holidays is complete. If not complete.
-     *
-     * @return	int			<0 if KO, >0 if OK
-     */
-    function updateBalance()
-    {
-    	$this->db->begin();
-
-	    // Update sold of vocations
-	    $result = $this->updateSoldeCP();
-
-	    // Check nb of users into table llx_holiday_users and update with empty lines
-	    //if ($result > 0) $result = $this->verifNbUsers($this->countActiveUsersWithoutCP(), $this->getConfCP('nbUser'));
-
-	    if ($result >= 0)
-	    {
-	    	$this->db->commit();
-	    	return 1;
-	    }
-	    else
+	var $rowid;
+
+	var $fk_user;
+	var $date_create='';
+	var $description;
+	var $date_debut='';			// Date start in PHP server TZ
+	var $date_fin='';			// Date end in PHP server TZ
+	var $date_debut_gmt='';		// Date start in GMT
+	var $date_fin_gmt='';		// Date end in GMT
+	var $halfday='';
+	var $statut='';				// 1=draft, 2=validated, 3=approved
+	var $fk_validator;
+	var $date_valid='';
+	var $fk_user_valid;
+	var $date_refuse='';
+	var $fk_user_refuse;
+	var $date_cancel='';
+	var $fk_user_cancel;
+	var $detail_refuse='';
+	var $fk_type;
+
+	var $holiday = array();
+	var $events = array();
+	var $logs = array();
+
+	var $optName = '';
+	var $optValue = '';
+	var $optRowid = '';
+
+
+	/**
+	 *   Constructor
+	 *
+	 *   @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+
+	/**
+	 * Update balance of vacations and check table of users for holidays is complete. If not complete.
+	 *
+	 * @return	int			<0 if KO, >0 if OK
+	 */
+	function updateBalance()
+	{
+		$this->db->begin();
+
+		// Update sold of vocations
+		$result = $this->updateSoldeCP();
+
+		// Check nb of users into table llx_holiday_users and update with empty lines
+		//if ($result > 0) $result = $this->verifNbUsers($this->countActiveUsersWithoutCP(), $this->getConfCP('nbUser'));
+
+		if ($result >= 0)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *   Créer un congés payés dans la base de données
+	 *
+	 *   @param		User	$user        	User that create
+	 *   @param     int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *   @return    int			         	<0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf;
+		$error=0;
+
+		$now=dol_now();
+
+		// Check parameters
+		if (empty($this->fk_user) || ! is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error="ErrorBadParameterFkUser"; return -1; }
+		if (empty($this->fk_validator) || ! is_numeric($this->fk_validator) || $this->fk_validator < 0)  { $this->error="ErrorBadParameterFkValidator"; return -1; }
+		if (empty($this->fk_type) || ! is_numeric($this->fk_type) || $this->fk_type < 0) { $this->error="ErrorBadParameterFkType"; return -1; }
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday(";
+		$sql.= "fk_user,";
+		$sql.= "date_create,";
+		$sql.= "description,";
+		$sql.= "date_debut,";
+		$sql.= "date_fin,";
+		$sql.= "halfday,";
+		$sql.= "statut,";
+		$sql.= "fk_validator,";
+		$sql.= "fk_type,";
+		$sql.= "fk_user_create,";
+		$sql.= "entity";
+		$sql.= ") VALUES (";
+		$sql.= "'".$this->db->escape($this->fk_user)."',";
+		$sql.= " '".$this->db->idate($now)."',";
+		$sql.= " '".$this->db->escape($this->description)."',";
+		$sql.= " '".$this->db->idate($this->date_debut)."',";
+		$sql.= " '".$this->db->idate($this->date_fin)."',";
+		$sql.= " ".$this->halfday.",";
+		$sql.= " '1',";
+		$sql.= " '".$this->db->escape($this->fk_validator)."',";
+		$sql.= " ".$this->fk_type.",";
+		$sql.= " ".$user->id.",";
+		$sql.= " ".$conf->entity;
+		$sql.= ")";
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (! $resql) {
+			$error++; $this->errors[]="Error ".$this->db->lasterror();
+		}
+
+		if (! $error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday");
+
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('HOLIDAY_CREATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+
+	/**
+	 *	Load object in memory from database
+	 *
+	 *  @param	int		$id         Id object
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	function fetch($id)
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql.= " cp.rowid,";
+		$sql.= " cp.fk_user,";
+		$sql.= " cp.date_create,";
+		$sql.= " cp.description,";
+		$sql.= " cp.date_debut,";
+		$sql.= " cp.date_fin,";
+		$sql.= " cp.halfday,";
+		$sql.= " cp.statut,";
+		$sql.= " cp.fk_validator,";
+		$sql.= " cp.date_valid,";
+		$sql.= " cp.fk_user_valid,";
+		$sql.= " cp.date_refuse,";
+		$sql.= " cp.fk_user_refuse,";
+		$sql.= " cp.date_cancel,";
+		$sql.= " cp.fk_user_cancel,";
+		$sql.= " cp.detail_refuse,";
+		$sql.= " cp.note_private,";
+		$sql.= " cp.note_public,";
+		$sql.= " cp.fk_user_create,";
+		$sql.= " cp.fk_type,";
+		$sql.= " cp.entity";
+		$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp";
+		$sql.= " WHERE cp.rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id    = $obj->rowid;
+				$this->rowid = $obj->rowid;	// deprecated
+				$this->ref   = $obj->rowid;
+				$this->fk_user = $obj->fk_user;
+				$this->date_create = $this->db->jdate($obj->date_create);
+				$this->description = $obj->description;
+				$this->date_debut = $this->db->jdate($obj->date_debut);
+				$this->date_fin = $this->db->jdate($obj->date_fin);
+				$this->date_debut_gmt = $this->db->jdate($obj->date_debut,1);
+				$this->date_fin_gmt = $this->db->jdate($obj->date_fin,1);
+				$this->halfday = $obj->halfday;
+				$this->statut = $obj->statut;
+				$this->fk_validator = $obj->fk_validator;
+				$this->date_valid = $this->db->jdate($obj->date_valid);
+				$this->fk_user_valid = $obj->fk_user_valid;
+				$this->date_refuse = $this->db->jdate($obj->date_refuse);
+				$this->fk_user_refuse = $obj->fk_user_refuse;
+				$this->date_cancel = $this->db->jdate($obj->date_cancel);
+				$this->fk_user_cancel = $obj->fk_user_cancel;
+				$this->detail_refuse = $obj->detail_refuse;
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
+				$this->fk_user_create = $obj->fk_user_create;
+				$this->fk_type = $obj->fk_type;
+				$this->entity = $obj->entity;
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *	List holidays for a particular user
+	 *
+	 *  @param		int		$user_id    ID of user to list
+	 *  @param      string	$order      Sort order
+	 *  @param      string	$filter     SQL Filter
+	 *  @return     int      			-1 if KO, 1 if OK, 2 if no result
+	 */
+	function fetchByUser($user_id, $order='', $filter='')
+	{
+		global $langs, $conf;
+
+		$sql = "SELECT";
+		$sql.= " cp.rowid,";
+
+		$sql.= " cp.fk_user,";
+		$sql.= " cp.fk_type,";
+		$sql.= " cp.date_create,";
+		$sql.= " cp.description,";
+		$sql.= " cp.date_debut,";
+		$sql.= " cp.date_fin,";
+		$sql.= " cp.halfday,";
+		$sql.= " cp.statut,";
+		$sql.= " cp.fk_validator,";
+		$sql.= " cp.date_valid,";
+		$sql.= " cp.fk_user_valid,";
+		$sql.= " cp.date_refuse,";
+		$sql.= " cp.fk_user_refuse,";
+		$sql.= " cp.date_cancel,";
+		$sql.= " cp.fk_user_cancel,";
+		$sql.= " cp.detail_refuse,";
+
+		$sql.= " uu.lastname as user_lastname,";
+		$sql.= " uu.firstname as user_firstname,";
+		$sql.= " uu.login as user_login,";
+		$sql.= " uu.statut as user_statut,";
+		$sql.= " uu.photo as user_photo,";
+
+		$sql.= " ua.lastname as validator_lastname,";
+		$sql.= " ua.firstname as validator_firstname,";
+		$sql.= " ua.login as validator_login,";
+		$sql.= " ua.statut as validator_statut,";
+		$sql.= " ua.photo as validator_photo";
+
+		$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
+		$sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
+		$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
+		$sql.= " AND cp.fk_user = ".$user_id;
+
+		// Filtre de séléction
+		if(!empty($filter)) {
+			$sql.= $filter;
+		}
+
+		// Ordre d'affichage du résultat
+		if(!empty($order)) {
+			$sql.= $order;
+		}
+
+		dol_syslog(get_class($this)."::fetchByUser", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+
+		// Si pas d'erreur SQL
+		if ($resql) {
+
+			$i = 0;
+			$tab_result = $this->holiday;
+			$num = $this->db->num_rows($resql);
+
+			// Si pas d'enregistrement
+			if(!$num) {
+				return 2;
+			}
+
+			// Liste les enregistrements et les ajoutent au tableau
+			while($i < $num) {
+
+				$obj = $this->db->fetch_object($resql);
+
+				$tab_result[$i]['rowid'] = $obj->rowid;
+				$tab_result[$i]['ref'] = $obj->rowid;
+				$tab_result[$i]['fk_user'] = $obj->fk_user;
+				$tab_result[$i]['fk_type'] = $obj->fk_type;
+				$tab_result[$i]['date_create'] = $this->db->jdate($obj->date_create);
+				$tab_result[$i]['description'] = $obj->description;
+				$tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
+				$tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
+				$tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut,1);
+				$tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin,1);
+				$tab_result[$i]['halfday'] = $obj->halfday;
+				$tab_result[$i]['statut'] = $obj->statut;
+				$tab_result[$i]['fk_validator'] = $obj->fk_validator;
+				$tab_result[$i]['date_valid'] = $this->db->jdate($obj->date_valid);
+				$tab_result[$i]['fk_user_valid'] = $obj->fk_user_valid;
+				$tab_result[$i]['date_refuse'] = $this->db->jdate($obj->date_refuse);
+				$tab_result[$i]['fk_user_refuse'] = $obj->fk_user_refuse;
+				$tab_result[$i]['date_cancel'] = $this->db->jdate($obj->date_cancel);
+				$tab_result[$i]['fk_user_cancel'] = $obj->fk_user_cancel;
+				$tab_result[$i]['detail_refuse'] = $obj->detail_refuse;
+
+				$tab_result[$i]['user_firstname'] = $obj->user_firstname;
+				$tab_result[$i]['user_lastname'] = $obj->user_lastname;
+				$tab_result[$i]['user_login'] = $obj->user_login;
+				$tab_result[$i]['user_statut'] = $obj->user_statut;
+				$tab_result[$i]['user_photo'] = $obj->user_photo;
+
+				$tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
+				$tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
+				$tab_result[$i]['validator_login'] = $obj->validator_login;
+				$tab_result[$i]['validator_statut'] = $obj->validator_statut;
+				$tab_result[$i]['validator_photo'] = $obj->validator_photo;
+
+				$i++;
+			}
+
+			// Retourne 1 avec le tableau rempli
+			$this->holiday = $tab_result;
+			return 1;
+		}
+		else
 		{
-	    	$this->db->rollback();
-	    	return -1;
+			// Erreur SQL
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
 		}
-    }
-
-    /**
-     *   Créer un congés payés dans la base de données
-     *
-     *   @param		User	$user        	User that create
-     *   @param     int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *   @return    int			         	<0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-        global $conf;
-        $error=0;
-
-        $now=dol_now();
-
-        // Check parameters
-        if (empty($this->fk_user) || ! is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error="ErrorBadParameterFkUser"; return -1; }
-        if (empty($this->fk_validator) || ! is_numeric($this->fk_validator) || $this->fk_validator < 0)  { $this->error="ErrorBadParameterFkValidator"; return -1; }
-        if (empty($this->fk_type) || ! is_numeric($this->fk_type) || $this->fk_type < 0) { $this->error="ErrorBadParameterFkType"; return -1; }
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday(";
-        $sql.= "fk_user,";
-        $sql.= "date_create,";
-        $sql.= "description,";
-        $sql.= "date_debut,";
-        $sql.= "date_fin,";
-        $sql.= "halfday,";
-        $sql.= "statut,";
-        $sql.= "fk_validator,";
-        $sql.= "fk_type,";
-        $sql.= "fk_user_create,";
-        $sql.= "entity";
-        $sql.= ") VALUES (";
-        $sql.= "'".$this->db->escape($this->fk_user)."',";
-        $sql.= " '".$this->db->idate($now)."',";
-        $sql.= " '".$this->db->escape($this->description)."',";
-        $sql.= " '".$this->db->idate($this->date_debut)."',";
-        $sql.= " '".$this->db->idate($this->date_fin)."',";
-        $sql.= " ".$this->halfday.",";
-        $sql.= " '1',";
-        $sql.= " '".$this->db->escape($this->fk_validator)."',";
-        $sql.= " ".$this->fk_type.",";
-        $sql.= " ".$user->id.",";
-        $sql.= " ".$conf->entity;
-        $sql.= ")";
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) {
-            $error++; $this->errors[]="Error ".$this->db->lasterror();
-        }
-
-        if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday");
-
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('HOLIDAY_CREATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
-
-
-    /**
-     *	Load object in memory from database
-     *
-     *  @param	int		$id         Id object
-     *  @return int         		<0 if KO, >0 if OK
-     */
-    function fetch($id)
-    {
-        global $langs;
-
-        $sql = "SELECT";
-        $sql.= " cp.rowid,";
-        $sql.= " cp.fk_user,";
-        $sql.= " cp.date_create,";
-        $sql.= " cp.description,";
-        $sql.= " cp.date_debut,";
-        $sql.= " cp.date_fin,";
-        $sql.= " cp.halfday,";
-        $sql.= " cp.statut,";
-        $sql.= " cp.fk_validator,";
-        $sql.= " cp.date_valid,";
-        $sql.= " cp.fk_user_valid,";
-        $sql.= " cp.date_refuse,";
-        $sql.= " cp.fk_user_refuse,";
-        $sql.= " cp.date_cancel,";
-        $sql.= " cp.fk_user_cancel,";
-        $sql.= " cp.detail_refuse,";
-        $sql.= " cp.note_private,";
-        $sql.= " cp.note_public,";
-        $sql.= " cp.fk_user_create,";
-        $sql.= " cp.fk_type,";
-        $sql.= " cp.entity";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp";
-        $sql.= " WHERE cp.rowid = ".$id;
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id    = $obj->rowid;
-                $this->rowid = $obj->rowid;	// deprecated
-                $this->ref   = $obj->rowid;
-                $this->fk_user = $obj->fk_user;
-                $this->date_create = $this->db->jdate($obj->date_create);
-                $this->description = $obj->description;
-                $this->date_debut = $this->db->jdate($obj->date_debut);
-                $this->date_fin = $this->db->jdate($obj->date_fin);
-                $this->date_debut_gmt = $this->db->jdate($obj->date_debut,1);
-                $this->date_fin_gmt = $this->db->jdate($obj->date_fin,1);
-                $this->halfday = $obj->halfday;
-                $this->statut = $obj->statut;
-                $this->fk_validator = $obj->fk_validator;
-                $this->date_valid = $this->db->jdate($obj->date_valid);
-                $this->fk_user_valid = $obj->fk_user_valid;
-                $this->date_refuse = $this->db->jdate($obj->date_refuse);
-                $this->fk_user_refuse = $obj->fk_user_refuse;
-                $this->date_cancel = $this->db->jdate($obj->date_cancel);
-                $this->fk_user_cancel = $obj->fk_user_cancel;
-                $this->detail_refuse = $obj->detail_refuse;
-                $this->note_private = $obj->note_private;
-                $this->note_public = $obj->note_public;
-                $this->fk_user_create = $obj->fk_user_create;
-                $this->fk_type = $obj->fk_type;
-                $this->entity = $obj->entity;
-            }
-            $this->db->free($resql);
-
-            return 1;
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *	List holidays for a particular user
-     *
-     *  @param		int		$user_id    ID of user to list
-     *  @param      string	$order      Sort order
-     *  @param      string	$filter     SQL Filter
-     *  @return     int      			-1 if KO, 1 if OK, 2 if no result
-     */
-    function fetchByUser($user_id, $order='', $filter='')
-    {
-        global $langs, $conf;
-
-        $sql = "SELECT";
-        $sql.= " cp.rowid,";
-
-        $sql.= " cp.fk_user,";
+	}
+
+	/**
+	 *	List all holidays of all users
+	 *
+	 *  @param      string	$order      Sort order
+	 *  @param      string	$filter     SQL Filter
+	 *  @return     int      			-1 if KO, 1 if OK, 2 if no result
+	 */
+	function fetchAll($order,$filter)
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql.= " cp.rowid,";
+
+		$sql.= " cp.fk_user,";
 		$sql.= " cp.fk_type,";
 		$sql.= " cp.date_create,";
-        $sql.= " cp.description,";
-        $sql.= " cp.date_debut,";
-        $sql.= " cp.date_fin,";
-        $sql.= " cp.halfday,";
-        $sql.= " cp.statut,";
-        $sql.= " cp.fk_validator,";
-        $sql.= " cp.date_valid,";
-        $sql.= " cp.fk_user_valid,";
-        $sql.= " cp.date_refuse,";
-        $sql.= " cp.fk_user_refuse,";
-        $sql.= " cp.date_cancel,";
-        $sql.= " cp.fk_user_cancel,";
-        $sql.= " cp.detail_refuse,";
+		$sql.= " cp.description,";
+		$sql.= " cp.date_debut,";
+		$sql.= " cp.date_fin,";
+		$sql.= " cp.halfday,";
+		$sql.= " cp.statut,";
+		$sql.= " cp.fk_validator,";
+		$sql.= " cp.date_valid,";
+		$sql.= " cp.fk_user_valid,";
+		$sql.= " cp.date_refuse,";
+		$sql.= " cp.fk_user_refuse,";
+		$sql.= " cp.date_cancel,";
+		$sql.= " cp.fk_user_cancel,";
+		$sql.= " cp.detail_refuse,";
 
 		$sql.= " uu.lastname as user_lastname,";
 		$sql.= " uu.firstname as user_firstname,";
@@ -314,553 +440,427 @@ 
 		$sql.= " uu.statut as user_statut,";
 		$sql.= " uu.photo as user_photo,";
 
-        $sql.= " ua.lastname as validator_lastname,";
-        $sql.= " ua.firstname as validator_firstname,";
-        $sql.= " ua.login as validator_login,";
-        $sql.= " ua.statut as validator_statut,";
-        $sql.= " ua.photo as validator_photo";
+		$sql.= " ua.lastname as validator_lastname,";
+		$sql.= " ua.firstname as validator_firstname,";
+		$sql.= " ua.login as validator_login,";
+		$sql.= " ua.statut as validator_statut,";
+		$sql.= " ua.photo as validator_photo";
 
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-        $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
+		$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
+		$sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
 		$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
-        $sql.= " AND cp.fk_user = ".$user_id;
-
-        // Filtre de séléction
-        if(!empty($filter)) {
-            $sql.= $filter;
-        }
-
-        // Ordre d'affichage du résultat
-        if(!empty($order)) {
-            $sql.= $order;
-        }
-
-        dol_syslog(get_class($this)."::fetchByUser", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-
-        // Si pas d'erreur SQL
-        if ($resql) {
-
-            $i = 0;
-            $tab_result = $this->holiday;
-            $num = $this->db->num_rows($resql);
-
-            // Si pas d'enregistrement
-            if(!$num) {
-                return 2;
-            }
-
-            // Liste les enregistrements et les ajoutent au tableau
-            while($i < $num) {
-
-                $obj = $this->db->fetch_object($resql);
-
-                $tab_result[$i]['rowid'] = $obj->rowid;
-                $tab_result[$i]['ref'] = $obj->rowid;
-                $tab_result[$i]['fk_user'] = $obj->fk_user;
-                $tab_result[$i]['fk_type'] = $obj->fk_type;
-                $tab_result[$i]['date_create'] = $this->db->jdate($obj->date_create);
-                $tab_result[$i]['description'] = $obj->description;
-                $tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
-                $tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
-                $tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut,1);
-                $tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin,1);
-                $tab_result[$i]['halfday'] = $obj->halfday;
-                $tab_result[$i]['statut'] = $obj->statut;
-                $tab_result[$i]['fk_validator'] = $obj->fk_validator;
-                $tab_result[$i]['date_valid'] = $this->db->jdate($obj->date_valid);
-                $tab_result[$i]['fk_user_valid'] = $obj->fk_user_valid;
-                $tab_result[$i]['date_refuse'] = $this->db->jdate($obj->date_refuse);
-                $tab_result[$i]['fk_user_refuse'] = $obj->fk_user_refuse;
-                $tab_result[$i]['date_cancel'] = $this->db->jdate($obj->date_cancel);
-                $tab_result[$i]['fk_user_cancel'] = $obj->fk_user_cancel;
-                $tab_result[$i]['detail_refuse'] = $obj->detail_refuse;
-
-                $tab_result[$i]['user_firstname'] = $obj->user_firstname;
-                $tab_result[$i]['user_lastname'] = $obj->user_lastname;
-                $tab_result[$i]['user_login'] = $obj->user_login;
-                $tab_result[$i]['user_statut'] = $obj->user_statut;
-                $tab_result[$i]['user_photo'] = $obj->user_photo;
-
-                $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
-                $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
-                $tab_result[$i]['validator_login'] = $obj->validator_login;
-                $tab_result[$i]['validator_statut'] = $obj->validator_statut;
-                $tab_result[$i]['validator_photo'] = $obj->validator_photo;
-
-                $i++;
-            }
-
-            // Retourne 1 avec le tableau rempli
-            $this->holiday = $tab_result;
-            return 1;
-        }
-        else
-        {
-            // Erreur SQL
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *	List all holidays of all users
-     *
-     *  @param      string	$order      Sort order
-     *  @param      string	$filter     SQL Filter
-     *  @return     int      			-1 if KO, 1 if OK, 2 if no result
-     */
-    function fetchAll($order,$filter)
-    {
-        global $langs;
-
-        $sql = "SELECT";
-        $sql.= " cp.rowid,";
-
-        $sql.= " cp.fk_user,";
-        $sql.= " cp.fk_type,";
-        $sql.= " cp.date_create,";
-        $sql.= " cp.description,";
-        $sql.= " cp.date_debut,";
-        $sql.= " cp.date_fin,";
-        $sql.= " cp.halfday,";
-        $sql.= " cp.statut,";
-        $sql.= " cp.fk_validator,";
-        $sql.= " cp.date_valid,";
-        $sql.= " cp.fk_user_valid,";
-        $sql.= " cp.date_refuse,";
-        $sql.= " cp.fk_user_refuse,";
-        $sql.= " cp.date_cancel,";
-        $sql.= " cp.fk_user_cancel,";
-        $sql.= " cp.detail_refuse,";
-
-        $sql.= " uu.lastname as user_lastname,";
-        $sql.= " uu.firstname as user_firstname,";
-        $sql.= " uu.login as user_login,";
-        $sql.= " uu.statut as user_statut,";
-        $sql.= " uu.photo as user_photo,";
-
-        $sql.= " ua.lastname as validator_lastname,";
-        $sql.= " ua.firstname as validator_firstname,";
-        $sql.= " ua.login as validator_login,";
-        $sql.= " ua.statut as validator_statut,";
-        $sql.= " ua.photo as validator_photo";
-
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-        $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
-        $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
-
-        // Filtrage de séléction
-        if(!empty($filter)) {
-            $sql.= $filter;
-        }
-
-        // Ordre d'affichage
-        if(!empty($order)) {
-            $sql.= $order;
-        }
-
-        dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-
-        // Si pas d'erreur SQL
-        if ($resql) {
-
-            $i = 0;
-            $tab_result = $this->holiday;
-            $num = $this->db->num_rows($resql);
-
-            // Si pas d'enregistrement
-            if(!$num) {
-                return 2;
-            }
-
-            // On liste les résultats et on les ajoutent dans le tableau
-            while($i < $num) {
-
-                $obj = $this->db->fetch_object($resql);
-
-                $tab_result[$i]['rowid'] = $obj->rowid;
-                $tab_result[$i]['ref'] = $obj->rowid;
-                $tab_result[$i]['fk_user'] = $obj->fk_user;
-                $tab_result[$i]['fk_type'] = $obj->fk_type;
-                $tab_result[$i]['date_create'] = $this->db->jdate($obj->date_create);
-                $tab_result[$i]['description'] = $obj->description;
-                $tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
-                $tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
-                $tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut,1);
-                $tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin,1);
-                $tab_result[$i]['halfday'] = $obj->halfday;
-                $tab_result[$i]['statut'] = $obj->statut;
-                $tab_result[$i]['fk_validator'] = $obj->fk_validator;
-                $tab_result[$i]['date_valid'] = $this->db->jdate($obj->date_valid);
-                $tab_result[$i]['fk_user_valid'] = $obj->fk_user_valid;
-                $tab_result[$i]['date_refuse'] = $obj->date_refuse;
-                $tab_result[$i]['fk_user_refuse'] = $obj->fk_user_refuse;
-                $tab_result[$i]['date_cancel'] = $obj->date_cancel;
-                $tab_result[$i]['fk_user_cancel'] = $obj->fk_user_cancel;
-                $tab_result[$i]['detail_refuse'] = $obj->detail_refuse;
-
-                $tab_result[$i]['user_firstname'] = $obj->user_firstname;
-                $tab_result[$i]['user_lastname'] = $obj->user_lastname;
-                $tab_result[$i]['user_login'] = $obj->user_login;
-                $tab_result[$i]['user_statut'] = $obj->user_statut;
-                $tab_result[$i]['user_photo'] = $obj->user_photo;
-
-                $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
-                $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
-                $tab_result[$i]['validator_login'] = $obj->validator_login;
-                $tab_result[$i]['validator_statut'] = $obj->validator_statut;
-                $tab_result[$i]['validator_photo'] = $obj->validator_photo;
-
-                $i++;
-            }
-            // Retourne 1 et ajoute le tableau à la variable
-            $this->holiday = $tab_result;
-            return 1;
-        }
-        else
-        {
-            // Erreur SQL
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *	Update database
-     *
-     *  @param	User	$user        	User that modify
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return int         			<0 if KO, >0 if OK
-     */
-    function update($user=null, $notrigger=0)
-    {
-        global $conf, $langs;
-        $error=0;
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET";
-
-        $sql.= " description= '".$this->db->escape($this->description)."',";
-
-        if(!empty($this->date_debut)) {
-            $sql.= " date_debut = '".$this->db->idate($this->date_debut)."',";
-        } else {
-            $error++;
-        }
-        if(!empty($this->date_fin)) {
-            $sql.= " date_fin = '".$this->db->idate($this->date_fin)."',";
-        } else {
-            $error++;
-        }
-       	$sql.= " halfday = ".$this->halfday.",";
-        if(!empty($this->statut) && is_numeric($this->statut)) {
-            $sql.= " statut = ".$this->statut.",";
-        } else {
-            $error++;
-        }
-        if(!empty($this->fk_validator)) {
-            $sql.= " fk_validator = '".$this->db->escape($this->fk_validator)."',";
-        } else {
-            $error++;
-        }
-        if(!empty($this->date_valid)) {
-            $sql.= " date_valid = '".$this->db->idate($this->date_valid)."',";
-        } else {
-            $sql.= " date_valid = NULL,";
-        }
-        if(!empty($this->fk_user_valid)) {
-            $sql.= " fk_user_valid = '".$this->db->escape($this->fk_user_valid)."',";
-        } else {
-            $sql.= " fk_user_valid = NULL,";
-        }
-        if(!empty($this->date_refuse)) {
-            $sql.= " date_refuse = '".$this->db->idate($this->date_refuse)."',";
-        } else {
-            $sql.= " date_refuse = NULL,";
-        }
-        if(!empty($this->fk_user_refuse)) {
-            $sql.= " fk_user_refuse = '".$this->db->escape($this->fk_user_refuse)."',";
-        } else {
-            $sql.= " fk_user_refuse = NULL,";
-        }
-        if(!empty($this->date_cancel)) {
-            $sql.= " date_cancel = '".$this->db->idate($this->date_cancel)."',";
-        } else {
-            $sql.= " date_cancel = NULL,";
-        }
-        if(!empty($this->fk_user_cancel)) {
-            $sql.= " fk_user_cancel = '".$this->db->escape($this->fk_user_cancel)."',";
-        } else {
-            $sql.= " fk_user_cancel = NULL,";
-        }
-        if(!empty($this->detail_refuse)) {
-            $sql.= " detail_refuse = '".$this->db->escape($this->detail_refuse)."'";
-        } else {
-            $sql.= " detail_refuse = NULL";
-        }
-
-        $sql.= " WHERE rowid= ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) {
-            $error++; $this->errors[]="Error ".$this->db->lasterror();
-        }
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('HOLIDAY_MODIFY',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-
-    /**
-     *   Delete object in database
-     *
-     *	 @param		User	$user        	User that delete
-     *   @param     int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *	 @return	int						<0 if KO, >0 if OK
-     */
-    function delete($user, $notrigger=0)
-    {
-        global $conf, $langs;
-        $error=0;
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday";
-        $sql.= " WHERE rowid=".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) {
-            $error++; $this->errors[]="Error ".$this->db->lasterror();
-        }
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('HOLIDAY_DELETE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *	Check if a user is on holiday (partially or completely) into a period.
-     *  This function can be used to avoid to have 2 leave requests on same period for example.
-     *  Warning: It consumes a lot of memory because it load in ->holiday all holiday of a dedicated user at each call.
-     *
-     * 	@param 	int		$fk_user		Id user
-     * 	@param 	date	$dateDebut		Start date of period to check
-     * 	@param 	date	$dateFin		End date of period to check
-     *  @param	int		$halfday		Tag to define how start and end the period to check:
-     *  	    						0:Full days, 2:Sart afternoon end monring, -1:Start afternoon, 1:End morning
-     * 	@return boolean					False is on holiday at least partially into the period, True is never on holiday during chcked period.
-     *  @see verifDateHolidayForTimestamp
-     */
-    function verifDateHolidayCP($fk_user, $dateDebut, $dateFin, $halfday=0)
-    {
-        $this->fetchByUser($fk_user,'','');
-
-        foreach($this->holiday as $infos_CP)
-        {
-        	if ($infos_CP['statut'] == 4) continue;		// ignore not validated holidays
-        	if ($infos_CP['statut'] == 5) continue;		// ignore not validated holidays
-
-        	// TODO Also use halfday for the check
-        	if ($halfday == 0)
-        	{
-	            if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
-	            {
-	                return false;
-	            }
-        	}
-            elseif ($halfday == -1)
-        	{
-	            if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
-	            {
-	                return false;
-	            }
-        	}
-            elseif ($halfday == 1)
-        	{
-	            if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
-	            {
-	                return false;
-	            }
-        	}
-            elseif ($halfday == 2)
-        	{
-	            if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
-	            {
-	                return false;
-	            }
-        	}
-        	else
-        	{
-        		dol_print_error('', 'Bad value of parameter halfday when calling function verifDateHolidayCP');
-        	}
-        }
-
-        return true;
-    }
-
-
-    /**
-     *	Check a user is not on holiday for a particular timestamp
-     *
-     * 	@param 	int			$fk_user				Id user
-     *  @param	timestamp	$timestamp				Time stamp date for a day (YYYY-MM-DD) without hours  (= 12:00AM in english and not 12:00PM that is 12:00)
-     * 	@return array								array('morning'=> ,'afternoon'=> ), Boolean is true if user is available for day timestamp.
-     *  @see verifDateHolidayCP
-     */
-    function verifDateHolidayForTimestamp($fk_user, $timestamp)
-    {
-    	global $langs, $conf;
-
-    	$isavailablemorning=true;
-    	$isavailableafternoon=true;
-
-    	$sql = "SELECT cp.rowid, cp.date_debut as date_start, cp.date_fin as date_end, cp.halfday";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp";
-    	$sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
-    	$sql.= " AND cp.fk_user = ".(int) $fk_user;
+
+		// Filtrage de séléction
+		if(!empty($filter)) {
+			$sql.= $filter;
+		}
+
+		// Ordre d'affichage
+		if(!empty($order)) {
+			$sql.= $order;
+		}
+
+		dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+
+		// Si pas d'erreur SQL
+		if ($resql) {
+
+			$i = 0;
+			$tab_result = $this->holiday;
+			$num = $this->db->num_rows($resql);
+
+			// Si pas d'enregistrement
+			if(!$num) {
+				return 2;
+			}
+
+			// On liste les résultats et on les ajoutent dans le tableau
+			while($i < $num) {
+
+				$obj = $this->db->fetch_object($resql);
+
+				$tab_result[$i]['rowid'] = $obj->rowid;
+				$tab_result[$i]['ref'] = $obj->rowid;
+				$tab_result[$i]['fk_user'] = $obj->fk_user;
+				$tab_result[$i]['fk_type'] = $obj->fk_type;
+				$tab_result[$i]['date_create'] = $this->db->jdate($obj->date_create);
+				$tab_result[$i]['description'] = $obj->description;
+				$tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
+				$tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
+				$tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut,1);
+				$tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin,1);
+				$tab_result[$i]['halfday'] = $obj->halfday;
+				$tab_result[$i]['statut'] = $obj->statut;
+				$tab_result[$i]['fk_validator'] = $obj->fk_validator;
+				$tab_result[$i]['date_valid'] = $this->db->jdate($obj->date_valid);
+				$tab_result[$i]['fk_user_valid'] = $obj->fk_user_valid;
+				$tab_result[$i]['date_refuse'] = $obj->date_refuse;
+				$tab_result[$i]['fk_user_refuse'] = $obj->fk_user_refuse;
+				$tab_result[$i]['date_cancel'] = $obj->date_cancel;
+				$tab_result[$i]['fk_user_cancel'] = $obj->fk_user_cancel;
+				$tab_result[$i]['detail_refuse'] = $obj->detail_refuse;
+
+				$tab_result[$i]['user_firstname'] = $obj->user_firstname;
+				$tab_result[$i]['user_lastname'] = $obj->user_lastname;
+				$tab_result[$i]['user_login'] = $obj->user_login;
+				$tab_result[$i]['user_statut'] = $obj->user_statut;
+				$tab_result[$i]['user_photo'] = $obj->user_photo;
+
+				$tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
+				$tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
+				$tab_result[$i]['validator_login'] = $obj->validator_login;
+				$tab_result[$i]['validator_statut'] = $obj->validator_statut;
+				$tab_result[$i]['validator_photo'] = $obj->validator_photo;
+
+				$i++;
+			}
+			// Retourne 1 et ajoute le tableau à la variable
+			$this->holiday = $tab_result;
+			return 1;
+		}
+		else
+		{
+			// Erreur SQL
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update database
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int         			<0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET";
+
+		$sql.= " description= '".$this->db->escape($this->description)."',";
+
+		if(!empty($this->date_debut)) {
+			$sql.= " date_debut = '".$this->db->idate($this->date_debut)."',";
+		} else {
+			$error++;
+		}
+		if(!empty($this->date_fin)) {
+			$sql.= " date_fin = '".$this->db->idate($this->date_fin)."',";
+		} else {
+			$error++;
+		}
+	   	$sql.= " halfday = ".$this->halfday.",";
+		if(!empty($this->statut) && is_numeric($this->statut)) {
+			$sql.= " statut = ".$this->statut.",";
+		} else {
+			$error++;
+		}
+		if(!empty($this->fk_validator)) {
+			$sql.= " fk_validator = '".$this->db->escape($this->fk_validator)."',";
+		} else {
+			$error++;
+		}
+		if(!empty($this->date_valid)) {
+			$sql.= " date_valid = '".$this->db->idate($this->date_valid)."',";
+		} else {
+			$sql.= " date_valid = NULL,";
+		}
+		if(!empty($this->fk_user_valid)) {
+			$sql.= " fk_user_valid = '".$this->db->escape($this->fk_user_valid)."',";
+		} else {
+			$sql.= " fk_user_valid = NULL,";
+		}
+		if(!empty($this->date_refuse)) {
+			$sql.= " date_refuse = '".$this->db->idate($this->date_refuse)."',";
+		} else {
+			$sql.= " date_refuse = NULL,";
+		}
+		if(!empty($this->fk_user_refuse)) {
+			$sql.= " fk_user_refuse = '".$this->db->escape($this->fk_user_refuse)."',";
+		} else {
+			$sql.= " fk_user_refuse = NULL,";
+		}
+		if(!empty($this->date_cancel)) {
+			$sql.= " date_cancel = '".$this->db->idate($this->date_cancel)."',";
+		} else {
+			$sql.= " date_cancel = NULL,";
+		}
+		if(!empty($this->fk_user_cancel)) {
+			$sql.= " fk_user_cancel = '".$this->db->escape($this->fk_user_cancel)."',";
+		} else {
+			$sql.= " fk_user_cancel = NULL,";
+		}
+		if(!empty($this->detail_refuse)) {
+			$sql.= " detail_refuse = '".$this->db->escape($this->detail_refuse)."'";
+		} else {
+			$sql.= " detail_refuse = NULL";
+		}
+
+		$sql.= " WHERE rowid= ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error++; $this->errors[]="Error ".$this->db->lasterror();
+		}
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('HOLIDAY_MODIFY',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 *   Delete object in database
+	 *
+	 *	 @param		User	$user        	User that delete
+	 *   @param     int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *	 @return	int						<0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday";
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error++; $this->errors[]="Error ".$this->db->lasterror();
+		}
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('HOLIDAY_DELETE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *	Check if a user is on holiday (partially or completely) into a period.
+	 *  This function can be used to avoid to have 2 leave requests on same period for example.
+	 *  Warning: It consumes a lot of memory because it load in ->holiday all holiday of a dedicated user at each call.
+	 *
+	 * 	@param 	int		$fk_user		Id user
+	 * 	@param 	date	$dateDebut		Start date of period to check
+	 * 	@param 	date	$dateFin		End date of period to check
+	 *  @param	int		$halfday		Tag to define how start and end the period to check:
+	 *  	    						0:Full days, 2:Sart afternoon end monring, -1:Start afternoon, 1:End morning
+	 * 	@return boolean					False is on holiday at least partially into the period, True is never on holiday during chcked period.
+	 *  @see verifDateHolidayForTimestamp
+	 */
+	function verifDateHolidayCP($fk_user, $dateDebut, $dateFin, $halfday=0)
+	{
+		$this->fetchByUser($fk_user,'','');
+
+		foreach($this->holiday as $infos_CP)
+		{
+			if ($infos_CP['statut'] == 4) continue;		// ignore not validated holidays
+			if ($infos_CP['statut'] == 5) continue;		// ignore not validated holidays
+
+			// TODO Also use halfday for the check
+			if ($halfday == 0)
+			{
+				if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
+				{
+					return false;
+				}
+			}
+			elseif ($halfday == -1)
+			{
+				if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
+				{
+					return false;
+				}
+			}
+			elseif ($halfday == 1)
+			{
+				if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
+				{
+					return false;
+				}
+			}
+			elseif ($halfday == 2)
+			{
+				if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
+				{
+					return false;
+				}
+			}
+			else
+			{
+				dol_print_error('', 'Bad value of parameter halfday when calling function verifDateHolidayCP');
+			}
+		}
+
+		return true;
+	}
+
+
+	/**
+	 *	Check a user is not on holiday for a particular timestamp
+	 *
+	 * 	@param 	int			$fk_user				Id user
+	 *  @param	timestamp	$timestamp				Time stamp date for a day (YYYY-MM-DD) without hours  (= 12:00AM in english and not 12:00PM that is 12:00)
+	 * 	@return array								array('morning'=> ,'afternoon'=> ), Boolean is true if user is available for day timestamp.
+	 *  @see verifDateHolidayCP
+	 */
+	function verifDateHolidayForTimestamp($fk_user, $timestamp)
+	{
+		global $langs, $conf;
+
+		$isavailablemorning=true;
+		$isavailableafternoon=true;
+
+		$sql = "SELECT cp.rowid, cp.date_debut as date_start, cp.date_fin as date_end, cp.halfday";
+		$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp";
+		$sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
+		$sql.= " AND cp.fk_user = ".(int) $fk_user;
    		$sql.= " AND date_debut <= '".$this->db->idate($timestamp)."' AND date_fin >= '".$this->db->idate($timestamp)."'";
 
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num_rows = $this->db->num_rows($resql);	// Note, we can have 2 records if on is morning and the other one is afternoon
-    		if ($num_rows > 0)
-    		{
-	    		$i=0;
-	    		while ($i < $num_rows)
-	    		{
-	    			$obj = $this->db->fetch_object($resql);
-
-	    			// Note: $obj->halday is  0:Full days, 2:Sart afternoon end morning, -1:Start afternoon, 1:End morning
-	    			$arrayofrecord[$obj->rowid]=array('date_start'=>$this->db->jdate($obj->date_start), 'date_end'=>$this->db->jdate($obj->date_end), 'halfday'=>$obj->halfday);
-	    			$i++;
-	    		}
-
-    			// We found a record, user is on holiday by default, so is not available is true.
-	    		$isavailablemorning = true;
-	    		foreach($arrayofrecord as $record)
-	    		{
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num_rows = $this->db->num_rows($resql);	// Note, we can have 2 records if on is morning and the other one is afternoon
+			if ($num_rows > 0)
+			{
+				$i=0;
+				while ($i < $num_rows)
+				{
+					$obj = $this->db->fetch_object($resql);
+
+					// Note: $obj->halday is  0:Full days, 2:Sart afternoon end morning, -1:Start afternoon, 1:End morning
+					$arrayofrecord[$obj->rowid]=array('date_start'=>$this->db->jdate($obj->date_start), 'date_end'=>$this->db->jdate($obj->date_end), 'halfday'=>$obj->halfday);
+					$i++;
+				}
+
+				// We found a record, user is on holiday by default, so is not available is true.
+				$isavailablemorning = true;
+				foreach($arrayofrecord as $record)
+				{
 					if ($timestamp == $record['date_start'] && $record['halfday'] == 2)  continue;
 					if ($timestamp == $record['date_start'] && $record['halfday'] == -1) continue;
-	    			$isavailablemorning = false;
-	    			break;
-	    		}
-    			$isavailableafternoon = true;
-	    		foreach($arrayofrecord as $record)
-	    		{
+					$isavailablemorning = false;
+					break;
+				}
+				$isavailableafternoon = true;
+				foreach($arrayofrecord as $record)
+				{
 					if ($timestamp == $record['date_end'] && $record['halfday'] == 2) continue;
 					if ($timestamp == $record['date_end'] && $record['halfday'] == 1) continue;
-	    			$isavailableafternoon = false;
-	    			break;
-	    		}
-    		}
-    	}
-    	else dol_print_error($this->db);
+					$isavailableafternoon = false;
+					break;
+				}
+			}
+		}
+		else dol_print_error($this->db);
 
    		return array('morning'=>$isavailablemorning, 'afternoon'=>$isavailableafternoon);
-    }
-
-
-    /**
-     *	Return clicable name (with picto eventually)
-     *
-     *	@param	int			$withpicto					0=_No picto, 1=Includes the picto in the linkn, 2=Picto only
-     *  @param  int     	$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string									String with URL
-     */
-    function getNomUrl($withpicto=0, $save_lastsearch_value=-1)
-    {
-        global $langs;
-
-        $result='';
-        $picto='holiday';
-        $label=$langs->trans("Show").': '.$this->ref;
-
-        $url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
-
-        //if ($option != 'nolink')
-        //{
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-        //}
-
-        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-        $linkend='</a>';
-
-        if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
-        return $result;
-    }
-
-
-    /**
-     *	Returns the label status
-     *
-     *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-     *	@return     string      		Label
-     */
-    function getLibStatut($mode=0)
-    {
-    	return $this->LibStatut($this->statut, $mode, $this->date_debut);
-    }
+	}
+
+
+	/**
+	 *	Return clicable name (with picto eventually)
+	 *
+	 *	@param	int			$withpicto					0=_No picto, 1=Includes the picto in the linkn, 2=Picto only
+	 *  @param  int     	$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string									String with URL
+	 */
+	function getNomUrl($withpicto=0, $save_lastsearch_value=-1)
+	{
+		global $langs;
+
+		$result='';
+		$picto='holiday';
+		$label=$langs->trans("Show").': '.$this->ref;
+
+		$url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
+
+		//if ($option != 'nolink')
+		//{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		//}
+
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend='</a>';
+
+		if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
+		return $result;
+	}
+
+
+	/**
+	 *	Returns the label status
+	 *
+	 *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 *	@return     string      		Label
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->statut, $mode, $this->date_debut);
+	}
 
 	/**
 	 *	Returns the label of a statut
@@ -876,11 +876,11 @@ 
 
 		if ($mode == 0)
 		{
-            if ($statut == 1) return $langs->trans('DraftCP');
-            if ($statut == 2) return $langs->trans('ToReviewCP');
-            if ($statut == 3) return $langs->trans('ApprovedCP');
-            if ($statut == 4) return $langs->trans('CancelCP');
-            if ($statut == 5) return $langs->trans('RefuseCP');
+			if ($statut == 1) return $langs->trans('DraftCP');
+			if ($statut == 2) return $langs->trans('ToReviewCP');
+			if ($statut == 3) return $langs->trans('ApprovedCP');
+			if ($statut == 4) return $langs->trans('CancelCP');
+			if ($statut == 5) return $langs->trans('RefuseCP');
 		}
 		if ($mode == 2)
 		{
@@ -914,865 +914,865 @@ 
 		}
 		if ($mode == 6)
 		{
-		    $pictoapproved='statut6';
-		    if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-		    if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
-		    if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
-		    if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-		    if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
-		    if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+			$pictoapproved='statut6';
+			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
+			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
+			if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
+			if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
+			if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
 		}
 
 		return $statut;
-    }
-
-
-    /**
-     *   Affiche un select HTML des statuts de congés payés
-     *
-     *   @param 	int		$selected   int du statut séléctionné par défaut
-     *   @return    string				affiche le select des statuts
-     */
-    function selectStatutCP($selected='') {
-
-        global $langs;
-
-        // Liste des statuts
-        $name = array('DraftCP','ToReviewCP','ApprovedCP','CancelCP','RefuseCP');
-        $nb = count($name)+1;
-
-        // Select HTML
-        $statut = '<select name="select_statut" class="flat">'."\n";
-        $statut.= '<option value="-1">&nbsp;</option>'."\n";
-
-        // Boucle des statuts
-        for($i=1; $i < $nb; $i++) {
-            if($i==$selected) {
-                $statut.= '<option value="'.$i.'" selected>'.$langs->trans($name[$i-1]).'</option>'."\n";
-            }
-            else {
-                $statut.= '<option value="'.$i.'">'.$langs->trans($name[$i-1]).'</option>'."\n";
-            }
-        }
-
-        $statut.= '</select>'."\n";
-        print $statut;
-
-    }
-
-    /**
-     *  Met à jour une option du module Holiday Payés
-     *
-     *  @param	string	$name       name du paramètre de configuration
-     *  @param	string	$value      vrai si mise à jour OK sinon faux
-     *  @return boolean				ok or ko
-     */
-    function updateConfCP($name,$value) {
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
-        $sql.= " value = '".$value."'";
-        $sql.= " WHERE name = '".$name."'";
-
-        dol_syslog(get_class($this).'::updateConfCP name='.$name.'', LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if($result) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     *  Return value of a conf parameterfor leave module
-     *  TODO Move this into llx_const table
-     *
-     *  @param	string	$name                 Name of parameter
-     *  @param  string  $createifnotfound     'stringvalue'=Create entry with string value if not found. For example 'YYYYMMDDHHMMSS'.
-     *  @return string      		          Value of parameter. Example: 'YYYYMMDDHHMMSS' or < 0 if error
-     */
-    function getConfCP($name, $createifnotfound='')
-    {
-        $sql = "SELECT value";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
-        $sql.= " WHERE name = '".$this->db->escape($name)."'";
-
-        dol_syslog(get_class($this).'::getConfCP name='.$name.' createifnotfound='.$createifnotfound, LOG_DEBUG);
-        $result = $this->db->query($sql);
-
-        if($result) {
-
-            $obj = $this->db->fetch_object($result);
-            // Return value
-            if (empty($obj))
-            {
-                if ($createifnotfound)
-                {
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_config(name, value)";
-                    $sql.= " VALUES('".$this->db->escape($name)."', '".$this->db->escape($createifnotfound)."')";
-                    $result = $this->db->query($sql);
-                    if ($result)
-                    {
-                        return $createifnotfound;
-                    }
-                    else
-                    {
-                        $this->error=$this->db->lasterror();
-                        return -2;
-                    }
-                }
-                else
-                {
-                    return '';
-                }
-            }
-            else
-            {
-                return $obj->value;
-            }
-        } else {
-
-            // Erreur SQL
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *	Met à jour le timestamp de la dernière mise à jour du solde des CP
-     *
-     *	@param		int		$userID		Id of user
-     *	@param		int		$nbHoliday	Nb of days
-     *  @param		int		$fk_type	Type of vacation
-     *  @return     int					0=Nothing done, 1=OK, -1=KO
-     */
-    function updateSoldeCP($userID='',$nbHoliday='', $fk_type='')
-    {
-        global $user, $langs;
-
-        $error = 0;
-
-        if (empty($userID) && empty($nbHoliday) && empty($fk_type))
-        {
-            $langs->load("holiday");
-
-            // Si mise à jour pour tout le monde en début de mois
+	}
+
+
+	/**
+	 *   Affiche un select HTML des statuts de congés payés
+	 *
+	 *   @param 	int		$selected   int du statut séléctionné par défaut
+	 *   @return    string				affiche le select des statuts
+	 */
+	function selectStatutCP($selected='') {
+
+		global $langs;
+
+		// Liste des statuts
+		$name = array('DraftCP','ToReviewCP','ApprovedCP','CancelCP','RefuseCP');
+		$nb = count($name)+1;
+
+		// Select HTML
+		$statut = '<select name="select_statut" class="flat">'."\n";
+		$statut.= '<option value="-1">&nbsp;</option>'."\n";
+
+		// Boucle des statuts
+		for($i=1; $i < $nb; $i++) {
+			if($i==$selected) {
+				$statut.= '<option value="'.$i.'" selected>'.$langs->trans($name[$i-1]).'</option>'."\n";
+			}
+			else {
+				$statut.= '<option value="'.$i.'">'.$langs->trans($name[$i-1]).'</option>'."\n";
+			}
+		}
+
+		$statut.= '</select>'."\n";
+		print $statut;
+
+	}
+
+	/**
+	 *  Met à jour une option du module Holiday Payés
+	 *
+	 *  @param	string	$name       name du paramètre de configuration
+	 *  @param	string	$value      vrai si mise à jour OK sinon faux
+	 *  @return boolean				ok or ko
+	 */
+	function updateConfCP($name,$value) {
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
+		$sql.= " value = '".$value."'";
+		$sql.= " WHERE name = '".$name."'";
+
+		dol_syslog(get_class($this).'::updateConfCP name='.$name.'', LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if($result) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 *  Return value of a conf parameterfor leave module
+	 *  TODO Move this into llx_const table
+	 *
+	 *  @param	string	$name                 Name of parameter
+	 *  @param  string  $createifnotfound     'stringvalue'=Create entry with string value if not found. For example 'YYYYMMDDHHMMSS'.
+	 *  @return string      		          Value of parameter. Example: 'YYYYMMDDHHMMSS' or < 0 if error
+	 */
+	function getConfCP($name, $createifnotfound='')
+	{
+		$sql = "SELECT value";
+		$sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
+		$sql.= " WHERE name = '".$this->db->escape($name)."'";
+
+		dol_syslog(get_class($this).'::getConfCP name='.$name.' createifnotfound='.$createifnotfound, LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if($result) {
+
+			$obj = $this->db->fetch_object($result);
+			// Return value
+			if (empty($obj))
+			{
+				if ($createifnotfound)
+				{
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_config(name, value)";
+					$sql.= " VALUES('".$this->db->escape($name)."', '".$this->db->escape($createifnotfound)."')";
+					$result = $this->db->query($sql);
+					if ($result)
+					{
+						return $createifnotfound;
+					}
+					else
+					{
+						$this->error=$this->db->lasterror();
+						return -2;
+					}
+				}
+				else
+				{
+					return '';
+				}
+			}
+			else
+			{
+				return $obj->value;
+			}
+		} else {
+
+			// Erreur SQL
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Met à jour le timestamp de la dernière mise à jour du solde des CP
+	 *
+	 *	@param		int		$userID		Id of user
+	 *	@param		int		$nbHoliday	Nb of days
+	 *  @param		int		$fk_type	Type of vacation
+	 *  @return     int					0=Nothing done, 1=OK, -1=KO
+	 */
+	function updateSoldeCP($userID='',$nbHoliday='', $fk_type='')
+	{
+		global $user, $langs;
+
+		$error = 0;
+
+		if (empty($userID) && empty($nbHoliday) && empty($fk_type))
+		{
+			$langs->load("holiday");
+
+			// Si mise à jour pour tout le monde en début de mois
 			$now=dol_now();
 
-            $month = date('m',$now);
-            $newdateforlastupdate = dol_print_date($now, '%Y%m%d%H%M%S');
+			$month = date('m',$now);
+			$newdateforlastupdate = dol_print_date($now, '%Y%m%d%H%M%S');
 
-            // Get month of last update
-            $lastUpdate = $this->getConfCP('lastUpdate', $newdateforlastupdate);
-            $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
+			// Get month of last update
+			$lastUpdate = $this->getConfCP('lastUpdate', $newdateforlastupdate);
+			$monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
 			//print 'month: '.$month.' lastUpdate:'.$lastUpdate.' monthLastUpdate:'.$monthLastUpdate;exit;
 
-            // Si la date du mois n'est pas la même que celle sauvegardée, on met à jour le timestamp
-            if ($month != $monthLastUpdate)
-            {
-            	$this->db->begin();
+			// Si la date du mois n'est pas la même que celle sauvegardée, on met à jour le timestamp
+			if ($month != $monthLastUpdate)
+			{
+				$this->db->begin();
 
-            	$users = $this->fetchUsers(false,false);
-	            $nbUser = count($users);
+				$users = $this->fetchUsers(false,false);
+				$nbUser = count($users);
 
-                $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
-                $sql.= " value = '".$this->db->escape($newdateforlastupdate)."'";
-                $sql.= " WHERE name = 'lastUpdate'";
-                $result = $this->db->query($sql);
+				$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
+				$sql.= " value = '".$this->db->escape($newdateforlastupdate)."'";
+				$sql.= " WHERE name = 'lastUpdate'";
+				$result = $this->db->query($sql);
 
 				$typeleaves=$this->getTypes(1,1);
-    			foreach($typeleaves as $key => $val)
-    			{
-	                // On ajoute x jours à chaque utilisateurs
-	                $nb_holiday = $val['newByMonth'];
+				foreach($typeleaves as $key => $val)
+				{
+					// On ajoute x jours à chaque utilisateurs
+					$nb_holiday = $val['newByMonth'];
 					if (empty($nb_holiday)) $nb_holiday=0;
 
 					if ($nb_holiday > 0)
 					{
 						dol_syslog("We update leavefor everybody for type ".$key, LOG_DEBUG);
 
-		                $i = 0;
-		                while ($i < $nbUser)
-		                {
-		                    $now_holiday = $this->getCPforUser($users[$i]['rowid'], $val['rowid']);
-		                    $new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth');
+						$i = 0;
+						while ($i < $nbUser)
+						{
+							$now_holiday = $this->getCPforUser($users[$i]['rowid'], $val['rowid']);
+							$new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth');
 
-		                    // We add a log for each user
-		                    $this->addLogCP($user->id, $users[$i]['rowid'], $langs->trans('HolidaysMonthlyUpdate'), $new_solde, $val['rowid']);
+							// We add a log for each user
+							$this->addLogCP($user->id, $users[$i]['rowid'], $langs->trans('HolidaysMonthlyUpdate'), $new_solde, $val['rowid']);
 
-		                    $i++;
-		                }
+							$i++;
+						}
 
-		                // Now we update counter for all users at once
-		                $sql2 = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
-		                $sql2.= " nb_holiday = nb_holiday + ".$nb_holiday;
+						// Now we update counter for all users at once
+						$sql2 = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
+						$sql2.= " nb_holiday = nb_holiday + ".$nb_holiday;
 						$sql2.= " WHERE fk_type = ".$val['rowid'];
 
-		                $result= $this->db->query($sql2);
+						$result= $this->db->query($sql2);
 
-		                if (! $result)
-		                {
-		                	dol_print_error($this->db);
-		                	break;
-		                }
+						if (! $result)
+						{
+							dol_print_error($this->db);
+							break;
+						}
 					}
 					else dol_syslog("No change for leave of type ".$key, LOG_DEBUG);
-    			}
+				}
 
 				if ($result)
-	           	{
-	            	$this->db->commit();
-	            	return 1;
-	           	}
-    	       	else
-    	      	{
-    	       		$this->db->rollback();
-    	        	return -1;
-    	       	}
-            }
-
-            return 0;
-        }
-        else
+			   	{
+					$this->db->commit();
+					return 1;
+			   	}
+			   	else
+			  	{
+			   		$this->db->rollback();
+					return -1;
+			   	}
+			}
+
+			return 0;
+		}
+		else
 		{
-            // Mise à jour pour un utilisateur
-            $nbHoliday = price2num($nbHoliday,5);
-
-            $sql = "SELECT nb_holiday FROM ".MAIN_DB_PREFIX."holiday_users";
-            $sql.= " WHERE fk_user = '".$userID."' AND fk_type = ".$fk_type;
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-            	$num = $this->db->num_rows($resql);
-
-            	if ($num > 0)
-            	{
-		            // Update for user
-		            $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
-		            $sql.= " nb_holiday = ".$nbHoliday;
-		            $sql.= " WHERE fk_user = '".$userID."' AND fk_type = ".$fk_type;
-		            $result = $this->db->query($sql);
-		            if (! $result)
-		            {
-		            	$error++;
-		            	$this->errors[]=$this->db->lasterror();
-		            }
-            	}
-            	else
-            	{
-		            // Insert for user
-		            $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
-		            $sql.= $nbHoliday;
-		            $sql.= ", '".$userID."', ".$fk_type.")";
-		            $result = $this->db->query($sql);
-		            if (! $result)
-		            {
-		            	$error++;
-		            	$this->errors[]=$this->db->lasterror();
-		            }
-            	}
-            }
-            else
+			// Mise à jour pour un utilisateur
+			$nbHoliday = price2num($nbHoliday,5);
+
+			$sql = "SELECT nb_holiday FROM ".MAIN_DB_PREFIX."holiday_users";
+			$sql.= " WHERE fk_user = '".$userID."' AND fk_type = ".$fk_type;
+			$resql = $this->db->query($sql);
+			if ($resql)
 			{
-		        $this->errors[]=$this->db->lasterror();
-            	$error++;
+				$num = $this->db->num_rows($resql);
+
+				if ($num > 0)
+				{
+					// Update for user
+					$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
+					$sql.= " nb_holiday = ".$nbHoliday;
+					$sql.= " WHERE fk_user = '".$userID."' AND fk_type = ".$fk_type;
+					$result = $this->db->query($sql);
+					if (! $result)
+					{
+						$error++;
+						$this->errors[]=$this->db->lasterror();
+					}
+				}
+				else
+				{
+					// Insert for user
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
+					$sql.= $nbHoliday;
+					$sql.= ", '".$userID."', ".$fk_type.")";
+					$result = $this->db->query($sql);
+					if (! $result)
+					{
+						$error++;
+						$this->errors[]=$this->db->lasterror();
+					}
+				}
+			}
+			else
+			{
+				$this->errors[]=$this->db->lasterror();
+				$error++;
+			}
+
+			if (! $error)
+			{
+				return 1;
+			}
+			else
+		   {
+				return -1;
+			}
+		}
+
+	}
+
+	/**
+	 *	Retourne un checked si vrai
+	 *
+	 *  @param	string	$name       name du paramètre de configuration
+	 *  @return string      		retourne checked si > 0
+	 */
+	function getCheckOption($name) {
+
+		$sql = "SELECT value";
+		$sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
+		$sql.= " WHERE name = '".$name."'";
+
+		$result = $this->db->query($sql);
+
+		if($result) {
+			$obj = $this->db->fetch_object($result);
+
+			// Si la valeur est 1 on retourne checked
+			if($obj->value) {
+				return 'checked';
 			}
+		}
+	}
 
-            if (! $error)
-            {
-            	return 1;
-            }
-            else
-           {
-            	return -1;
-            }
-        }
-
-    }
-
-    /**
-     *	Retourne un checked si vrai
-     *
-     *  @param	string	$name       name du paramètre de configuration
-     *  @return string      		retourne checked si > 0
-     */
-    function getCheckOption($name) {
-
-        $sql = "SELECT value";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
-        $sql.= " WHERE name = '".$name."'";
-
-        $result = $this->db->query($sql);
-
-        if($result) {
-            $obj = $this->db->fetch_object($result);
-
-            // Si la valeur est 1 on retourne checked
-            if($obj->value) {
-                return 'checked';
-            }
-        }
-    }
-
-
-    /**
-     *  Créer les entrées pour chaque utilisateur au moment de la configuration
-     *
-     *  @param	boolean		$single		Single
-     *  @param	int			$userid		Id user
-     *  @return void
-     */
-    function createCPusers($single=false,$userid='')
-    {
-        // Si c'est l'ensemble des utilisateurs à ajouter
-        if (! $single)
-        {
-        	dol_syslog(get_class($this).'::createCPusers');
-        	$arrayofusers = $this->fetchUsers(false,true);
-
-            foreach($arrayofusers as $users)
-            {
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
-                $sql.= " (fk_user, nb_holiday)";
-                $sql.= " VALUES ('".$users['rowid']."','0')";
-
-                $resql=$this->db->query($sql);
-                if (! $resql) dol_print_error($this->db);
-            }
-        }
-        else
+
+	/**
+	 *  Créer les entrées pour chaque utilisateur au moment de la configuration
+	 *
+	 *  @param	boolean		$single		Single
+	 *  @param	int			$userid		Id user
+	 *  @return void
+	 */
+	function createCPusers($single=false,$userid='')
+	{
+		// Si c'est l'ensemble des utilisateurs à ajouter
+		if (! $single)
 		{
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
-            $sql.= " (fk_user, nb_holiday)";
-            $sql.= " VALUES ('".$userid."','0')";
-
-            $resql=$this->db->query($sql);
-            if (! $resql) dol_print_error($this->db);
-        }
-    }
-
-    /**
-     *  Supprime un utilisateur du module Congés Payés
-     *
-     *  @param	int		$user_id        ID de l'utilisateur à supprimer
-     *  @return boolean      			Vrai si pas d'erreur, faut si Erreur
-     */
-    function deleteCPuser($user_id) {
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday_users";
-        $sql.= " WHERE fk_user = '".$user_id."'";
-
-        $this->db->query($sql);
-
-    }
-
-
-    /**
-     *  Retourne le solde de congés payés pour un utilisateur
-     *
-     *  @param	int		$user_id    ID de l'utilisateur
-     *  @param	int		$fk_type	Filter on type
-     *  @return float        		Retourne le solde de congés payés de l'utilisateur
-     */
-    function getCPforUser($user_id, $fk_type=0)
-    {
-        $sql = "SELECT nb_holiday";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users";
-        $sql.= " WHERE fk_user = '".$user_id."'";
-        if ($fk_type > 0) $sql.=" AND fk_type = ".$fk_type;
-
-        dol_syslog(get_class($this).'::getCPforUser', LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            //return number_format($obj->nb_holiday,2);
-            if ($obj) return $obj->nb_holiday;
-            else return null;
-        }
-        else
+			dol_syslog(get_class($this).'::createCPusers');
+			$arrayofusers = $this->fetchUsers(false,true);
+
+			foreach($arrayofusers as $users)
+			{
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
+				$sql.= " (fk_user, nb_holiday)";
+				$sql.= " VALUES ('".$users['rowid']."','0')";
+
+				$resql=$this->db->query($sql);
+				if (! $resql) dol_print_error($this->db);
+			}
+		}
+		else
 		{
-            return null;
-        }
-    }
-
-    /**
-     *    Get list of Users or list of vacation balance.
-     *
-     *    @param      boolean			$stringlist	    If true return a string list of id. If false, return an array with detail.
-     *    @param      boolean   		$type			If true, read Dolibarr user list, if false, return vacation balance list.
-     *    @param      string            $filters        Filters
-     *    @return     array|string|int      			Return an array
-     */
-    function fetchUsers($stringlist=true, $type=true, $filters='')
-    {
-    	global $conf;
-
-    	dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
-
-        if ($stringlist)
-        {
-            if ($type)
-            {
-                // Si utilisateur de Dolibarr
-
-                $sql = "SELECT u.rowid";
-                $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-
-                if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-                {
-                	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-                	$sql.= " WHERE (ug.fk_user = u.rowid";
-                	$sql.= " AND ug.entity = ".$conf->entity.")";
-                	$sql.= " OR u.admin = 1";
-                }
-                else
-                {
-                	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
-                }
-                $sql.= " AND u.statut > 0";
-                if ($filters) $sql.=$filters;
-
-                $resql=$this->db->query($sql);
-
-                // Si pas d'erreur SQL
-                if ($resql) {
-
-                    $i = 0;
-                    $num = $this->db->num_rows($resql);
-                    $stringlist = '';
-
-                    // Boucles du listage des utilisateurs
-                    while($i < $num)
-                    {
-                        $obj = $this->db->fetch_object($resql);
-
-                        if ($i == 0) {
-                            $stringlist.= $obj->rowid;
-                        } else {
-                            $stringlist.= ', '.$obj->rowid;
-                        }
-
-                        $i++;
-                    }
-                    // Retoune le tableau des utilisateurs
-                    return $stringlist;
-                }
-                else
-                {
-                    // Erreur SQL
-                    $this->error="Error ".$this->db->lasterror();
-                    return -1;
-                }
-
-            }
-            else
-            {
-           		// We want only list of vacation balance for user ids
-                $sql = "SELECT DISTINCT cpu.fk_user";
-                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
-                $sql.= " WHERE cpu.fk_user = u.user";
-                if ($filters) $sql.=$filters;
-
-                $resql=$this->db->query($sql);
-
-                // Si pas d'erreur SQL
-                if ($resql) {
-
-                    $i = 0;
-                    $num = $this->db->num_rows($resql);
-                    $stringlist = '';
-
-                    // Boucles du listage des utilisateurs
-                    while($i < $num)
-                    {
-                        $obj = $this->db->fetch_object($resql);
-
-                        if($i == 0) {
-                            $stringlist.= $obj->fk_user;
-                        } else {
-                            $stringlist.= ', '.$obj->fk_user;
-                        }
-
-                        $i++;
-                    }
-                    // Retoune le tableau des utilisateurs
-                    return $stringlist;
-                }
-                else
-              {
-                    // Erreur SQL
-                    $this->error="Error ".$this->db->lasterror();
-                    return -1;
-                }
-            }
-
-        }
-        else
-        { // Si faux donc return array
-
-            // List for Dolibarr users
-            if ($type)
-            {
-                $sql = "SELECT u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
-                $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-
-                if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-                {
-                	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-                	$sql.= " WHERE (ug.fk_user = u.rowid";
-                	$sql.= " AND ug.entity = ".$conf->entity.")";
-                	$sql.= " OR u.admin = 1";
-                }
-                else
-                	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
-
-                $sql.= " AND u.statut > 0";
-                if ($filters) $sql.=$filters;
-
-                $resql=$this->db->query($sql);
-
-                // Si pas d'erreur SQL
-                if ($resql)
-                {
-                    $i = 0;
-                    $tab_result = $this->holiday;
-                    $num = $this->db->num_rows($resql);
-
-                    // Boucles du listage des utilisateurs
-                    while($i < $num) {
-
-                        $obj = $this->db->fetch_object($resql);
-
-                        $tab_result[$i]['rowid'] = $obj->rowid;
-                        $tab_result[$i]['name'] = $obj->lastname;       // deprecated
-                        $tab_result[$i]['lastname'] = $obj->lastname;
-                        $tab_result[$i]['firstname'] = $obj->firstname;
-                        $tab_result[$i]['gender'] = $obj->gender;
-                        $tab_result[$i]['status'] = $obj->statut;
-                        $tab_result[$i]['employee'] = $obj->employee;
-                        $tab_result[$i]['photo'] = $obj->photo;
-                        $tab_result[$i]['fk_user'] = $obj->fk_user;
-                        //$tab_result[$i]['type'] = $obj->type;
-                        //$tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
-
-                        $i++;
-                    }
-                    // Retoune le tableau des utilisateurs
-                    return $tab_result;
-                }
-                else
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
+			$sql.= " (fk_user, nb_holiday)";
+			$sql.= " VALUES ('".$userid."','0')";
+
+			$resql=$this->db->query($sql);
+			if (! $resql) dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 *  Supprime un utilisateur du module Congés Payés
+	 *
+	 *  @param	int		$user_id        ID de l'utilisateur à supprimer
+	 *  @return boolean      			Vrai si pas d'erreur, faut si Erreur
+	 */
+	function deleteCPuser($user_id) {
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday_users";
+		$sql.= " WHERE fk_user = '".$user_id."'";
+
+		$this->db->query($sql);
+
+	}
+
+
+	/**
+	 *  Retourne le solde de congés payés pour un utilisateur
+	 *
+	 *  @param	int		$user_id    ID de l'utilisateur
+	 *  @param	int		$fk_type	Filter on type
+	 *  @return float        		Retourne le solde de congés payés de l'utilisateur
+	 */
+	function getCPforUser($user_id, $fk_type=0)
+	{
+		$sql = "SELECT nb_holiday";
+		$sql.= " FROM ".MAIN_DB_PREFIX."holiday_users";
+		$sql.= " WHERE fk_user = '".$user_id."'";
+		if ($fk_type > 0) $sql.=" AND fk_type = ".$fk_type;
+
+		dol_syslog(get_class($this).'::getCPforUser', LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			//return number_format($obj->nb_holiday,2);
+			if ($obj) return $obj->nb_holiday;
+			else return null;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 *    Get list of Users or list of vacation balance.
+	 *
+	 *    @param      boolean			$stringlist	    If true return a string list of id. If false, return an array with detail.
+	 *    @param      boolean   		$type			If true, read Dolibarr user list, if false, return vacation balance list.
+	 *    @param      string            $filters        Filters
+	 *    @return     array|string|int      			Return an array
+	 */
+	function fetchUsers($stringlist=true, $type=true, $filters='')
+	{
+		global $conf;
+
+		dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
+
+		if ($stringlist)
+		{
+			if ($type)
+			{
+				// Si utilisateur de Dolibarr
+
+				$sql = "SELECT u.rowid";
+				$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+
+				if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+				{
+					$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+					$sql.= " WHERE (ug.fk_user = u.rowid";
+					$sql.= " AND ug.entity = ".$conf->entity.")";
+					$sql.= " OR u.admin = 1";
+				}
+				else
+				{
+					$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+				}
+				$sql.= " AND u.statut > 0";
+				if ($filters) $sql.=$filters;
+
+				$resql=$this->db->query($sql);
+
+				// Si pas d'erreur SQL
+				if ($resql) {
+
+					$i = 0;
+					$num = $this->db->num_rows($resql);
+					$stringlist = '';
+
+					// Boucles du listage des utilisateurs
+					while($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+
+						if ($i == 0) {
+							$stringlist.= $obj->rowid;
+						} else {
+							$stringlist.= ', '.$obj->rowid;
+						}
+
+						$i++;
+					}
+					// Retoune le tableau des utilisateurs
+					return $stringlist;
+				}
+				else
 				{
-                    // Erreur SQL
-                    $this->errors[]="Error ".$this->db->lasterror();
-                    return -1;
-                }
-            }
-            else
-            {
+					// Erreur SQL
+					$this->error="Error ".$this->db->lasterror();
+					return -1;
+				}
+
+			}
+			else
+			{
+		   		// We want only list of vacation balance for user ids
+				$sql = "SELECT DISTINCT cpu.fk_user";
+				$sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
+				$sql.= " WHERE cpu.fk_user = u.user";
+				if ($filters) $sql.=$filters;
+
+				$resql=$this->db->query($sql);
+
+				// Si pas d'erreur SQL
+				if ($resql) {
+
+					$i = 0;
+					$num = $this->db->num_rows($resql);
+					$stringlist = '';
+
+					// Boucles du listage des utilisateurs
+					while($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+
+						if($i == 0) {
+							$stringlist.= $obj->fk_user;
+						} else {
+							$stringlist.= ', '.$obj->fk_user;
+						}
+
+						$i++;
+					}
+					// Retoune le tableau des utilisateurs
+					return $stringlist;
+				}
+				else
+			  {
+					// Erreur SQL
+					$this->error="Error ".$this->db->lasterror();
+					return -1;
+				}
+			}
+
+		}
+		else
+		{ // Si faux donc return array
+
+			// List for Dolibarr users
+			if ($type)
+			{
+				$sql = "SELECT u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
+				$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+
+				if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+				{
+					$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+					$sql.= " WHERE (ug.fk_user = u.rowid";
+					$sql.= " AND ug.entity = ".$conf->entity.")";
+					$sql.= " OR u.admin = 1";
+				}
+				else
+					$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+
+				$sql.= " AND u.statut > 0";
+				if ($filters) $sql.=$filters;
+
+				$resql=$this->db->query($sql);
+
+				// Si pas d'erreur SQL
+				if ($resql)
+				{
+					$i = 0;
+					$tab_result = $this->holiday;
+					$num = $this->db->num_rows($resql);
+
+					// Boucles du listage des utilisateurs
+					while($i < $num) {
+
+						$obj = $this->db->fetch_object($resql);
+
+						$tab_result[$i]['rowid'] = $obj->rowid;
+						$tab_result[$i]['name'] = $obj->lastname;       // deprecated
+						$tab_result[$i]['lastname'] = $obj->lastname;
+						$tab_result[$i]['firstname'] = $obj->firstname;
+						$tab_result[$i]['gender'] = $obj->gender;
+						$tab_result[$i]['status'] = $obj->statut;
+						$tab_result[$i]['employee'] = $obj->employee;
+						$tab_result[$i]['photo'] = $obj->photo;
+						$tab_result[$i]['fk_user'] = $obj->fk_user;
+						//$tab_result[$i]['type'] = $obj->type;
+						//$tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
+
+						$i++;
+					}
+					// Retoune le tableau des utilisateurs
+					return $tab_result;
+				}
+				else
+				{
+					// Erreur SQL
+					$this->errors[]="Error ".$this->db->lasterror();
+					return -1;
+				}
+			}
+			else
+			{
 				// List of vacation balance users
-                $sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holiday, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
-                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
-                $sql.= " WHERE cpu.fk_user = u.rowid";
-                if ($filters) $sql.=$filters;
-
-                $resql=$this->db->query($sql);
-
-                // Si pas d'erreur SQL
-                if ($resql)
-                {
-                    $i = 0;
-                    $tab_result = $this->holiday;
-                    $num = $this->db->num_rows($resql);
-
-                    // Boucles du listage des utilisateurs
-                    while($i < $num)
-                    {
-                        $obj = $this->db->fetch_object($resql);
-
-                        $tab_result[$i]['rowid'] = $obj->fk_user;
-                        $tab_result[$i]['name'] = $obj->lastname;			// deprecated
-                        $tab_result[$i]['lastname'] = $obj->lastname;
-                        $tab_result[$i]['firstname'] = $obj->firstname;
-                        $tab_result[$i]['gender'] = $obj->gender;
-                        $tab_result[$i]['status'] = $obj->statut;
-                        $tab_result[$i]['employee'] = $obj->employee;
-                        $tab_result[$i]['photo'] = $obj->photo;
-                        $tab_result[$i]['fk_user'] = $obj->fk_user;
-
-                        $tab_result[$i]['type'] = $obj->type;
-                        $tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
-
-                        $i++;
-                    }
-                    // Retoune le tableau des utilisateurs
-                    return $tab_result;
-                }
-                else
+				$sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holiday, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
+				$sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
+				$sql.= " WHERE cpu.fk_user = u.rowid";
+				if ($filters) $sql.=$filters;
+
+				$resql=$this->db->query($sql);
+
+				// Si pas d'erreur SQL
+				if ($resql)
 				{
-                    // Erreur SQL
-                    $this->error="Error ".$this->db->lasterror();
-                    return -1;
-                }
-            }
-        }
-    }
-
-    /**
-     *	Compte le nombre d'utilisateur actifs dans Dolibarr
-     *
-     *  @return     int      retourne le nombre d'utilisateur
-     */
-    function countActiveUsers()
-    {
-        $sql = "SELECT count(u.rowid) as compteur";
-        $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+					$i = 0;
+					$tab_result = $this->holiday;
+					$num = $this->db->num_rows($resql);
+
+					// Boucles du listage des utilisateurs
+					while($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+
+						$tab_result[$i]['rowid'] = $obj->fk_user;
+						$tab_result[$i]['name'] = $obj->lastname;			// deprecated
+						$tab_result[$i]['lastname'] = $obj->lastname;
+						$tab_result[$i]['firstname'] = $obj->firstname;
+						$tab_result[$i]['gender'] = $obj->gender;
+						$tab_result[$i]['status'] = $obj->statut;
+						$tab_result[$i]['employee'] = $obj->employee;
+						$tab_result[$i]['photo'] = $obj->photo;
+						$tab_result[$i]['fk_user'] = $obj->fk_user;
+
+						$tab_result[$i]['type'] = $obj->type;
+						$tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
+
+						$i++;
+					}
+					// Retoune le tableau des utilisateurs
+					return $tab_result;
+				}
+				else
+				{
+					// Erreur SQL
+					$this->error="Error ".$this->db->lasterror();
+					return -1;
+				}
+			}
+		}
+	}
+
+	/**
+	 *	Compte le nombre d'utilisateur actifs dans Dolibarr
+	 *
+	 *  @return     int      retourne le nombre d'utilisateur
+	 */
+	function countActiveUsers()
+	{
+		$sql = "SELECT count(u.rowid) as compteur";
+		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 		$sql.= " WHERE u.statut > 0";
 
-        $result = $this->db->query($sql);
-        $objet = $this->db->fetch_object($result);
+		$result = $this->db->query($sql);
+		$objet = $this->db->fetch_object($result);
 
-        return $objet->compteur;
-    }
-    /**
-     *	Compte le nombre d'utilisateur actifs dans Dolibarr sans CP
-     *
-     *  @return     int      retourne le nombre d'utilisateur
-     */
-    function countActiveUsersWithoutCP() {
+		return $objet->compteur;
+	}
+	/**
+	 *	Compte le nombre d'utilisateur actifs dans Dolibarr sans CP
+	 *
+	 *  @return     int      retourne le nombre d'utilisateur
+	 */
+	function countActiveUsersWithoutCP() {
 
-        $sql = "SELECT count(u.rowid) as compteur";
-        $sql.= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
+		$sql = "SELECT count(u.rowid) as compteur";
+		$sql.= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
 		$sql.= " WHERE u.statut > 0 AND hu.fk_user IS NULL";
 
-        $result = $this->db->query($sql);
-        $objet = $this->db->fetch_object($result);
-
-        return $objet->compteur;
-    }
-
-    /**
-     *  Compare le nombre d'utilisateur actif de Dolibarr à celui des utilisateurs des congés payés
-     *
-     *  @param    int	$userDolibarrWithoutCP	Number of active users in Dolibarr without holidays
-     *  @param    int	$userCP    				Number of active users into table of holidays
-     *  @return   int							<0 if KO, >0 if OK
-     */
-    function verifNbUsers($userDolibarrWithoutCP, $userCP)
-    {
-    	if (empty($userCP)) $userCP=0;
-    	dol_syslog(get_class($this).'::verifNbUsers userDolibarr='.$userDolibarrWithoutCP.' userCP='.$userCP);
-        return 1;
-    }
-
-
-    /**
-     * addLogCP
-     *
-     * @param 	int		$fk_user_action		Id user creation
-     * @param 	int		$fk_user_update		Id user update
-     * @param 	string	$label				Label
-     * @param 	int		$new_solde			New value
-     * @param	int		$fk_type			Type of vacation
-     * @return 	int							Id of record added, 0 if nothing done, < 0 if KO
-     */
-    function addLogCP($fk_user_action, $fk_user_update, $label, $new_solde, $fk_type)
-    {
-        global $conf, $langs;
-
-        $error=0;
-
-        $prev_solde = price2num($this->getCPforUser($fk_user_update, $fk_type), 5);
-        $new_solde = price2num($new_solde, 5);
+		$result = $this->db->query($sql);
+		$objet = $this->db->fetch_object($result);
+
+		return $objet->compteur;
+	}
+
+	/**
+	 *  Compare le nombre d'utilisateur actif de Dolibarr à celui des utilisateurs des congés payés
+	 *
+	 *  @param    int	$userDolibarrWithoutCP	Number of active users in Dolibarr without holidays
+	 *  @param    int	$userCP    				Number of active users into table of holidays
+	 *  @return   int							<0 if KO, >0 if OK
+	 */
+	function verifNbUsers($userDolibarrWithoutCP, $userCP)
+	{
+		if (empty($userCP)) $userCP=0;
+		dol_syslog(get_class($this).'::verifNbUsers userDolibarr='.$userDolibarrWithoutCP.' userCP='.$userCP);
+		return 1;
+	}
+
+
+	/**
+	 * addLogCP
+	 *
+	 * @param 	int		$fk_user_action		Id user creation
+	 * @param 	int		$fk_user_update		Id user update
+	 * @param 	string	$label				Label
+	 * @param 	int		$new_solde			New value
+	 * @param	int		$fk_type			Type of vacation
+	 * @return 	int							Id of record added, 0 if nothing done, < 0 if KO
+	 */
+	function addLogCP($fk_user_action, $fk_user_update, $label, $new_solde, $fk_type)
+	{
+		global $conf, $langs;
+
+		$error=0;
+
+		$prev_solde = price2num($this->getCPforUser($fk_user_update, $fk_type), 5);
+		$new_solde = price2num($new_solde, 5);
 		//print "$prev_solde == $new_solde";
 
-        if ($prev_solde == $new_solde) return 0;
+		if ($prev_solde == $new_solde) return 0;
 
 		$this->db->begin();
 
 		// Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_logs (";
-        $sql.= "date_action,";
-        $sql.= "fk_user_action,";
-        $sql.= "fk_user_update,";
-        $sql.= "type_action,";
-        $sql.= "prev_solde,";
-        $sql.= "new_solde,";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_logs (";
+		$sql.= "date_action,";
+		$sql.= "fk_user_action,";
+		$sql.= "fk_user_update,";
+		$sql.= "type_action,";
+		$sql.= "prev_solde,";
+		$sql.= "new_solde,";
 		$sql.= "fk_type";
-        $sql.= ") VALUES (";
-        $sql.= " '".$this->db->idate(dol_now())."',";
-        $sql.= " '".$fk_user_action."',";
-        $sql.= " '".$fk_user_update."',";
-        $sql.= " '".$this->db->escape($label)."',";
-        $sql.= " '".$prev_solde."',";
-        $sql.= " '".$new_solde."',";
-        $sql.= " ".$fk_type;
-        $sql.= ")";
-
-        $resql=$this->db->query($sql);
-       	if (! $resql)
-       	{
-       	    $error++; $this->errors[]="Error ".$this->db->lasterror();
-       	}
-
-       	if (! $error)
-       	{
-       	    $this->optRowid = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday_logs");
-       	}
-
-       	// Commit or rollback
-       	if ($error)
-       	{
-       	    foreach($this->errors as $errmsg)
-       	    {
-   	            dol_syslog(get_class($this)."::addLogCP ".$errmsg, LOG_ERR);
-   	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-       	    }
-       	    $this->db->rollback();
-       	    return -1*$error;
-       	}
-       	else
-       	{
-       	    $this->db->commit();
-            return $this->optRowid;
-       	}
-    }
-
-    /**
-     *  Liste le log des congés payés
-     *
-     *  @param	string	$order      Filtrage par ordre
-     *  @param  string	$filter     Filtre de séléction
-     *  @return int         		-1 si erreur, 1 si OK et 2 si pas de résultat
-     */
-    function fetchLog($order,$filter)
-    {
-        global $langs;
-
-        $sql = "SELECT";
-        $sql.= " cpl.rowid,";
-        $sql.= " cpl.date_action,";
-        $sql.= " cpl.fk_user_action,";
-        $sql.= " cpl.fk_user_update,";
-        $sql.= " cpl.type_action,";
-        $sql.= " cpl.prev_solde,";
-        $sql.= " cpl.new_solde,";
+		$sql.= ") VALUES (";
+		$sql.= " '".$this->db->idate(dol_now())."',";
+		$sql.= " '".$fk_user_action."',";
+		$sql.= " '".$fk_user_update."',";
+		$sql.= " '".$this->db->escape($label)."',";
+		$sql.= " '".$prev_solde."',";
+		$sql.= " '".$new_solde."',";
+		$sql.= " ".$fk_type;
+		$sql.= ")";
+
+		$resql=$this->db->query($sql);
+	   	if (! $resql)
+	   	{
+	   		$error++; $this->errors[]="Error ".$this->db->lasterror();
+	   	}
+
+	   	if (! $error)
+	   	{
+	   		$this->optRowid = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday_logs");
+	   	}
+
+	   	// Commit or rollback
+	   	if ($error)
+	   	{
+	   		foreach($this->errors as $errmsg)
+	   		{
+   				dol_syslog(get_class($this)."::addLogCP ".$errmsg, LOG_ERR);
+   				$this->error.=($this->error?', '.$errmsg:$errmsg);
+	   		}
+	   		$this->db->rollback();
+	   		return -1*$error;
+	   	}
+	   	else
+	   	{
+	   		$this->db->commit();
+			return $this->optRowid;
+	   	}
+	}
+
+	/**
+	 *  Liste le log des congés payés
+	 *
+	 *  @param	string	$order      Filtrage par ordre
+	 *  @param  string	$filter     Filtre de séléction
+	 *  @return int         		-1 si erreur, 1 si OK et 2 si pas de résultat
+	 */
+	function fetchLog($order,$filter)
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql.= " cpl.rowid,";
+		$sql.= " cpl.date_action,";
+		$sql.= " cpl.fk_user_action,";
+		$sql.= " cpl.fk_user_update,";
+		$sql.= " cpl.type_action,";
+		$sql.= " cpl.prev_solde,";
+		$sql.= " cpl.new_solde,";
 		$sql.= " cpl.fk_type";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday_logs as cpl";
-        $sql.= " WHERE cpl.rowid > 0"; // To avoid error with other search and criteria
+		$sql.= " FROM ".MAIN_DB_PREFIX."holiday_logs as cpl";
+		$sql.= " WHERE cpl.rowid > 0"; // To avoid error with other search and criteria
 
-        // Filtrage de séléction
-        if(!empty($filter)) {
-            $sql.= " ".$filter;
-        }
+		// Filtrage de séléction
+		if(!empty($filter)) {
+			$sql.= " ".$filter;
+		}
 
-        // Ordre d'affichage
-        if(!empty($order)) {
-            $sql.= " ".$order;
-        }
+		// Ordre d'affichage
+		if(!empty($order)) {
+			$sql.= " ".$order;
+		}
 
-        dol_syslog(get_class($this)."::fetchLog", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+		dol_syslog(get_class($this)."::fetchLog", LOG_DEBUG);
+		$resql=$this->db->query($sql);
 
-        // Si pas d'erreur SQL
+		// Si pas d'erreur SQL
   		if ($resql) {
 
-  		    $i = 0;
-  		    $tab_result = $this->logs;
-  		    $num = $this->db->num_rows($resql);
-
-  		    // Si pas d'enregistrement
-  		    if(!$num) {
-                return 2;
-  		    }
-
-  		    // On liste les résultats et on les ajoutent dans le tableau
-  		    while($i < $num) {
-
-  		        $obj = $this->db->fetch_object($resql);
-
-  		        $tab_result[$i]['rowid'] = $obj->rowid;
-  		        $tab_result[$i]['date_action'] = $obj->date_action;
-  		        $tab_result[$i]['fk_user_action'] = $obj->fk_user_action;
-  		        $tab_result[$i]['fk_user_update'] = $obj->fk_user_update;
-  		        $tab_result[$i]['type_action'] = $obj->type_action;
-  		        $tab_result[$i]['prev_solde'] = $obj->prev_solde;
-  		        $tab_result[$i]['new_solde'] = $obj->new_solde;
-  		        $tab_result[$i]['fk_type'] = $obj->fk_type;
-
-  		        $i++;
-  		    }
-  		    // Retourne 1 et ajoute le tableau à la variable
-  		    $this->logs = $tab_result;
-  		    return 1;
+  			$i = 0;
+  			$tab_result = $this->logs;
+  			$num = $this->db->num_rows($resql);
+
+  			// Si pas d'enregistrement
+  			if(!$num) {
+				return 2;
+  			}
+
+  			// On liste les résultats et on les ajoutent dans le tableau
+  			while($i < $num) {
+
+  				$obj = $this->db->fetch_object($resql);
+
+  				$tab_result[$i]['rowid'] = $obj->rowid;
+  				$tab_result[$i]['date_action'] = $obj->date_action;
+  				$tab_result[$i]['fk_user_action'] = $obj->fk_user_action;
+  				$tab_result[$i]['fk_user_update'] = $obj->fk_user_update;
+  				$tab_result[$i]['type_action'] = $obj->type_action;
+  				$tab_result[$i]['prev_solde'] = $obj->prev_solde;
+  				$tab_result[$i]['new_solde'] = $obj->new_solde;
+  				$tab_result[$i]['fk_type'] = $obj->fk_type;
+
+  				$i++;
+  			}
+  			// Retourne 1 et ajoute le tableau à la variable
+  			$this->logs = $tab_result;
+  			return 1;
   		}
   		else
   		{
-  		    // Erreur SQL
-  		    $this->error="Error ".$this->db->lasterror();
-  		    return -1;
+  			// Erreur SQL
+  			$this->error="Error ".$this->db->lasterror();
+  			return -1;
   		}
-    }
-
-
-    /**
-     *  Return array with list of types
-     *
-     *  @param		int		$active		Status of type. -1 = Both
-     *  @param		int		$affect		Filter on affect (a request will change sold or not). -1 = Both
-     *  @return     array	    		Return array with list of types
-     */
-    function getTypes($active=-1, $affect=-1)
-    {
-    	global $mysoc;
-
-    	$sql = "SELECT rowid, code, label, affect, delay, newByMonth";
-    	$sql.= " FROM " . MAIN_DB_PREFIX . "c_holiday_types";
-    	$sql.= " WHERE (fk_country IS NULL OR fk_country = ".$mysoc->country_id.')';
-    	if ($active >= 0) $sql.=" AND active = ".((int) $active);
-    	if ($affect >= 0) $sql.=" AND affect = ".((int) $affect);
-
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-	    	$num = $this->db->num_rows($result);
-	    	if ($num)
-	    	{
-	    		while ($obj = $this->db->fetch_object($result))
-	    		{
-	    			$types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newByMonth'=>$obj->newByMonth);
-	    		}
-
-	    		return $types;
-	    	}
-    	}
-    	else dol_print_error($this->db);
-
-    	return array();
-    }
-
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    function initAsSpecimen()
-    {
-    	global $user,$langs;
-
-    	// Initialise parameters
-    	$this->id=0;
-    	$this->specimen=1;
-
-    	$this->fk_user=1;
-    	$this->description='SPECIMEN description';
-    	$this->date_debut=dol_now();
-    	$this->date_fin=dol_now()+(24*3600);
-    	$this->fk_validator=1;
-    	$this->halfday=0;
-    	$this->fk_type=1;
-    }
+	}
+
+
+	/**
+	 *  Return array with list of types
+	 *
+	 *  @param		int		$active		Status of type. -1 = Both
+	 *  @param		int		$affect		Filter on affect (a request will change sold or not). -1 = Both
+	 *  @return     array	    		Return array with list of types
+	 */
+	function getTypes($active=-1, $affect=-1)
+	{
+		global $mysoc;
+
+		$sql = "SELECT rowid, code, label, affect, delay, newByMonth";
+		$sql.= " FROM " . MAIN_DB_PREFIX . "c_holiday_types";
+		$sql.= " WHERE (fk_country IS NULL OR fk_country = ".$mysoc->country_id.')';
+		if ($active >= 0) $sql.=" AND active = ".((int) $active);
+		if ($affect >= 0) $sql.=" AND affect = ".((int) $affect);
+
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			if ($num)
+			{
+				while ($obj = $this->db->fetch_object($result))
+				{
+					$types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newByMonth'=>$obj->newByMonth);
+				}
+
+				return $types;
+			}
+		}
+		else dol_print_error($this->db);
+
+		return array();
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	function initAsSpecimen()
+	{
+		global $user,$langs;
+
+		// Initialise parameters
+		$this->id=0;
+		$this->specimen=1;
+
+		$this->fk_user=1;
+		$this->description='SPECIMEN description';
+		$this->date_debut=dol_now();
+		$this->date_fin=dol_now()+(24*3600);
+		$this->fk_validator=1;
+		$this->halfday=0;
+		$this->fk_type=1;
+	}
 
 }

Spacing +460 added lines, -460 removed lines

@@ -24,7 +24,7 @@ 
  *    \ingroup    holiday
  *    \brief      Class file of the module paid holiday.
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -32,10 +32,10 @@ 
  */
 class Holiday extends CommonObject
 {
-	public $element='holiday';
-	public $table_element='holiday';
-	protected $isnolinkedbythird = 1;     // No field fk_soc
-	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $element = 'holiday';
+	public $table_element = 'holiday';
+	protected $isnolinkedbythird = 1; // No field fk_soc
+	protected $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'holiday';
 
 	/**
@@ -45,22 +45,22 @@ 
     var $rowid;
 
     var $fk_user;
-    var $date_create='';
+    var $date_create = '';
     var $description;
-    var $date_debut='';			// Date start in PHP server TZ
-    var $date_fin='';			// Date end in PHP server TZ
-    var $date_debut_gmt='';		// Date start in GMT
-    var $date_fin_gmt='';		// Date end in GMT
-    var $halfday='';
-    var $statut='';				// 1=draft, 2=validated, 3=approved
+    var $date_debut = ''; // Date start in PHP server TZ
+    var $date_fin = ''; // Date end in PHP server TZ
+    var $date_debut_gmt = ''; // Date start in GMT
+    var $date_fin_gmt = ''; // Date end in GMT
+    var $halfday = '';
+    var $statut = ''; // 1=draft, 2=validated, 3=approved
     var $fk_validator;
-    var $date_valid='';
+    var $date_valid = '';
     var $fk_user_valid;
-    var $date_refuse='';
+    var $date_refuse = '';
     var $fk_user_refuse;
-    var $date_cancel='';
+    var $date_cancel = '';
     var $fk_user_cancel;
-    var $detail_refuse='';
+    var $detail_refuse = '';
     var $fk_type;
 
     var $holiday = array();
@@ -117,61 +117,61 @@ 
      *   @param     int		$notrigger	    0=launch triggers after, 1=disable triggers
      *   @return    int			         	<0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
         global $conf;
-        $error=0;
+        $error = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Check parameters
-        if (empty($this->fk_user) || ! is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error="ErrorBadParameterFkUser"; return -1; }
-        if (empty($this->fk_validator) || ! is_numeric($this->fk_validator) || $this->fk_validator < 0)  { $this->error="ErrorBadParameterFkValidator"; return -1; }
-        if (empty($this->fk_type) || ! is_numeric($this->fk_type) || $this->fk_type < 0) { $this->error="ErrorBadParameterFkType"; return -1; }
+        if (empty($this->fk_user) || !is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error = "ErrorBadParameterFkUser"; return -1; }
+        if (empty($this->fk_validator) || !is_numeric($this->fk_validator) || $this->fk_validator < 0) { $this->error = "ErrorBadParameterFkValidator"; return -1; }
+        if (empty($this->fk_type) || !is_numeric($this->fk_type) || $this->fk_type < 0) { $this->error = "ErrorBadParameterFkType"; return -1; }
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday(";
-        $sql.= "fk_user,";
-        $sql.= "date_create,";
-        $sql.= "description,";
-        $sql.= "date_debut,";
-        $sql.= "date_fin,";
-        $sql.= "halfday,";
-        $sql.= "statut,";
-        $sql.= "fk_validator,";
-        $sql.= "fk_type,";
-        $sql.= "fk_user_create,";
-        $sql.= "entity";
-        $sql.= ") VALUES (";
-        $sql.= "'".$this->db->escape($this->fk_user)."',";
-        $sql.= " '".$this->db->idate($now)."',";
-        $sql.= " '".$this->db->escape($this->description)."',";
-        $sql.= " '".$this->db->idate($this->date_debut)."',";
-        $sql.= " '".$this->db->idate($this->date_fin)."',";
-        $sql.= " ".$this->halfday.",";
-        $sql.= " '1',";
-        $sql.= " '".$this->db->escape($this->fk_validator)."',";
-        $sql.= " ".$this->fk_type.",";
-        $sql.= " ".$user->id.",";
-        $sql.= " ".$conf->entity;
-        $sql.= ")";
+        $sql .= "fk_user,";
+        $sql .= "date_create,";
+        $sql .= "description,";
+        $sql .= "date_debut,";
+        $sql .= "date_fin,";
+        $sql .= "halfday,";
+        $sql .= "statut,";
+        $sql .= "fk_validator,";
+        $sql .= "fk_type,";
+        $sql .= "fk_user_create,";
+        $sql .= "entity";
+        $sql .= ") VALUES (";
+        $sql .= "'".$this->db->escape($this->fk_user)."',";
+        $sql .= " '".$this->db->idate($now)."',";
+        $sql .= " '".$this->db->escape($this->description)."',";
+        $sql .= " '".$this->db->idate($this->date_debut)."',";
+        $sql .= " '".$this->db->idate($this->date_fin)."',";
+        $sql .= " ".$this->halfday.",";
+        $sql .= " '1',";
+        $sql .= " '".$this->db->escape($this->fk_validator)."',";
+        $sql .= " ".$this->fk_type.",";
+        $sql .= " ".$user->id.",";
+        $sql .= " ".$conf->entity;
+        $sql .= ")";
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) {
-            $error++; $this->errors[]="Error ".$this->db->lasterror();
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error++; $this->errors[] = "Error ".$this->db->lasterror();
         }
 
-        if (! $error)
+        if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday");
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('HOLIDAY_CREATE',$user);
+                $result = $this->call_trigger('HOLIDAY_CREATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -180,13 +180,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -207,32 +207,32 @@ 
         global $langs;
 
         $sql = "SELECT";
-        $sql.= " cp.rowid,";
-        $sql.= " cp.fk_user,";
-        $sql.= " cp.date_create,";
-        $sql.= " cp.description,";
-        $sql.= " cp.date_debut,";
-        $sql.= " cp.date_fin,";
-        $sql.= " cp.halfday,";
-        $sql.= " cp.statut,";
-        $sql.= " cp.fk_validator,";
-        $sql.= " cp.date_valid,";
-        $sql.= " cp.fk_user_valid,";
-        $sql.= " cp.date_refuse,";
-        $sql.= " cp.fk_user_refuse,";
-        $sql.= " cp.date_cancel,";
-        $sql.= " cp.fk_user_cancel,";
-        $sql.= " cp.detail_refuse,";
-        $sql.= " cp.note_private,";
-        $sql.= " cp.note_public,";
-        $sql.= " cp.fk_user_create,";
-        $sql.= " cp.fk_type,";
-        $sql.= " cp.entity";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp";
-        $sql.= " WHERE cp.rowid = ".$id;
+        $sql .= " cp.rowid,";
+        $sql .= " cp.fk_user,";
+        $sql .= " cp.date_create,";
+        $sql .= " cp.description,";
+        $sql .= " cp.date_debut,";
+        $sql .= " cp.date_fin,";
+        $sql .= " cp.halfday,";
+        $sql .= " cp.statut,";
+        $sql .= " cp.fk_validator,";
+        $sql .= " cp.date_valid,";
+        $sql .= " cp.fk_user_valid,";
+        $sql .= " cp.date_refuse,";
+        $sql .= " cp.fk_user_refuse,";
+        $sql .= " cp.date_cancel,";
+        $sql .= " cp.fk_user_cancel,";
+        $sql .= " cp.detail_refuse,";
+        $sql .= " cp.note_private,";
+        $sql .= " cp.note_public,";
+        $sql .= " cp.fk_user_create,";
+        $sql .= " cp.fk_type,";
+        $sql .= " cp.entity";
+        $sql .= " FROM ".MAIN_DB_PREFIX."holiday as cp";
+        $sql .= " WHERE cp.rowid = ".$id;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
@@ -240,15 +240,15 @@ 
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id    = $obj->rowid;
-                $this->rowid = $obj->rowid;	// deprecated
+                $this->rowid = $obj->rowid; // deprecated
                 $this->ref   = $obj->rowid;
                 $this->fk_user = $obj->fk_user;
                 $this->date_create = $this->db->jdate($obj->date_create);
                 $this->description = $obj->description;
                 $this->date_debut = $this->db->jdate($obj->date_debut);
                 $this->date_fin = $this->db->jdate($obj->date_fin);
-                $this->date_debut_gmt = $this->db->jdate($obj->date_debut,1);
-                $this->date_fin_gmt = $this->db->jdate($obj->date_fin,1);
+                $this->date_debut_gmt = $this->db->jdate($obj->date_debut, 1);
+                $this->date_fin_gmt = $this->db->jdate($obj->date_fin, 1);
                 $this->halfday = $obj->halfday;
                 $this->statut = $obj->statut;
                 $this->fk_validator = $obj->fk_validator;
@@ -271,7 +271,7 @@ 
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -284,59 +284,59 @@ 
      *  @param      string	$filter     SQL Filter
      *  @return     int      			-1 if KO, 1 if OK, 2 if no result
      */
-    function fetchByUser($user_id, $order='', $filter='')
+    function fetchByUser($user_id, $order = '', $filter = '')
     {
         global $langs, $conf;
 
         $sql = "SELECT";
-        $sql.= " cp.rowid,";
-
-        $sql.= " cp.fk_user,";
-		$sql.= " cp.fk_type,";
-		$sql.= " cp.date_create,";
-        $sql.= " cp.description,";
-        $sql.= " cp.date_debut,";
-        $sql.= " cp.date_fin,";
-        $sql.= " cp.halfday,";
-        $sql.= " cp.statut,";
-        $sql.= " cp.fk_validator,";
-        $sql.= " cp.date_valid,";
-        $sql.= " cp.fk_user_valid,";
-        $sql.= " cp.date_refuse,";
-        $sql.= " cp.fk_user_refuse,";
-        $sql.= " cp.date_cancel,";
-        $sql.= " cp.fk_user_cancel,";
-        $sql.= " cp.detail_refuse,";
-
-		$sql.= " uu.lastname as user_lastname,";
-		$sql.= " uu.firstname as user_firstname,";
-		$sql.= " uu.login as user_login,";
-		$sql.= " uu.statut as user_statut,";
-		$sql.= " uu.photo as user_photo,";
-
-        $sql.= " ua.lastname as validator_lastname,";
-        $sql.= " ua.firstname as validator_firstname,";
-        $sql.= " ua.login as validator_login,";
-        $sql.= " ua.statut as validator_statut,";
-        $sql.= " ua.photo as validator_photo";
-
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-        $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
-		$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
-        $sql.= " AND cp.fk_user = ".$user_id;
+        $sql .= " cp.rowid,";
+
+        $sql .= " cp.fk_user,";
+		$sql .= " cp.fk_type,";
+		$sql .= " cp.date_create,";
+        $sql .= " cp.description,";
+        $sql .= " cp.date_debut,";
+        $sql .= " cp.date_fin,";
+        $sql .= " cp.halfday,";
+        $sql .= " cp.statut,";
+        $sql .= " cp.fk_validator,";
+        $sql .= " cp.date_valid,";
+        $sql .= " cp.fk_user_valid,";
+        $sql .= " cp.date_refuse,";
+        $sql .= " cp.fk_user_refuse,";
+        $sql .= " cp.date_cancel,";
+        $sql .= " cp.fk_user_cancel,";
+        $sql .= " cp.detail_refuse,";
+
+		$sql .= " uu.lastname as user_lastname,";
+		$sql .= " uu.firstname as user_firstname,";
+		$sql .= " uu.login as user_login,";
+		$sql .= " uu.statut as user_statut,";
+		$sql .= " uu.photo as user_photo,";
+
+        $sql .= " ua.lastname as validator_lastname,";
+        $sql .= " ua.firstname as validator_firstname,";
+        $sql .= " ua.login as validator_login,";
+        $sql .= " ua.statut as validator_statut,";
+        $sql .= " ua.photo as validator_photo";
+
+        $sql .= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
+        $sql .= " WHERE cp.entity IN (".getEntity('holiday').")";
+		$sql .= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
+        $sql .= " AND cp.fk_user = ".$user_id;
 
         // Filtre de séléction
-        if(!empty($filter)) {
-            $sql.= $filter;
+        if (!empty($filter)) {
+            $sql .= $filter;
         }
 
         // Ordre d'affichage du résultat
-        if(!empty($order)) {
-            $sql.= $order;
+        if (!empty($order)) {
+            $sql .= $order;
         }
 
         dol_syslog(get_class($this)."::fetchByUser", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
 
         // Si pas d'erreur SQL
         if ($resql) {
@@ -346,12 +346,12 @@ 
             $num = $this->db->num_rows($resql);
 
             // Si pas d'enregistrement
-            if(!$num) {
+            if (!$num) {
                 return 2;
             }
 
             // Liste les enregistrements et les ajoutent au tableau
-            while($i < $num) {
+            while ($i < $num) {
 
                 $obj = $this->db->fetch_object($resql);
 
@@ -363,8 +363,8 @@ 
                 $tab_result[$i]['description'] = $obj->description;
                 $tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
                 $tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
-                $tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut,1);
-                $tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin,1);
+                $tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut, 1);
+                $tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin, 1);
                 $tab_result[$i]['halfday'] = $obj->halfday;
                 $tab_result[$i]['statut'] = $obj->statut;
                 $tab_result[$i]['fk_validator'] = $obj->fk_validator;
@@ -398,7 +398,7 @@ 
         else
         {
             // Erreur SQL
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -410,58 +410,58 @@ 
      *  @param      string	$filter     SQL Filter
      *  @return     int      			-1 if KO, 1 if OK, 2 if no result
      */
-    function fetchAll($order,$filter)
+    function fetchAll($order, $filter)
     {
         global $langs;
 
         $sql = "SELECT";
-        $sql.= " cp.rowid,";
-
-        $sql.= " cp.fk_user,";
-        $sql.= " cp.fk_type,";
-        $sql.= " cp.date_create,";
-        $sql.= " cp.description,";
-        $sql.= " cp.date_debut,";
-        $sql.= " cp.date_fin,";
-        $sql.= " cp.halfday,";
-        $sql.= " cp.statut,";
-        $sql.= " cp.fk_validator,";
-        $sql.= " cp.date_valid,";
-        $sql.= " cp.fk_user_valid,";
-        $sql.= " cp.date_refuse,";
-        $sql.= " cp.fk_user_refuse,";
-        $sql.= " cp.date_cancel,";
-        $sql.= " cp.fk_user_cancel,";
-        $sql.= " cp.detail_refuse,";
-
-        $sql.= " uu.lastname as user_lastname,";
-        $sql.= " uu.firstname as user_firstname,";
-        $sql.= " uu.login as user_login,";
-        $sql.= " uu.statut as user_statut,";
-        $sql.= " uu.photo as user_photo,";
-
-        $sql.= " ua.lastname as validator_lastname,";
-        $sql.= " ua.firstname as validator_firstname,";
-        $sql.= " ua.login as validator_login,";
-        $sql.= " ua.statut as validator_statut,";
-        $sql.= " ua.photo as validator_photo";
-
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-        $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
-        $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
+        $sql .= " cp.rowid,";
+
+        $sql .= " cp.fk_user,";
+        $sql .= " cp.fk_type,";
+        $sql .= " cp.date_create,";
+        $sql .= " cp.description,";
+        $sql .= " cp.date_debut,";
+        $sql .= " cp.date_fin,";
+        $sql .= " cp.halfday,";
+        $sql .= " cp.statut,";
+        $sql .= " cp.fk_validator,";
+        $sql .= " cp.date_valid,";
+        $sql .= " cp.fk_user_valid,";
+        $sql .= " cp.date_refuse,";
+        $sql .= " cp.fk_user_refuse,";
+        $sql .= " cp.date_cancel,";
+        $sql .= " cp.fk_user_cancel,";
+        $sql .= " cp.detail_refuse,";
+
+        $sql .= " uu.lastname as user_lastname,";
+        $sql .= " uu.firstname as user_firstname,";
+        $sql .= " uu.login as user_login,";
+        $sql .= " uu.statut as user_statut,";
+        $sql .= " uu.photo as user_photo,";
+
+        $sql .= " ua.lastname as validator_lastname,";
+        $sql .= " ua.firstname as validator_firstname,";
+        $sql .= " ua.login as validator_login,";
+        $sql .= " ua.statut as validator_statut,";
+        $sql .= " ua.photo as validator_photo";
+
+        $sql .= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
+        $sql .= " WHERE cp.entity IN (".getEntity('holiday').")";
+        $sql .= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
 
         // Filtrage de séléction
-        if(!empty($filter)) {
-            $sql.= $filter;
+        if (!empty($filter)) {
+            $sql .= $filter;
         }
 
         // Ordre d'affichage
-        if(!empty($order)) {
-            $sql.= $order;
+        if (!empty($order)) {
+            $sql .= $order;
         }
 
         dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
 
         // Si pas d'erreur SQL
         if ($resql) {
@@ -471,12 +471,12 @@ 
             $num = $this->db->num_rows($resql);
 
             // Si pas d'enregistrement
-            if(!$num) {
+            if (!$num) {
                 return 2;
             }
 
             // On liste les résultats et on les ajoutent dans le tableau
-            while($i < $num) {
+            while ($i < $num) {
 
                 $obj = $this->db->fetch_object($resql);
 
@@ -488,8 +488,8 @@ 
                 $tab_result[$i]['description'] = $obj->description;
                 $tab_result[$i]['date_debut'] = $this->db->jdate($obj->date_debut);
                 $tab_result[$i]['date_fin'] = $this->db->jdate($obj->date_fin);
-                $tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut,1);
-                $tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin,1);
+                $tab_result[$i]['date_debut_gmt'] = $this->db->jdate($obj->date_debut, 1);
+                $tab_result[$i]['date_fin_gmt'] = $this->db->jdate($obj->date_fin, 1);
                 $tab_result[$i]['halfday'] = $obj->halfday;
                 $tab_result[$i]['statut'] = $obj->statut;
                 $tab_result[$i]['fk_validator'] = $obj->fk_validator;
@@ -522,7 +522,7 @@ 
         else
         {
             // Erreur SQL
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -534,89 +534,89 @@ 
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
      *  @return int         			<0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
         global $conf, $langs;
-        $error=0;
+        $error = 0;
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET";
 
-        $sql.= " description= '".$this->db->escape($this->description)."',";
+        $sql .= " description= '".$this->db->escape($this->description)."',";
 
-        if(!empty($this->date_debut)) {
-            $sql.= " date_debut = '".$this->db->idate($this->date_debut)."',";
+        if (!empty($this->date_debut)) {
+            $sql .= " date_debut = '".$this->db->idate($this->date_debut)."',";
         } else {
             $error++;
         }
-        if(!empty($this->date_fin)) {
-            $sql.= " date_fin = '".$this->db->idate($this->date_fin)."',";
+        if (!empty($this->date_fin)) {
+            $sql .= " date_fin = '".$this->db->idate($this->date_fin)."',";
         } else {
             $error++;
         }
-       	$sql.= " halfday = ".$this->halfday.",";
-        if(!empty($this->statut) && is_numeric($this->statut)) {
-            $sql.= " statut = ".$this->statut.",";
+       	$sql .= " halfday = ".$this->halfday.",";
+        if (!empty($this->statut) && is_numeric($this->statut)) {
+            $sql .= " statut = ".$this->statut.",";
         } else {
             $error++;
         }
-        if(!empty($this->fk_validator)) {
-            $sql.= " fk_validator = '".$this->db->escape($this->fk_validator)."',";
+        if (!empty($this->fk_validator)) {
+            $sql .= " fk_validator = '".$this->db->escape($this->fk_validator)."',";
         } else {
             $error++;
         }
-        if(!empty($this->date_valid)) {
-            $sql.= " date_valid = '".$this->db->idate($this->date_valid)."',";
+        if (!empty($this->date_valid)) {
+            $sql .= " date_valid = '".$this->db->idate($this->date_valid)."',";
         } else {
-            $sql.= " date_valid = NULL,";
+            $sql .= " date_valid = NULL,";
         }
-        if(!empty($this->fk_user_valid)) {
-            $sql.= " fk_user_valid = '".$this->db->escape($this->fk_user_valid)."',";
+        if (!empty($this->fk_user_valid)) {
+            $sql .= " fk_user_valid = '".$this->db->escape($this->fk_user_valid)."',";
         } else {
-            $sql.= " fk_user_valid = NULL,";
+            $sql .= " fk_user_valid = NULL,";
         }
-        if(!empty($this->date_refuse)) {
-            $sql.= " date_refuse = '".$this->db->idate($this->date_refuse)."',";
+        if (!empty($this->date_refuse)) {
+            $sql .= " date_refuse = '".$this->db->idate($this->date_refuse)."',";
         } else {
-            $sql.= " date_refuse = NULL,";
+            $sql .= " date_refuse = NULL,";
         }
-        if(!empty($this->fk_user_refuse)) {
-            $sql.= " fk_user_refuse = '".$this->db->escape($this->fk_user_refuse)."',";
+        if (!empty($this->fk_user_refuse)) {
+            $sql .= " fk_user_refuse = '".$this->db->escape($this->fk_user_refuse)."',";
         } else {
-            $sql.= " fk_user_refuse = NULL,";
+            $sql .= " fk_user_refuse = NULL,";
         }
-        if(!empty($this->date_cancel)) {
-            $sql.= " date_cancel = '".$this->db->idate($this->date_cancel)."',";
+        if (!empty($this->date_cancel)) {
+            $sql .= " date_cancel = '".$this->db->idate($this->date_cancel)."',";
         } else {
-            $sql.= " date_cancel = NULL,";
+            $sql .= " date_cancel = NULL,";
         }
-        if(!empty($this->fk_user_cancel)) {
-            $sql.= " fk_user_cancel = '".$this->db->escape($this->fk_user_cancel)."',";
+        if (!empty($this->fk_user_cancel)) {
+            $sql .= " fk_user_cancel = '".$this->db->escape($this->fk_user_cancel)."',";
         } else {
-            $sql.= " fk_user_cancel = NULL,";
+            $sql .= " fk_user_cancel = NULL,";
         }
-        if(!empty($this->detail_refuse)) {
-            $sql.= " detail_refuse = '".$this->db->escape($this->detail_refuse)."'";
+        if (!empty($this->detail_refuse)) {
+            $sql .= " detail_refuse = '".$this->db->escape($this->detail_refuse)."'";
         } else {
-            $sql.= " detail_refuse = NULL";
+            $sql .= " detail_refuse = NULL";
         }
 
-        $sql.= " WHERE rowid= ".$this->id;
+        $sql .= " WHERE rowid= ".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql) {
-            $error++; $this->errors[]="Error ".$this->db->lasterror();
+        if (!$resql) {
+            $error++; $this->errors[] = "Error ".$this->db->lasterror();
         }
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('HOLIDAY_MODIFY',$user);
+                $result = $this->call_trigger('HOLIDAY_MODIFY', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -625,13 +625,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -648,28 +648,28 @@ 
      *   @param     int		$notrigger	    0=launch triggers after, 1=disable triggers
      *	 @return	int						<0 if KO, >0 if OK
      */
-    function delete($user, $notrigger=0)
+    function delete($user, $notrigger = 0)
     {
         global $conf, $langs;
-        $error=0;
+        $error = 0;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday";
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql) {
-            $error++; $this->errors[]="Error ".$this->db->lasterror();
+        if (!$resql) {
+            $error++; $this->errors[] = "Error ".$this->db->lasterror();
         }
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('HOLIDAY_DELETE',$user);
+                $result = $this->call_trigger('HOLIDAY_DELETE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -678,13 +678,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
-            return -1*$error;
+            return -1 * $error;
         }
         else
         {
@@ -706,14 +706,14 @@ 
      * 	@return boolean					False is on holiday at least partially into the period, True is never on holiday during chcked period.
      *  @see verifDateHolidayForTimestamp
      */
-    function verifDateHolidayCP($fk_user, $dateDebut, $dateFin, $halfday=0)
+    function verifDateHolidayCP($fk_user, $dateDebut, $dateFin, $halfday = 0)
     {
-        $this->fetchByUser($fk_user,'','');
+        $this->fetchByUser($fk_user, '', '');
 
-        foreach($this->holiday as $infos_CP)
+        foreach ($this->holiday as $infos_CP)
         {
-        	if ($infos_CP['statut'] == 4) continue;		// ignore not validated holidays
-        	if ($infos_CP['statut'] == 5) continue;		// ignore not validated holidays
+        	if ($infos_CP['statut'] == 4) continue; // ignore not validated holidays
+        	if ($infos_CP['statut'] == 5) continue; // ignore not validated holidays
 
         	// TODO Also use halfday for the check
         	if ($halfday == 0)
@@ -766,34 +766,34 @@ 
     {
     	global $langs, $conf;
 
-    	$isavailablemorning=true;
-    	$isavailableafternoon=true;
+    	$isavailablemorning = true;
+    	$isavailableafternoon = true;
 
     	$sql = "SELECT cp.rowid, cp.date_debut as date_start, cp.date_fin as date_end, cp.halfday";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp";
-    	$sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
-    	$sql.= " AND cp.fk_user = ".(int) $fk_user;
-   		$sql.= " AND date_debut <= '".$this->db->idate($timestamp)."' AND date_fin >= '".$this->db->idate($timestamp)."'";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as cp";
+    	$sql .= " WHERE cp.entity IN (".getEntity('holiday').")";
+    	$sql .= " AND cp.fk_user = ".(int) $fk_user;
+   		$sql .= " AND date_debut <= '".$this->db->idate($timestamp)."' AND date_fin >= '".$this->db->idate($timestamp)."'";
 
     	$resql = $this->db->query($sql);
     	if ($resql)
     	{
-    		$num_rows = $this->db->num_rows($resql);	// Note, we can have 2 records if on is morning and the other one is afternoon
+    		$num_rows = $this->db->num_rows($resql); // Note, we can have 2 records if on is morning and the other one is afternoon
     		if ($num_rows > 0)
     		{
-	    		$i=0;
+	    		$i = 0;
 	    		while ($i < $num_rows)
 	    		{
 	    			$obj = $this->db->fetch_object($resql);
 
 	    			// Note: $obj->halday is  0:Full days, 2:Sart afternoon end morning, -1:Start afternoon, 1:End morning
-	    			$arrayofrecord[$obj->rowid]=array('date_start'=>$this->db->jdate($obj->date_start), 'date_end'=>$this->db->jdate($obj->date_end), 'halfday'=>$obj->halfday);
+	    			$arrayofrecord[$obj->rowid] = array('date_start'=>$this->db->jdate($obj->date_start), 'date_end'=>$this->db->jdate($obj->date_end), 'halfday'=>$obj->halfday);
 	    			$i++;
 	    		}
 
     			// We found a record, user is on holiday by default, so is not available is true.
 	    		$isavailablemorning = true;
-	    		foreach($arrayofrecord as $record)
+	    		foreach ($arrayofrecord as $record)
 	    		{
 					if ($timestamp == $record['date_start'] && $record['halfday'] == 2)  continue;
 					if ($timestamp == $record['date_start'] && $record['halfday'] == -1) continue;
@@ -801,7 +801,7 @@ 
 	    			break;
 	    		}
     			$isavailableafternoon = true;
-	    		foreach($arrayofrecord as $record)
+	    		foreach ($arrayofrecord as $record)
 	    		{
 					if ($timestamp == $record['date_end'] && $record['halfday'] == 2) continue;
 					if ($timestamp == $record['date_end'] && $record['halfday'] == 1) continue;
@@ -823,30 +823,30 @@ 
      *  @param  int     	$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
      *	@return	string									String with URL
      */
-    function getNomUrl($withpicto=0, $save_lastsearch_value=-1)
+    function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
     {
         global $langs;
 
-        $result='';
-        $picto='holiday';
-        $label=$langs->trans("Show").': '.$this->ref;
+        $result = '';
+        $picto = 'holiday';
+        $label = $langs->trans("Show").': '.$this->ref;
 
         $url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
 
         //if ($option != 'nolink')
         //{
         	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         //}
 
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-        $linkend='</a>';
+        $linkend = '</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
+        if ($withpicto) $result .= ($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        if ($withpicto && $withpicto != 2) $result .= ' ';
+        if ($withpicto != 2) $result .= $linkstart.$this->ref.$linkend;
         return $result;
     }
 
@@ -857,7 +857,7 @@ 
      *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
      *	@return     string      		Label
      */
-    function getLibStatut($mode=0)
+    function getLibStatut($mode = 0)
     {
     	return $this->LibStatut($this->statut, $mode, $this->date_debut);
     }
@@ -870,7 +870,7 @@ 
 	 *  @param		date	$startdate	Date holiday should start
 	 *	@return     string      		Label
 	 */
-	function LibStatut($statut, $mode=0, $startdate='')
+	function LibStatut($statut, $mode = 0, $startdate = '')
 	{
 		global $langs;
 
@@ -884,43 +884,43 @@ 
 		}
 		if ($mode == 2)
 		{
-			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP');				// Draft
-			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP');		// Waiting approval
-			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
-			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
-			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
+			$pictoapproved = 'statut6';
+			if (!empty($startdate) && $startdate > dol_now()) $pictoapproved = 'statut4';
+			if ($statut == 1) return img_picto($langs->trans('DraftCP'), 'statut0').' '.$langs->trans('DraftCP'); // Draft
+			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'), 'statut1').' '.$langs->trans('ToReviewCP'); // Waiting approval
+			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'), $pictoapproved).' '.$langs->trans('ApprovedCP');
+			if ($statut == 4) return img_picto($langs->trans('CancelCP'), 'statut5').' '.$langs->trans('CancelCP');
+			if ($statut == 5) return img_picto($langs->trans('RefuseCP'), 'statut5').' '.$langs->trans('RefuseCP');
 		}
 		if ($mode == 3)
 		{
-			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0');
-			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1');
-			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5');
+			$pictoapproved = 'statut6';
+			if (!empty($startdate) && $startdate > dol_now()) $pictoapproved = 'statut4';
+			if ($statut == 1) return img_picto($langs->trans('DraftCP'), 'statut0');
+			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'), 'statut1');
+			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'), $pictoapproved);
+			if ($statut == 4) return img_picto($langs->trans('CancelCP'), 'statut5');
+			if ($statut == 5) return img_picto($langs->trans('RefuseCP'), 'statut5');
 		}
 		if ($mode == 5)
 		{
-			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
-			if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
-			if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+			$pictoapproved = 'statut6';
+			if (!empty($startdate) && $startdate > dol_now()) $pictoapproved = 'statut4';
+			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'), 'statut0'); // Draft
+			if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'), 'statut1'); // Waiting approval
+			if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'), $pictoapproved);
+			if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'), 'statut5');
+			if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'), 'statut5');
 		}
 		if ($mode == 6)
 		{
-		    $pictoapproved='statut6';
-		    if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-		    if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
-		    if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
-		    if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-		    if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
-		    if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+		    $pictoapproved = 'statut6';
+		    if (!empty($startdate) && $startdate > dol_now()) $pictoapproved = 'statut4';
+		    if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'), 'statut0'); // Draft
+		    if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'), 'statut1'); // Waiting approval
+		    if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'), $pictoapproved);
+		    if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'), 'statut5');
+		    if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'), 'statut5');
 		}
 
 		return $statut;
@@ -933,29 +933,29 @@ 
      *   @param 	int		$selected   int du statut séléctionné par défaut
      *   @return    string				affiche le select des statuts
      */
-    function selectStatutCP($selected='') {
+    function selectStatutCP($selected = '') {
 
         global $langs;
 
         // Liste des statuts
-        $name = array('DraftCP','ToReviewCP','ApprovedCP','CancelCP','RefuseCP');
-        $nb = count($name)+1;
+        $name = array('DraftCP', 'ToReviewCP', 'ApprovedCP', 'CancelCP', 'RefuseCP');
+        $nb = count($name) + 1;
 
         // Select HTML
         $statut = '<select name="select_statut" class="flat">'."\n";
-        $statut.= '<option value="-1">&nbsp;</option>'."\n";
+        $statut .= '<option value="-1">&nbsp;</option>'."\n";
 
         // Boucle des statuts
-        for($i=1; $i < $nb; $i++) {
-            if($i==$selected) {
-                $statut.= '<option value="'.$i.'" selected>'.$langs->trans($name[$i-1]).'</option>'."\n";
+        for ($i = 1; $i < $nb; $i++) {
+            if ($i == $selected) {
+                $statut .= '<option value="'.$i.'" selected>'.$langs->trans($name[$i - 1]).'</option>'."\n";
             }
             else {
-                $statut.= '<option value="'.$i.'">'.$langs->trans($name[$i-1]).'</option>'."\n";
+                $statut .= '<option value="'.$i.'">'.$langs->trans($name[$i - 1]).'</option>'."\n";
             }
         }
 
-        $statut.= '</select>'."\n";
+        $statut .= '</select>'."\n";
         print $statut;
 
     }
@@ -967,15 +967,15 @@ 
      *  @param	string	$value      vrai si mise à jour OK sinon faux
      *  @return boolean				ok or ko
      */
-    function updateConfCP($name,$value) {
+    function updateConfCP($name, $value) {
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
-        $sql.= " value = '".$value."'";
-        $sql.= " WHERE name = '".$name."'";
+        $sql .= " value = '".$value."'";
+        $sql .= " WHERE name = '".$name."'";
 
         dol_syslog(get_class($this).'::updateConfCP name='.$name.'', LOG_DEBUG);
         $result = $this->db->query($sql);
-        if($result) {
+        if ($result) {
             return true;
         }
 
@@ -990,16 +990,16 @@ 
      *  @param  string  $createifnotfound     'stringvalue'=Create entry with string value if not found. For example 'YYYYMMDDHHMMSS'.
      *  @return string      		          Value of parameter. Example: 'YYYYMMDDHHMMSS' or < 0 if error
      */
-    function getConfCP($name, $createifnotfound='')
+    function getConfCP($name, $createifnotfound = '')
     {
         $sql = "SELECT value";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
-        $sql.= " WHERE name = '".$this->db->escape($name)."'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."holiday_config";
+        $sql .= " WHERE name = '".$this->db->escape($name)."'";
 
         dol_syslog(get_class($this).'::getConfCP name='.$name.' createifnotfound='.$createifnotfound, LOG_DEBUG);
         $result = $this->db->query($sql);
 
-        if($result) {
+        if ($result) {
 
             $obj = $this->db->fetch_object($result);
             // Return value
@@ -1008,7 +1008,7 @@ 
                 if ($createifnotfound)
                 {
                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_config(name, value)";
-                    $sql.= " VALUES('".$this->db->escape($name)."', '".$this->db->escape($createifnotfound)."')";
+                    $sql .= " VALUES('".$this->db->escape($name)."', '".$this->db->escape($createifnotfound)."')";
                     $result = $this->db->query($sql);
                     if ($result)
                     {
@@ -1016,7 +1016,7 @@ 
                     }
                     else
                     {
-                        $this->error=$this->db->lasterror();
+                        $this->error = $this->db->lasterror();
                         return -2;
                     }
                 }
@@ -1032,7 +1032,7 @@ 
         } else {
 
             // Erreur SQL
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -1045,7 +1045,7 @@ 
      *  @param		int		$fk_type	Type of vacation
      *  @return     int					0=Nothing done, 1=OK, -1=KO
      */
-    function updateSoldeCP($userID='',$nbHoliday='', $fk_type='')
+    function updateSoldeCP($userID = '', $nbHoliday = '', $fk_type = '')
     {
         global $user, $langs;
 
@@ -1056,9 +1056,9 @@ 
             $langs->load("holiday");
 
             // Si mise à jour pour tout le monde en début de mois
-			$now=dol_now();
+			$now = dol_now();
 
-            $month = date('m',$now);
+            $month = date('m', $now);
             $newdateforlastupdate = dol_print_date($now, '%Y%m%d%H%M%S');
 
             // Get month of last update
@@ -1071,20 +1071,20 @@ 
             {
             	$this->db->begin();
 
-            	$users = $this->fetchUsers(false,false);
+            	$users = $this->fetchUsers(false, false);
 	            $nbUser = count($users);
 
                 $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
-                $sql.= " value = '".$this->db->escape($newdateforlastupdate)."'";
-                $sql.= " WHERE name = 'lastUpdate'";
+                $sql .= " value = '".$this->db->escape($newdateforlastupdate)."'";
+                $sql .= " WHERE name = 'lastUpdate'";
                 $result = $this->db->query($sql);
 
-				$typeleaves=$this->getTypes(1,1);
-    			foreach($typeleaves as $key => $val)
+				$typeleaves = $this->getTypes(1, 1);
+    			foreach ($typeleaves as $key => $val)
     			{
 	                // On ajoute x jours à chaque utilisateurs
 	                $nb_holiday = $val['newByMonth'];
-					if (empty($nb_holiday)) $nb_holiday=0;
+					if (empty($nb_holiday)) $nb_holiday = 0;
 
 					if ($nb_holiday > 0)
 					{
@@ -1104,12 +1104,12 @@ 
 
 		                // Now we update counter for all users at once
 		                $sql2 = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
-		                $sql2.= " nb_holiday = nb_holiday + ".$nb_holiday;
-						$sql2.= " WHERE fk_type = ".$val['rowid'];
+		                $sql2 .= " nb_holiday = nb_holiday + ".$nb_holiday;
+						$sql2 .= " WHERE fk_type = ".$val['rowid'];
 
-		                $result= $this->db->query($sql2);
+		                $result = $this->db->query($sql2);
 
-		                if (! $result)
+		                if (!$result)
 		                {
 		                	dol_print_error($this->db);
 		                	break;
@@ -1135,10 +1135,10 @@ 
         else
 		{
             // Mise à jour pour un utilisateur
-            $nbHoliday = price2num($nbHoliday,5);
+            $nbHoliday = price2num($nbHoliday, 5);
 
             $sql = "SELECT nb_holiday FROM ".MAIN_DB_PREFIX."holiday_users";
-            $sql.= " WHERE fk_user = '".$userID."' AND fk_type = ".$fk_type;
+            $sql .= " WHERE fk_user = '".$userID."' AND fk_type = ".$fk_type;
             $resql = $this->db->query($sql);
             if ($resql)
             {
@@ -1148,36 +1148,36 @@ 
             	{
 		            // Update for user
 		            $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
-		            $sql.= " nb_holiday = ".$nbHoliday;
-		            $sql.= " WHERE fk_user = '".$userID."' AND fk_type = ".$fk_type;
+		            $sql .= " nb_holiday = ".$nbHoliday;
+		            $sql .= " WHERE fk_user = '".$userID."' AND fk_type = ".$fk_type;
 		            $result = $this->db->query($sql);
-		            if (! $result)
+		            if (!$result)
 		            {
 		            	$error++;
-		            	$this->errors[]=$this->db->lasterror();
+		            	$this->errors[] = $this->db->lasterror();
 		            }
             	}
             	else
             	{
 		            // Insert for user
 		            $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
-		            $sql.= $nbHoliday;
-		            $sql.= ", '".$userID."', ".$fk_type.")";
+		            $sql .= $nbHoliday;
+		            $sql .= ", '".$userID."', ".$fk_type.")";
 		            $result = $this->db->query($sql);
-		            if (! $result)
+		            if (!$result)
 		            {
 		            	$error++;
-		            	$this->errors[]=$this->db->lasterror();
+		            	$this->errors[] = $this->db->lasterror();
 		            }
             	}
             }
             else
 			{
-		        $this->errors[]=$this->db->lasterror();
+		        $this->errors[] = $this->db->lasterror();
             	$error++;
 			}
 
-            if (! $error)
+            if (!$error)
             {
             	return 1;
             }
@@ -1198,16 +1198,16 @@ 
     function getCheckOption($name) {
 
         $sql = "SELECT value";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
-        $sql.= " WHERE name = '".$name."'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."holiday_config";
+        $sql .= " WHERE name = '".$name."'";
 
         $result = $this->db->query($sql);
 
-        if($result) {
+        if ($result) {
             $obj = $this->db->fetch_object($result);
 
             // Si la valeur est 1 on retourne checked
-            if($obj->value) {
+            if ($obj->value) {
                 return 'checked';
             }
         }
@@ -1221,32 +1221,32 @@ 
      *  @param	int			$userid		Id user
      *  @return void
      */
-    function createCPusers($single=false,$userid='')
+    function createCPusers($single = false, $userid = '')
     {
         // Si c'est l'ensemble des utilisateurs à ajouter
-        if (! $single)
+        if (!$single)
         {
         	dol_syslog(get_class($this).'::createCPusers');
-        	$arrayofusers = $this->fetchUsers(false,true);
+        	$arrayofusers = $this->fetchUsers(false, true);
 
-            foreach($arrayofusers as $users)
+            foreach ($arrayofusers as $users)
             {
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
-                $sql.= " (fk_user, nb_holiday)";
-                $sql.= " VALUES ('".$users['rowid']."','0')";
+                $sql .= " (fk_user, nb_holiday)";
+                $sql .= " VALUES ('".$users['rowid']."','0')";
 
-                $resql=$this->db->query($sql);
-                if (! $resql) dol_print_error($this->db);
+                $resql = $this->db->query($sql);
+                if (!$resql) dol_print_error($this->db);
             }
         }
         else
 		{
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
-            $sql.= " (fk_user, nb_holiday)";
-            $sql.= " VALUES ('".$userid."','0')";
+            $sql .= " (fk_user, nb_holiday)";
+            $sql .= " VALUES ('".$userid."','0')";
 
-            $resql=$this->db->query($sql);
-            if (! $resql) dol_print_error($this->db);
+            $resql = $this->db->query($sql);
+            if (!$resql) dol_print_error($this->db);
         }
     }
 
@@ -1259,7 +1259,7 @@ 
     function deleteCPuser($user_id) {
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday_users";
-        $sql.= " WHERE fk_user = '".$user_id."'";
+        $sql .= " WHERE fk_user = '".$user_id."'";
 
         $this->db->query($sql);
 
@@ -1273,16 +1273,16 @@ 
      *  @param	int		$fk_type	Filter on type
      *  @return float        		Retourne le solde de congés payés de l'utilisateur
      */
-    function getCPforUser($user_id, $fk_type=0)
+    function getCPforUser($user_id, $fk_type = 0)
     {
         $sql = "SELECT nb_holiday";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users";
-        $sql.= " WHERE fk_user = '".$user_id."'";
-        if ($fk_type > 0) $sql.=" AND fk_type = ".$fk_type;
+        $sql .= " FROM ".MAIN_DB_PREFIX."holiday_users";
+        $sql .= " WHERE fk_user = '".$user_id."'";
+        if ($fk_type > 0) $sql .= " AND fk_type = ".$fk_type;
 
         dol_syslog(get_class($this).'::getCPforUser', LOG_DEBUG);
         $result = $this->db->query($sql);
-        if($result)
+        if ($result)
         {
             $obj = $this->db->fetch_object($result);
             //return number_format($obj->nb_holiday,2);
@@ -1303,7 +1303,7 @@ 
      *    @param      string            $filters        Filters
      *    @return     array|string|int      			Return an array
      */
-    function fetchUsers($stringlist=true, $type=true, $filters='')
+    function fetchUsers($stringlist = true, $type = true, $filters = '')
     {
     	global $conf;
 
@@ -1316,23 +1316,23 @@ 
                 // Si utilisateur de Dolibarr
 
                 $sql = "SELECT u.rowid";
-                $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+                $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-                if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+                if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                 {
-                	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-                	$sql.= " WHERE (ug.fk_user = u.rowid";
-                	$sql.= " AND ug.entity = ".$conf->entity.")";
-                	$sql.= " OR u.admin = 1";
+                	$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+                	$sql .= " WHERE (ug.fk_user = u.rowid";
+                	$sql .= " AND ug.entity = ".$conf->entity.")";
+                	$sql .= " OR u.admin = 1";
                 }
                 else
                 {
-                	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+                	$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
                 }
-                $sql.= " AND u.statut > 0";
-                if ($filters) $sql.=$filters;
+                $sql .= " AND u.statut > 0";
+                if ($filters) $sql .= $filters;
 
-                $resql=$this->db->query($sql);
+                $resql = $this->db->query($sql);
 
                 // Si pas d'erreur SQL
                 if ($resql) {
@@ -1342,14 +1342,14 @@ 
                     $stringlist = '';
 
                     // Boucles du listage des utilisateurs
-                    while($i < $num)
+                    while ($i < $num)
                     {
                         $obj = $this->db->fetch_object($resql);
 
                         if ($i == 0) {
-                            $stringlist.= $obj->rowid;
+                            $stringlist .= $obj->rowid;
                         } else {
-                            $stringlist.= ', '.$obj->rowid;
+                            $stringlist .= ', '.$obj->rowid;
                         }
 
                         $i++;
@@ -1360,7 +1360,7 @@ 
                 else
                 {
                     // Erreur SQL
-                    $this->error="Error ".$this->db->lasterror();
+                    $this->error = "Error ".$this->db->lasterror();
                     return -1;
                 }
 
@@ -1369,11 +1369,11 @@ 
             {
            		// We want only list of vacation balance for user ids
                 $sql = "SELECT DISTINCT cpu.fk_user";
-                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
-                $sql.= " WHERE cpu.fk_user = u.user";
-                if ($filters) $sql.=$filters;
+                $sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
+                $sql .= " WHERE cpu.fk_user = u.user";
+                if ($filters) $sql .= $filters;
 
-                $resql=$this->db->query($sql);
+                $resql = $this->db->query($sql);
 
                 // Si pas d'erreur SQL
                 if ($resql) {
@@ -1383,14 +1383,14 @@ 
                     $stringlist = '';
 
                     // Boucles du listage des utilisateurs
-                    while($i < $num)
+                    while ($i < $num)
                     {
                         $obj = $this->db->fetch_object($resql);
 
-                        if($i == 0) {
-                            $stringlist.= $obj->fk_user;
+                        if ($i == 0) {
+                            $stringlist .= $obj->fk_user;
                         } else {
-                            $stringlist.= ', '.$obj->fk_user;
+                            $stringlist .= ', '.$obj->fk_user;
                         }
 
                         $i++;
@@ -1401,7 +1401,7 @@ 
                 else
               {
                     // Erreur SQL
-                    $this->error="Error ".$this->db->lasterror();
+                    $this->error = "Error ".$this->db->lasterror();
                     return -1;
                 }
             }
@@ -1414,22 +1414,22 @@ 
             if ($type)
             {
                 $sql = "SELECT u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
-                $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+                $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-                if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+                if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                 {
-                	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-                	$sql.= " WHERE (ug.fk_user = u.rowid";
-                	$sql.= " AND ug.entity = ".$conf->entity.")";
-                	$sql.= " OR u.admin = 1";
+                	$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+                	$sql .= " WHERE (ug.fk_user = u.rowid";
+                	$sql .= " AND ug.entity = ".$conf->entity.")";
+                	$sql .= " OR u.admin = 1";
                 }
                 else
-                	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+                	$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 
-                $sql.= " AND u.statut > 0";
-                if ($filters) $sql.=$filters;
+                $sql .= " AND u.statut > 0";
+                if ($filters) $sql .= $filters;
 
-                $resql=$this->db->query($sql);
+                $resql = $this->db->query($sql);
 
                 // Si pas d'erreur SQL
                 if ($resql)
@@ -1439,12 +1439,12 @@ 
                     $num = $this->db->num_rows($resql);
 
                     // Boucles du listage des utilisateurs
-                    while($i < $num) {
+                    while ($i < $num) {
 
                         $obj = $this->db->fetch_object($resql);
 
                         $tab_result[$i]['rowid'] = $obj->rowid;
-                        $tab_result[$i]['name'] = $obj->lastname;       // deprecated
+                        $tab_result[$i]['name'] = $obj->lastname; // deprecated
                         $tab_result[$i]['lastname'] = $obj->lastname;
                         $tab_result[$i]['firstname'] = $obj->firstname;
                         $tab_result[$i]['gender'] = $obj->gender;
@@ -1463,7 +1463,7 @@ 
                 else
 				{
                     // Erreur SQL
-                    $this->errors[]="Error ".$this->db->lasterror();
+                    $this->errors[] = "Error ".$this->db->lasterror();
                     return -1;
                 }
             }
@@ -1471,11 +1471,11 @@ 
             {
 				// List of vacation balance users
                 $sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holiday, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
-                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
-                $sql.= " WHERE cpu.fk_user = u.rowid";
-                if ($filters) $sql.=$filters;
+                $sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
+                $sql .= " WHERE cpu.fk_user = u.rowid";
+                if ($filters) $sql .= $filters;
 
-                $resql=$this->db->query($sql);
+                $resql = $this->db->query($sql);
 
                 // Si pas d'erreur SQL
                 if ($resql)
@@ -1485,12 +1485,12 @@ 
                     $num = $this->db->num_rows($resql);
 
                     // Boucles du listage des utilisateurs
-                    while($i < $num)
+                    while ($i < $num)
                     {
                         $obj = $this->db->fetch_object($resql);
 
                         $tab_result[$i]['rowid'] = $obj->fk_user;
-                        $tab_result[$i]['name'] = $obj->lastname;			// deprecated
+                        $tab_result[$i]['name'] = $obj->lastname; // deprecated
                         $tab_result[$i]['lastname'] = $obj->lastname;
                         $tab_result[$i]['firstname'] = $obj->firstname;
                         $tab_result[$i]['gender'] = $obj->gender;
@@ -1510,7 +1510,7 @@ 
                 else
 				{
                     // Erreur SQL
-                    $this->error="Error ".$this->db->lasterror();
+                    $this->error = "Error ".$this->db->lasterror();
                     return -1;
                 }
             }
@@ -1525,8 +1525,8 @@ 
     function countActiveUsers()
     {
         $sql = "SELECT count(u.rowid) as compteur";
-        $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		$sql.= " WHERE u.statut > 0";
+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql .= " WHERE u.statut > 0";
 
         $result = $this->db->query($sql);
         $objet = $this->db->fetch_object($result);
@@ -1541,8 +1541,8 @@ 
     function countActiveUsersWithoutCP() {
 
         $sql = "SELECT count(u.rowid) as compteur";
-        $sql.= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
-		$sql.= " WHERE u.statut > 0 AND hu.fk_user IS NULL";
+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
+		$sql .= " WHERE u.statut > 0 AND hu.fk_user IS NULL";
 
         $result = $this->db->query($sql);
         $objet = $this->db->fetch_object($result);
@@ -1559,7 +1559,7 @@ 
      */
     function verifNbUsers($userDolibarrWithoutCP, $userCP)
     {
-    	if (empty($userCP)) $userCP=0;
+    	if (empty($userCP)) $userCP = 0;
     	dol_syslog(get_class($this).'::verifNbUsers userDolibarr='.$userDolibarrWithoutCP.' userCP='.$userCP);
         return 1;
     }
@@ -1579,7 +1579,7 @@ 
     {
         global $conf, $langs;
 
-        $error=0;
+        $error = 0;
 
         $prev_solde = price2num($this->getCPforUser($fk_user_update, $fk_type), 5);
         $new_solde = price2num($new_solde, 5);
@@ -1591,30 +1591,30 @@ 
 
 		// Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_logs (";
-        $sql.= "date_action,";
-        $sql.= "fk_user_action,";
-        $sql.= "fk_user_update,";
-        $sql.= "type_action,";
-        $sql.= "prev_solde,";
-        $sql.= "new_solde,";
-		$sql.= "fk_type";
-        $sql.= ") VALUES (";
-        $sql.= " '".$this->db->idate(dol_now())."',";
-        $sql.= " '".$fk_user_action."',";
-        $sql.= " '".$fk_user_update."',";
-        $sql.= " '".$this->db->escape($label)."',";
-        $sql.= " '".$prev_solde."',";
-        $sql.= " '".$new_solde."',";
-        $sql.= " ".$fk_type;
-        $sql.= ")";
-
-        $resql=$this->db->query($sql);
-       	if (! $resql)
+        $sql .= "date_action,";
+        $sql .= "fk_user_action,";
+        $sql .= "fk_user_update,";
+        $sql .= "type_action,";
+        $sql .= "prev_solde,";
+        $sql .= "new_solde,";
+		$sql .= "fk_type";
+        $sql .= ") VALUES (";
+        $sql .= " '".$this->db->idate(dol_now())."',";
+        $sql .= " '".$fk_user_action."',";
+        $sql .= " '".$fk_user_update."',";
+        $sql .= " '".$this->db->escape($label)."',";
+        $sql .= " '".$prev_solde."',";
+        $sql .= " '".$new_solde."',";
+        $sql .= " ".$fk_type;
+        $sql .= ")";
+
+        $resql = $this->db->query($sql);
+       	if (!$resql)
        	{
-       	    $error++; $this->errors[]="Error ".$this->db->lasterror();
+       	    $error++; $this->errors[] = "Error ".$this->db->lasterror();
        	}
 
-       	if (! $error)
+       	if (!$error)
        	{
        	    $this->optRowid = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday_logs");
        	}
@@ -1622,13 +1622,13 @@ 
        	// Commit or rollback
        	if ($error)
        	{
-       	    foreach($this->errors as $errmsg)
+       	    foreach ($this->errors as $errmsg)
        	    {
    	            dol_syslog(get_class($this)."::addLogCP ".$errmsg, LOG_ERR);
-   	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+   	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
        	    }
        	    $this->db->rollback();
-       	    return -1*$error;
+       	    return -1 * $error;
        	}
        	else
        	{
@@ -1644,34 +1644,34 @@ 
      *  @param  string	$filter     Filtre de séléction
      *  @return int         		-1 si erreur, 1 si OK et 2 si pas de résultat
      */
-    function fetchLog($order,$filter)
+    function fetchLog($order, $filter)
     {
         global $langs;
 
         $sql = "SELECT";
-        $sql.= " cpl.rowid,";
-        $sql.= " cpl.date_action,";
-        $sql.= " cpl.fk_user_action,";
-        $sql.= " cpl.fk_user_update,";
-        $sql.= " cpl.type_action,";
-        $sql.= " cpl.prev_solde,";
-        $sql.= " cpl.new_solde,";
-		$sql.= " cpl.fk_type";
-        $sql.= " FROM ".MAIN_DB_PREFIX."holiday_logs as cpl";
-        $sql.= " WHERE cpl.rowid > 0"; // To avoid error with other search and criteria
+        $sql .= " cpl.rowid,";
+        $sql .= " cpl.date_action,";
+        $sql .= " cpl.fk_user_action,";
+        $sql .= " cpl.fk_user_update,";
+        $sql .= " cpl.type_action,";
+        $sql .= " cpl.prev_solde,";
+        $sql .= " cpl.new_solde,";
+		$sql .= " cpl.fk_type";
+        $sql .= " FROM ".MAIN_DB_PREFIX."holiday_logs as cpl";
+        $sql .= " WHERE cpl.rowid > 0"; // To avoid error with other search and criteria
 
         // Filtrage de séléction
-        if(!empty($filter)) {
-            $sql.= " ".$filter;
+        if (!empty($filter)) {
+            $sql .= " ".$filter;
         }
 
         // Ordre d'affichage
-        if(!empty($order)) {
-            $sql.= " ".$order;
+        if (!empty($order)) {
+            $sql .= " ".$order;
         }
 
         dol_syslog(get_class($this)."::fetchLog", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
 
         // Si pas d'erreur SQL
   		if ($resql) {
@@ -1681,12 +1681,12 @@ 
   		    $num = $this->db->num_rows($resql);
 
   		    // Si pas d'enregistrement
-  		    if(!$num) {
+  		    if (!$num) {
                 return 2;
   		    }
 
   		    // On liste les résultats et on les ajoutent dans le tableau
-  		    while($i < $num) {
+  		    while ($i < $num) {
 
   		        $obj = $this->db->fetch_object($resql);
 
@@ -1708,7 +1708,7 @@ 
   		else
   		{
   		    // Erreur SQL
-  		    $this->error="Error ".$this->db->lasterror();
+  		    $this->error = "Error ".$this->db->lasterror();
   		    return -1;
   		}
     }
@@ -1721,15 +1721,15 @@ 
      *  @param		int		$affect		Filter on affect (a request will change sold or not). -1 = Both
      *  @return     array	    		Return array with list of types
      */
-    function getTypes($active=-1, $affect=-1)
+    function getTypes($active = -1, $affect = -1)
     {
     	global $mysoc;
 
     	$sql = "SELECT rowid, code, label, affect, delay, newByMonth";
-    	$sql.= " FROM " . MAIN_DB_PREFIX . "c_holiday_types";
-    	$sql.= " WHERE (fk_country IS NULL OR fk_country = ".$mysoc->country_id.')';
-    	if ($active >= 0) $sql.=" AND active = ".((int) $active);
-    	if ($affect >= 0) $sql.=" AND affect = ".((int) $affect);
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_holiday_types";
+    	$sql .= " WHERE (fk_country IS NULL OR fk_country = ".$mysoc->country_id.')';
+    	if ($active >= 0) $sql .= " AND active = ".((int) $active);
+    	if ($affect >= 0) $sql .= " AND affect = ".((int) $affect);
 
     	$result = $this->db->query($sql);
     	if ($result)
@@ -1760,19 +1760,19 @@ 
      */
     function initAsSpecimen()
     {
-    	global $user,$langs;
+    	global $user, $langs;
 
     	// Initialise parameters
-    	$this->id=0;
-    	$this->specimen=1;
-
-    	$this->fk_user=1;
-    	$this->description='SPECIMEN description';
-    	$this->date_debut=dol_now();
-    	$this->date_fin=dol_now()+(24*3600);
-    	$this->fk_validator=1;
-    	$this->halfday=0;
-    	$this->fk_type=1;
+    	$this->id = 0;
+    	$this->specimen = 1;
+
+    	$this->fk_user = 1;
+    	$this->description = 'SPECIMEN description';
+    	$this->date_debut = dol_now();
+    	$this->date_fin = dol_now() + (24 * 3600);
+    	$this->fk_validator = 1;
+    	$this->halfday = 0;
+    	$this->fk_type = 1;
     }
 
 }

Braces +209 added lines, -123 removed lines

@@ -102,8 +102,7 @@ 
 	    {
 	    	$this->db->commit();
 	    	return 1;
-	    }
-	    else
+	    } else
 		{
 	    	$this->db->rollback();
 	    	return -1;
@@ -187,8 +186,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return $this->id;
@@ -268,8 +266,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -394,8 +391,7 @@ 
             // Retourne 1 avec le tableau rempli
             $this->holiday = $tab_result;
             return 1;
-        }
-        else
+        } else
         {
             // Erreur SQL
             $this->error="Error ".$this->db->lasterror();
@@ -518,8 +514,7 @@ 
             // Retourne 1 et ajoute le tableau à la variable
             $this->holiday = $tab_result;
             return 1;
-        }
-        else
+        } else
         {
             // Erreur SQL
             $this->error="Error ".$this->db->lasterror();
@@ -632,8 +627,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -685,8 +679,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -712,8 +705,14 @@ 
 
         foreach($this->holiday as $infos_CP)
         {
-        	if ($infos_CP['statut'] == 4) continue;		// ignore not validated holidays
-        	if ($infos_CP['statut'] == 5) continue;		// ignore not validated holidays
+        	if ($infos_CP['statut'] == 4) {
+        		continue;
+        	}
+        	// ignore not validated holidays
+        	if ($infos_CP['statut'] == 5) {
+        		continue;
+        	}
+        	// ignore not validated holidays
 
         	// TODO Also use halfday for the check
         	if ($halfday == 0)
@@ -722,29 +721,25 @@ 
 	            {
 	                return false;
 	            }
-        	}
-            elseif ($halfday == -1)
+        	} elseif ($halfday == -1)
         	{
 	            if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
 	            {
 	                return false;
 	            }
-        	}
-            elseif ($halfday == 1)
+        	} elseif ($halfday == 1)
         	{
 	            if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
 	            {
 	                return false;
 	            }
-        	}
-            elseif ($halfday == 2)
+        	} elseif ($halfday == 2)
         	{
 	            if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
 	            {
 	                return false;
 	            }
-        	}
-        	else
+        	} else
         	{
         		dol_print_error('', 'Bad value of parameter halfday when calling function verifDateHolidayCP');
         	}
@@ -795,22 +790,31 @@ 
 	    		$isavailablemorning = true;
 	    		foreach($arrayofrecord as $record)
 	    		{
-					if ($timestamp == $record['date_start'] && $record['halfday'] == 2)  continue;
-					if ($timestamp == $record['date_start'] && $record['halfday'] == -1) continue;
+					if ($timestamp == $record['date_start'] && $record['halfday'] == 2) {
+						continue;
+					}
+					if ($timestamp == $record['date_start'] && $record['halfday'] == -1) {
+						continue;
+					}
 	    			$isavailablemorning = false;
 	    			break;
 	    		}
     			$isavailableafternoon = true;
 	    		foreach($arrayofrecord as $record)
 	    		{
-					if ($timestamp == $record['date_end'] && $record['halfday'] == 2) continue;
-					if ($timestamp == $record['date_end'] && $record['halfday'] == 1) continue;
+					if ($timestamp == $record['date_end'] && $record['halfday'] == 2) {
+						continue;
+					}
+					if ($timestamp == $record['date_end'] && $record['halfday'] == 1) {
+						continue;
+					}
 	    			$isavailableafternoon = false;
 	    			break;
 	    		}
     		}
+    	} else {
+    		dol_print_error($this->db);
     	}
-    	else dol_print_error($this->db);
 
    		return array('morning'=>$isavailablemorning, 'afternoon'=>$isavailableafternoon);
     }
@@ -837,16 +841,26 @@ 
         //{
         	// Add param to save lastsearch_values or not
         	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+        		$add_save_lastsearch_values=1;
+        	}
+        	if ($add_save_lastsearch_values) {
+        		$url.='&save_lastsearch_values=1';
+        	}
         //}
 
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
+        if ($withpicto) {
+        	$result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+        	$result.=' ';
+        }
+        if ($withpicto != 2) {
+        	$result.=$linkstart.$this->ref.$linkend;
+        }
         return $result;
     }
 
@@ -876,51 +890,115 @@ 
 
 		if ($mode == 0)
 		{
-            if ($statut == 1) return $langs->trans('DraftCP');
-            if ($statut == 2) return $langs->trans('ToReviewCP');
-            if ($statut == 3) return $langs->trans('ApprovedCP');
-            if ($statut == 4) return $langs->trans('CancelCP');
-            if ($statut == 5) return $langs->trans('RefuseCP');
+            if ($statut == 1) {
+            	return $langs->trans('DraftCP');
+            }
+            if ($statut == 2) {
+            	return $langs->trans('ToReviewCP');
+            }
+            if ($statut == 3) {
+            	return $langs->trans('ApprovedCP');
+            }
+            if ($statut == 4) {
+            	return $langs->trans('CancelCP');
+            }
+            if ($statut == 5) {
+            	return $langs->trans('RefuseCP');
+            }
 		}
 		if ($mode == 2)
 		{
 			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP');				// Draft
-			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP');		// Waiting approval
-			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
-			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
-			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
+			if (! empty($startdate) && $startdate > dol_now()) {
+				$pictoapproved='statut4';
+			}
+			if ($statut == 1) {
+				return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP');
+			}
+			// Draft
+			if ($statut == 2) {
+				return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP');
+			}
+			// Waiting approval
+			if ($statut == 3) {
+				return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
+			}
+			if ($statut == 4) {
+				return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
+			}
+			if ($statut == 5) {
+				return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
+			}
 		}
 		if ($mode == 3)
 		{
 			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0');
-			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1');
-			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5');
+			if (! empty($startdate) && $startdate > dol_now()) {
+				$pictoapproved='statut4';
+			}
+			if ($statut == 1) {
+				return img_picto($langs->trans('DraftCP'),'statut0');
+			}
+			if ($statut == 2) {
+				return img_picto($langs->trans('ToReviewCP'),'statut1');
+			}
+			if ($statut == 3) {
+				return img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			}
+			if ($statut == 4) {
+				return img_picto($langs->trans('CancelCP'),'statut5');
+			}
+			if ($statut == 5) {
+				return img_picto($langs->trans('RefuseCP'),'statut5');
+			}
 		}
 		if ($mode == 5)
 		{
 			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
-			if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
-			if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+			if (! empty($startdate) && $startdate > dol_now()) {
+				$pictoapproved='statut4';
+			}
+			if ($statut == 1) {
+				return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');
+			}
+			// Draft
+			if ($statut == 2) {
+				return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');
+			}
+			// Waiting approval
+			if ($statut == 3) {
+				return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			}
+			if ($statut == 4) {
+				return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
+			}
+			if ($statut == 5) {
+				return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+			}
 		}
 		if ($mode == 6)
 		{
 		    $pictoapproved='statut6';
-		    if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-		    if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
-		    if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
-		    if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-		    if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
-		    if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+		    if (! empty($startdate) && $startdate > dol_now()) {
+		    	$pictoapproved='statut4';
+		    }
+		    if ($statut == 1) {
+		    	return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');
+		    }
+		    // Draft
+		    if ($statut == 2) {
+		    	return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');
+		    }
+		    // Waiting approval
+		    if ($statut == 3) {
+		    	return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+		    }
+		    if ($statut == 4) {
+		    	return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
+		    }
+		    if ($statut == 5) {
+		    	return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+		    }
 		}
 
 		return $statut;
@@ -949,8 +1027,7 @@ 
         for($i=1; $i < $nb; $i++) {
             if($i==$selected) {
                 $statut.= '<option value="'.$i.'" selected>'.$langs->trans($name[$i-1]).'</option>'."\n";
-            }
-            else {
+            } else {
                 $statut.= '<option value="'.$i.'">'.$langs->trans($name[$i-1]).'</option>'."\n";
             }
         }
@@ -1013,19 +1090,16 @@ 
                     if ($result)
                     {
                         return $createifnotfound;
-                    }
-                    else
+                    } else
                     {
                         $this->error=$this->db->lasterror();
                         return -2;
                     }
-                }
-                else
+                } else
                 {
                     return '';
                 }
-            }
-            else
+            } else
             {
                 return $obj->value;
             }
@@ -1084,7 +1158,9 @@ 
     			{
 	                // On ajoute x jours à chaque utilisateurs
 	                $nb_holiday = $val['newByMonth'];
-					if (empty($nb_holiday)) $nb_holiday=0;
+					if (empty($nb_holiday)) {
+						$nb_holiday=0;
+					}
 
 					if ($nb_holiday > 0)
 					{
@@ -1114,16 +1190,16 @@ 
 		                	dol_print_error($this->db);
 		                	break;
 		                }
+					} else {
+						dol_syslog("No change for leave of type ".$key, LOG_DEBUG);
 					}
-					else dol_syslog("No change for leave of type ".$key, LOG_DEBUG);
     			}
 
 				if ($result)
 	           	{
 	            	$this->db->commit();
 	            	return 1;
-	           	}
-    	       	else
+	           	} else
     	      	{
     	       		$this->db->rollback();
     	        	return -1;
@@ -1131,8 +1207,7 @@ 
             }
 
             return 0;
-        }
-        else
+        } else
 		{
             // Mise à jour pour un utilisateur
             $nbHoliday = price2num($nbHoliday,5);
@@ -1156,8 +1231,7 @@ 
 		            	$error++;
 		            	$this->errors[]=$this->db->lasterror();
 		            }
-            	}
-            	else
+            	} else
             	{
 		            // Insert for user
 		            $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
@@ -1170,8 +1244,7 @@ 
 		            	$this->errors[]=$this->db->lasterror();
 		            }
             	}
-            }
-            else
+            } else
 			{
 		        $this->errors[]=$this->db->lasterror();
             	$error++;
@@ -1180,8 +1253,7 @@ 
             if (! $error)
             {
             	return 1;
-            }
-            else
+            } else
            {
             	return -1;
             }
@@ -1236,17 +1308,20 @@ 
                 $sql.= " VALUES ('".$users['rowid']."','0')";
 
                 $resql=$this->db->query($sql);
-                if (! $resql) dol_print_error($this->db);
+                if (! $resql) {
+                	dol_print_error($this->db);
+                }
             }
-        }
-        else
+        } else
 		{
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
             $sql.= " (fk_user, nb_holiday)";
             $sql.= " VALUES ('".$userid."','0')";
 
             $resql=$this->db->query($sql);
-            if (! $resql) dol_print_error($this->db);
+            if (! $resql) {
+            	dol_print_error($this->db);
+            }
         }
     }
 
@@ -1278,7 +1353,9 @@ 
         $sql = "SELECT nb_holiday";
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users";
         $sql.= " WHERE fk_user = '".$user_id."'";
-        if ($fk_type > 0) $sql.=" AND fk_type = ".$fk_type;
+        if ($fk_type > 0) {
+        	$sql.=" AND fk_type = ".$fk_type;
+        }
 
         dol_syslog(get_class($this).'::getCPforUser', LOG_DEBUG);
         $result = $this->db->query($sql);
@@ -1286,10 +1363,12 @@ 
         {
             $obj = $this->db->fetch_object($result);
             //return number_format($obj->nb_holiday,2);
-            if ($obj) return $obj->nb_holiday;
-            else return null;
-        }
-        else
+            if ($obj) {
+            	return $obj->nb_holiday;
+            } else {
+            	return null;
+            }
+        } else
 		{
             return null;
         }
@@ -1324,13 +1403,14 @@ 
                 	$sql.= " WHERE (ug.fk_user = u.rowid";
                 	$sql.= " AND ug.entity = ".$conf->entity.")";
                 	$sql.= " OR u.admin = 1";
-                }
-                else
+                } else
                 {
                 	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
                 }
                 $sql.= " AND u.statut > 0";
-                if ($filters) $sql.=$filters;
+                if ($filters) {
+                	$sql.=$filters;
+                }
 
                 $resql=$this->db->query($sql);
 
@@ -1356,22 +1436,22 @@ 
                     }
                     // Retoune le tableau des utilisateurs
                     return $stringlist;
-                }
-                else
+                } else
                 {
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
                     return -1;
                 }
 
-            }
-            else
+            } else
             {
            		// We want only list of vacation balance for user ids
                 $sql = "SELECT DISTINCT cpu.fk_user";
                 $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
                 $sql.= " WHERE cpu.fk_user = u.user";
-                if ($filters) $sql.=$filters;
+                if ($filters) {
+                	$sql.=$filters;
+                }
 
                 $resql=$this->db->query($sql);
 
@@ -1397,8 +1477,7 @@ 
                     }
                     // Retoune le tableau des utilisateurs
                     return $stringlist;
-                }
-                else
+                } else
               {
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
@@ -1406,8 +1485,7 @@ 
                 }
             }
 
-        }
-        else
+        } else
         { // Si faux donc return array
 
             // List for Dolibarr users
@@ -1422,12 +1500,14 @@ 
                 	$sql.= " WHERE (ug.fk_user = u.rowid";
                 	$sql.= " AND ug.entity = ".$conf->entity.")";
                 	$sql.= " OR u.admin = 1";
+                } else {
+                                	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
                 }
-                else
-                	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
 
                 $sql.= " AND u.statut > 0";
-                if ($filters) $sql.=$filters;
+                if ($filters) {
+                	$sql.=$filters;
+                }
 
                 $resql=$this->db->query($sql);
 
@@ -1459,21 +1539,21 @@ 
                     }
                     // Retoune le tableau des utilisateurs
                     return $tab_result;
-                }
-                else
+                } else
 				{
                     // Erreur SQL
                     $this->errors[]="Error ".$this->db->lasterror();
                     return -1;
                 }
-            }
-            else
+            } else
             {
 				// List of vacation balance users
                 $sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holiday, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
                 $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
                 $sql.= " WHERE cpu.fk_user = u.rowid";
-                if ($filters) $sql.=$filters;
+                if ($filters) {
+                	$sql.=$filters;
+                }
 
                 $resql=$this->db->query($sql);
 
@@ -1506,8 +1586,7 @@ 
                     }
                     // Retoune le tableau des utilisateurs
                     return $tab_result;
-                }
-                else
+                } else
 				{
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
@@ -1559,7 +1638,9 @@ 
      */
     function verifNbUsers($userDolibarrWithoutCP, $userCP)
     {
-    	if (empty($userCP)) $userCP=0;
+    	if (empty($userCP)) {
+    		$userCP=0;
+    	}
     	dol_syslog(get_class($this).'::verifNbUsers userDolibarr='.$userDolibarrWithoutCP.' userCP='.$userCP);
         return 1;
     }
@@ -1585,7 +1666,9 @@ 
         $new_solde = price2num($new_solde, 5);
 		//print "$prev_solde == $new_solde";
 
-        if ($prev_solde == $new_solde) return 0;
+        if ($prev_solde == $new_solde) {
+        	return 0;
+        }
 
 		$this->db->begin();
 
@@ -1629,8 +1712,7 @@ 
        	    }
        	    $this->db->rollback();
        	    return -1*$error;
-       	}
-       	else
+       	} else
        	{
        	    $this->db->commit();
             return $this->optRowid;
@@ -1704,8 +1786,7 @@ 
   		    // Retourne 1 et ajoute le tableau à la variable
   		    $this->logs = $tab_result;
   		    return 1;
-  		}
-  		else
+  		} else
   		{
   		    // Erreur SQL
   		    $this->error="Error ".$this->db->lasterror();
@@ -1728,8 +1809,12 @@ 
     	$sql = "SELECT rowid, code, label, affect, delay, newByMonth";
     	$sql.= " FROM " . MAIN_DB_PREFIX . "c_holiday_types";
     	$sql.= " WHERE (fk_country IS NULL OR fk_country = ".$mysoc->country_id.')';
-    	if ($active >= 0) $sql.=" AND active = ".((int) $active);
-    	if ($affect >= 0) $sql.=" AND affect = ".((int) $affect);
+    	if ($active >= 0) {
+    		$sql.=" AND active = ".((int) $active);
+    	}
+    	if ($affect >= 0) {
+    		$sql.=" AND affect = ".((int) $affect);
+    	}
 
     	$result = $this->db->query($sql);
     	if ($result)
@@ -1744,8 +1829,9 @@ 
 
 	    		return $types;
 	    	}
+    	} else {
+    		dol_print_error($this->db);
     	}
-    	else dol_print_error($this->db);
 
     	return array();
     }

htdocs/categories/class/api_deprecated_category.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -297,7 +297,7 @@
      * @param int		$cusid	Id of customer
      * @param int		$catid  Id of category
      * 
-     * @return mixed
+     * @return Client
      * 
      * @url GET /customer/{cusid}/addCategory/{catid}
      */

Indentation +389 added lines, -389 removed lines

@@ -31,462 +31,462 @@
  */
 class CategoryApi extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
-     */
-    static $FIELDS = array(
-        'label',
-        'type'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+	 */
+	static $FIELDS = array(
+		'label',
+		'type'
+	);
 
-    static $TYPES = array(
-        0 => 'product',
-        1 => 'supplier',
-        2 => 'customer',
-        3 => 'member',
-        4 => 'contact',
-        5 => 'account',
-    );
+	static $TYPES = array(
+		0 => 'product',
+		1 => 'supplier',
+		2 => 'customer',
+		3 => 'member',
+		4 => 'contact',
+		5 => 'account',
+	);
     
-    /**
-     * @var Categorie $category {@type Categorie}
-     */
-    public $category;
+	/**
+	 * @var Categorie $category {@type Categorie}
+	 */
+	public $category;
 
-    /**
-     * Constructor <b>Warning: Deprecated</b>
-     *
-     * @url     GET category/
-     * 
-     */
-    function __construct()
-    {
+	/**
+	 * Constructor <b>Warning: Deprecated</b>
+	 *
+	 * @url     GET category/
+	 * 
+	 */
+	function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
-        $this->category = new Categorie($this->db);
+		$this->category = new Categorie($this->db);
         
-    }
+	}
 
-    /**
-     * Get properties of a category object <b>Warning: Deprecated</b>
-     *
-     * Return an array with category informations
-     *
-     * @param 	int 	$id ID of category
-     * @return 	array|mixed data without useless information
+	/**
+	 * Get properties of a category object <b>Warning: Deprecated</b>
+	 *
+	 * Return an array with category informations
+	 *
+	 * @param 	int 	$id ID of category
+	 * @return 	array|mixed data without useless information
 	 * 
-     * @url	GET category/{id}
-     * @throws 	RestException
-     */
-    function get($id)
-    {		
+	 * @url	GET category/{id}
+	 * @throws 	RestException
+	 */
+	function get($id)
+	{		
 		if(! DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 			
-        $result = $this->category->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'category not found');
-        }
+		$result = $this->category->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'category not found');
+		}
 		
 		if( ! DolibarrApi::_checkAccessToResource('category',$this->category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->_cleanObjectDatas($this->category);
-    }
+	}
 
-    /**
-     * List categories <b>Warning: Deprecated</b>
-     * 
-     * Get a list of categories
-     *
-     * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact')
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @return array Array of category objects
-     *
-     * @url	GET /category/list
-     */
-    function getList($type='product', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
-        global $db, $conf;
+	/**
+	 * List categories <b>Warning: Deprecated</b>
+	 * 
+	 * Get a list of categories
+	 *
+	 * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact')
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @return array Array of category objects
+	 *
+	 * @url	GET /category/list
+	 */
+	function getList($type='product', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
+		global $db, $conf;
         
-        $obj_ret = array();
+		$obj_ret = array();
         
-         if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+		 if(! DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
         
-        $sql = "SELECT s.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
-        $sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
+		$sql = "SELECT s.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
+		$sql.= ' WHERE s.entity IN ('.getEntity('category').')';
+		$sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
 
-        $nbtotalofrecords = '';
-        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-        {
-            $result = $db->query($sql);
-            $nbtotalofrecords = $db->num_rows($result);
-        }
+		$nbtotalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $db->query($sql);
+			$nbtotalofrecords = $db->num_rows($result);
+		}
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql.= $db->order($sortfield, $sortorder);
+		if ($limit)	{
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
+			$sql.= $db->plimit($limit + 1, $offset);
+		}
 
-        $result = $db->query($sql);
-        if ($result)
-        {
-        	$i=0;
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $category_static = new Categorie($db);
-                if($category_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($category_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No category found');
-        }
+		$result = $db->query($sql);
+		if ($result)
+		{
+			$i=0;
+			$num = $db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $db->fetch_object($result);
+				$category_static = new Categorie($db);
+				if($category_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($category_static);
+				}
+				$i++;
+			}
+		}
+		else {
+			throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
+		}
+		if( ! count($obj_ret)) {
+			throw new RestException(404, 'No category found');
+		}
 		return $obj_ret;
-    }
-    /**
-     * List categories of an entity <b>Warning: Deprecated</b>
-     * 
-     * Get a list of categories
-     *
-     * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact')
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param int		$item		Id of the item to get categories for
-     * @return array Array of category objects
-     *
-     * @url	GET /product/{item}/categories
-     */
-    function getListForItem($type='product', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $item = 0) {
-        global $db, $conf;
+	}
+	/**
+	 * List categories of an entity <b>Warning: Deprecated</b>
+	 * 
+	 * Get a list of categories
+	 *
+	 * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact')
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param int		$item		Id of the item to get categories for
+	 * @return array Array of category objects
+	 *
+	 * @url	GET /product/{item}/categories
+	 */
+	function getListForItem($type='product', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $item = 0) {
+		global $db, $conf;
         
-        $obj_ret = array();
+		$obj_ret = array();
         
-         if(! DolibarrApiAccess::$user->rights->categorie->lire) {
-			    throw new RestException(401);
-         }
-        //if ($type == "") {
-          //$type="product";
-        //}
-        $sub_type = $type;
-        $subcol_name = "fk_".$type;
-        if ($type=="customer" || $type=="supplier") {
-          $sub_type="societe";
-          $subcol_name="fk_soc";
-        }
-        $sql = "SELECT s.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
-        $sql.= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
-        $sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
-        $sql.= ' AND s.rowid = sub.fk_categorie';
-        $sql.= ' AND sub.'.$subcol_name.' = '.$item;
+		 if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+				throw new RestException(401);
+		 }
+		//if ($type == "") {
+		  //$type="product";
+		//}
+		$sub_type = $type;
+		$subcol_name = "fk_".$type;
+		if ($type=="customer" || $type=="supplier") {
+		  $sub_type="societe";
+		  $subcol_name="fk_soc";
+		}
+		$sql = "SELECT s.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
+		$sql.= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
+		$sql.= ' WHERE s.entity IN ('.getEntity('category').')';
+		$sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
+		$sql.= ' AND s.rowid = sub.fk_categorie';
+		$sql.= ' AND sub.'.$subcol_name.' = '.$item;
 
-        $nbtotalofrecords = '';
-        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-        {
-            $result = $db->query($sql);
-            $nbtotalofrecords = $db->num_rows($result);
-        }
+		$nbtotalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $db->query($sql);
+			$nbtotalofrecords = $db->num_rows($result);
+		}
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql.= $db->order($sortfield, $sortorder);
+		if ($limit)	{
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
+			$sql.= $db->plimit($limit + 1, $offset);
+		}
 
-        $result = $db->query($sql);
-        if ($result)
-        {
-        	$i=0;
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $category_static = new Categorie($db);
-                if($category_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($category_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No category found');
-        }
+		$result = $db->query($sql);
+		if ($result)
+		{
+			$i=0;
+			$num = $db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $db->fetch_object($result);
+				$category_static = new Categorie($db);
+				if($category_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($category_static);
+				}
+				$i++;
+			}
+		}
+		else {
+			throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
+		}
+		if( ! count($obj_ret)) {
+			throw new RestException(404, 'No category found');
+		}
 		return $obj_ret;
-    }
+	}
     
-    /**
-     * Get member categories list <b>Warning: Deprecated</b>
-     * 
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @return mixed
-     * 
-     * @url GET /category/list/member
-     */
-    function getListCategoryMember($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
-        return $this->getList('member', $sortfield, $sortorder, $limit, $page);  
-    }
+	/**
+	 * Get member categories list <b>Warning: Deprecated</b>
+	 * 
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @return mixed
+	 * 
+	 * @url GET /category/list/member
+	 */
+	function getListCategoryMember($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
+		return $this->getList('member', $sortfield, $sortorder, $limit, $page);  
+	}
     
-    /**
-     * Get customer categories list <b>Warning: Deprecated</b>
-     * 
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * 
-     * @return mixed
-     * 
-     * @url GET /category/list/customer
-     */
-    function getListCategoryCustomer($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
-        return $this->getList('customer', $sortfield, $sortorder, $limit, $page);  
-    }
-    /**
-     * Get categories for a customer <b>Warning: Deprecated</b>
-     * 
-     * @param int		$cusid  Customer id filter
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * 
-     * @return mixed
-     * 
-     * @url GET /customer/{cusid}/categories
-     */
-    function getListCustomerCategories($cusid, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
-        return $this->getListForItem($sortfield, $sortorder, $limit, $page, 'customer', $cusid);  
-    }
+	/**
+	 * Get customer categories list <b>Warning: Deprecated</b>
+	 * 
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * 
+	 * @return mixed
+	 * 
+	 * @url GET /category/list/customer
+	 */
+	function getListCategoryCustomer($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
+		return $this->getList('customer', $sortfield, $sortorder, $limit, $page);  
+	}
+	/**
+	 * Get categories for a customer <b>Warning: Deprecated</b>
+	 * 
+	 * @param int		$cusid  Customer id filter
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * 
+	 * @return mixed
+	 * 
+	 * @url GET /customer/{cusid}/categories
+	 */
+	function getListCustomerCategories($cusid, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
+		return $this->getListForItem($sortfield, $sortorder, $limit, $page, 'customer', $cusid);  
+	}
 
-    /**
-     * Add category to customer <b>Warning: Deprecated</b>
-     * 
-     * @param int		$cusid	Id of customer
-     * @param int		$catid  Id of category
-     * 
-     * @return mixed
-     * 
-     * @url GET /customer/{cusid}/addCategory/{catid}
-     */
-    function addCustomerCategory($cusid,$catid) {
-      if(! DolibarrApiAccess::$user->rights->societe->creer) {
+	/**
+	 * Add category to customer <b>Warning: Deprecated</b>
+	 * 
+	 * @param int		$cusid	Id of customer
+	 * @param int		$catid  Id of category
+	 * 
+	 * @return mixed
+	 * 
+	 * @url GET /customer/{cusid}/addCategory/{catid}
+	 */
+	function addCustomerCategory($cusid,$catid) {
+	  if(! DolibarrApiAccess::$user->rights->societe->creer) {
 			  throw new RestException(401);
-      }
-      $customer = new Client($this->db);
-      $customer->fetch($cusid);
-      if( ! $customer ) {
-        throw new RestException(404, 'customer not found');
-      }
-      $result = $this->category->fetch($catid);
-      if( ! $result ) {
-        throw new RestException(404, 'category not found');
-      }
+	  }
+	  $customer = new Client($this->db);
+	  $customer->fetch($cusid);
+	  if( ! $customer ) {
+		throw new RestException(404, 'customer not found');
+	  }
+	  $result = $this->category->fetch($catid);
+	  if( ! $result ) {
+		throw new RestException(404, 'category not found');
+	  }
       
-      if( ! DolibarrApi::_checkAccessToResource('societe',$customer->id)) {
-        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
-      if( ! DolibarrApi::_checkAccessToResource('category',$this->category->id)) {
-        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
-      $this->category->add_type($customer,'customer');
-      return $customer;
-    }
+	  if( ! DolibarrApi::_checkAccessToResource('societe',$customer->id)) {
+		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+	  }
+	  if( ! DolibarrApi::_checkAccessToResource('category',$this->category->id)) {
+		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+	  }
+	  $this->category->add_type($customer,'customer');
+	  return $customer;
+	}
     
-    /**
-     * Get supplier categories list <b>Warning: Deprecated</b>
-     * 
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * 
-     * @return mixed
-     * 
-     * @url GET /category/list/supplier
-     */
-    function getListCategorySupplier($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
-        return $this->getList('supplier', $sortfield, $sortorder, $limit, $page);  
-    }
+	/**
+	 * Get supplier categories list <b>Warning: Deprecated</b>
+	 * 
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * 
+	 * @return mixed
+	 * 
+	 * @url GET /category/list/supplier
+	 */
+	function getListCategorySupplier($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
+		return $this->getList('supplier', $sortfield, $sortorder, $limit, $page);  
+	}
     
-    /**
-     * Get product categories list <b>Warning: Deprecated</b>
-     * 
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * 
-     * @return mixed
-     * 
-     * @url GET /category/list/product
-     */
-    function getListCategoryProduct($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
-        return $this->getList('product', $sortfield, $sortorder, $limit, $page);  
-    }
+	/**
+	 * Get product categories list <b>Warning: Deprecated</b>
+	 * 
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * 
+	 * @return mixed
+	 * 
+	 * @url GET /category/list/product
+	 */
+	function getListCategoryProduct($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
+		return $this->getList('product', $sortfield, $sortorder, $limit, $page);  
+	}
     
-    /**
-     * Get contact categories list <b>Warning: Deprecated</b>
-     * 
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @return mixed
-     * 
-     * @url GET /category/list/contact
-     */
-    function getListCategoryContact($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
-        return $this->getList('contact', $sortfield, $sortorder, $limit, $page);  
-    }
+	/**
+	 * Get contact categories list <b>Warning: Deprecated</b>
+	 * 
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @return mixed
+	 * 
+	 * @url GET /category/list/contact
+	 */
+	function getListCategoryContact($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
+		return $this->getList('contact', $sortfield, $sortorder, $limit, $page);  
+	}
     
-    /**
-     * Create category object <b>Warning: Deprecated</b>
-     * 
-     * @param array $request_data   Request data
-     * @return int  ID of category
-     *
-     * @url	POST category/
-     */
-    function post($request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->categorie->creer) {
+	/**
+	 * Create category object <b>Warning: Deprecated</b>
+	 * 
+	 * @param array $request_data   Request data
+	 * @return int  ID of category
+	 *
+	 * @url	POST category/
+	 */
+	function post($request_data = NULL)
+	{
+		if(! DolibarrApiAccess::$user->rights->categorie->creer) {
 			throw new RestException(401);
 		}
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
         
-        foreach($request_data as $field => $value) {
-            $this->category->$field = $value;
-        }
-        if($this->category->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error when create category : '.$this->category->error);
-        }
-        return $this->category->id;
-    }
+		foreach($request_data as $field => $value) {
+			$this->category->$field = $value;
+		}
+		if($this->category->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error when create category : '.$this->category->error);
+		}
+		return $this->category->id;
+	}
 
-    /**
-     * Update category <b>Warning: Deprecated</b>
-     * 
-     * @param int   $id             Id of category to update
-     * @param array $request_data   Datas   
-     * @return int 
-     *
-     * @url	PUT category/{id}
-     */
-    function put($id, $request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->categorie->creer) {
+	/**
+	 * Update category <b>Warning: Deprecated</b>
+	 * 
+	 * @param int   $id             Id of category to update
+	 * @param array $request_data   Datas   
+	 * @return int 
+	 *
+	 * @url	PUT category/{id}
+	 */
+	function put($id, $request_data = NULL)
+	{
+		if(! DolibarrApiAccess::$user->rights->categorie->creer) {
 			throw new RestException(401);
 		}
         
-        $result = $this->category->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'category not found');
-        }
+		$result = $this->category->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'category not found');
+		}
 		
 		if( ! DolibarrApi::_checkAccessToResource('category',$this->category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->category->$field = $value;
-        }
+		foreach($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->category->$field = $value;
+		}
         
-        if($this->category->update(DolibarrApiAccess::$user))
-            return $this->get ($id);
+		if($this->category->update(DolibarrApiAccess::$user))
+			return $this->get ($id);
         
-        return false;
-    }
+		return false;
+	}
     
-    /**
-     * Delete category <b>Warning: Deprecated</b>
-     *
-     * @param int $id   Category ID
-     * @return array
-     * 
-     * @url	DELETE category/{id}
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->categorie->supprimer) {
+	/**
+	 * Delete category <b>Warning: Deprecated</b>
+	 *
+	 * @param int $id   Category ID
+	 * @return array
+	 * 
+	 * @url	DELETE category/{id}
+	 */
+	function delete($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->categorie->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->category->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'category not found');
-        }
+		$result = $this->category->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'category not found');
+		}
 		
 		if( ! DolibarrApi::_checkAccessToResource('category',$this->category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         
-        if (! $this->category->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(401,'error when delete category');
-        }
+		if (! $this->category->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(401,'error when delete category');
+		}
         
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Category deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Category deleted'
+			)
+		);
+	}
     
-    /**
-     * Validate fields before create or update object
-     * 
-     * @param array|null    $data   Data to validate
-     * @return array
-     * 
-     * @throws RestException
-     */
-    function _validate($data)
-    {
-        $category = array();
-        foreach (CategoryApi::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $category[$field] = $data[$field];
-        }
-        return $category;
-    }
+	/**
+	 * Validate fields before create or update object
+	 * 
+	 * @param array|null    $data   Data to validate
+	 * @return array
+	 * 
+	 * @throws RestException
+	 */
+	function _validate($data)
+	{
+		$category = array();
+		foreach (CategoryApi::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$category[$field] = $data[$field];
+		}
+		return $category;
+	}
 }

Spacing +52 added lines, -52 removed lines

@@ -80,16 +80,16 @@ 
      */
     function get($id)
     {		
-		if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 			
         $result = $this->category->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 		
-		if( ! DolibarrApi::_checkAccessToResource('category',$this->category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -110,19 +110,19 @@ 
      *
      * @url	GET /category/list
      */
-    function getList($type='product', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
+    function getList($type = 'product', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
         global $db, $conf;
         
         $obj_ret = array();
         
-         if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+         if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
         
         $sql = "SELECT s.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
-        $sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
+        $sql .= " FROM ".MAIN_DB_PREFIX."categorie as s";
+        $sql .= ' WHERE s.entity IN ('.getEntity('category').')';
+        $sql .= ' AND s.type='.array_search($type, CategoryApi::$TYPES);
 
         $nbtotalofrecords = '';
         if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -131,28 +131,28 @@ 
             $nbtotalofrecords = $db->num_rows($result);
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         $result = $db->query($sql);
         if ($result)
         {
-        	$i=0;
+        	$i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
-                if($category_static->fetch($obj->rowid)) {
+                if ($category_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($category_static);
                 }
                 $i++;
@@ -161,7 +161,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No category found');
         }
 		return $obj_ret;
@@ -181,12 +181,12 @@ 
      *
      * @url	GET /product/{item}/categories
      */
-    function getListForItem($type='product', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $item = 0) {
+    function getListForItem($type = 'product', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $item = 0) {
         global $db, $conf;
         
         $obj_ret = array();
         
-         if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+         if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			    throw new RestException(401);
          }
         //if ($type == "") {
@@ -194,17 +194,17 @@ 
         //}
         $sub_type = $type;
         $subcol_name = "fk_".$type;
-        if ($type=="customer" || $type=="supplier") {
-          $sub_type="societe";
-          $subcol_name="fk_soc";
+        if ($type == "customer" || $type == "supplier") {
+          $sub_type = "societe";
+          $subcol_name = "fk_soc";
         }
         $sql = "SELECT s.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
-        $sql.= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
-        $sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
-        $sql.= ' AND s.rowid = sub.fk_categorie';
-        $sql.= ' AND sub.'.$subcol_name.' = '.$item;
+        $sql .= " FROM ".MAIN_DB_PREFIX."categorie as s";
+        $sql .= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
+        $sql .= ' WHERE s.entity IN ('.getEntity('category').')';
+        $sql .= ' AND s.type='.array_search($type, CategoryApi::$TYPES);
+        $sql .= ' AND s.rowid = sub.fk_categorie';
+        $sql .= ' AND sub.'.$subcol_name.' = '.$item;
 
         $nbtotalofrecords = '';
         if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -213,28 +213,28 @@ 
             $nbtotalofrecords = $db->num_rows($result);
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         $result = $db->query($sql);
         if ($result)
         {
-        	$i=0;
+        	$i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
-                if($category_static->fetch($obj->rowid)) {
+                if ($category_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($category_static);
                 }
                 $i++;
@@ -243,7 +243,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No category found');
         }
 		return $obj_ret;
@@ -306,27 +306,27 @@ 
      * 
      * @url GET /customer/{cusid}/addCategory/{catid}
      */
-    function addCustomerCategory($cusid,$catid) {
-      if(! DolibarrApiAccess::$user->rights->societe->creer) {
+    function addCustomerCategory($cusid, $catid) {
+      if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			  throw new RestException(401);
       }
       $customer = new Client($this->db);
       $customer->fetch($cusid);
-      if( ! $customer ) {
+      if (!$customer) {
         throw new RestException(404, 'customer not found');
       }
       $result = $this->category->fetch($catid);
-      if( ! $result ) {
+      if (!$result) {
         throw new RestException(404, 'category not found');
       }
       
-      if( ! DolibarrApi::_checkAccessToResource('societe',$customer->id)) {
+      if (!DolibarrApi::_checkAccessToResource('societe', $customer->id)) {
         throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
-      if( ! DolibarrApi::_checkAccessToResource('category',$this->category->id)) {
+      if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
         throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
-      $this->category->add_type($customer,'customer');
+      $this->category->add_type($customer, 'customer');
       return $customer;
     }
     
@@ -387,16 +387,16 @@ 
      */
     function post($request_data = NULL)
     {
-        if(! DolibarrApiAccess::$user->rights->categorie->creer) {
+        if (!DolibarrApiAccess::$user->rights->categorie->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->category->$field = $value;
         }
-        if($this->category->create(DolibarrApiAccess::$user) < 0) {
+        if ($this->category->create(DolibarrApiAccess::$user) < 0) {
             throw new RestException(500, 'Error when create category : '.$this->category->error);
         }
         return $this->category->id;
@@ -413,26 +413,26 @@ 
      */
     function put($id, $request_data = NULL)
     {
-        if(! DolibarrApiAccess::$user->rights->categorie->creer) {
+        if (!DolibarrApiAccess::$user->rights->categorie->creer) {
 			throw new RestException(401);
 		}
         
         $result = $this->category->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 		
-		if( ! DolibarrApi::_checkAccessToResource('category',$this->category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $this->category->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->category->$field = $value;
         }
         
-        if($this->category->update(DolibarrApiAccess::$user))
-            return $this->get ($id);
+        if ($this->category->update(DolibarrApiAccess::$user))
+            return $this->get($id);
         
         return false;
     }
@@ -447,20 +447,20 @@ 
      */
     function delete($id)
     {
-        if(! DolibarrApiAccess::$user->rights->categorie->supprimer) {
+        if (!DolibarrApiAccess::$user->rights->categorie->supprimer) {
 			throw new RestException(401);
 		}
         $result = $this->category->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 		
-		if( ! DolibarrApi::_checkAccessToResource('category',$this->category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         
-        if (! $this->category->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(401,'error when delete category');
+        if (!$this->category->delete(DolibarrApiAccess::$user)) {
+            throw new RestException(401, 'error when delete category');
         }
         
         return array(

Braces +11 added lines, -9 removed lines

@@ -157,8 +157,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
         }
         if( ! count($obj_ret)) {
@@ -239,8 +238,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
         }
         if( ! count($obj_ret)) {
@@ -427,12 +425,15 @@ 
 		}
 
         foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+            	continue;
+            }
             $this->category->$field = $value;
         }
         
-        if($this->category->update(DolibarrApiAccess::$user))
-            return $this->get ($id);
+        if($this->category->update(DolibarrApiAccess::$user)) {
+                    return $this->get ($id);
+        }
         
         return false;
     }
@@ -483,8 +484,9 @@ 
     {
         $category = array();
         foreach (CategoryApi::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $category[$field] = $data[$field];
         }
         return $category;

htdocs/projet/ganttchart.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
  * Add a gant chart line
  *
  * @param 	string	$tarr					tarr
- * @param	array	$task					Array with properties of one task
+ * @param	string	$task					Array with properties of one task
  * @param 	Project	$project_dependencies	Project object
  * @param 	int		$level					Level
  * @param 	int		$project_id				Id of project

Indentation +48 added lines, -48 removed lines

@@ -140,43 +140,43 @@ 
  */
 function constructGanttLine($tarr,$task,$project_dependencies,$level=0,$project_id=null)
 {
-    global $dateformatinput2;
-
-    $start_date = $task["task_start_date"];
-    $end_date = $task["task_end_date"];
-    if (!$end_date) $end_date = $start_date;
-    $start_date = dol_print_date($start_date, $dateformatinput2);
-    $end_date = dol_print_date($end_date, $dateformatinput2);
-    // Resources
-    $resources = $task["task_resources"];
-    // Define depend (ex: "", "4,13", ...)
-    $depend = '';
-    $count = 0;
-    foreach ($project_dependencies as $value) {
-        // Not yet used project_dependencies = array(array(0=>idtask,1=>idtasktofinishfisrt))
-        if ($value[0] == $task['task_id']) {
-            $depend.=($count>0?",":"").$value[1];
-            $count ++;
-        }
-    }
+	global $dateformatinput2;
+
+	$start_date = $task["task_start_date"];
+	$end_date = $task["task_end_date"];
+	if (!$end_date) $end_date = $start_date;
+	$start_date = dol_print_date($start_date, $dateformatinput2);
+	$end_date = dol_print_date($end_date, $dateformatinput2);
+	// Resources
+	$resources = $task["task_resources"];
+	// Define depend (ex: "", "4,13", ...)
+	$depend = '';
+	$count = 0;
+	foreach ($project_dependencies as $value) {
+		// Not yet used project_dependencies = array(array(0=>idtask,1=>idtasktofinishfisrt))
+		if ($value[0] == $task['task_id']) {
+			$depend.=($count>0?",":"").$value[1];
+			$count ++;
+		}
+	}
    // $depend .= "\"";
-    // Define parent
-    if ($project_id && $level < 0)
-    $parent = 'p'.$project_id;
-    else
-    $parent = $task["task_parent"];
-    // Define percent
-    $percent = $task['task_percent_complete']?$task['task_percent_complete']:0;
-    // Link (more information)
-    $link=DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
-
-    // Name
-    $name=$task['task_name'];
-    /*for($i=0; $i < $level; $i++) {
+	// Define parent
+	if ($project_id && $level < 0)
+	$parent = 'p'.$project_id;
+	else
+	$parent = $task["task_parent"];
+	// Define percent
+	$percent = $task['task_percent_complete']?$task['task_percent_complete']:0;
+	// Link (more information)
+	$link=DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
+
+	// Name
+	$name=$task['task_name'];
+	/*for($i=0; $i < $level; $i++) {
         $name=' - '.$name;
     }*/
-    // Add line to gantt
-    /*
+	// Add line to gantt
+	/*
 	g.AddTaskItem(new JSGantt.TaskItem(1, 'Define Chart API','',          '',          'ggroupblack','', 0, 'Brian', 0,  1,0,1,'','','Some Notes text',g));
 	g.AddTaskItem(new JSGantt.TaskItem(11,'Chart Object',    '2014-02-20','2014-02-20','gmilestone', '', 1, 'Shlomy',100,0,1,1,'','','',g));
 	</pre>
@@ -201,13 +201,13 @@ 
 	<dt>pGantt</dt><dd>(required) javascript JSGantt.GanttChart object from which to take settings.  Defaults to &quot;g&quot; for backwards compatibility</dd>
     */
 
-    //$note="";
+	//$note="";
 
-    $s = "\n// Add taks id=".$task["task_id"]." level = ".$level."\n";
+	$s = "\n// Add taks id=".$task["task_id"]." level = ".$level."\n";
    // $s.= "g.AddTaskItem(new JSGantt.TaskItem(".$task['task_id'].",'".dol_escape_js($name)."','".$start_date."', '".$end_date."', '".$task['task_color']."', '".$link."', ".$task['task_milestone'].", '".$resources."', ".($percent >= 0 ? $percent : 0).", ".($task["task_is_group"]>0?1:0).", '".$parent."', 1, '".($depend?$depend:"")."', '".$note."'));";
-    // For JSGanttImproved
-    $s.= "g.AddTaskItem(new JSGantt.TaskItem(".$task['task_id'].",'".dol_escape_js(trim($name))."','".$start_date."', '".$end_date."', '".$task['task_css']."', '".$link."', ".$task['task_milestone'].", '".$resources."', ".($percent >= 0 ? $percent : 0).", ".($task["task_is_group"]).", '".$parent."', 1, '".($depend?$depend:$parent."SS")."', '".($percent >= 0 ? $percent.'%' : '0%')."','".dol_escape_js($task['note'])."'));";
-    echo $s;
+	// For JSGanttImproved
+	$s.= "g.AddTaskItem(new JSGantt.TaskItem(".$task['task_id'].",'".dol_escape_js(trim($name))."','".$start_date."', '".$end_date."', '".$task['task_css']."', '".$link."', ".$task['task_milestone'].", '".$resources."', ".($percent >= 0 ? $percent : 0).", ".($task["task_is_group"]).", '".$parent."', 1, '".($depend?$depend:$parent."SS")."', '".($percent >= 0 ? $percent.'%' : '0%')."','".dol_escape_js($task['note'])."'));";
+	echo $s;
 
 
 }
@@ -223,14 +223,14 @@ 
  */
 function findChildGanttLine($tarr,$parent,$project_dependencies,$level)
 {
-    $n=count($tarr);
-    for ($x=0; $x < $n; $x++)
-    {
-        if($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"])
-        {
-            constructGanttLine($tarr,$tarr[$x],$project_dependencies,$level,null);
-            findChildGanttLine($tarr,$tarr[$x]["task_id"],$project_dependencies,$level+1);
-        }
-    }
+	$n=count($tarr);
+	for ($x=0; $x < $n; $x++)
+	{
+		if($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"])
+		{
+			constructGanttLine($tarr,$tarr[$x],$project_dependencies,$level,null);
+			findChildGanttLine($tarr,$tarr[$x]["task_id"],$project_dependencies,$level+1);
+		}
+	}
 }
 

Spacing +17 added lines, -17 removed lines

@@ -104,13 +104,13 @@ 
 	/* g.setShowTaskInfoLink(1) */
 
 	<?php
-	$level=0;
+	$level = 0;
 	$tnums = count($tasks);
-	for ($tcursor=0; $tcursor < $tnums; $tcursor++) {
+	for ($tcursor = 0; $tcursor < $tnums; $tcursor++) {
 		$t = $tasks[$tcursor];
 		if ($t["task_parent"] == 0) {
-			constructGanttLine($tasks,$t,$project_dependencies,$level,$project_id);
-			findChildGanttLine($tasks,$t["task_id"],$project_dependencies,$level+1);
+			constructGanttLine($tasks, $t, $project_dependencies, $level, $project_id);
+			findChildGanttLine($tasks, $t["task_id"], $project_dependencies, $level + 1);
 		}
 	}
 	?>
@@ -138,7 +138,7 @@ 
  * @param 	int		$project_id				Id of project
  * @return	void
  */
-function constructGanttLine($tarr,$task,$project_dependencies,$level=0,$project_id=null)
+function constructGanttLine($tarr, $task, $project_dependencies, $level = 0, $project_id = null)
 {
     global $dateformatinput2;
 
@@ -155,8 +155,8 @@ 
     foreach ($project_dependencies as $value) {
         // Not yet used project_dependencies = array(array(0=>idtask,1=>idtasktofinishfisrt))
         if ($value[0] == $task['task_id']) {
-            $depend.=($count>0?",":"").$value[1];
-            $count ++;
+            $depend .= ($count > 0 ? "," : "").$value[1];
+            $count++;
         }
     }
    // $depend .= "\"";
@@ -166,12 +166,12 @@ 
     else
     $parent = $task["task_parent"];
     // Define percent
-    $percent = $task['task_percent_complete']?$task['task_percent_complete']:0;
+    $percent = $task['task_percent_complete'] ? $task['task_percent_complete'] : 0;
     // Link (more information)
-    $link=DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
+    $link = DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
 
     // Name
-    $name=$task['task_name'];
+    $name = $task['task_name'];
     /*for($i=0; $i < $level; $i++) {
         $name=' - '.$name;
     }*/
@@ -206,7 +206,7 @@ 
     $s = "\n// Add taks id=".$task["task_id"]." level = ".$level."\n";
    // $s.= "g.AddTaskItem(new JSGantt.TaskItem(".$task['task_id'].",'".dol_escape_js($name)."','".$start_date."', '".$end_date."', '".$task['task_color']."', '".$link."', ".$task['task_milestone'].", '".$resources."', ".($percent >= 0 ? $percent : 0).", ".($task["task_is_group"]>0?1:0).", '".$parent."', 1, '".($depend?$depend:"")."', '".$note."'));";
     // For JSGanttImproved
-    $s.= "g.AddTaskItem(new JSGantt.TaskItem(".$task['task_id'].",'".dol_escape_js(trim($name))."','".$start_date."', '".$end_date."', '".$task['task_css']."', '".$link."', ".$task['task_milestone'].", '".$resources."', ".($percent >= 0 ? $percent : 0).", ".($task["task_is_group"]).", '".$parent."', 1, '".($depend?$depend:$parent."SS")."', '".($percent >= 0 ? $percent.'%' : '0%')."','".dol_escape_js($task['note'])."'));";
+    $s .= "g.AddTaskItem(new JSGantt.TaskItem(".$task['task_id'].",'".dol_escape_js(trim($name))."','".$start_date."', '".$end_date."', '".$task['task_css']."', '".$link."', ".$task['task_milestone'].", '".$resources."', ".($percent >= 0 ? $percent : 0).", ".($task["task_is_group"]).", '".$parent."', 1, '".($depend ? $depend : $parent."SS")."', '".($percent >= 0 ? $percent.'%' : '0%')."','".dol_escape_js($task['note'])."'));";
     echo $s;
 
 
@@ -221,15 +221,15 @@ 
  * @param 	int		$level					Level
  * @return	void
  */
-function findChildGanttLine($tarr,$parent,$project_dependencies,$level)
+function findChildGanttLine($tarr, $parent, $project_dependencies, $level)
 {
-    $n=count($tarr);
-    for ($x=0; $x < $n; $x++)
+    $n = count($tarr);
+    for ($x = 0; $x < $n; $x++)
     {
-        if($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"])
+        if ($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"])
         {
-            constructGanttLine($tarr,$tarr[$x],$project_dependencies,$level,null);
-            findChildGanttLine($tarr,$tarr[$x]["task_id"],$project_dependencies,$level+1);
+            constructGanttLine($tarr, $tarr[$x], $project_dependencies, $level, null);
+            findChildGanttLine($tarr, $tarr[$x]["task_id"], $project_dependencies, $level + 1);
         }
     }
 }

Braces +8 added lines, -5 removed lines

@@ -144,7 +144,9 @@ 
 
     $start_date = $task["task_start_date"];
     $end_date = $task["task_end_date"];
-    if (!$end_date) $end_date = $start_date;
+    if (!$end_date) {
+    	$end_date = $start_date;
+    }
     $start_date = dol_print_date($start_date, $dateformatinput2);
     $end_date = dol_print_date($end_date, $dateformatinput2);
     // Resources
@@ -161,10 +163,11 @@ 
     }
    // $depend .= "\"";
     // Define parent
-    if ($project_id && $level < 0)
-    $parent = 'p'.$project_id;
-    else
-    $parent = $task["task_parent"];
+    if ($project_id && $level < 0) {
+        $parent = 'p'.$project_id;
+    } else {
+        $parent = $task["task_parent"];
+    }
     // Define percent
     $percent = $task['task_percent_complete']?$task['task_percent_complete']:0;
     // Link (more information)

htdocs/contact/class/contact.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -562,7 +562,7 @@
 	 *  Load object contact
 	 *
 	 *  @param      int		$id          id du contact
-	 *  @param      User	$user        Utilisateur (abonnes aux alertes) qui veut les alertes de ce contact
+	 *  @param      integer	$user        Utilisateur (abonnes aux alertes) qui veut les alertes de ce contact
      *  @param      string  $ref_ext     External reference, not given by Dolibarr
 	 *  @return     int     		     -1 if KO, 0 if OK but not found, 1 if OK
 	 */

Indentation +168 added lines, -168 removed lines

@@ -66,7 +66,7 @@ 
 	public $state_code;		    // Code of department
 	public $state;			        // Label of department
 
-    	public $poste;                 // Position
+		public $poste;                 // Position
 
 	public $socid;					// fk_soc
 	public $statut;				// 0=inactif, 1=actif
@@ -75,17 +75,17 @@ 
 	public $email;
 	public $skype;
 	public $photo;
-    	public $jabberid;
+		public $jabberid;
 	public $phone_pro;
 	public $phone_perso;
 	public $phone_mobile;
-    	public $fax;
+		public $fax;
 
-    	public $priv;
+		public $priv;
 
 	public $birthday;
 	public $default_lang;
-    	public $no_email;				// 1=Don't send e-mail to this contact, 0=do
+		public $no_email;				// 1=Don't send e-mail to this contact, 0=do
 
 	public $ref_facturation;       // Reference number of invoice for which it is contact
 	public $ref_contrat;           // Nb de reference contrat pour lequel il est contact
@@ -125,14 +125,14 @@ 
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+			$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE sp.fk_soc = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			$clause = "AND";
 		}
 		$sql.= ' '.$clause.' sp.entity IN ('.getEntity($this->element, 1).')';
 		$sql.= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".$user->id."))";
-        if ($user->societe_id > 0) $sql.=" AND sp.fk_soc = ".$user->societe_id;
+		if ($user->societe_id > 0) $sql.=" AND sp.fk_soc = ".$user->societe_id;
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -169,19 +169,19 @@ 
 
 		// Clean parameters
 		$this->lastname=$this->lastname?trim($this->lastname):trim($this->name);
-        $this->firstname=trim($this->firstname);
-        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
-        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);
-        if (empty($this->socid)) $this->socid = 0;
+		$this->firstname=trim($this->firstname);
+		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
+		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);
+		if (empty($this->socid)) $this->socid = 0;
 		if (empty($this->priv)) $this->priv = 0;
 		if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (";
 		$sql.= " datec";
 		$sql.= ", fk_soc";
-        $sql.= ", lastname";
-        $sql.= ", firstname";
-        $sql.= ", fk_user_creat";
+		$sql.= ", lastname";
+		$sql.= ", firstname";
+		$sql.= ", fk_user_creat";
 		$sql.= ", priv";
 		$sql.= ", statut";
 		$sql.= ", canvas";
@@ -193,14 +193,14 @@ 
 		if ($this->socid > 0) $sql.= " ".$this->socid.",";
 		else $sql.= "null,";
 		$sql.= "'".$this->db->escape($this->lastname)."',";
-        $sql.= "'".$this->db->escape($this->firstname)."',";
+		$sql.= "'".$this->db->escape($this->firstname)."',";
 		$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null").",";
 		$sql.= " ".$this->priv.",";
 		$sql.= " ".$this->statut.",";
-        $sql.= " ".(! empty($this->canvas)?"'".$this->db->escape($this->canvas)."'":"null").",";
-        $sql.= " ".$conf->entity.",";
-        $sql.= "'".$this->db->escape($this->ref_ext)."',";
-        $sql.= " ".(! empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
+		$sql.= " ".(! empty($this->canvas)?"'".$this->db->escape($this->canvas)."'":"null").",";
+		$sql.= " ".$conf->entity.",";
+		$sql.= "'".$this->db->escape($this->ref_ext)."',";
+		$sql.= " ".(! empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
 		$sql.= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -211,43 +211,43 @@ 
 
 			if (! $error)
 			{
-                $result=$this->update($this->id, $user, 1, 'add');
-                if ($result < 0)
-                {
-                    $error++;
-				    $this->error=$this->db->lasterror();
-                }
+				$result=$this->update($this->id, $user, 1, 'add');
+				if ($result < 0)
+				{
+					$error++;
+					$this->error=$this->db->lasterror();
+				}
 			}
 
 			if (! $error)
-            {
-                $result=$this->update_perso($this->id, $user, 1);   // TODO Remove function update_perso, should be same than update
-                if ($result < 0)
-                {
-                    $error++;
-                    $this->error=$this->db->lasterror();
-                }
-            }
+			{
+				$result=$this->update_perso($this->id, $user, 1);   // TODO Remove function update_perso, should be same than update
+				if ($result < 0)
+				{
+					$error++;
+					$this->error=$this->db->lasterror();
+				}
+			}
+
+			if (! $error)
+			{
+				// Call trigger
+				$result=$this->call_trigger('CONTACT_CREATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 
 			if (! $error)
-            {
-                // Call trigger
-                $result=$this->call_trigger('CONTACT_CREATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-
-            if (! $error)
-            {
-                $this->db->commit();
-                return $this->id;
-            }
-            else
-            {
-                $this->db->rollback();
-                dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-                return -2;
-            }
+			{
+				$this->db->commit();
+				return $this->id;
+			}
+			else
+			{
+				$this->db->rollback();
+				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+				return -2;
+			}
 		}
 		else
 		{
@@ -328,36 +328,36 @@ 
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-		    unset($this->country_code);
-		    unset($this->country);
-		    unset($this->state_code);
-		    unset($this->state);
-
-		    $action='update';
-
-		    // Actions on extra fields (by external module or standard code)
-		    $hookmanager->initHooks(array('contactdao'));
-		    $parameters=array('socid'=>$this->id);
-		    $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		    if (empty($reshook))
-		    {
-		    	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-		    	{
-		    		$result=$this->insertExtraFields();
-		    		if ($result < 0)
-		    		{
-		    			$error++;
-		    		}
-		    	}
-		    }
-		    else if ($reshook < 0) $error++;
+			unset($this->country_code);
+			unset($this->country);
+			unset($this->state_code);
+			unset($this->state);
+
+			$action='update';
+
+			// Actions on extra fields (by external module or standard code)
+			$hookmanager->initHooks(array('contactdao'));
+			$parameters=array('socid'=>$this->id);
+			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			if (empty($reshook))
+			{
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				{
+					$result=$this->insertExtraFields();
+					if ($result < 0)
+					{
+						$error++;
+					}
+				}
+			}
+			else if ($reshook < 0) $error++;
 
 			if (! $error && ! $notrigger)
 			{
-                // Call trigger
-                $result=$this->call_trigger('CONTACT_MODIFY',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('CONTACT_MODIFY',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 
 			if (! $error)
@@ -375,7 +375,7 @@ 
 		else
 		{
 			$this->error=$this->db->lasterror().' sql='.$sql;
-            $this->db->rollback();
+			$this->db->rollback();
 			return -1;
 		}
 	}
@@ -410,9 +410,9 @@ 
 	{
 		global $conf,$langs;
 
-        $info = array();
+		$info = array();
 
-        // Object classes
+		// Object classes
 		$info["objectclass"]=explode(',',$conf->global->LDAP_CONTACT_OBJECT_CLASS);
 
 		$this->fullname=$this->getFullName($langs);
@@ -441,7 +441,7 @@ 
 		if ($this->phone_perso && ! empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
 		if ($this->phone_mobile && ! empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) $info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
 		if ($this->fax && ! empty($conf->global->LDAP_CONTACT_FIELD_FAX))	    $info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
-        if ($this->skype && ! empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
+		if ($this->skype && ! empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
 		if ($this->note_private && ! empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = $this->note_private;
 		if ($this->email && ! empty($conf->global->LDAP_CONTACT_FIELD_MAIL))     $info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
 
@@ -480,14 +480,14 @@ 
 	 *  @param      int			$id         Id of contact
 	 *  @param      User		$user		User asking to change alert or birthday
 	 *  @param      int		    $notrigger	0=no, 1=yes
-     *  @return     int         			<0 if KO, >=0 if OK
+	 *  @return     int         			<0 if KO, >=0 if OK
 	 */
 	function update_perso($id, $user=null, $notrigger=0)
 	{
-	    $error=0;
-	    $result=false;
+		$error=0;
+		$result=false;
 
-	    $this->db->begin();
+		$this->db->begin();
 
 		// Mis a jour contact
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
@@ -500,8 +500,8 @@ 
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
-            $error++;
-		    $this->error=$this->db->lasterror();
+			$error++;
+			$this->error=$this->db->lasterror();
 		}
 
 		// Mis a jour alerte birthday
@@ -518,8 +518,8 @@ 
 				$result = $this->db->query($sql);
 				if (! $result)
 				{
-                    $error++;
-                    $this->error=$this->db->lasterror();
+					$error++;
+					$this->error=$this->db->lasterror();
 				}
 			}
 			else
@@ -534,29 +534,29 @@ 
 			$result = $this->db->query($sql);
 			if (! $result)
 			{
-                $error++;
-                $this->error=$this->db->lasterror();
+				$error++;
+				$this->error=$this->db->lasterror();
 			}
 		}
 
 		if (! $error && ! $notrigger)
 		{
-		    // Call trigger
-		    $result=$this->call_trigger('CONTACT_MODIFY',$user);
-		    if ($result < 0) { $error++; }
-		    // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('CONTACT_MODIFY',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if (! $error)
 		{
-		    $this->db->commit();
-		    return 1;
+			$this->db->commit();
+			return 1;
 		}
 		else
 		{
-		    dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
-		    $this->db->rollback();
-		    return -$error;
+			dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
+			$this->db->rollback();
+			return -$error;
 		}
 	}
 
@@ -566,7 +566,7 @@ 
 	 *
 	 *  @param      int		$id          id du contact
 	 *  @param      User	$user        Utilisateur (abonnes aux alertes) qui veut les alertes de ce contact
-     *  @param      string  $ref_ext     External reference, not given by Dolibarr
+	 *  @param      string  $ref_ext     External reference, not given by Dolibarr
 	 *  @return     int     		     -1 if KO, 0 if OK but not found, 1 if OK
 	 */
 	function fetch($id, $user=0, $ref_ext='')
@@ -589,7 +589,7 @@ 
 		$sql.= " c.fk_departement,";
 		$sql.= " c.birthday,";
 		$sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid, c.skype,";
-        $sql.= " c.photo,";
+		$sql.= " c.photo,";
 		$sql.= " c.priv, c.note_private, c.note_public, c.default_lang, c.no_email, c.canvas,";
 		$sql.= " c.import_key,";
 		$sql.= " co.label as country, co.code as country_code,";
@@ -645,8 +645,8 @@ 
 
 				$this->email			= $obj->email;
 				$this->jabberid			= $obj->jabberid;
-        		$this->skype			= $obj->skype;
-                $this->photo			= $obj->photo;
+				$this->skype			= $obj->skype;
+				$this->photo			= $obj->photo;
 				$this->priv				= $obj->priv;
 				$this->mail				= $obj->email;
 
@@ -713,11 +713,11 @@ 
 				}
 
 				// Retreive all extrafield for contact
-                // fetch optionals attributes and labels
-                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-               	$this->fetch_optionals($this->id,$extralabels);
+				// fetch optionals attributes and labels
+				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+				$extrafields=new ExtraFields($this->db);
+				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+			   	$this->fetch_optionals($this->id,$extralabels);
 
 				return 1;
 			}
@@ -742,12 +742,12 @@ 
 	 */
 	function setGenderFromCivility()
 	{
-	    unset($this->gender);
-    	if (in_array($this->civility_id, array('MR'))) {
-    	    $this->gender = 'man';
-    	} else if(in_array($this->civility_id, array('MME','MLE'))) {
-    	    $this->gender = 'woman';
-    	}
+		unset($this->gender);
+		if (in_array($this->civility_id, array('MR'))) {
+			$this->gender = 'man';
+		} else if(in_array($this->civility_id, array('MME','MLE'))) {
+			$this->gender = 'woman';
+		}
 	}
 
 	/**
@@ -757,7 +757,7 @@ 
 	 *  ref_commande (for order and/or shipments)
 	 *  ref_propale
 	 *
-     *  @return     int             					<0 if KO, >=0 if OK
+	 *  @return     int             					<0 if KO, >=0 if OK
 	 */
 	function load_ref_elements()
 	{
@@ -885,10 +885,10 @@ 
 
 		if (! $error && ! $notrigger)
 		{
-            // Call trigger
-            $result=$this->call_trigger('CONTACT_DELETE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('CONTACT_DELETE',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if (! $error)
@@ -991,7 +991,7 @@ 
 	 *	@param		string		$option						Where the link point to
 	 *	@param		int			$maxlen						Max length of
 	 *  @param		string		$moreparam					Add more param into URL
-     *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return		string									String with URL
 	 */
 	function getNomUrl($withpicto=0, $option='', $maxlen=0, $moreparam='', $save_lastsearch_value=-1)
@@ -1000,39 +1000,39 @@ 
 
 		$result='';
 
-        $label = '<u>' . $langs->trans("ShowContact") . '</u>';
-        $label.= '<br><b>' . $langs->trans("Name") . ':</b> '.$this->getFullName($langs);
-        //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
-        if (! empty($this->poste)) $label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
-        $label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
-        $phonelist=array();
-        if ($this->phone_pro) $phonelist[]=$this->phone_pro;
-        if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;
-        if ($this->phone_perso) $phonelist[]=$this->phone_perso;
-        $label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',$phonelist);
-        $label.= '<br><b>' . $langs->trans("Address") . ':</b> '.dol_format_address($this, 1, ' ', $langs);
-
-        $url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
-
-        if ($option !== 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-        }
-
-        $url .= $moreparam;
-
-        $linkstart = '<a href="'.$url.'"';
-        $linkclose="";
-    	if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        {
-            $label=$langs->trans("ShowContact");
-            $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-        }
-       	$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-       	$linkclose.= ' class="classfortooltip">';
+		$label = '<u>' . $langs->trans("ShowContact") . '</u>';
+		$label.= '<br><b>' . $langs->trans("Name") . ':</b> '.$this->getFullName($langs);
+		//if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
+		if (! empty($this->poste)) $label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
+		$label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
+		$phonelist=array();
+		if ($this->phone_pro) $phonelist[]=$this->phone_pro;
+		if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;
+		if ($this->phone_perso) $phonelist[]=$this->phone_perso;
+		$label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',$phonelist);
+		$label.= '<br><b>' . $langs->trans("Address") . ':</b> '.dol_format_address($this, 1, ' ', $langs);
+
+		$url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
+
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		}
+
+		$url .= $moreparam;
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkclose="";
+		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		{
+			$label=$langs->trans("ShowContact");
+			$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		}
+	   	$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+	   	$linkclose.= ' class="classfortooltip">';
 
 		if (! is_object($hookmanager))
 		{
@@ -1053,7 +1053,7 @@ 
 			$linkend='</a>';
 		}
 
-	        if ($withpicto) $result.=($linkstart.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
+			if ($withpicto) $result.=($linkstart.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
 			$result.=$linkstart.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend;
 		return $result;
 	}
@@ -1070,7 +1070,7 @@ 
 
 		$code=(! empty($this->civility_id)?$this->civility_id:(! empty($this->civilite_id)?$this->civilite_id:''));
 		if (empty($code)) return '';
-        return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
+		return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
 	}
 
 	/**
@@ -1144,11 +1144,11 @@ 
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	function initAsSpecimen()
 	{
@@ -1174,7 +1174,7 @@ 
 		$this->country_code = 'FR';
 		$this->country = 'France';
 		$this->email = 'specimen@specimen.com';
-    	$this->skype = 'tom.hanson';
+		$this->skype = 'tom.hanson';
 
 		$this->phone_pro = '0909090901';
 		$this->phone_perso = '0909090902';
@@ -1215,10 +1215,10 @@ 
 		dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
 		if ($result)
 		{
-            // Call trigger
-            $result=$this->call_trigger('CONTACT_ENABLEDISABLE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('CONTACT_ENABLEDISABLE',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if ($error)

Spacing +322 added lines, -322 removed lines

@@ -29,7 +29,7 @@ 
  *	\ingroup    societe
  *	\brief      File of contacts class
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -37,11 +37,11 @@ 
  */
 class Contact extends CommonObject
 {
-	public $element='contact';
-	public $table_element='socpeople';
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $element = 'contact';
+	public $table_element = 'socpeople';
+	protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
-	public $civility_id;      // In fact we store civility_code
+	public $civility_id; // In fact we store civility_code
 	public $civility_code;
 	public $address;
 	public $zip;
@@ -62,14 +62,14 @@ 
 	 * @see state
 	 */
 	public $departement;
-	public $state_id;	        	// Id of department
-	public $state_code;		    // Code of department
-	public $state;			        // Label of department
+	public $state_id; // Id of department
+	public $state_code; // Code of department
+	public $state; // Label of department
 
-    	public $poste;                 // Position
+    	public $poste; // Position
 
-	public $socid;					// fk_soc
-	public $statut;				// 0=inactif, 1=actif
+	public $socid; // fk_soc
+	public $statut; // 0=inactif, 1=actif
 
 	public $code;
 	public $email;
@@ -85,17 +85,17 @@ 
 
 	public $birthday;
 	public $default_lang;
-    	public $no_email;				// 1=Don't send e-mail to this contact, 0=do
+    	public $no_email; // 1=Don't send e-mail to this contact, 0=do
 
-	public $ref_facturation;       // Reference number of invoice for which it is contact
-	public $ref_contrat;           // Nb de reference contrat pour lequel il est contact
-	public $ref_commande;          // Nb de reference commande pour lequel il est contact
-	public $ref_propal;            // Nb de reference propal pour lequel il est contact
+	public $ref_facturation; // Reference number of invoice for which it is contact
+	public $ref_contrat; // Nb de reference contrat pour lequel il est contact
+	public $ref_commande; // Nb de reference commande pour lequel il est contact
+	public $ref_propal; // Nb de reference propal pour lequel il est contact
 
 	public $user_id;
 	public $user_login;
 
-	public $oldcopy;				// To contains a clone of this when we need to save old properties of object
+	public $oldcopy; // To contains a clone of this when we need to save old properties of object
 
 
 	/**
@@ -106,7 +106,7 @@ 
 	function __construct($db)
 	{
 		$this->db = $db;
-		$this->statut = 1;	// By default, status is enabled
+		$this->statut = 1; // By default, status is enabled
 	}
 
 	/**
@@ -118,28 +118,28 @@ 
 	{
 		global $user;
 
-		$this->nb=array();
+		$this->nb = array();
 		$clause = "WHERE";
 
 		$sql = "SELECT count(sp.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE sp.fk_soc = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+		    $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE sp.fk_soc = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			$clause = "AND";
 		}
-		$sql.= ' '.$clause.' sp.entity IN ('.getEntity($this->element, 1).')';
-		$sql.= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".$user->id."))";
-        if ($user->societe_id > 0) $sql.=" AND sp.fk_soc = ".$user->societe_id;
+		$sql .= ' '.$clause.' sp.entity IN ('.getEntity($this->element, 1).')';
+		$sql .= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".$user->id."))";
+        if ($user->societe_id > 0) $sql .= " AND sp.fk_soc = ".$user->societe_id;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$this->nb["contacts"]=$obj->nb;
+				$this->nb["contacts"] = $obj->nb;
 			}
 			$this->db->free($resql);
 			return 1;
@@ -147,7 +147,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -162,82 +162,82 @@ 
 	{
 		global $conf, $langs;
 
-		$error=0;
-		$now=dol_now();
+		$error = 0;
+		$now = dol_now();
 
 		$this->db->begin();
 
 		// Clean parameters
-		$this->lastname=$this->lastname?trim($this->lastname):trim($this->name);
-        $this->firstname=trim($this->firstname);
-        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
-        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);
+		$this->lastname = $this->lastname ?trim($this->lastname) : trim($this->name);
+        $this->firstname = trim($this->firstname);
+        if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords($this->lastname);
+        if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords($this->firstname);
         if (empty($this->socid)) $this->socid = 0;
 		if (empty($this->priv)) $this->priv = 0;
 		if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (";
-		$sql.= " datec";
-		$sql.= ", fk_soc";
-        $sql.= ", lastname";
-        $sql.= ", firstname";
-        $sql.= ", fk_user_creat";
-		$sql.= ", priv";
-		$sql.= ", statut";
-		$sql.= ", canvas";
-		$sql.= ", entity";
-		$sql.= ",ref_ext";
-		$sql.= ", import_key";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->idate($now)."',";
-		if ($this->socid > 0) $sql.= " ".$this->socid.",";
-		else $sql.= "null,";
-		$sql.= "'".$this->db->escape($this->lastname)."',";
-        $sql.= "'".$this->db->escape($this->firstname)."',";
-		$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null").",";
-		$sql.= " ".$this->priv.",";
-		$sql.= " ".$this->statut.",";
-        $sql.= " ".(! empty($this->canvas)?"'".$this->db->escape($this->canvas)."'":"null").",";
-        $sql.= " ".$conf->entity.",";
-        $sql.= "'".$this->db->escape($this->ref_ext)."',";
-        $sql.= " ".(! empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= ")";
+		$sql .= " datec";
+		$sql .= ", fk_soc";
+        $sql .= ", lastname";
+        $sql .= ", firstname";
+        $sql .= ", fk_user_creat";
+		$sql .= ", priv";
+		$sql .= ", statut";
+		$sql .= ", canvas";
+		$sql .= ", entity";
+		$sql .= ",ref_ext";
+		$sql .= ", import_key";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->idate($now)."',";
+		if ($this->socid > 0) $sql .= " ".$this->socid.",";
+		else $sql .= "null,";
+		$sql .= "'".$this->db->escape($this->lastname)."',";
+        $sql .= "'".$this->db->escape($this->firstname)."',";
+		$sql .= " ".($user->id > 0 ? "'".$user->id."'" : "null").",";
+		$sql .= " ".$this->priv.",";
+		$sql .= " ".$this->statut.",";
+        $sql .= " ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null").",";
+        $sql .= " ".$conf->entity.",";
+        $sql .= "'".$this->db->escape($this->ref_ext)."',";
+        $sql .= " ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."socpeople");
 
-			if (! $error)
+			if (!$error)
 			{
-                $result=$this->update($this->id, $user, 1, 'add');
+                $result = $this->update($this->id, $user, 1, 'add');
                 if ($result < 0)
                 {
                     $error++;
-				    $this->error=$this->db->lasterror();
+				    $this->error = $this->db->lasterror();
                 }
 			}
 
-			if (! $error)
+			if (!$error)
             {
-                $result=$this->update_perso($this->id, $user, 1);   // TODO Remove function update_perso, should be same than update
+                $result = $this->update_perso($this->id, $user, 1); // TODO Remove function update_perso, should be same than update
                 if ($result < 0)
                 {
                     $error++;
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                 }
             }
 
-			if (! $error)
+			if (!$error)
             {
                 // Call trigger
-                $result=$this->call_trigger('CONTACT_CREATE',$user);
+                $result = $this->call_trigger('CONTACT_CREATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->db->commit();
                 return $this->id;
@@ -251,7 +251,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
@@ -268,29 +268,29 @@ 
 	 *      @param		string	$action			Current action for hookmanager
 	 *      @return     int      			   	<0 if KO, >0 if OK
 	 */
-	function update($id, $user=null, $notrigger=0, $action='update')
+	function update($id, $user = null, $notrigger = 0, $action = 'update')
 	{
 		global $conf, $langs, $hookmanager;
 
-		$error=0;
+		$error = 0;
 
 		$this->id = $id;
 
 		// Clean parameters
-		$this->lastname=trim($this->lastname)?trim($this->lastname):trim($this->lastname);
-		$this->firstname=trim($this->firstname);
-		$this->email=trim($this->email);
-		$this->phone_pro=trim($this->phone_pro);
-		$this->phone_perso=trim($this->phone_perso);
-		$this->phone_mobile=trim($this->phone_mobile);
-		$this->jabberid=trim($this->jabberid);
-		$this->skype=trim($this->skype);
-		$this->photo=trim($this->photo);
-		$this->fax=trim($this->fax);
-		$this->zip=(empty($this->zip)?'':$this->zip);
-		$this->town=(empty($this->town)?'':$this->town);
-		$this->country_id=($this->country_id > 0?$this->country_id:$this->country_id);
-		$this->state_id=($this->state_id > 0?$this->state_id:$this->fk_departement);
+		$this->lastname = trim($this->lastname) ?trim($this->lastname) : trim($this->lastname);
+		$this->firstname = trim($this->firstname);
+		$this->email = trim($this->email);
+		$this->phone_pro = trim($this->phone_pro);
+		$this->phone_perso = trim($this->phone_perso);
+		$this->phone_mobile = trim($this->phone_mobile);
+		$this->jabberid = trim($this->jabberid);
+		$this->skype = trim($this->skype);
+		$this->photo = trim($this->photo);
+		$this->fax = trim($this->fax);
+		$this->zip = (empty($this->zip) ? '' : $this->zip);
+		$this->town = (empty($this->town) ? '' : $this->town);
+		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		$this->state_id = ($this->state_id > 0 ? $this->state_id : $this->fk_departement);
 		if (empty($this->statut)) $this->statut = 0;
 
 		$this->db->begin();
@@ -304,24 +304,24 @@ 
 		$sql .= ", address='".$this->db->escape($this->address)."'";
 		$sql .= ", zip='".$this->db->escape($this->zip)."'";
 		$sql .= ", town='".$this->db->escape($this->town)."'";
-		$sql .= ", fk_pays=".($this->country_id>0?$this->country_id:'NULL');
-		$sql .= ", fk_departement=".($this->state_id>0?$this->state_id:'NULL');
+		$sql .= ", fk_pays=".($this->country_id > 0 ? $this->country_id : 'NULL');
+		$sql .= ", fk_departement=".($this->state_id > 0 ? $this->state_id : 'NULL');
 		$sql .= ", poste='".$this->db->escape($this->poste)."'";
 		$sql .= ", fax='".$this->db->escape($this->fax)."'";
 		$sql .= ", email='".$this->db->escape($this->email)."'";
 		$sql .= ", skype='".$this->db->escape($this->skype)."'";
 		$sql .= ", photo='".$this->db->escape($this->photo)."'";
-		$sql .= ", note_private = ".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql .= ", note_public = ".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql .= ", phone = ".(isset($this->phone_pro)?"'".$this->db->escape($this->phone_pro)."'":"null");
-		$sql .= ", phone_perso = ".(isset($this->phone_perso)?"'".$this->db->escape($this->phone_perso)."'":"null");
-		$sql .= ", phone_mobile = ".(isset($this->phone_mobile)?"'".$this->db->escape($this->phone_mobile)."'":"null");
-		$sql .= ", jabberid = ".(isset($this->jabberid)?"'".$this->db->escape($this->jabberid)."'":"null");
+		$sql .= ", note_private = ".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", note_public = ".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", phone = ".(isset($this->phone_pro) ? "'".$this->db->escape($this->phone_pro)."'" : "null");
+		$sql .= ", phone_perso = ".(isset($this->phone_perso) ? "'".$this->db->escape($this->phone_perso)."'" : "null");
+		$sql .= ", phone_mobile = ".(isset($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "null");
+		$sql .= ", jabberid = ".(isset($this->jabberid) ? "'".$this->db->escape($this->jabberid)."'" : "null");
 		$sql .= ", priv = '".$this->db->escape($this->priv)."'";
 		$sql .= ", statut = ".$this->statut;
-		$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$this->db->escape($user->id)."'":"NULL");
-		$sql .= ", default_lang=".($this->default_lang?"'".$this->db->escape($this->default_lang)."'":"NULL");
-		$sql .= ", no_email=".($this->no_email?"'".$this->db->escape($this->no_email)."'":"0");
+		$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "NULL");
+		$sql .= ", default_lang=".($this->default_lang ? "'".$this->db->escape($this->default_lang)."'" : "NULL");
+		$sql .= ", no_email=".($this->no_email ? "'".$this->db->escape($this->no_email)."'" : "0");
 		$sql .= " WHERE rowid=".$this->db->escape($id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -333,17 +333,17 @@ 
 		    unset($this->state_code);
 		    unset($this->state);
 
-		    $action='update';
+		    $action = 'update';
 
 		    // Actions on extra fields (by external module or standard code)
 		    $hookmanager->initHooks(array('contactdao'));
-		    $parameters=array('socid'=>$this->id);
-		    $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		    $parameters = array('socid'=>$this->id);
+		    $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		    if (empty($reshook))
 		    {
 		    	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 		    	{
-		    		$result=$this->insertExtraFields();
+		    		$result = $this->insertExtraFields();
 		    		if ($result < 0)
 		    		{
 		    			$error++;
@@ -352,29 +352,29 @@ 
 		    }
 		    else if ($reshook < 0) $error++;
 
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
                 // Call trigger
-                $result=$this->call_trigger('CONTACT_MODIFY',$user);
+                $result = $this->call_trigger('CONTACT_MODIFY', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return 1;
 			}
 			else
 			{
-				dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
+				dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -$error;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror().' sql='.$sql;
+			$this->error = $this->db->lasterror().' sql='.$sql;
             $this->db->rollback();
 			return -1;
 		}
@@ -390,13 +390,13 @@ 
 	 *									2=Return key only (uid=qqq)
 	 *	@return		string				DN
 	 */
-	function _load_ldap_dn($info,$mode=0)
+	function _load_ldap_dn($info, $mode = 0)
 	{
 		global $conf;
-		$dn='';
-		if ($mode==0) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN;
-		if ($mode==1) $dn=$conf->global->LDAP_CONTACT_DN;
-		if ($mode==2) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS];
+		$dn = '';
+		if ($mode == 0) $dn = $conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN;
+		if ($mode == 1) $dn = $conf->global->LDAP_CONTACT_DN;
+		if ($mode == 2) $dn = $conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS];
 		return $dn;
 	}
 
@@ -408,19 +408,19 @@ 
 	 */
 	function _load_ldap_info()
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
         $info = array();
 
         // Object classes
-		$info["objectclass"]=explode(',',$conf->global->LDAP_CONTACT_OBJECT_CLASS);
+		$info["objectclass"] = explode(',', $conf->global->LDAP_CONTACT_OBJECT_CLASS);
 
-		$this->fullname=$this->getFullName($langs);
+		$this->fullname = $this->getFullName($langs);
 
 		// Fields
-		if ($this->fullname && ! empty($conf->global->LDAP_CONTACT_FIELD_FULLNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FULLNAME] = $this->fullname;
-		if ($this->lastname && ! empty($conf->global->LDAP_CONTACT_FIELD_NAME)) $info[$conf->global->LDAP_CONTACT_FIELD_NAME] = $this->lastname;
-		if ($this->firstname && ! empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME] = $this->firstname;
+		if ($this->fullname && !empty($conf->global->LDAP_CONTACT_FIELD_FULLNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FULLNAME] = $this->fullname;
+		if ($this->lastname && !empty($conf->global->LDAP_CONTACT_FIELD_NAME)) $info[$conf->global->LDAP_CONTACT_FIELD_NAME] = $this->lastname;
+		if ($this->firstname && !empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME] = $this->firstname;
 
 		if ($this->poste) $info["title"] = $this->poste;
 		if ($this->socid > 0)
@@ -433,17 +433,17 @@ 
 			if ($soc->client == 2)      $info["businessCategory"] = "Prospects";
 			if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
 		}
-		if ($this->address && ! empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) $info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address;
-		if ($this->zip && ! empty($conf->global->LDAP_CONTACT_FIELD_ZIP))          $info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->zip;
-		if ($this->town && ! empty($conf->global->LDAP_CONTACT_FIELD_TOWN))      $info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town;
-		if ($this->country_code && ! empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY))      $info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code;
-		if ($this->phone_pro && ! empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro;
-		if ($this->phone_perso && ! empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
-		if ($this->phone_mobile && ! empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) $info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
-		if ($this->fax && ! empty($conf->global->LDAP_CONTACT_FIELD_FAX))	    $info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
-        if ($this->skype && ! empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
-		if ($this->note_private && ! empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = $this->note_private;
-		if ($this->email && ! empty($conf->global->LDAP_CONTACT_FIELD_MAIL))     $info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
+		if ($this->address && !empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) $info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address;
+		if ($this->zip && !empty($conf->global->LDAP_CONTACT_FIELD_ZIP))          $info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->zip;
+		if ($this->town && !empty($conf->global->LDAP_CONTACT_FIELD_TOWN))      $info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town;
+		if ($this->country_code && !empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY))      $info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code;
+		if ($this->phone_pro && !empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro;
+		if ($this->phone_perso && !empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
+		if ($this->phone_mobile && !empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) $info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
+		if ($this->fax && !empty($conf->global->LDAP_CONTACT_FIELD_FAX))	    $info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
+        if ($this->skype && !empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
+		if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = $this->note_private;
+		if ($this->email && !empty($conf->global->LDAP_CONTACT_FIELD_MAIL))     $info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
 
 		if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
 		{
@@ -451,7 +451,7 @@ 
 
 			$info['uidnumber'] = $this->id;
 
-			$info['phpgwTz']      = 0;
+			$info['phpgwTz'] = 0;
 			$info['phpgwMailType'] = 'INTERNET';
 			$info['phpgwMailHomeType'] = 'INTERNET';
 
@@ -482,26 +482,26 @@ 
 	 *  @param      int		    $notrigger	0=no, 1=yes
      *  @return     int         			<0 if KO, >=0 if OK
 	 */
-	function update_perso($id, $user=null, $notrigger=0)
+	function update_perso($id, $user = null, $notrigger = 0)
 	{
-	    $error=0;
-	    $result=false;
+	    $error = 0;
+	    $result = false;
 
 	    $this->db->begin();
 
 		// Mis a jour contact
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
-		$sql.= " birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
-		$sql.= ", photo = ".($this->photo? "'".$this->db->escape($this->photo)."'" : "null");
+		$sql .= " birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
+		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
 		if ($user) $sql .= ", fk_user_modif=".$user->id;
-		$sql.= " WHERE rowid=".$this->db->escape($id);
+		$sql .= " WHERE rowid=".$this->db->escape($id);
 
 		dol_syslog(get_class($this)."::update_perso this->birthday=".$this->birthday." -", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
             $error++;
-		    $this->error=$this->db->lasterror();
+		    $this->error = $this->db->lasterror();
 		}
 
 		// Mis a jour alerte birthday
@@ -510,16 +510,16 @@ 
 			//check existing
 			$sql_check = "SELECT * FROM ".MAIN_DB_PREFIX."user_alert WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result_check = $this->db->query($sql_check);
-			if (! $result_check || ($this->db->num_rows($result_check)<1))
+			if (!$result_check || ($this->db->num_rows($result_check) < 1))
 			{
 				//insert
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_alert(type,fk_contact,fk_user) ";
-				$sql.= "VALUES (1,".$this->db->escape($id).",".$user->id.")";
+				$sql .= "VALUES (1,".$this->db->escape($id).",".$user->id.")";
 				$result = $this->db->query($sql);
-				if (! $result)
+				if (!$result)
 				{
                     $error++;
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
 				}
 			}
 			else
@@ -530,31 +530,31 @@ 
 		else
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
-			$sql.= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
+			$sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result = $this->db->query($sql);
-			if (! $result)
+			if (!$result)
 			{
                 $error++;
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
 			}
 		}
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 		    // Call trigger
-		    $result=$this->call_trigger('CONTACT_MODIFY',$user);
+		    $result = $this->call_trigger('CONTACT_MODIFY', $user);
 		    if ($result < 0) { $error++; }
 		    // End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 		    $this->db->commit();
 		    return 1;
 		}
 		else
 		{
-		    dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
+		    dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 		    $this->db->rollback();
 		    return -$error;
 		}
@@ -569,7 +569,7 @@ 
      *  @param      string  $ref_ext     External reference, not given by Dolibarr
 	 *  @return     int     		     -1 if KO, 0 if OK but not found, 1 if OK
 	 */
-	function fetch($id, $user=0, $ref_ext='')
+	function fetch($id, $user = 0, $ref_ext = '')
 	{
 		global $langs;
 
@@ -577,88 +577,88 @@ 
 
 		if (empty($id) && empty($ref_ext))
 		{
-			$this->error='BadParameter';
+			$this->error = 'BadParameter';
 			return -1;
 		}
 
 		$langs->load("companies");
 
 		$sql = "SELECT c.rowid, c.fk_soc, c.ref_ext, c.civility as civility_id, c.lastname, c.firstname,";
-		$sql.= " c.address, c.statut, c.zip, c.town,";
-		$sql.= " c.fk_pays as country_id,";
-		$sql.= " c.fk_departement,";
-		$sql.= " c.birthday,";
-		$sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid, c.skype,";
-        $sql.= " c.photo,";
-		$sql.= " c.priv, c.note_private, c.note_public, c.default_lang, c.no_email, c.canvas,";
-		$sql.= " c.import_key,";
-		$sql.= " co.label as country, co.code as country_code,";
-		$sql.= " d.nom as state, d.code_departement as state_code,";
-		$sql.= " u.rowid as user_id, u.login as user_login,";
-		$sql.= " s.nom as socname, s.address as socaddress, s.zip as soccp, s.town as soccity, s.default_lang as socdefault_lang";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON c.fk_pays = co.rowid";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
-		if ($id) $sql.= " WHERE c.rowid = ". $id;
+		$sql .= " c.address, c.statut, c.zip, c.town,";
+		$sql .= " c.fk_pays as country_id,";
+		$sql .= " c.fk_departement,";
+		$sql .= " c.birthday,";
+		$sql .= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid, c.skype,";
+        $sql .= " c.photo,";
+		$sql .= " c.priv, c.note_private, c.note_public, c.default_lang, c.no_email, c.canvas,";
+		$sql .= " c.import_key,";
+		$sql .= " co.label as country, co.code as country_code,";
+		$sql .= " d.nom as state, d.code_departement as state_code,";
+		$sql .= " u.rowid as user_id, u.login as user_login,";
+		$sql .= " s.nom as socname, s.address as socaddress, s.zip as soccp, s.town as soccity, s.default_lang as socdefault_lang";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON c.fk_pays = co.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
+		if ($id) $sql .= " WHERE c.rowid = ".$id;
 		elseif ($ref_ext) $sql .= " WHERE c.ref_ext = '".$this->db->escape($ref_ext)."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id				= $obj->rowid;
-				$this->ref				= $obj->rowid;
-				$this->ref_ext			= $obj->ref_ext;
-				$this->civility_id		= $obj->civility_id;
-				$this->civility_code	= $obj->civility_id;
+				$this->id = $obj->rowid;
+				$this->ref = $obj->rowid;
+				$this->ref_ext = $obj->ref_ext;
+				$this->civility_id = $obj->civility_id;
+				$this->civility_code = $obj->civility_id;
 				$this->lastname			= $obj->lastname;
 				$this->firstname		= $obj->firstname;
-				$this->address			= $obj->address;
-				$this->zip				= $obj->zip;
-				$this->town				= $obj->town;
+				$this->address = $obj->address;
+				$this->zip = $obj->zip;
+				$this->town = $obj->town;
 
-				$this->fk_departement	= $obj->fk_departement;    // deprecated
-				$this->state_id			= $obj->fk_departement;
-				$this->departement_code = $obj->state_code;	       // deprecated
+				$this->fk_departement = $obj->fk_departement; // deprecated
+				$this->state_id = $obj->fk_departement;
+				$this->departement_code = $obj->state_code; // deprecated
 				$this->state_code       = $obj->state_code;
-				$this->departement		= $obj->state;	           // deprecated
-				$this->state			= $obj->state;
+				$this->departement		= $obj->state; // deprecated
+				$this->state = $obj->state;
 
 				$this->country_id 		= $obj->country_id;
-				$this->country_code		= $obj->country_id?$obj->country_code:'';
-				$this->country			= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+				$this->country_code = $obj->country_id ? $obj->country_code : '';
+				$this->country			= $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
 
 				$this->socid			= $obj->fk_soc;
 				$this->socname			= $obj->socname;
 				$this->poste			= $obj->poste;
-				$this->statut			= $obj->statut;
+				$this->statut = $obj->statut;
 
-				$this->phone_pro		= trim($obj->phone);
-				$this->fax				= trim($obj->fax);
-				$this->phone_perso		= trim($obj->phone_perso);
-				$this->phone_mobile		= trim($obj->phone_mobile);
+				$this->phone_pro = trim($obj->phone);
+				$this->fax = trim($obj->fax);
+				$this->phone_perso = trim($obj->phone_perso);
+				$this->phone_mobile = trim($obj->phone_mobile);
 
-				$this->email			= $obj->email;
-				$this->jabberid			= $obj->jabberid;
-        		$this->skype			= $obj->skype;
-                $this->photo			= $obj->photo;
+				$this->email = $obj->email;
+				$this->jabberid = $obj->jabberid;
+        		$this->skype = $obj->skype;
+                $this->photo = $obj->photo;
 				$this->priv				= $obj->priv;
 				$this->mail				= $obj->email;
 
-				$this->birthday			= $this->db->jdate($obj->birthday);
-				$this->note				= $obj->note_private;		// deprecated
+				$this->birthday = $this->db->jdate($obj->birthday);
+				$this->note				= $obj->note_private; // deprecated
 				$this->note_private		= $obj->note_private;
-				$this->note_public		= $obj->note_public;
+				$this->note_public = $obj->note_public;
 				$this->default_lang		= $obj->default_lang;
-				$this->no_email			= $obj->no_email;
-				$this->user_id			= $obj->user_id;
+				$this->no_email = $obj->no_email;
+				$this->user_id = $obj->user_id;
 				$this->user_login		= $obj->user_login;
-				$this->canvas			= $obj->canvas;
+				$this->canvas = $obj->canvas;
 
 				$this->import_key		= $obj->import_key;
 
@@ -668,9 +668,9 @@ 
 				// Search Dolibarr user linked to this contact
 				$sql = "SELECT u.rowid ";
 				$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-				$sql .= " WHERE u.fk_socpeople = ". $this->id;
+				$sql .= " WHERE u.fk_socpeople = ".$this->id;
 
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
 					if ($this->db->num_rows($resql))
@@ -683,7 +683,7 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->error();
+					$this->error = $this->db->error();
 					return -1;
 				}
 
@@ -694,7 +694,7 @@ 
 					$sql .= " FROM ".MAIN_DB_PREFIX."user_alert";
 					$sql .= " WHERE fk_user = ".$user->id." AND fk_contact = ".$this->db->escape($id);
 
-					$resql=$this->db->query($sql);
+					$resql = $this->db->query($sql);
 					if ($resql)
 					{
 						if ($this->db->num_rows($resql))
@@ -707,7 +707,7 @@ 
 					}
 					else
 					{
-						$this->error=$this->db->error();
+						$this->error = $this->db->error();
 						return -1;
 					}
 				}
@@ -715,21 +715,21 @@ 
 				// Retreive all extrafield for contact
                 // fetch optionals attributes and labels
                 require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-               	$this->fetch_optionals($this->id,$extralabels);
+                $extrafields = new ExtraFields($this->db);
+                $extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+               	$this->fetch_optionals($this->id, $extralabels);
 
 				return 1;
 			}
 			else
 			{
-				$this->error=$langs->trans("RecordNotFound");
+				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -745,7 +745,7 @@ 
 	    unset($this->gender);
     	if (in_array($this->civility_id, array('MR'))) {
     	    $this->gender = 'man';
-    	} else if(in_array($this->civility_id, array('MME','MLE'))) {
+    	} else if (in_array($this->civility_id, array('MME', 'MLE'))) {
     	    $this->gender = 'woman';
     	}
 	}
@@ -762,25 +762,25 @@ 
 	function load_ref_elements()
 	{
 		// Compte les elements pour lesquels il est contact
-		$sql ="SELECT tc.element, count(ec.rowid) as nb";
-		$sql.=" FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql.=" WHERE ec.fk_c_type_contact = tc.rowid";
-		$sql.=" AND fk_socpeople = ". $this->id;
-		$sql.=" GROUP BY tc.element";
+		$sql = "SELECT tc.element, count(ec.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " WHERE ec.fk_c_type_contact = tc.rowid";
+		$sql .= " AND fk_socpeople = ".$this->id;
+		$sql .= " GROUP BY tc.element";
 
 		dol_syslog(get_class($this)."::load_ref_elements", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				if ($obj->nb)
 				{
-					if ($obj->element=='facture')  $this->ref_facturation = $obj->nb;
-					if ($obj->element=='contrat')  $this->ref_contrat = $obj->nb;
-					if ($obj->element=='commande') $this->ref_commande = $obj->nb;
-					if ($obj->element=='propal')   $this->ref_propal = $obj->nb;
+					if ($obj->element == 'facture')  $this->ref_facturation = $obj->nb;
+					if ($obj->element == 'contrat')  $this->ref_contrat = $obj->nb;
+					if ($obj->element == 'commande') $this->ref_commande = $obj->nb;
+					if ($obj->element == 'propal')   $this->ref_propal = $obj->nb;
 				}
 			}
 			$this->db->free($resql);
@@ -788,7 +788,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -799,45 +799,45 @@ 
 	 *   	@param		int		$notrigger		Disable all trigger
 	 *		@return		int						<0 if KO, >0 if OK
 	 */
-	function delete($notrigger=0)
+	function delete($notrigger = 0)
 	{
 		global $conf, $langs, $user;
 
-		$error=0;
+		$error = 0;
 
 		$this->old_lastname       = $obj->lastname;
 		$this->old_firstname      = $obj->firstname;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
 			// Get all rowid of element_contact linked to a type that is link to llx_socpeople
 			$sql = "SELECT ec.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."element_contact ec,";
-			$sql.= " ".MAIN_DB_PREFIX."c_type_contact tc";
-			$sql.= " WHERE ec.fk_socpeople=".$this->id;
-			$sql.= " AND ec.fk_c_type_contact=tc.rowid";
-			$sql.= " AND tc.source='external'";
+			$sql .= " FROM ".MAIN_DB_PREFIX."element_contact ec,";
+			$sql .= " ".MAIN_DB_PREFIX."c_type_contact tc";
+			$sql .= " WHERE ec.fk_socpeople=".$this->id;
+			$sql .= " AND ec.fk_c_type_contact=tc.rowid";
+			$sql .= " AND tc.source='external'";
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$num=$this->db->num_rows($resql);
+				$num = $this->db->num_rows($resql);
 
-				$i=0;
-				while ($i < $num && ! $error)
+				$i = 0;
+				while ($i < $num && !$error)
 				{
 					$obj = $this->db->fetch_object($resql);
 
 					$sqldel = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-					$sqldel.=" WHERE rowid = ".$obj->rowid;
+					$sqldel .= " WHERE rowid = ".$obj->rowid;
 					dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 					$result = $this->db->query($sqldel);
-					if (! $result)
+					if (!$result)
 					{
 						$error++;
-						$this->error=$this->db->error().' sql='.$sqldel;
+						$this->error = $this->db->error().' sql='.$sqldel;
 					}
 
 					$i++;
@@ -846,52 +846,52 @@ 
 			else
 			{
 				$error++;
-				$this->error=$this->db->error().' sql='.$sql;
+				$this->error = $this->db->error().' sql='.$sql;
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			// Remove category
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_contact WHERE fk_socpeople = ".$this->id;
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$error++;
 				$this->error .= $this->db->lasterror();
-				$errorflag=-1;
+				$errorflag = -1;
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople";
 			$sql .= " WHERE rowid=".$this->id;
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if (! $result)
+			if (!$result)
 			{
 				$error++;
-				$this->error=$this->db->error().' sql='.$sql;
+				$this->error = $this->db->error().' sql='.$sql;
 			}
 		}
 
 		// Removed extrafields
-		 if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) { // For avoid conflicts if trigger used
-			$result=$this->deleteExtraFields($this);
+		 if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) { // For avoid conflicts if trigger used
+			$result = $this->deleteExtraFields($this);
 			if ($result < 0) $error++;
 		}
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
             // Call trigger
-            $result=$this->call_trigger('CONTACT_DELETE',$user);
+            $result = $this->call_trigger('CONTACT_DELETE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 
 			$this->db->commit();
@@ -900,7 +900,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			dol_syslog("Error ".$this->error,LOG_ERR);
+			dol_syslog("Error ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -915,23 +915,23 @@ 
 	function info($id)
 	{
 		$sql = "SELECT c.rowid, c.datec as datec, c.fk_user_creat,";
-		$sql.= " c.tms as tms, c.fk_user_modif";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$sql.= " WHERE c.rowid = ".$this->db->escape($id);
+		$sql .= " c.tms as tms, c.fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+		$sql .= " WHERE c.rowid = ".$this->db->escape($id);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id                = $obj->rowid;
+				$this->id = $obj->rowid;
 
 				if ($obj->fk_user_creat) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creat);
-					$this->user_creation     = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_modif) {
@@ -960,25 +960,25 @@ 
 	function getNbOfEMailings()
 	{
 		$sql = "SELECT count(mc.email) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-		$sql.= " WHERE mc.email = '".$this->db->escape($this->email)."'";
-		$sql.= " AND mc.statut NOT IN (-1,0)";      // -1 erreur, 0 non envoye, 1 envoye avec succes
+		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+		$sql .= " WHERE mc.email = '".$this->db->escape($this->email)."'";
+		$sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes
 
 		dol_syslog(get_class($this)."::getNbOfEMailings", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
-			$nb=$obj->nb;
+			$nb = $obj->nb;
 
 			$this->db->free($resql);
 			return $nb;
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -994,67 +994,67 @@ 
      *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return		string									String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $maxlen=0, $moreparam='', $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $moreparam = '', $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $hookmanager;
 
-		$result='';
+		$result = '';
 
-        $label = '<u>' . $langs->trans("ShowContact") . '</u>';
-        $label.= '<br><b>' . $langs->trans("Name") . ':</b> '.$this->getFullName($langs);
+        $label = '<u>'.$langs->trans("ShowContact").'</u>';
+        $label .= '<br><b>'.$langs->trans("Name").':</b> '.$this->getFullName($langs);
         //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
-        if (! empty($this->poste)) $label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
-        $label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
-        $phonelist=array();
-        if ($this->phone_pro) $phonelist[]=$this->phone_pro;
-        if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;
-        if ($this->phone_perso) $phonelist[]=$this->phone_perso;
-        $label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',$phonelist);
-        $label.= '<br><b>' . $langs->trans("Address") . ':</b> '.dol_format_address($this, 1, ' ', $langs);
+        if (!empty($this->poste)) $label .= '<br><b>'.$langs->trans("Poste").':</b> '.$this->poste;
+        $label .= '<br><b>'.$langs->trans("EMail").':</b> '.$this->email;
+        $phonelist = array();
+        if ($this->phone_pro) $phonelist[] = $this->phone_pro;
+        if ($this->phone_mobile) $phonelist[] = $this->phone_mobile;
+        if ($this->phone_perso) $phonelist[] = $this->phone_perso;
+        $label .= '<br><b>'.$langs->trans("Phone").':</b> '.join(', ', $phonelist);
+        $label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
 
         $url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
 
         if ($option !== 'nolink')
         {
         	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
         $url .= $moreparam;
 
         $linkstart = '<a href="'.$url.'"';
-        $linkclose="";
-    	if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        $linkclose = "";
+    	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
         {
-            $label=$langs->trans("ShowContact");
-            $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            $label = $langs->trans("ShowContact");
+            $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
         }
-       	$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-       	$linkclose.= ' class="classfortooltip">';
+       	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+       	$linkclose .= ' class="classfortooltip">';
 
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('contactdao'));
-		$parameters=array('id'=>$this->id);
-		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('id'=>$this->id);
+		$reshook = $hookmanager->executeHooks('getnomurltooltip', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 
-		$linkstart.=$linkclose;
-		$linkend='</a>';
+		$linkstart .= $linkclose;
+		$linkend = '</a>';
 
 		if ($option == 'xxx')
 		{
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$this->id.$moreparam.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-			$linkend='</a>';
+			$linkend = '</a>';
 		}
 
-	        if ($withpicto) $result.=($linkstart.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
-			$result.=$linkstart.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend;
+	        if ($withpicto) $result .= ($linkstart.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
+			$result .= $linkstart.($maxlen ?dol_trunc($this->getFullName($langs), $maxlen) : $this->getFullName($langs)).$linkend;
 		return $result;
 	}
 
@@ -1068,7 +1068,7 @@ 
 		global $langs;
 		$langs->load("dict");
 
-		$code=(! empty($this->civility_id)?$this->civility_id:(! empty($this->civilite_id)?$this->civilite_id:''));
+		$code = (!empty($this->civility_id) ? $this->civility_id : (!empty($this->civilite_id) ? $this->civilite_id : ''));
 		if (empty($code)) return '';
         return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
 	}
@@ -1081,7 +1081,7 @@ 
 	 */
 	function getLibStatut($mode)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	/**
@@ -1091,40 +1091,40 @@ 
 	 *  @param      int			$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return     string					Libelle
 	 */
-	function LibStatut($statut,$mode)
+	function LibStatut($statut, $mode)
 	{
 		global $langs;
 
 		if ($mode == 0)
 		{
-			if ($statut==0 || $statut==5) return $langs->trans('Disabled');
-			elseif ($statut==1 || $statut==4) return $langs->trans('Enabled');
+			if ($statut == 0 || $statut == 5) return $langs->trans('Disabled');
+			elseif ($statut == 1 || $statut == 4) return $langs->trans('Enabled');
 		}
 		elseif ($mode == 1)
 		{
-			if ($statut==0 || $statut==5) return $langs->trans('Disabled');
-			elseif ($statut==1 || $statut==4) return $langs->trans('Enabled');
+			if ($statut == 0 || $statut == 5) return $langs->trans('Disabled');
+			elseif ($statut == 1 || $statut == 4) return $langs->trans('Enabled');
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut==0 || $statut==5) return img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
-			elseif ($statut==1 || $statut==4) return img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
+			if ($statut == 0 || $statut == 5) return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
+			elseif ($statut == 1 || $statut == 4) return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
 
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut==0 || $statut==5) return img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"');
-			elseif ($statut==1 || $statut==4) return img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"');
+			if ($statut == 0 || $statut == 5) return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');
+			elseif ($statut == 1 || $statut == 4) return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
-			elseif ($statut==1 || $statut==4) return img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
+			if ($statut == 0) return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
+			elseif ($statut == 1 || $statut == 4) return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut==0 || $statut==5) return '<span class="hideonsmartphone">'.$langs->trans('Disabled').' </span>'.img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"');
-			elseif ($statut==1 || $statut==4) return '<span class="hideonsmartphone">'.$langs->trans('Enabled').' </span>'.img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"');
+			if ($statut == 0 || $statut == 5) return '<span class="hideonsmartphone">'.$langs->trans('Disabled').' </span>'.img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');
+			elseif ($statut == 1 || $statut == 4) return '<span class="hideonsmartphone">'.$langs->trans('Enabled').' </span>'.img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');
 		}
 	}
 
@@ -1138,7 +1138,7 @@ 
 	function LibPubPriv($statut)
 	{
 		global $langs;
-		if ($statut=='1') return $langs->trans('ContactPrivate');
+		if ($statut == '1') return $langs->trans('ContactPrivate');
 		else return $langs->trans('ContactPublic');
 	}
 
@@ -1159,12 +1159,12 @@ 
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $socid=$obj->rowid;
+			if ($obj) $socid = $obj->rowid;
 		}
 
 		// Initialise parameters
-		$this->id=0;
-		$this->specimen=1;
+		$this->id = 0;
+		$this->specimen = 1;
 		$this->lastname = 'DOLIBARR';
 		$this->firstname = 'SPECIMEN';
 		$this->address = '21 jump street';
@@ -1181,11 +1181,11 @@ 
 		$this->phone_mobile = '0909090903';
 		$this->fax = '0909090909';
 
-		$this->note_public='This is a comment (public)';
-		$this->note_private='This is a comment (private)';
+		$this->note_public = 'This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
 
 		$this->socid = $socid;
-		$this->statut=1;
+		$this->statut = 1;
 	}
 
 	/**
@@ -1196,9 +1196,9 @@ 
 	 */
 	function setstatus($statut)
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		$error=0;
+		$error = 0;
 
 		// Check parameters
 		if ($this->statut == $statut) return 0;
@@ -1208,15 +1208,15 @@ 
 
 		// Desactive utilisateur
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " SET statut = ".$this->statut;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET statut = ".$this->statut;
+		$sql .= " WHERE rowid = ".$this->id;
 		$result = $this->db->query($sql);
 
 		dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
 		if ($result)
 		{
             // Call trigger
-            $result=$this->call_trigger('CONTACT_ENABLEDISABLE',$user);
+            $result = $this->call_trigger('CONTACT_ENABLEDISABLE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
 		}
@@ -1250,7 +1250,7 @@ 
 		}
 
 		// Get current categories
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$c = new Categorie($this->db);
 		$existing = $c->containing($this->id, Categorie::TYPE_CONTACT, 'id');
 

Braces +222 added lines, -116 removed lines

@@ -132,7 +132,9 @@ 
 		}
 		$sql.= ' '.$clause.' sp.entity IN ('.getEntity($this->element, 1).')';
 		$sql.= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".$user->id."))";
-        if ($user->societe_id > 0) $sql.=" AND sp.fk_soc = ".$user->societe_id;
+        if ($user->societe_id > 0) {
+        	$sql.=" AND sp.fk_soc = ".$user->societe_id;
+        }
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -143,8 +145,7 @@ 
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->lasterror();
@@ -170,11 +171,22 @@ 
 		// Clean parameters
 		$this->lastname=$this->lastname?trim($this->lastname):trim($this->name);
         $this->firstname=trim($this->firstname);
-        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
-        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);
-        if (empty($this->socid)) $this->socid = 0;
-		if (empty($this->priv)) $this->priv = 0;
-		if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request
+        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+        	$this->lastname=ucwords($this->lastname);
+        }
+        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+        	$this->firstname=ucwords($this->firstname);
+        }
+        if (empty($this->socid)) {
+        	$this->socid = 0;
+        }
+		if (empty($this->priv)) {
+			$this->priv = 0;
+		}
+		if (empty($this->statut)) {
+			$this->statut = 0;
+		}
+		// This is to convert '' into '0' to avoid bad sql request
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (";
 		$sql.= " datec";
@@ -190,8 +202,11 @@ 
 		$sql.= ", import_key";
 		$sql.= ") VALUES (";
 		$sql.= "'".$this->db->idate($now)."',";
-		if ($this->socid > 0) $sql.= " ".$this->socid.",";
-		else $sql.= "null,";
+		if ($this->socid > 0) {
+			$sql.= " ".$this->socid.",";
+		} else {
+			$sql.= "null,";
+		}
 		$sql.= "'".$this->db->escape($this->lastname)."',";
         $sql.= "'".$this->db->escape($this->firstname)."',";
 		$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null").",";
@@ -241,15 +256,13 @@ 
             {
                 $this->db->commit();
                 return $this->id;
-            }
-            else
+            } else
             {
                 $this->db->rollback();
                 dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
                 return -2;
             }
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 
@@ -291,13 +304,18 @@ 
 		$this->town=(empty($this->town)?'':$this->town);
 		$this->country_id=($this->country_id > 0?$this->country_id:$this->country_id);
 		$this->state_id=($this->state_id > 0?$this->state_id:$this->fk_departement);
-		if (empty($this->statut)) $this->statut = 0;
+		if (empty($this->statut)) {
+			$this->statut = 0;
+		}
 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
-		if ($this->socid > 0) $sql .= " fk_soc='".$this->db->escape($this->socid)."',";
-		else if ($this->socid == -1) $sql .= " fk_soc=null,";
+		if ($this->socid > 0) {
+			$sql .= " fk_soc='".$this->db->escape($this->socid)."',";
+		} else if ($this->socid == -1) {
+			$sql .= " fk_soc=null,";
+		}
 		$sql .= "  civility='".$this->db->escape($this->civility_id)."'";
 		$sql .= ", lastname='".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname='".$this->db->escape($this->firstname)."'";
@@ -341,16 +359,19 @@ 
 		    $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		    if (empty($reshook))
 		    {
-		    	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+		    	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    		// For avoid conflicts if trigger used
 		    	{
 		    		$result=$this->insertExtraFields();
+		    	}
 		    		if ($result < 0)
 		    		{
 		    			$error++;
 		    		}
 		    	}
+		    } else if ($reshook < 0) {
+		    	$error++;
 		    }
-		    else if ($reshook < 0) $error++;
 
 			if (! $error && ! $notrigger)
 			{
@@ -364,15 +385,13 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
 				$this->db->rollback();
 				return -$error;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror().' sql='.$sql;
             $this->db->rollback();
@@ -394,9 +413,15 @@ 
 	{
 		global $conf;
 		$dn='';
-		if ($mode==0) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN;
-		if ($mode==1) $dn=$conf->global->LDAP_CONTACT_DN;
-		if ($mode==2) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS];
+		if ($mode==0) {
+			$dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN;
+		}
+		if ($mode==1) {
+			$dn=$conf->global->LDAP_CONTACT_DN;
+		}
+		if ($mode==2) {
+			$dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS];
+		}
 		return $dn;
 	}
 
@@ -418,32 +443,68 @@ 
 		$this->fullname=$this->getFullName($langs);
 
 		// Fields
-		if ($this->fullname && ! empty($conf->global->LDAP_CONTACT_FIELD_FULLNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FULLNAME] = $this->fullname;
-		if ($this->lastname && ! empty($conf->global->LDAP_CONTACT_FIELD_NAME)) $info[$conf->global->LDAP_CONTACT_FIELD_NAME] = $this->lastname;
-		if ($this->firstname && ! empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME] = $this->firstname;
+		if ($this->fullname && ! empty($conf->global->LDAP_CONTACT_FIELD_FULLNAME)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_FULLNAME] = $this->fullname;
+		}
+		if ($this->lastname && ! empty($conf->global->LDAP_CONTACT_FIELD_NAME)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_NAME] = $this->lastname;
+		}
+		if ($this->firstname && ! empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME] = $this->firstname;
+		}
 
-		if ($this->poste) $info["title"] = $this->poste;
+		if ($this->poste) {
+			$info["title"] = $this->poste;
+		}
 		if ($this->socid > 0)
 		{
 			$soc = new Societe($this->db);
 			$soc->fetch($this->socid);
 
 			$info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->name;
-			if ($soc->client == 1)      $info["businessCategory"] = "Customers";
-			if ($soc->client == 2)      $info["businessCategory"] = "Prospects";
-			if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
+			if ($soc->client == 1) {
+				$info["businessCategory"] = "Customers";
+			}
+			if ($soc->client == 2) {
+				$info["businessCategory"] = "Prospects";
+			}
+			if ($soc->fournisseur == 1) {
+				$info["businessCategory"] = "Suppliers";
+			}
+		}
+		if ($this->address && ! empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address;
+		}
+		if ($this->zip && ! empty($conf->global->LDAP_CONTACT_FIELD_ZIP)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->zip;
+		}
+		if ($this->town && ! empty($conf->global->LDAP_CONTACT_FIELD_TOWN)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town;
+		}
+		if ($this->country_code && ! empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code;
+		}
+		if ($this->phone_pro && ! empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro;
+		}
+		if ($this->phone_perso && ! empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
+		}
+		if ($this->phone_mobile && ! empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
+		}
+		if ($this->fax && ! empty($conf->global->LDAP_CONTACT_FIELD_FAX)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
+		}
+        if ($this->skype && ! empty($conf->global->LDAP_CONTACT_FIELD_SKYPE)) {
+        	$info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
+        }
+		if ($this->note_private && ! empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = $this->note_private;
+		}
+		if ($this->email && ! empty($conf->global->LDAP_CONTACT_FIELD_MAIL)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
 		}
-		if ($this->address && ! empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) $info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address;
-		if ($this->zip && ! empty($conf->global->LDAP_CONTACT_FIELD_ZIP))          $info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->zip;
-		if ($this->town && ! empty($conf->global->LDAP_CONTACT_FIELD_TOWN))      $info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town;
-		if ($this->country_code && ! empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY))      $info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code;
-		if ($this->phone_pro && ! empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro;
-		if ($this->phone_perso && ! empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
-		if ($this->phone_mobile && ! empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) $info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
-		if ($this->fax && ! empty($conf->global->LDAP_CONTACT_FIELD_FAX))	    $info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
-        if ($this->skype && ! empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
-		if ($this->note_private && ! empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = $this->note_private;
-		if ($this->email && ! empty($conf->global->LDAP_CONTACT_FIELD_MAIL))     $info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
 
 		if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
 		{
@@ -466,8 +527,12 @@ 
 
 			$info["phpgwContactOwner"] = $this->egroupware_id;
 
-			if ($this->email) $info["rfc822Mailbox"] = $this->email;
-			if ($this->phone_mobile) $info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
+			if ($this->email) {
+				$info["rfc822Mailbox"] = $this->email;
+			}
+			if ($this->phone_mobile) {
+				$info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
+			}
 		}
 
 		return $info;
@@ -493,7 +558,9 @@ 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
 		$sql.= " birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
 		$sql.= ", photo = ".($this->photo? "'".$this->db->escape($this->photo)."'" : "null");
-		if ($user) $sql .= ", fk_user_modif=".$user->id;
+		if ($user) {
+			$sql .= ", fk_user_modif=".$user->id;
+		}
 		$sql.= " WHERE rowid=".$this->db->escape($id);
 
 		dol_syslog(get_class($this)."::update_perso this->birthday=".$this->birthday." -", LOG_DEBUG);
@@ -521,13 +588,11 @@ 
                     $error++;
                     $this->error=$this->db->lasterror();
 				}
-			}
-			else
+			} else
 			{
 				$result = true;
 			}
-		}
-		else
+		} else
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
 			$sql.= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
@@ -551,8 +616,7 @@ 
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else
+		} else
 		{
 		    dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
 		    $this->db->rollback();
@@ -601,8 +665,11 @@ 
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
-		if ($id) $sql.= " WHERE c.rowid = ". $id;
-		elseif ($ref_ext) $sql .= " WHERE c.ref_ext = '".$this->db->escape($ref_ext)."'";
+		if ($id) {
+			$sql.= " WHERE c.rowid = ". $id;
+		} elseif ($ref_ext) {
+			$sql .= " WHERE c.ref_ext = '".$this->db->escape($ref_ext)."'";
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -680,8 +747,7 @@ 
 						$this->user_id = $uobj->rowid;
 					}
 					$this->db->free($resql);
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->error();
 					return -1;
@@ -704,8 +770,7 @@ 
 							$this->birthday_alert = 1;
 						}
 						$this->db->free($resql);
-					}
-					else
+					} else
 					{
 						$this->error=$this->db->error();
 						return -1;
@@ -720,14 +785,12 @@ 
                	$this->fetch_optionals($this->id,$extralabels);
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -777,16 +840,23 @@ 
 			{
 				if ($obj->nb)
 				{
-					if ($obj->element=='facture')  $this->ref_facturation = $obj->nb;
-					if ($obj->element=='contrat')  $this->ref_contrat = $obj->nb;
-					if ($obj->element=='commande') $this->ref_commande = $obj->nb;
-					if ($obj->element=='propal')   $this->ref_propal = $obj->nb;
+					if ($obj->element=='facture') {
+						$this->ref_facturation = $obj->nb;
+					}
+					if ($obj->element=='contrat') {
+						$this->ref_contrat = $obj->nb;
+					}
+					if ($obj->element=='commande') {
+						$this->ref_commande = $obj->nb;
+					}
+					if ($obj->element=='propal') {
+						$this->ref_propal = $obj->nb;
+					}
 				}
 			}
 			$this->db->free($resql);
 			return 0;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -842,8 +912,7 @@ 
 
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$this->error=$this->db->error().' sql='.$sql;
@@ -880,7 +949,9 @@ 
 		// Removed extrafields
 		 if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) { // For avoid conflicts if trigger used
 			$result=$this->deleteExtraFields($this);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
 		if (! $error && ! $notrigger)
@@ -896,8 +967,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			dol_syslog("Error ".$this->error,LOG_ERR);
@@ -945,8 +1015,7 @@ 
 			}
 
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			print $this->db->error();
 		}
@@ -975,8 +1044,7 @@ 
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -1003,12 +1071,20 @@ 
         $label = '<u>' . $langs->trans("ShowContact") . '</u>';
         $label.= '<br><b>' . $langs->trans("Name") . ':</b> '.$this->getFullName($langs);
         //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
-        if (! empty($this->poste)) $label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
+        if (! empty($this->poste)) {
+        	$label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
+        }
         $label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
         $phonelist=array();
-        if ($this->phone_pro) $phonelist[]=$this->phone_pro;
-        if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;
-        if ($this->phone_perso) $phonelist[]=$this->phone_perso;
+        if ($this->phone_pro) {
+        	$phonelist[]=$this->phone_pro;
+        }
+        if ($this->phone_mobile) {
+        	$phonelist[]=$this->phone_mobile;
+        }
+        if ($this->phone_perso) {
+        	$phonelist[]=$this->phone_perso;
+        }
         $label.= '<br><b>' . $langs->trans("Phone") . ':</b> '.join(', ',$phonelist);
         $label.= '<br><b>' . $langs->trans("Address") . ':</b> '.dol_format_address($this, 1, ' ', $langs);
 
@@ -1018,8 +1094,12 @@ 
         {
         	// Add param to save lastsearch_values or not
         	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+        		$add_save_lastsearch_values=1;
+        	}
+        	if ($add_save_lastsearch_values) {
+        		$url.='&save_lastsearch_values=1';
+        	}
         }
 
         $url .= $moreparam;
@@ -1042,7 +1122,9 @@ 
 		$hookmanager->initHooks(array('contactdao'));
 		$parameters=array('id'=>$this->id);
 		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$linkclose = $hookmanager->resPrint;
+		}
 
 		$linkstart.=$linkclose;
 		$linkend='</a>';
@@ -1053,7 +1135,9 @@ 
 			$linkend='</a>';
 		}
 
-	        if ($withpicto) $result.=($linkstart.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
+	        if ($withpicto) {
+	        	$result.=($linkstart.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
+	        }
 			$result.=$linkstart.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend;
 		return $result;
 	}
@@ -1069,7 +1153,9 @@ 
 		$langs->load("dict");
 
 		$code=(! empty($this->civility_id)?$this->civility_id:(! empty($this->civilite_id)?$this->civilite_id:''));
-		if (empty($code)) return '';
+		if (empty($code)) {
+			return '';
+		}
         return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
 	}
 
@@ -1097,34 +1183,47 @@ 
 
 		if ($mode == 0)
 		{
-			if ($statut==0 || $statut==5) return $langs->trans('Disabled');
-			elseif ($statut==1 || $statut==4) return $langs->trans('Enabled');
-		}
-		elseif ($mode == 1)
+			if ($statut==0 || $statut==5) {
+				return $langs->trans('Disabled');
+			} elseif ($statut==1 || $statut==4) {
+				return $langs->trans('Enabled');
+			}
+		} elseif ($mode == 1)
 		{
-			if ($statut==0 || $statut==5) return $langs->trans('Disabled');
-			elseif ($statut==1 || $statut==4) return $langs->trans('Enabled');
-		}
-		elseif ($mode == 2)
+			if ($statut==0 || $statut==5) {
+				return $langs->trans('Disabled');
+			} elseif ($statut==1 || $statut==4) {
+				return $langs->trans('Enabled');
+			}
+		} elseif ($mode == 2)
 		{
-			if ($statut==0 || $statut==5) return img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
-			elseif ($statut==1 || $statut==4) return img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
+			if ($statut==0 || $statut==5) {
+				return img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
+			} elseif ($statut==1 || $statut==4) {
+				return img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
+			}
 
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
-			if ($statut==0 || $statut==5) return img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"');
-			elseif ($statut==1 || $statut==4) return img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"');
-		}
-		elseif ($mode == 4)
+			if ($statut==0 || $statut==5) {
+				return img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"');
+			} elseif ($statut==1 || $statut==4) {
+				return img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
-			elseif ($statut==1 || $statut==4) return img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
-		}
-		elseif ($mode == 5)
+			if ($statut==0) {
+				return img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
+			} elseif ($statut==1 || $statut==4) {
+				return img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
+			}
+		} elseif ($mode == 5)
 		{
-			if ($statut==0 || $statut==5) return '<span class="hideonsmartphone">'.$langs->trans('Disabled').' </span>'.img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"');
-			elseif ($statut==1 || $statut==4) return '<span class="hideonsmartphone">'.$langs->trans('Enabled').' </span>'.img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"');
+			if ($statut==0 || $statut==5) {
+				return '<span class="hideonsmartphone">'.$langs->trans('Disabled').' </span>'.img_picto($langs->trans('Disabled'),'statut5', 'class="pictostatus"');
+			} elseif ($statut==1 || $statut==4) {
+				return '<span class="hideonsmartphone">'.$langs->trans('Enabled').' </span>'.img_picto($langs->trans('Enabled'),'statut4', 'class="pictostatus"');
+			}
 		}
 	}
 
@@ -1138,8 +1237,11 @@ 
 	function LibPubPriv($statut)
 	{
 		global $langs;
-		if ($statut=='1') return $langs->trans('ContactPrivate');
-		else return $langs->trans('ContactPublic');
+		if ($statut=='1') {
+			return $langs->trans('ContactPrivate');
+		} else {
+			return $langs->trans('ContactPublic');
+		}
 	}
 
 
@@ -1159,7 +1261,9 @@ 
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $socid=$obj->rowid;
+			if ($obj) {
+				$socid=$obj->rowid;
+			}
 		}
 
 		// Initialise parameters
@@ -1201,8 +1305,11 @@ 
 		$error=0;
 
 		// Check parameters
-		if ($this->statut == $statut) return 0;
-		else $this->statut = $statut;
+		if ($this->statut == $statut) {
+			return 0;
+		} else {
+			$this->statut = $statut;
+		}
 
 		$this->db->begin();
 
@@ -1225,8 +1332,7 @@ 
 		{
 			$this->db->rollback();
 			return -$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

htdocs/commande/class/api_deprecated_commande.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
      * @param int		$limit		Limit for list
      * @param int		$page		Page number
      * @param int		$mode		Use this param to filter list
-     * @param string	$societe	Thirdparty filter field
+     * @param integer	$societe	Thirdparty filter field
      *
      * @url     GET     /order/list
      * @return  array   Array of order objects

Indentation +437 added lines, -437 removed lines

@@ -34,506 +34,506 @@
 class CommandeApi extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid'
-    );
-
-    /**
-     * @var Commande $commande {@type Commande}
-     */
-    public $commande;
-
-    /**
-     * Constructor <b>Warning: Deprecated</b>
-     *
-     * @url     GET order/
-     *
-     */
-    function __construct()
-    {
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid'
+	);
+
+	/**
+	 * @var Commande $commande {@type Commande}
+	 */
+	public $commande;
+
+	/**
+	 * Constructor <b>Warning: Deprecated</b>
+	 *
+	 * @url     GET order/
+	 *
+	 */
+	function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
-        $this->commande = new Commande($this->db);
-    }
-
-    /**
-     * Get properties of a commande object <b>Warning: Deprecated</b>
-     *
-     * Return an array with commande informations
-     *
-     * @param       int         $id         ID of order
-     * @param		string		$ref		Ref of object
-     * @param		string		$ref_ext		External reference of object
-     * @param		string		$ref_int		Internal reference of other object
-     * @return 	array|mixed data without useless information
-	 *
-     * @url	GET order/{id}
-     * @throws 	RestException
-     */
-    function get($id='',$ref='', $ref_ext='', $ref_int='')
-    {
+		$this->commande = new Commande($this->db);
+	}
+
+	/**
+	 * Get properties of a commande object <b>Warning: Deprecated</b>
+	 *
+	 * Return an array with commande informations
+	 *
+	 * @param       int         $id         ID of order
+	 * @param		string		$ref		Ref of object
+	 * @param		string		$ref_ext		External reference of object
+	 * @param		string		$ref_int		Internal reference of other object
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url	GET order/{id}
+	 * @throws 	RestException
+	 */
+	function get($id='',$ref='', $ref_ext='', $ref_int='')
+	{
 		if(! DolibarrApiAccess::$user->rights->commande->lire) {
 			throw new RestException(401);
 		}
 
-        $result = $this->commande->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $this->commande->fetchObjectLinked();
+		$this->commande->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->commande);
-    }
-
-    /**
-     * List orders <b>Warning: Deprecated</b>
-     *
-     * Get a list of orders
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param int		$mode		Use this param to filter list
-     * @param string	$societe	Thirdparty filter field
-     *
-     * @url     GET     /order/list
-     * @return  array   Array of order objects
-     */
-    function getList($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $mode=0, $societe = 0) {
-        global $db, $conf;
-
-        $obj_ret = array();
-        // case of external user, $societe param is ignored and replaced by user's socid
-        $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $societe;
-
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-
-        $sql = "SELECT s.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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."commande as s";
-
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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
+	}
+
+	/**
+	 * List orders <b>Warning: Deprecated</b>
+	 *
+	 * Get a list of orders
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param int		$mode		Use this param to filter list
+	 * @param string	$societe	Thirdparty filter field
+	 *
+	 * @url     GET     /order/list
+	 * @return  array   Array of order objects
+	 */
+	function getList($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $mode=0, $societe = 0) {
+		global $db, $conf;
+
+		$obj_ret = array();
+		// case of external user, $societe param is ignored and replaced by user's socid
+		$socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $societe;
+
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+
+		$sql = "SELECT s.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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."commande as s";
+
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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
 
 		// Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
-
-        $sql.= ' WHERE s.entity IN ('.getEntity('commande').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
-        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
-        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-
-        $nbtotalofrecords = '';
-        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-        {
-            $result = $db->query($sql);
-            $nbtotalofrecords = $db->num_rows($result);
-        }
-
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-
-        if ($result)
-        {
-        	$i=0;
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $commande_static = new Commande($db);
-                if($commande_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($commande_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No commande found');
-        }
+		//if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
+		//if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
+
+		$sql.= ' WHERE s.entity IN ('.getEntity('commande').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
+		if ($socid) $sql.= " AND s.fk_soc = ".$socid;
+		if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+
+		$nbtotalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $db->query($sql);
+			$nbtotalofrecords = $db->num_rows($result);
+		}
+
+		$sql.= $db->order($sortfield, $sortorder);
+		if ($limit)	{
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql.= $db->plimit($limit + 1, $offset);
+		}
+
+		$result = $db->query($sql);
+
+		if ($result)
+		{
+			$i=0;
+			$num = $db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $db->fetch_object($result);
+				$commande_static = new Commande($db);
+				if($commande_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($commande_static);
+				}
+				$i++;
+			}
+		}
+		else {
+			throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
+		}
+		if( ! count($obj_ret)) {
+			throw new RestException(404, 'No commande found');
+		}
 		return $obj_ret;
-    }
-
-    /**
-     * List orders for specific thirdparty <b>Warning: Deprecated</b>
-     *
-     * Get a list of orders
-     *
-     * @param int	$socid Id of customer
-     *
-     * @url     GET     /customer/{socid}/order/list
-     * @url     GET     /thirdparty/{socid}/order/list
-     * @return  array   Array of order objects
-     */
-    function getListForSoc($socid = 0) {
-      return $this->getList(0,"s.rowid","ASC",0,0,$socid);
-    }
-
-
-    /**
-     * Create order object <b>Warning: Deprecated</b>
-     *
-     * @param   array   $request_data   Request datas
-     *
-     * @url     POST    order/
-     *
-     * @return  int     ID of commande
-     */
-    function post($request_data = NULL)
-    {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+	}
+
+	/**
+	 * List orders for specific thirdparty <b>Warning: Deprecated</b>
+	 *
+	 * Get a list of orders
+	 *
+	 * @param int	$socid Id of customer
+	 *
+	 * @url     GET     /customer/{socid}/order/list
+	 * @url     GET     /thirdparty/{socid}/order/list
+	 * @return  array   Array of order objects
+	 */
+	function getListForSoc($socid = 0) {
+	  return $this->getList(0,"s.rowid","ASC",0,0,$socid);
+	}
+
+
+	/**
+	 * Create order object <b>Warning: Deprecated</b>
+	 *
+	 * @param   array   $request_data   Request datas
+	 *
+	 * @url     POST    order/
+	 *
+	 * @return  int     ID of commande
+	 */
+	function post($request_data = NULL)
+	{
+	  if(! DolibarrApiAccess::$user->rights->commande->creer) {
 			  throw new RestException(401, "Insuffisant rights");
 		  }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-
-        foreach($request_data as $field => $value) {
-            $this->commande->$field = $value;
-        }
-        if (isset($request_data["lines"])) {
-          $lines = array();
-          foreach ($request_data["lines"] as $line) {
-            array_push($lines, (object) $line);
-          }
-          $this->commande->lines = $lines;
-        }
-        if(! $this->commande->create(DolibarrApiAccess::$user) ) {
-            throw new RestException(500, "Error while creating order");
-        }
-
-        return $this->commande->id;
-    }
-    /**
-     * Get lines of an order <b>Warning: Deprecated</b>
-     *
-     *
-     * @param int   $id             Id of order
-     *
-     * @url	GET order/{id}/line/list
-     *
-     * @return int
-     */
-    function getLines($id) {
-      if(! DolibarrApiAccess::$user->rights->commande->lire) {
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		foreach($request_data as $field => $value) {
+			$this->commande->$field = $value;
+		}
+		if (isset($request_data["lines"])) {
+		  $lines = array();
+		  foreach ($request_data["lines"] as $line) {
+			array_push($lines, (object) $line);
+		  }
+		  $this->commande->lines = $lines;
+		}
+		if(! $this->commande->create(DolibarrApiAccess::$user) ) {
+			throw new RestException(500, "Error while creating order");
+		}
+
+		return $this->commande->id;
+	}
+	/**
+	 * Get lines of an order <b>Warning: Deprecated</b>
+	 *
+	 *
+	 * @param int   $id             Id of order
+	 *
+	 * @url	GET order/{id}/line/list
+	 *
+	 * @return int
+	 */
+	function getLines($id) {
+	  if(! DolibarrApiAccess::$user->rights->commande->lire) {
 		  	throw new RestException(401);
 		  }
 
-      $result = $this->commande->fetch($id);
-      if( ! $result ) {
-         throw new RestException(404, 'Commande not found');
-      }
+	  $result = $this->commande->fetch($id);
+	  if( ! $result ) {
+		 throw new RestException(404, 'Commande not found');
+	  }
 
 		  if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
-      $this->commande->getLinesArray();
-      $result = array();
-      foreach ($this->commande->lines as $line) {
-        array_push($result,$this->_cleanObjectDatas($line));
-      }
-      return $result;
-    }
-    /**
-     * Add a line to given order <b>Warning: Deprecated</b>
-     *
-     *
-     * @param int   $id             Id of commande to update
-     * @param array $request_data   Orderline data
-     *
-     * @url	POST order/{id}/line
-     *
-     * @return int
-     */
-    function postLine($id, $request_data = NULL) {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+	  }
+	  $this->commande->getLinesArray();
+	  $result = array();
+	  foreach ($this->commande->lines as $line) {
+		array_push($result,$this->_cleanObjectDatas($line));
+	  }
+	  return $result;
+	}
+	/**
+	 * Add a line to given order <b>Warning: Deprecated</b>
+	 *
+	 *
+	 * @param int   $id             Id of commande to update
+	 * @param array $request_data   Orderline data
+	 *
+	 * @url	POST order/{id}/line
+	 *
+	 * @return int
+	 */
+	function postLine($id, $request_data = NULL) {
+	  if(! DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
 
-      $result = $this->commande->fetch($id);
-      if( ! $result ) {
-         throw new RestException(404, 'Commande not found');
-      }
+	  $result = $this->commande->fetch($id);
+	  if( ! $result ) {
+		 throw new RestException(404, 'Commande not found');
+	  }
 
 		  if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
+	  }
 			$request_data = (object) $request_data;
-      $updateRes = $this->commande->addline(
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        $request_data->fk_product,
-                        $request_data->remise_percent,
-                        $request_data->info_bits,
-                        $request_data->fk_remise_except,
-                        'HT',
-                        0,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->rang,
-                        $request_data->special_code,
-                        $fk_parent_line,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $this->element,
-                        $request_data->id
-      );
-
-      if ($updateRes > 0) {
-        return $this->get($id)->line->rowid;
-
-      }
-      return false;
-    }
-    /**
-     * Update a line to given order <b>Warning: Deprecated</b>
-     *
-     *
-     * @param int   $id             Id of commande to update
-     * @param int   $lineid         Id of line to update
-     * @param array $request_data   Orderline data
-     *
-     * @url	PUT order/{id}/line/{lineid}
-     *
-     * @return object
-     */
-    function putLine($id, $lineid, $request_data = NULL) {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+	  $updateRes = $this->commande->addline(
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						$request_data->fk_product,
+						$request_data->remise_percent,
+						$request_data->info_bits,
+						$request_data->fk_remise_except,
+						'HT',
+						0,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+						$fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$this->element,
+						$request_data->id
+	  );
+
+	  if ($updateRes > 0) {
+		return $this->get($id)->line->rowid;
+
+	  }
+	  return false;
+	}
+	/**
+	 * Update a line to given order <b>Warning: Deprecated</b>
+	 *
+	 *
+	 * @param int   $id             Id of commande to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   Orderline data
+	 *
+	 * @url	PUT order/{id}/line/{lineid}
+	 *
+	 * @return object
+	 */
+	function putLine($id, $lineid, $request_data = NULL) {
+	  if(! DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
 
-      $result = $this->commande->fetch($id);
-      if( ! $result ) {
-         throw new RestException(404, 'Commande not found');
-      }
+	  $result = $this->commande->fetch($id);
+	  if( ! $result ) {
+		 throw new RestException(404, 'Commande not found');
+	  }
 
 		  if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
+	  }
 			$request_data = (object) $request_data;
-      $updateRes = $this->commande->updateline(
-                        $lineid,
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->remise_percent,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        'HT',
-                        $request_data->info_bits,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->fk_parent_line,
-                        0,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->special_code,
-                        $request_data->array_options,
-                        $request_data->fk_unit
-      );
-
-      if ($updateRes > 0) {
-        $result = $this->get($id);
-        unset($result->line);
-        return $this->_cleanObjectDatas($result);
-      }
-      return false;
-    }
-    /**
-     * Delete a line to given order <b>Warning: Deprecated</b>
-     *
-     *
-     * @param int   $id             Id of commande to update
-     * @param int   $lineid         Id of line to delete
-     *
-     * @url	DELETE order/{id}/line/{lineid}
-     *
-     * @return int
-     */
-    function delLine($id, $lineid) {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+	  $updateRes = $this->commande->updateline(
+						$lineid,
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->remise_percent,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						'HT',
+						$request_data->info_bits,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->fk_parent_line,
+						0,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->special_code,
+						$request_data->array_options,
+						$request_data->fk_unit
+	  );
+
+	  if ($updateRes > 0) {
+		$result = $this->get($id);
+		unset($result->line);
+		return $this->_cleanObjectDatas($result);
+	  }
+	  return false;
+	}
+	/**
+	 * Delete a line to given order <b>Warning: Deprecated</b>
+	 *
+	 *
+	 * @param int   $id             Id of commande to update
+	 * @param int   $lineid         Id of line to delete
+	 *
+	 * @url	DELETE order/{id}/line/{lineid}
+	 *
+	 * @return int
+	 */
+	function delLine($id, $lineid) {
+	  if(! DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
 
-      $result = $this->commande->fetch($id);
-      if( ! $result ) {
-         throw new RestException(404, 'Commande not found');
-      }
+	  $result = $this->commande->fetch($id);
+	  if( ! $result ) {
+		 throw new RestException(404, 'Commande not found');
+	  }
 
 		  if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
+	  }
 			$request_data = (object) $request_data;
-      $updateRes = $this->commande->deleteline(DolibarrApiAccess::$user,$lineid);
-      if ($updateRes == 1) {
-        return $this->get($id);
-      }
-      return false;
-    }
-
-    /**
-     * Update order general fields (won't touch lines of order) <b>Warning: Deprecated</b>
-     *
-     * @param int   $id             Id of commande to update
-     * @param array $request_data   Datas
-     *
-     * @url	PUT order/{id}
-     *
-     * @return int
-     */
-    function put($id, $request_data = NULL) {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+	  $updateRes = $this->commande->deleteline(DolibarrApiAccess::$user,$lineid);
+	  if ($updateRes == 1) {
+		return $this->get($id);
+	  }
+	  return false;
+	}
+
+	/**
+	 * Update order general fields (won't touch lines of order) <b>Warning: Deprecated</b>
+	 *
+	 * @param int   $id             Id of commande to update
+	 * @param array $request_data   Datas
+	 *
+	 * @url	PUT order/{id}
+	 *
+	 * @return int
+	 */
+	function put($id, $request_data = NULL) {
+	  if(! DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
 
-        $result = $this->commande->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Commande not found');
-        }
+		$result = $this->commande->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Commande not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->commande->$field = $value;
-        }
-
-        if($this->commande->update($id, DolibarrApiAccess::$user,1,'','','update'))
-            return $this->get($id);
-
-        return false;
-    }
-
-    /**
-     * Delete order <b>Warning: Deprecated</b>
-     *
-     * @param   int     $id         Order ID
-     *
-     * @url     DELETE  order/{id}
-     *
-     * @return  array
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->commande->supprimer) {
+		foreach($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->commande->$field = $value;
+		}
+
+		if($this->commande->update($id, DolibarrApiAccess::$user,1,'','','update'))
+			return $this->get($id);
+
+		return false;
+	}
+
+	/**
+	 * Delete order <b>Warning: Deprecated</b>
+	 *
+	 * @param   int     $id         Order ID
+	 *
+	 * @url     DELETE  order/{id}
+	 *
+	 * @return  array
+	 */
+	function delete($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->commande->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->commande->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( ! $this->commande->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete order : '.$this->commande->error);
-        }
-
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Order deleted'
-            )
-        );
-
-    }
-
-    /**
-     * Validate an order <b>Warning: Deprecated</b>
-     *
-     * @param   int $id             Order ID
-     * @param   int $idwarehouse    Warehouse ID
-     *
-     * @url GET     order/{id}/validate
-     * @url POST    order/{id}/validate
-     *
-     * @return  array
-     *
-     */
-    function validOrder($id, $idwarehouse=0)
-    {
-        if(! DolibarrApiAccess::$user->rights->commande->creer) {
+		if( ! $this->commande->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete order : '.$this->commande->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order deleted'
+			)
+		);
+
+	}
+
+	/**
+	 * Validate an order <b>Warning: Deprecated</b>
+	 *
+	 * @param   int $id             Order ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 *
+	 * @url GET     order/{id}/validate
+	 * @url POST    order/{id}/validate
+	 *
+	 * @return  array
+	 *
+	 */
+	function validOrder($id, $idwarehouse=0)
+	{
+		if(! DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
 		}
-        $result = $this->commande->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( ! $this->commande->valid(DolibarrApiAccess::$user, $idwarehouse)) {
-            throw new RestException(500, 'Error when validate order');
-        }
-
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Order validated'
-            )
-        );
-    }
-
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    function _validate($data)
-    {
-        $commande = array();
-        foreach (CommandeApi::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $commande[$field] = $data[$field];
-
-        }
-        return $commande;
-    }
+		if( ! $this->commande->valid(DolibarrApiAccess::$user, $idwarehouse)) {
+			throw new RestException(500, 'Error when validate order');
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order validated'
+			)
+		);
+	}
+
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	function _validate($data)
+	{
+		$commande = array();
+		foreach (CommandeApi::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$commande[$field] = $data[$field];
+
+		}
+		return $commande;
+	}
 }

Spacing +50 added lines, -50 removed lines

@@ -73,18 +73,18 @@ 
      * @url	GET order/{id}
      * @throws 	RestException
      */
-    function get($id='',$ref='', $ref_ext='', $ref_int='')
+    function get($id = '', $ref = '', $ref_ext = '', $ref_int = '')
     {
-		if(! DolibarrApiAccess::$user->rights->commande->lire) {
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
 			throw new RestException(401);
 		}
 
         $result = $this->commande->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Order not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -107,7 +107,7 @@ 
      * @url     GET     /order/list
      * @return  array   Array of order objects
      */
-    function getList($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $mode=0, $societe = 0) {
+    function getList($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $mode = 0, $societe = 0) {
         global $db, $conf;
 
         $obj_ret = array();
@@ -116,22 +116,22 @@ 
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT s.rowid";
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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."commande as s";
+        $sql .= " FROM ".MAIN_DB_PREFIX."commande as s";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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
 
 		// Example of use $mode
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        $sql.= ' WHERE s.entity IN ('.getEntity('commande').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
-        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
-        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        $sql .= ' WHERE s.entity IN ('.getEntity('commande').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND s.fk_soc = sc.fk_soc";
+        if ($socid) $sql .= " AND s.fk_soc = ".$socid;
+        if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 
         // Insert sale filter
         if ($search_sale > 0)
@@ -146,29 +146,29 @@ 
             $nbtotalofrecords = $db->num_rows($result);
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         $result = $db->query($sql);
 
         if ($result)
         {
-        	$i=0;
+        	$i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $commande_static = new Commande($db);
-                if($commande_static->fetch($obj->rowid)) {
+                if ($commande_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($commande_static);
                 }
                 $i++;
@@ -177,7 +177,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No commande found');
         }
 		return $obj_ret;
@@ -195,7 +195,7 @@ 
      * @return  array   Array of order objects
      */
     function getListForSoc($socid = 0) {
-      return $this->getList(0,"s.rowid","ASC",0,0,$socid);
+      return $this->getList(0, "s.rowid", "ASC", 0, 0, $socid);
     }
 
 
@@ -210,13 +210,13 @@ 
      */
     function post($request_data = NULL)
     {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+      if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			  throw new RestException(401, "Insuffisant rights");
 		  }
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             $this->commande->$field = $value;
         }
         if (isset($request_data["lines"])) {
@@ -226,7 +226,7 @@ 
           }
           $this->commande->lines = $lines;
         }
-        if(! $this->commande->create(DolibarrApiAccess::$user) ) {
+        if (!$this->commande->create(DolibarrApiAccess::$user)) {
             throw new RestException(500, "Error while creating order");
         }
 
@@ -243,22 +243,22 @@ 
      * @return int
      */
     function getLines($id) {
-      if(! DolibarrApiAccess::$user->rights->commande->lire) {
+      if (!DolibarrApiAccess::$user->rights->commande->lire) {
 		  	throw new RestException(401);
 		  }
 
       $result = $this->commande->fetch($id);
-      if( ! $result ) {
+      if (!$result) {
          throw new RestException(404, 'Commande not found');
       }
 
-		  if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+		  if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
       $this->commande->getLinesArray();
       $result = array();
       foreach ($this->commande->lines as $line) {
-        array_push($result,$this->_cleanObjectDatas($line));
+        array_push($result, $this->_cleanObjectDatas($line));
       }
       return $result;
     }
@@ -274,16 +274,16 @@ 
      * @return int
      */
     function postLine($id, $request_data = NULL) {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+      if (!DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
 
       $result = $this->commande->fetch($id);
-      if( ! $result ) {
+      if (!$result) {
          throw new RestException(404, 'Commande not found');
       }
 
-		  if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+		  if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
 			$request_data = (object) $request_data;
@@ -334,16 +334,16 @@ 
      * @return object
      */
     function putLine($id, $lineid, $request_data = NULL) {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+      if (!DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
 
       $result = $this->commande->fetch($id);
-      if( ! $result ) {
+      if (!$result) {
          throw new RestException(404, 'Commande not found');
       }
 
-		  if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+		  if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
 			$request_data = (object) $request_data;
@@ -390,20 +390,20 @@ 
      * @return int
      */
     function delLine($id, $lineid) {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+      if (!DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
 
       $result = $this->commande->fetch($id);
-      if( ! $result ) {
+      if (!$result) {
          throw new RestException(404, 'Commande not found');
       }
 
-		  if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+		  if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
       }
 			$request_data = (object) $request_data;
-      $updateRes = $this->commande->deleteline(DolibarrApiAccess::$user,$lineid);
+      $updateRes = $this->commande->deleteline(DolibarrApiAccess::$user, $lineid);
       if ($updateRes == 1) {
         return $this->get($id);
       }
@@ -421,24 +421,24 @@ 
      * @return int
      */
     function put($id, $request_data = NULL) {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+      if (!DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
 
         $result = $this->commande->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Commande not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->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->commande->$field = $value;
         }
 
-        if($this->commande->update($id, DolibarrApiAccess::$user,1,'','','update'))
+        if ($this->commande->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
             return $this->get($id);
 
         return false;
@@ -455,19 +455,19 @@ 
      */
     function delete($id)
     {
-        if(! DolibarrApiAccess::$user->rights->commande->supprimer) {
+        if (!DolibarrApiAccess::$user->rights->commande->supprimer) {
 			throw new RestException(401);
 		}
         $result = $this->commande->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Order not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( ! $this->commande->delete(DolibarrApiAccess::$user)) {
+        if (!$this->commande->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when delete order : '.$this->commande->error);
         }
 
@@ -492,21 +492,21 @@ 
      * @return  array
      *
      */
-    function validOrder($id, $idwarehouse=0)
+    function validOrder($id, $idwarehouse = 0)
     {
-        if(! DolibarrApiAccess::$user->rights->commande->creer) {
+        if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
 		}
         $result = $this->commande->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Order not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( ! $this->commande->valid(DolibarrApiAccess::$user, $idwarehouse)) {
+        if (!$this->commande->valid(DolibarrApiAccess::$user, $idwarehouse)) {
             throw new RestException(500, 'Error when validate order');
         }
 

Braces +31 added lines, -13 removed lines

@@ -116,22 +116,37 @@ 
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+        	$search_sale = DolibarrApiAccess::$user->id;
+        }
 
         $sql = "SELECT s.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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."commande as s";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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
 
 		// Example of use $mode
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
         $sql.= ' WHERE s.entity IN ('.getEntity('commande').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
-        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
-        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+        	$sql.= " AND s.fk_soc = sc.fk_soc";
+        }
+        if ($socid) {
+        	$sql.= " AND s.fk_soc = ".$socid;
+        }
+        if ($search_sale > 0) {
+        	$sql.= " AND s.rowid = sc.fk_soc";
+        }
+        // Join for the needed table to filter by sale
 
         // Insert sale filter
         if ($search_sale > 0)
@@ -173,8 +188,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
         }
         if( ! count($obj_ret)) {
@@ -434,12 +448,15 @@ 
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+            	continue;
+            }
             $this->commande->$field = $value;
         }
 
-        if($this->commande->update($id, DolibarrApiAccess::$user,1,'','','update'))
-            return $this->get($id);
+        if($this->commande->update($id, DolibarrApiAccess::$user,1,'','','update')) {
+                    return $this->get($id);
+        }
 
         return false;
     }
@@ -529,8 +546,9 @@ 
     {
         $commande = array();
         foreach (CommandeApi::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $commande[$field] = $data[$field];
 
         }