Dolibarr / dolibarr

htdocs/public/donations/donateurs_code.php

Spacing +11 added lines, -11 removed lines

@@ -21,8 +21,8 @@ 
  *		\brief      Page to list donators
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+define("NOLOGIN", 1); // This means this output page does not require to be logged.
+define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 // C'est un wrapper, donc header vierge
 /**
@@ -39,10 +39,10 @@ 
 function llxFooterVierge() { print '</body></html>'; }
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT .'/don/class/don.class.php';
+require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 // Security check
-if (empty($conf->don->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->don->enabled)) accessforbidden('', 0, 0, 1);
 
 
 $langs->load("donations");
@@ -55,10 +55,10 @@ 
 llxHeaderVierge();
 
 $sql = "SELECT d.datedon as datedon, d.lastname, d.firstname, d.amount, d.public, d.societe";
-$sql.= " FROM ".MAIN_DB_PREFIX."don as d";
-$sql.= " WHERE d.fk_statut in (2, 3) ORDER BY d.datedon DESC";
+$sql .= " FROM ".MAIN_DB_PREFIX."don as d";
+$sql .= " WHERE d.fk_statut in (2, 3) ORDER BY d.datedon DESC";
 
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -73,9 +73,9 @@ 
 		print "<td align=\"right\">".$langs->trans("Amount")."</TD>";
 		print "</TR>\n";
 
-		$var=True;
-		$bc[1]='bgcolor="#f5f5f5"';
-		$bc[0]='bgcolor="#f0f0f0"';
+		$var = True;
+		$bc[1] = 'bgcolor="#f5f5f5"';
+		$bc[0] = 'bgcolor="#f0f0f0"';
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
@@ -91,7 +91,7 @@ 
 				print "<td>Anonyme Anonyme</td>\n";
 			}
 			print "<td>".dol_print_date($db->jdate($objp->datedon))."</td>\n";
-			print '<td align="right">'.number_format($objp->amount,2,'.',' ').' '.$langs->trans("Currency".$conf->currency).'</td>';
+			print '<td align="right">'.number_format($objp->amount, 2, '.', ' ').' '.$langs->trans("Currency".$conf->currency).'</td>';
 			print "</tr>";
 			$i++;
 		}

Braces +6 added lines, -7 removed lines

@@ -42,7 +42,9 @@ 
 require_once DOL_DOCUMENT_ROOT .'/don/class/don.class.php';
 
 // Security check
-if (empty($conf->don->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->don->enabled)) {
+	accessforbidden('',0,0,1);
+}
 
 
 $langs->load("donations");
@@ -85,8 +87,7 @@ 
 			if ($objp->public)
 			{
 				print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe."</td>\n";
-			}
-			else
+			} else
 			{
 				print "<td>Anonyme Anonyme</td>\n";
 			}
@@ -97,13 +98,11 @@ 
 		}
 		print "</table>";
 
-	}
-	else
+	} else
 	{
 		print "Aucun don publique";
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 }

htdocs/webservices/server_user.php

Indentation +128 added lines, -128 removed lines

@@ -38,11 +38,11 @@ 
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -56,70 +56,70 @@ 
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-    	'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+		'login' => array('name'=>'login','type'=>'xsd:string'),
+		'password' => array('name'=>'password','type'=>'xsd:string'),
+		'entity' => array('name'=>'entity','type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+	)
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'user',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'element' => array('name'=>'element','type'=>'xsd:string'),
-        'id' => array('name'=>'id','type'=>'xsd:string'),
-        'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
-        'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
-        'note' => array('name'=>'note','type'=>'xsd:string'),
-        'email' => array('name'=>'email','type'=>'xsd:string'),
-        'signature' => array('name'=>'signature','type'=>'xsd:string'),
-        'office_phone' => array('name'=>'office_phone','type'=>'xsd:string'),
-        'office_fax' => array('name'=>'office_fax','type'=>'xsd:string'),
-        'user_mobile' => array('name'=>'user_mobile','type'=>'xsd:string'),
-        'admin' => array('name'=>'admin','type'=>'xsd:string'),
-        'login' => array('name'=>'login','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-        'pass_indatabase' => array('name'=>'pass_indatabase','type'=>'xsd:string'),
-        'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted','type'=>'xsd:string'),
-        'datec' => array('name'=>'datec','type'=>'xsd:dateTime'),
-        'datem' => array('name'=>'datem','type'=>'xsd:dateTime'),
-        'fk_thirdparty' => array('name'=>'fk_thirdparty','type'=>'xsd:string'),
-        'fk_contact' => array('name'=>'fk_contact','type'=>'xsd:string'),
-        'fk_member' => array('name'=>'fk_member','type'=>'xsd:string'),
-        'datelastlogin' => array('name'=>'datelastlogin','type'=>'xsd:dateTime'),
-        'datepreviouslogin' => array('name'=>'datepreviouslogin','type'=>'xsd:dateTime'),
-        'statut' => array('name'=>'statut','type'=>'xsd:string'),
-        'photo' => array('name'=>'photo','type'=>'xsd:string'),
-        'lang' => array('name'=>'lang','type'=>'xsd:string'),
-        'entrepots' => array('name'=>'entrepots','type'=>'xsd:string'),
-        //'rights' => array('name'=>'rights','type'=>'xsd:string'),
-        'canvas' => array('name'=>'canvas','type'=>'xsd:string')
-    )
+	'user',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'element' => array('name'=>'element','type'=>'xsd:string'),
+		'id' => array('name'=>'id','type'=>'xsd:string'),
+		'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
+		'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
+		'note' => array('name'=>'note','type'=>'xsd:string'),
+		'email' => array('name'=>'email','type'=>'xsd:string'),
+		'signature' => array('name'=>'signature','type'=>'xsd:string'),
+		'office_phone' => array('name'=>'office_phone','type'=>'xsd:string'),
+		'office_fax' => array('name'=>'office_fax','type'=>'xsd:string'),
+		'user_mobile' => array('name'=>'user_mobile','type'=>'xsd:string'),
+		'admin' => array('name'=>'admin','type'=>'xsd:string'),
+		'login' => array('name'=>'login','type'=>'xsd:string'),
+		'entity' => array('name'=>'entity','type'=>'xsd:string'),
+		'pass_indatabase' => array('name'=>'pass_indatabase','type'=>'xsd:string'),
+		'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted','type'=>'xsd:string'),
+		'datec' => array('name'=>'datec','type'=>'xsd:dateTime'),
+		'datem' => array('name'=>'datem','type'=>'xsd:dateTime'),
+		'fk_thirdparty' => array('name'=>'fk_thirdparty','type'=>'xsd:string'),
+		'fk_contact' => array('name'=>'fk_contact','type'=>'xsd:string'),
+		'fk_member' => array('name'=>'fk_member','type'=>'xsd:string'),
+		'datelastlogin' => array('name'=>'datelastlogin','type'=>'xsd:dateTime'),
+		'datepreviouslogin' => array('name'=>'datepreviouslogin','type'=>'xsd:dateTime'),
+		'statut' => array('name'=>'statut','type'=>'xsd:string'),
+		'photo' => array('name'=>'photo','type'=>'xsd:string'),
+		'lang' => array('name'=>'lang','type'=>'xsd:string'),
+		'entrepots' => array('name'=>'entrepots','type'=>'xsd:string'),
+		//'rights' => array('name'=>'rights','type'=>'xsd:string'),
+		'canvas' => array('name'=>'canvas','type'=>'xsd:string')
+	)
 );
 
 // Define other specific objects
@@ -237,16 +237,16 @@ 
 
 // Register WSDL
 $server->register(
-    'getUser',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','user'=>'tns:user'),
-    $ns,
-    $ns.'#getUser',
-    $styledoc,
-    $styleuse,
-    'WS to get user'
+	'getUser',
+	// Entry values
+	array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','user'=>'tns:user'),
+	$ns,
+	$ns.'#getUser',
+	$styledoc,
+	$styleuse,
+	'WS to get user'
 );
 
 $server->register(
@@ -302,41 +302,41 @@ 
  */
 function getUser($authentication,$id,$ref='',$ref_ext='')
 {
-    global $db,$conf,$langs;
-
-    dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
-
-    if (! $error)
-    {
-        $fuser->getrights();
-
-        if ($fuser->rights->user->user->lire
-        	|| ($fuser->rights->user->self->creer && $id && $id==$fuser->id)
-        	|| ($fuser->rights->user->self->creer && $ref && $ref==$fuser->login)
-        	|| ($fuser->rights->user->self->creer && $ref_ext && $ref_ext==$fuser->ref_ext))
-        {
-            $user=new User($db);
-            $result=$user->fetch($id,$ref,$ref_ext);
-            if ($result > 0)
-            {
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'user'=>array(
+	global $db,$conf,$langs;
+
+	dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	{
+		$error++;
+		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
+
+	if (! $error)
+	{
+		$fuser->getrights();
+
+		if ($fuser->rights->user->user->lire
+			|| ($fuser->rights->user->self->creer && $id && $id==$fuser->id)
+			|| ($fuser->rights->user->self->creer && $ref && $ref==$fuser->login)
+			|| ($fuser->rights->user->self->creer && $ref_ext && $ref_ext==$fuser->ref_ext))
+		{
+			$user=new User($db);
+			$result=$user->fetch($id,$ref,$ref_ext);
+			if ($result > 0)
+			{
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'user'=>array(
 						'id' => $user->id,
 						'lastname' => $user->lastname,
 						'firstname' => $user->firstname,
@@ -363,28 +363,28 @@ 
 						'lang' => $user->lang,
 						//'rights' => $user->rights,
 						'canvas' => $user->canvas
-                    )
-                );
-            }
-            else
-            {
-                $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
+					)
+				);
+			}
+			else
+			{
+				$error++;
+				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+			}
+		}
+		else
+		{
+			$error++;
+			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
 }
 
 /**

Spacing +223 added lines, -223 removed lines

@@ -20,10 +20,10 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
 
 require_once '../master.inc.php';
-require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -40,18 +40,18 @@ 
 {
     $langs->load("admin");
     dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
     print $langs->trans("ToActivateModule");
     exit;
 }
 
 // Create the soap Object
 $server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrUser',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
+$server->soap_defencoding = 'UTF-8';
+$server->decode_utf8 = false;
+$ns = 'http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrUser', $ns);
+$server->wsdl->schemaTargetNamespace = $ns;
 
 
 // Define WSDL Authentication object
@@ -62,11 +62,11 @@ 
     'all',
     '',
     array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-    	'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
+        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
+    	'password' => array('name'=>'password', 'type'=>'xsd:string'),
+        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
     )
 );
 
@@ -78,8 +78,8 @@ 
     'all',
     '',
     array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
     )
 );
 
@@ -91,34 +91,34 @@ 
     'all',
     '',
     array(
-        'element' => array('name'=>'element','type'=>'xsd:string'),
-        'id' => array('name'=>'id','type'=>'xsd:string'),
-        'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
-        'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
-        'note' => array('name'=>'note','type'=>'xsd:string'),
-        'email' => array('name'=>'email','type'=>'xsd:string'),
-        'signature' => array('name'=>'signature','type'=>'xsd:string'),
-        'office_phone' => array('name'=>'office_phone','type'=>'xsd:string'),
-        'office_fax' => array('name'=>'office_fax','type'=>'xsd:string'),
-        'user_mobile' => array('name'=>'user_mobile','type'=>'xsd:string'),
-        'admin' => array('name'=>'admin','type'=>'xsd:string'),
-        'login' => array('name'=>'login','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-        'pass_indatabase' => array('name'=>'pass_indatabase','type'=>'xsd:string'),
-        'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted','type'=>'xsd:string'),
-        'datec' => array('name'=>'datec','type'=>'xsd:dateTime'),
-        'datem' => array('name'=>'datem','type'=>'xsd:dateTime'),
-        'fk_thirdparty' => array('name'=>'fk_thirdparty','type'=>'xsd:string'),
-        'fk_contact' => array('name'=>'fk_contact','type'=>'xsd:string'),
-        'fk_member' => array('name'=>'fk_member','type'=>'xsd:string'),
-        'datelastlogin' => array('name'=>'datelastlogin','type'=>'xsd:dateTime'),
-        'datepreviouslogin' => array('name'=>'datepreviouslogin','type'=>'xsd:dateTime'),
-        'statut' => array('name'=>'statut','type'=>'xsd:string'),
-        'photo' => array('name'=>'photo','type'=>'xsd:string'),
-        'lang' => array('name'=>'lang','type'=>'xsd:string'),
-        'entrepots' => array('name'=>'entrepots','type'=>'xsd:string'),
+        'element' => array('name'=>'element', 'type'=>'xsd:string'),
+        'id' => array('name'=>'id', 'type'=>'xsd:string'),
+        'lastname' => array('name'=>'lastname', 'type'=>'xsd:string'),
+        'firstname' => array('name'=>'firstname', 'type'=>'xsd:string'),
+        'note' => array('name'=>'note', 'type'=>'xsd:string'),
+        'email' => array('name'=>'email', 'type'=>'xsd:string'),
+        'signature' => array('name'=>'signature', 'type'=>'xsd:string'),
+        'office_phone' => array('name'=>'office_phone', 'type'=>'xsd:string'),
+        'office_fax' => array('name'=>'office_fax', 'type'=>'xsd:string'),
+        'user_mobile' => array('name'=>'user_mobile', 'type'=>'xsd:string'),
+        'admin' => array('name'=>'admin', 'type'=>'xsd:string'),
+        'login' => array('name'=>'login', 'type'=>'xsd:string'),
+        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+        'pass_indatabase' => array('name'=>'pass_indatabase', 'type'=>'xsd:string'),
+        'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted', 'type'=>'xsd:string'),
+        'datec' => array('name'=>'datec', 'type'=>'xsd:dateTime'),
+        'datem' => array('name'=>'datem', 'type'=>'xsd:dateTime'),
+        'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:string'),
+        'fk_contact' => array('name'=>'fk_contact', 'type'=>'xsd:string'),
+        'fk_member' => array('name'=>'fk_member', 'type'=>'xsd:string'),
+        'datelastlogin' => array('name'=>'datelastlogin', 'type'=>'xsd:dateTime'),
+        'datepreviouslogin' => array('name'=>'datepreviouslogin', 'type'=>'xsd:dateTime'),
+        'statut' => array('name'=>'statut', 'type'=>'xsd:string'),
+        'photo' => array('name'=>'photo', 'type'=>'xsd:string'),
+        'lang' => array('name'=>'lang', 'type'=>'xsd:string'),
+        'entrepots' => array('name'=>'entrepots', 'type'=>'xsd:string'),
         //'rights' => array('name'=>'rights','type'=>'xsd:string'),
-        'canvas' => array('name'=>'canvas','type'=>'xsd:string')
+        'canvas' => array('name'=>'canvas', 'type'=>'xsd:string')
     )
 );
 
@@ -130,10 +130,10 @@ 
 	'all',
 	'',
 	array(
-	'name' => array('name'=>'name','type'=>'xsd:string'),
-	'id' => array('name'=>'id','type'=>'xsd:string'),
-	'datec' => array('name'=>'datec','type'=>'xsd:string'),
-	'nb' => array('name'=>'nb','type'=>'xsd:string')
+	'name' => array('name'=>'name', 'type'=>'xsd:string'),
+	'id' => array('name'=>'id', 'type'=>'xsd:string'),
+	'datec' => array('name'=>'datec', 'type'=>'xsd:string'),
+	'nb' => array('name'=>'nb', 'type'=>'xsd:string')
 	)
 );
 
@@ -145,61 +145,61 @@ 
 	'SOAP-ENC:Array',
 	array(),
 	array(
-	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:group[]')
+	array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:group[]')
 	),
 	'tns:group'
 );
 
 $thirdpartywithuser_fields = array(
 	// For thirdparty and contact
-	'name' => array('name'=>'name','type'=>'xsd:string'),
-	'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
-	'name_thirdparty' => array('name'=>'name_thirdparty','type'=>'xsd:string'),
-	'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-	'client' => array('name'=>'client','type'=>'xsd:string'),
-	'fournisseur' => array('name'=>'fournisseur','type'=>'xsd:string'),
-	'address' => array('name'=>'address','type'=>'xsd:string'),
-	'zip' => array('name'=>'zip','type'=>'xsd:string'),
-	'town' => array('name'=>'town','type'=>'xsd:string'),
-	'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
-	'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
-	'phone' => array('name'=>'phone','type'=>'xsd:string'),
-	'phone_mobile' => array('name'=>'phone_mobile','type'=>'xsd:string'),
-	'fax' => array('name'=>'fax','type'=>'xsd:string'),
-	'email' => array('name'=>'email','type'=>'xsd:string'),
-	'url' => array('name'=>'url','type'=>'xsd:string'),
-	'profid1' => array('name'=>'profid1','type'=>'xsd:string'),
-	'profid2' => array('name'=>'profid2','type'=>'xsd:string'),
-	'profid3' => array('name'=>'profid3','type'=>'xsd:string'),
-	'profid4' => array('name'=>'profid4','type'=>'xsd:string'),
-	'profid5' => array('name'=>'profid5','type'=>'xsd:string'),
-	'profid6' => array('name'=>'profid6','type'=>'xsd:string'),
-	'capital' => array('name'=>'capital','type'=>'xsd:string'),
-	'tva_assuj' => array('name'=>'tva_assuj','type'=>'xsd:string'),
-	'tva_intra' => array('name'=>'tva_intra','type'=>'xsd:string'),
+	'name' => array('name'=>'name', 'type'=>'xsd:string'),
+	'firstname' => array('name'=>'firstname', 'type'=>'xsd:string'),
+	'name_thirdparty' => array('name'=>'name_thirdparty', 'type'=>'xsd:string'),
+	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+	'client' => array('name'=>'client', 'type'=>'xsd:string'),
+	'fournisseur' => array('name'=>'fournisseur', 'type'=>'xsd:string'),
+	'address' => array('name'=>'address', 'type'=>'xsd:string'),
+	'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
+	'town' => array('name'=>'town', 'type'=>'xsd:string'),
+	'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
+	'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
+	'phone' => array('name'=>'phone', 'type'=>'xsd:string'),
+	'phone_mobile' => array('name'=>'phone_mobile', 'type'=>'xsd:string'),
+	'fax' => array('name'=>'fax', 'type'=>'xsd:string'),
+	'email' => array('name'=>'email', 'type'=>'xsd:string'),
+	'url' => array('name'=>'url', 'type'=>'xsd:string'),
+	'profid1' => array('name'=>'profid1', 'type'=>'xsd:string'),
+	'profid2' => array('name'=>'profid2', 'type'=>'xsd:string'),
+	'profid3' => array('name'=>'profid3', 'type'=>'xsd:string'),
+	'profid4' => array('name'=>'profid4', 'type'=>'xsd:string'),
+	'profid5' => array('name'=>'profid5', 'type'=>'xsd:string'),
+	'profid6' => array('name'=>'profid6', 'type'=>'xsd:string'),
+	'capital' => array('name'=>'capital', 'type'=>'xsd:string'),
+	'tva_assuj' => array('name'=>'tva_assuj', 'type'=>'xsd:string'),
+	'tva_intra' => array('name'=>'tva_intra', 'type'=>'xsd:string'),
 	// 	For user
-	'login' => array('name'=>'login','type'=>'xsd:string'),
-	'password' => array('name'=>'password','type'=>'xsd:string'),
-	'group_id' => array('name'=>'group_id','type'=>'xsd:string')
+	'login' => array('name'=>'login', 'type'=>'xsd:string'),
+	'password' => array('name'=>'password', 'type'=>'xsd:string'),
+	'group_id' => array('name'=>'group_id', 'type'=>'xsd:string')
 );
 
 //Retreive all extrafield for contact
 // fetch optionals attributes and labels
-$extrafields=new ExtraFields($db);
-$extralabels=$extrafields->fetch_name_optionals_label('socpeople',true);
-if (count($extrafields)>0) {
+$extrafields = new ExtraFields($db);
+$extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
+if (count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-foreach($extrafields->attribute_label as $key=>$label)
+foreach ($extrafields->attribute_label as $key=>$label)
 {
-	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	$type = $extrafields->attribute_type[$key];
+	if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
+	else {$type = 'xsd:string'; }
 
-	$extrafield_array['contact_options_'.$key]=array('name'=>'contact_options_'.$key,'type'=>$type);
+	$extrafield_array['contact_options_'.$key] = array('name'=>'contact_options_'.$key, 'type'=>$type);
 }
 
-$thirdpartywithuser_fields=array_merge($thirdpartywithuser_fields,$extrafield_array);
+$thirdpartywithuser_fields = array_merge($thirdpartywithuser_fields, $extrafield_array);
 
 
 $server->wsdl->addComplexType(
@@ -219,9 +219,9 @@ 
 	'all',
 	'',
 	array(
-	'login' => array('name'=>'login','type'=>'xsd:string'),
-	'password' => array('name'=>'password','type'=>'xsd:string'),
-	'entity' => array('name'=>'entity','type'=>'xsd:string'),
+	'login' => array('name'=>'login', 'type'=>'xsd:string'),
+	'password' => array('name'=>'password', 'type'=>'xsd:string'),
+	'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
 	)
 );
 
@@ -230,8 +230,8 @@ 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
 // Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
 // http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
+$styledoc = 'rpc'; // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded'; // encoded/literal/literal wrapped
 // Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
 
 
@@ -239,9 +239,9 @@ 
 $server->register(
     'getUser',
     // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','user'=>'tns:user'),
+    array('result'=>'tns:result', 'user'=>'tns:user'),
     $ns,
     $ns.'#getUser',
     $styledoc,
@@ -254,7 +254,7 @@ 
 	// Entry values
 	array('authentication'=>'tns:authentication'),
 	// Exit values
-	array('result'=>'tns:result','groups'=>'tns:GroupsArray'),
+	array('result'=>'tns:result', 'groups'=>'tns:GroupsArray'),
 	$ns,
 	$ns.'#getListOfGroups',
 	$styledoc,
@@ -265,9 +265,9 @@ 
 $server->register(
 	'createUserFromThirdparty',
 	// Entry values
-	array('authentication'=>'tns:authentication','thirdpartywithuser'=>'tns:thirdpartywithuser'),
+	array('authentication'=>'tns:authentication', 'thirdpartywithuser'=>'tns:thirdpartywithuser'),
 	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
+	array('result'=>'tns:result', 'id'=>'xsd:string'),
 	$ns,
 	$ns.'#createUserFromThirdparty',
 	$styledoc,
@@ -278,9 +278,9 @@ 
 $server->register(
 	'setUserPassword',
 	// Entry values
-	array('authentication'=>'tns:authentication','shortuser'=>'tns:shortuser'),
+	array('authentication'=>'tns:authentication', 'shortuser'=>'tns:shortuser'),
 	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
+	array('result'=>'tns:result', 'id'=>'xsd:string'),
 	$ns,
 	$ns.'#setUserPassword',
 	$styledoc,
@@ -300,37 +300,37 @@ 
  * @param	string		$ref_ext			Ref external of object
  * @return	mixed
  */
-function getUser($authentication,$id,$ref='',$ref_ext='')
+function getUser($authentication, $id, $ref = '', $ref_ext = '')
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
     dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+    if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
     {
         $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
     }
 
-    if (! $error)
+    if (!$error)
     {
         $fuser->getrights();
 
         if ($fuser->rights->user->user->lire
-        	|| ($fuser->rights->user->self->creer && $id && $id==$fuser->id)
-        	|| ($fuser->rights->user->self->creer && $ref && $ref==$fuser->login)
-        	|| ($fuser->rights->user->self->creer && $ref_ext && $ref_ext==$fuser->ref_ext))
+        	|| ($fuser->rights->user->self->creer && $id && $id == $fuser->id)
+        	|| ($fuser->rights->user->self->creer && $ref && $ref == $fuser->login)
+        	|| ($fuser->rights->user->self->creer && $ref_ext && $ref_ext == $fuser->ref_ext))
         {
-            $user=new User($db);
-            $result=$user->fetch($id,$ref,$ref_ext);
+            $user = new User($db);
+            $result = $user->fetch($id, $ref, $ref_ext);
             if ($result > 0)
             {
                 // Create
@@ -351,13 +351,13 @@ 
 						'entity' => $user->entity,
 						'pass_indatabase' => $user->pass_indatabase,
 						'pass_indatabase_crypted' => $user->pass_indatabase_crypted,
-						'datec' => dol_print_date($user->datec,'dayhourrfc'),
-						'datem' => dol_print_date($user->datem,'dayhourrfc'),
+						'datec' => dol_print_date($user->datec, 'dayhourrfc'),
+						'datem' => dol_print_date($user->datem, 'dayhourrfc'),
 						'fk_thirdparty' => $user->societe_id,
 						'fk_contact' => $user->contact_id,
 						'fk_member' => $user->fk_member,
-						'datelastlogin' => dol_print_date($user->datelastlogin,'dayhourrfc'),
-						'datepreviouslogin' => dol_print_date($user->datepreviouslogin,'dayhourrfc'),
+						'datelastlogin' => dol_print_date($user->datelastlogin, 'dayhourrfc'),
+						'datepreviouslogin' => dol_print_date($user->datepreviouslogin, 'dayhourrfc'),
 						'statut' => $user->statut,
 						'photo' => $user->photo,
 						'lang' => $user->lang,
@@ -369,13 +369,13 @@ 
             else
             {
                 $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
         else
         {
             $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
     }
 
@@ -395,54 +395,54 @@ 
  */
 function getListOfGroups($authentication)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
-	$now=dol_now();
+	$now = dol_now();
 
 	dol_syslog("Function: getListOfGroups login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
 	// Init and check authentication
-	$objectresp=array();
-	$arraygroups=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$objectresp = array();
+	$arraygroups = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 
-	if (! $error)
+	if (!$error)
 	{
 		$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
-		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
+		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
+		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity)))
 		{
-			$sql.= " WHERE g.entity IS NOT NULL";
+			$sql .= " WHERE g.entity IS NOT NULL";
 		}
 		else
 		{
-			$sql.= " WHERE g.entity IN (0,".$conf->entity.")";
+			$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 		}
-		$sql.= " GROUP BY g.rowid, g.nom, g.entity, g.datec";
-		$resql=$db->query($sql);
+		$sql .= " GROUP BY g.rowid, g.nom, g.entity, g.datec";
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$num=$db->num_rows($resql);
+			$num = $db->num_rows($resql);
 
-			$i=0;
+			$i = 0;
 			while ($i < $num)
 			{
-				$obj=$db->fetch_object($resql);
-				$arraygroups[]=array('id'=>$obj->rowid,'name'=>$obj->name,'datec'=>$obj->datec,'nb'=>$obj->nb);
+				$obj = $db->fetch_object($resql);
+				$arraygroups[] = array('id'=>$obj->rowid, 'name'=>$obj->name, 'datec'=>$obj->datec, 'nb'=>$obj->nb);
 				$i++;
 			}
 		}
 		else
 		{
 			$error++;
-			$errorcode=$db->lasterrno();
-			$errorlabel=$db->lasterror();
+			$errorcode = $db->lasterrno();
+			$errorlabel = $db->lasterror();
 		}
 	}
 
@@ -472,43 +472,43 @@ 
  * @param	array		$thirdpartywithuser Datas
  * @return	mixed
  */
-function createUserFromThirdparty($authentication,$thirdpartywithuser)
+function createUserFromThirdparty($authentication, $thirdpartywithuser)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: createUserFromThirdparty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
 
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid=$fuser->societe_id;
+	if ($fuser->societe_id) $socid = $fuser->societe_id;
 
-	if (! $error && ! $thirdpartywithuser)
+	if (!$error && !$thirdpartywithuser)
 	{
 		$error++;
-		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter thirdparty must be provided.";
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter thirdparty must be provided.";
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$fuser->getrights();
 
 		if ($fuser->rights->societe->creer)
 		{
-			$thirdparty=new Societe($db);
+			$thirdparty = new Societe($db);
 
 			// If a contact / company already exists with the email, return the corresponding socid
 			$sql = "SELECT s.rowid as societe_id FROM ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
-			$sql.= " WHERE s.entity=".$conf->entity;
-			$sql.= " AND s.email='".$db->escape($thirdpartywithuser['email'])."'";
-			$sql.= " OR sp.email='".$db->escape($thirdpartywithuser['email'])."'";
-			$sql.= $db->plimit(1);
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
+			$sql .= " WHERE s.entity=".$conf->entity;
+			$sql .= " AND s.email='".$db->escape($thirdpartywithuser['email'])."'";
+			$sql .= " OR sp.email='".$db->escape($thirdpartywithuser['email'])."'";
+			$sql .= $db->plimit(1);
 
 			$resql = $db->query($sql);
 			if ($resql)
@@ -518,7 +518,7 @@ 
 				if ($row)
 				{
 					$error++;
-					$errorcode='ALREADY_EXIST'; $errorlabel='Object not create : company or contact exists '.$thirdpartywithuser['email'];
+					$errorcode = 'ALREADY_EXIST'; $errorlabel = 'Object not create : company or contact exists '.$thirdpartywithuser['email'];
 				}
 				else
 				{
@@ -526,48 +526,48 @@ 
 					/*
 					 * Company creation
 					 */
-					$thirdparty->name=$thirdpartywithuser['name_thirdparty'];
-					$thirdparty->ref_ext=$thirdpartywithuser['ref_ext'];
-					$thirdparty->address=$thirdpartywithuser['address'];
-					$thirdparty->zip=$thirdpartywithuser['zip'];
-					$thirdparty->town=$thirdpartywithuser['town'];
-					$thirdparty->country_id=$thirdpartywithuser['country_id'];
-					$thirdparty->country_code=$thirdpartywithuser['country_code'];
+					$thirdparty->name = $thirdpartywithuser['name_thirdparty'];
+					$thirdparty->ref_ext = $thirdpartywithuser['ref_ext'];
+					$thirdparty->address = $thirdpartywithuser['address'];
+					$thirdparty->zip = $thirdpartywithuser['zip'];
+					$thirdparty->town = $thirdpartywithuser['town'];
+					$thirdparty->country_id = $thirdpartywithuser['country_id'];
+					$thirdparty->country_code = $thirdpartywithuser['country_code'];
 
 					// find the country id by code
 					$langs->load("dict");
 
 					$sql = "SELECT rowid";
-					$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
-					$sql.= " WHERE active = 1";
-					$sql.= " AND code='".$thirdparty->country_code."'";
+					$sql .= " FROM ".MAIN_DB_PREFIX."c_country";
+					$sql .= " WHERE active = 1";
+					$sql .= " AND code='".$thirdparty->country_code."'";
 
-					$resql=$db->query($sql);
+					$resql = $db->query($sql);
 					if ($resql)
 					{
 						$num = $db->num_rows($resql);
 						if ($num)
 						{
 							$obj = $db->fetch_object($resql);
-							$thirdparty->country_id      = $obj->rowid;
+							$thirdparty->country_id = $obj->rowid;
 						}
 					}
-					$thirdparty->phone=$thirdpartywithuser['phone'];
-					$thirdparty->fax=$thirdpartywithuser['fax'];
-					$thirdparty->email=$thirdpartywithuser['email'];
-					$thirdparty->url=$thirdpartywithuser['url'];
-					$thirdparty->ape=$thirdpartywithuser['ape'];
-					$thirdparty->idprof1=$thirdpartywithuser['prof1'];
-					$thirdparty->idprof2=$thirdpartywithuser['prof2'];
-					$thirdparty->idprof3=$thirdpartywithuser['prof3'];
-					$thirdparty->idprof4=$thirdpartywithuser['prof4'];
-					$thirdparty->idprof5=$thirdpartywithuser['prof5'];
-					$thirdparty->idprof6=$thirdpartywithuser['prof6'];
-
-					$thirdparty->client=$thirdpartywithuser['client'];
-					$thirdparty->fournisseur=$thirdpartywithuser['fournisseur'];
-
-					$socid_return=$thirdparty->create($fuser);
+					$thirdparty->phone = $thirdpartywithuser['phone'];
+					$thirdparty->fax = $thirdpartywithuser['fax'];
+					$thirdparty->email = $thirdpartywithuser['email'];
+					$thirdparty->url = $thirdpartywithuser['url'];
+					$thirdparty->ape = $thirdpartywithuser['ape'];
+					$thirdparty->idprof1 = $thirdpartywithuser['prof1'];
+					$thirdparty->idprof2 = $thirdpartywithuser['prof2'];
+					$thirdparty->idprof3 = $thirdpartywithuser['prof3'];
+					$thirdparty->idprof4 = $thirdpartywithuser['prof4'];
+					$thirdparty->idprof5 = $thirdpartywithuser['prof5'];
+					$thirdparty->idprof6 = $thirdpartywithuser['prof6'];
+
+					$thirdparty->client = $thirdpartywithuser['client'];
+					$thirdparty->fournisseur = $thirdpartywithuser['fournisseur'];
+
+					$socid_return = $thirdparty->create($fuser);
 
 					if ($socid_return > 0)
 					{
@@ -595,16 +595,16 @@ 
 
 						//Retreive all extrafield for thirdsparty
 						// fetch optionals attributes and labels
-						$extrafields=new ExtraFields($db);
-						$extralabels=$extrafields->fetch_name_optionals_label('socpeople',true);
-						foreach($extrafields->attribute_label as $key=>$label)
+						$extrafields = new ExtraFields($db);
+						$extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
+						foreach ($extrafields->attribute_label as $key=>$label)
 						{
-							$key='contact_options_'.$key;
-							$key=substr($key,8);   // Remove 'contact_' prefix
-							$contact->array_options[$key]=$thirdpartywithuser[$key];
+							$key = 'contact_options_'.$key;
+							$key = substr($key, 8); // Remove 'contact_' prefix
+							$contact->array_options[$key] = $thirdpartywithuser[$key];
 						}
 
-						$contact_id =  $contact->create($fuser);
+						$contact_id = $contact->create($fuser);
 
 						if ($contact_id > 0)
 						{
@@ -614,36 +614,36 @@ 
 							*/
 							$edituser = new User($db);
 
-							$id = $edituser->create_from_contact($contact,$thirdpartywithuser["login"]);
+							$id = $edituser->create_from_contact($contact, $thirdpartywithuser["login"]);
 							if ($id > 0)
 							{
-								$edituser->setPassword($fuser,trim($thirdpartywithuser['password']));
+								$edituser->setPassword($fuser, trim($thirdpartywithuser['password']));
 
-								if($thirdpartywithuser['group_id'] > 0 )
-									$edituser->SetInGroup($thirdpartywithuser['group_id'],$conf->entity);
+								if ($thirdpartywithuser['group_id'] > 0)
+									$edituser->SetInGroup($thirdpartywithuser['group_id'], $conf->entity);
 							}
 							else
 							{
 								$error++;
-								$errorcode='NOT_CREATE'; $errorlabel='Object not create : '.$edituser->error;
+								$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$edituser->error;
 							}
 						}
 						else
 						{
 							$error++;
-							$errorcode='NOT_CREATE'; $errorlabel='Object not create : '.$contact->error;
+							$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$contact->error;
 						}
 
-						if(!$error) {
+						if (!$error) {
 							$db->commit();
-							$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>'SUCCESS'),'id'=>$socid_return);
-							$error=0;
+							$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>'SUCCESS'), 'id'=>$socid_return);
+							$error = 0;
 						}
 					}
 					else
 					{
 						$error++;
-						$errors=($thirdparty->error?array($thirdparty->error):$thirdparty->errors);
+						$errors = ($thirdparty->error ? array($thirdparty->error) : $thirdparty->errors);
 					}
 				}
 			}
@@ -651,13 +651,13 @@ 
 			{
 				// retour creation KO
 				$error++;
-				$errorcode='NOT_CREATE'; $errorlabel='Object not create';
+				$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create';
 			}
 		}
 		else
 		{
 			$error++;
-			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -680,40 +680,40 @@ 
  * @param	array		$shortuser			Array of login/password info
  * @return	mixed
  */
-function setUserPassword($authentication,$shortuser) {
+function setUserPassword($authentication, $shortuser) {
 
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: setUserPassword login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
 
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid=$fuser->societe_id;
+	if ($fuser->societe_id) $socid = $fuser->societe_id;
 
-	if (! $error && ! $shortuser)
+	if (!$error && !$shortuser)
 	{
 		$error++;
-		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter shortuser must be provided.";
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter shortuser must be provided.";
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$fuser->getrights();
 
 		if ($fuser->rights->user->user->password || $fuser->rights->user->self->password)
 		{
-			$userstat=new User($db);
-			$res = $userstat->fetch('',$shortuser['login']);
-			if($res)
+			$userstat = new User($db);
+			$res = $userstat->fetch('', $shortuser['login']);
+			if ($res)
 			{
-				$res = $userstat->setPassword($userstat,$shortuser['password']);
-				if($res)
+				$res = $userstat->setPassword($userstat, $shortuser['password']);
+				if ($res)
 				{
 					$objectresp = array(
 						'result'=>array('result_code' => 'OK', 'result_label' => ''),
@@ -723,20 +723,20 @@ 
 				else
 				{
 					$error++;
-					$errorcode='NOT_MODIFIED'; $errorlabel='Error when changing password';
+					$errorcode = 'NOT_MODIFIED'; $errorlabel = 'Error when changing password';
 				}
 			}
 			else
 			{
 				$error++;
-				$errorcode='NOT_FOUND'; $errorlabel='User not found';
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'User not found';
 			}
 
 		}
 		else
 		{
 			$error++;
-			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 

Braces +39 added lines, -39 removed lines

@@ -20,7 +20,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
@@ -193,8 +195,7 @@ 
 foreach($extrafields->attribute_label as $key=>$label)
 {
 	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} else {$type='xsd:string';}
 
 	$extrafield_array['contact_options_'.$key]=array('name'=>'contact_options_'.$key,'type'=>$type);
 }
@@ -306,7 +307,9 @@ 
 
     dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -365,14 +368,12 @@ 
 						'canvas' => $user->canvas
                     )
                 );
-            }
-            else
+            } else
             {
                 $error++;
                 $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -401,7 +402,9 @@ 
 
 	dol_syslog("Function: getListOfGroups login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -419,8 +422,7 @@ 
 		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 		{
 			$sql.= " WHERE g.entity IS NOT NULL";
-		}
-		else
+		} else
 		{
 			$sql.= " WHERE g.entity IN (0,".$conf->entity.")";
 		}
@@ -437,8 +439,7 @@ 
 				$arraygroups[]=array('id'=>$obj->rowid,'name'=>$obj->name,'datec'=>$obj->datec,'nb'=>$obj->nb);
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode=$db->lasterrno();
@@ -452,8 +453,7 @@ 
 		'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
 		'groups'=>$arraygroups
 		);
-	}
-	else
+	} else
 	{
 		$objectresp = array(
 		'result'=>array('result_code' => 'OK', 'result_label' => ''),
@@ -478,7 +478,9 @@ 
 
 	dol_syslog("Function: createUserFromThirdparty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
@@ -486,7 +488,9 @@ 
 
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-	if ($fuser->societe_id) $socid=$fuser->societe_id;
+	if ($fuser->societe_id) {
+		$socid=$fuser->societe_id;
+	}
 
 	if (! $error && ! $thirdpartywithuser)
 	{
@@ -519,8 +523,7 @@ 
 				{
 					$error++;
 					$errorcode='ALREADY_EXIST'; $errorlabel='Object not create : company or contact exists '.$thirdpartywithuser['email'];
-				}
-				else
+				} else
 				{
 					$db->begin();
 					/*
@@ -619,16 +622,15 @@ 
 							{
 								$edituser->setPassword($fuser,trim($thirdpartywithuser['password']));
 
-								if($thirdpartywithuser['group_id'] > 0 )
-									$edituser->SetInGroup($thirdpartywithuser['group_id'],$conf->entity);
-							}
-							else
+								if($thirdpartywithuser['group_id'] > 0 ) {
+																	$edituser->SetInGroup($thirdpartywithuser['group_id'],$conf->entity);
+								}
+							} else
 							{
 								$error++;
 								$errorcode='NOT_CREATE'; $errorlabel='Object not create : '.$edituser->error;
 							}
-						}
-						else
+						} else
 						{
 							$error++;
 							$errorcode='NOT_CREATE'; $errorlabel='Object not create : '.$contact->error;
@@ -639,22 +641,19 @@ 
 							$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>'SUCCESS'),'id'=>$socid_return);
 							$error=0;
 						}
-					}
-					else
+					} else
 					{
 						$error++;
 						$errors=($thirdparty->error?array($thirdparty->error):$thirdparty->errors);
 					}
 				}
-			}
-			else
+			} else
 			{
 				// retour creation KO
 				$error++;
 				$errorcode='NOT_CREATE'; $errorlabel='Object not create';
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -686,7 +685,9 @@ 
 
 	dol_syslog("Function: setUserPassword login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
@@ -694,7 +695,9 @@ 
 
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-	if ($fuser->societe_id) $socid=$fuser->societe_id;
+	if ($fuser->societe_id) {
+		$socid=$fuser->societe_id;
+	}
 
 	if (! $error && ! $shortuser)
 	{
@@ -719,21 +722,18 @@ 
 						'result'=>array('result_code' => 'OK', 'result_label' => ''),
 						'groups'=>$arraygroups
 					);
-				}
-				else
+				} else
 				{
 					$error++;
 					$errorcode='NOT_MODIFIED'; $errorlabel='Error when changing password';
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='User not found';
 			}
 
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';

htdocs/webservices/server_invoice.php

Indentation +363 added lines, -363 removed lines

@@ -58,57 +58,57 @@ 
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string')
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+		'login' => array('name'=>'login','type'=>'xsd:string'),
+		'password' => array('name'=>'password','type'=>'xsd:string'),
+		'entity' => array('name'=>'entity','type'=>'xsd:string')
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+	)
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'line',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'id' => array('name'=>'id','type'=>'xsd:string'),
-        'type' => array('name'=>'type','type'=>'xsd:int'),
-        'desc' => array('name'=>'desc','type'=>'xsd:string'),
-        'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:double'),
-        'qty' => array('name'=>'qty','type'=>'xsd:double'),
-        'unitprice' => array('name'=>'unitprice','type'=>'xsd:double'),
-        'total_net' => array('name'=>'total_net','type'=>'xsd:double'),
-    	'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'),
-    	'total' => array('name'=>'total','type'=>'xsd:double'),
-        'date_start' => array('name'=>'date_start','type'=>'xsd:date'),
-        'date_end' => array('name'=>'date_end','type'=>'xsd:date'),
-        // From product
-        'product_id' => array('name'=>'product_id','type'=>'xsd:int'),
-        'product_ref' => array('name'=>'product_ref','type'=>'xsd:string'),
-        'product_label' => array('name'=>'product_label','type'=>'xsd:string'),
-        'product_desc' => array('name'=>'product_desc','type'=>'xsd:string')
-    )
+	'line',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id','type'=>'xsd:string'),
+		'type' => array('name'=>'type','type'=>'xsd:int'),
+		'desc' => array('name'=>'desc','type'=>'xsd:string'),
+		'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:double'),
+		'qty' => array('name'=>'qty','type'=>'xsd:double'),
+		'unitprice' => array('name'=>'unitprice','type'=>'xsd:double'),
+		'total_net' => array('name'=>'total_net','type'=>'xsd:double'),
+		'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'),
+		'total' => array('name'=>'total','type'=>'xsd:double'),
+		'date_start' => array('name'=>'date_start','type'=>'xsd:date'),
+		'date_end' => array('name'=>'date_end','type'=>'xsd:date'),
+		// From product
+		'product_id' => array('name'=>'product_id','type'=>'xsd:int'),
+		'product_ref' => array('name'=>'product_ref','type'=>'xsd:string'),
+		'product_label' => array('name'=>'product_label','type'=>'xsd:string'),
+		'product_desc' => array('name'=>'product_desc','type'=>'xsd:string')
+	)
 );
 
 /*$server->wsdl->addComplexType(
@@ -124,55 +124,55 @@ 
     'tns:line'
 );*/
 $server->wsdl->addComplexType(
-    'LinesArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'line' => array(
-            'name' => 'line',
-            'type' => 'tns:line',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    ),
-    null,
-    'tns:line'
+	'LinesArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'line' => array(
+			'name' => 'line',
+			'type' => 'tns:line',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	),
+	null,
+	'tns:line'
 );
 
 
 $server->wsdl->addComplexType(
-    'invoice',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-    	'id' => array('name'=>'id','type'=>'xsd:string'),
-        'ref' => array('name'=>'ref','type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-        'thirdparty_id' => array('name'=>'thirdparty_id','type'=>'xsd:int'),
-        'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:string'),
-        'fk_user_valid' => array('name'=>'fk_user_valid','type'=>'xsd:string'),
-        'date' => array('name'=>'date','type'=>'xsd:date'),
-        'date_due' => array('name'=>'date_due','type'=>'xsd:date'),
-        'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
-        'date_validation' => array('name'=>'date_validation','type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
-    	'payment_mode_id' => array('name'=>'payment_mode_id','type'=>'xsd:string'),
-        'type' => array('name'=>'type','type'=>'xsd:int'),
-        'total_net' => array('name'=>'type','type'=>'xsd:double'),
-        'total_vat' => array('name'=>'type','type'=>'xsd:double'),
-        'total' => array('name'=>'type','type'=>'xsd:double'),
-        'note_private' => array('name'=>'note_private','type'=>'xsd:string'),
-        'note_public' => array('name'=>'note_public','type'=>'xsd:string'),
-        'status' => array('name'=>'status','type'=>'xsd:int'),
-        'close_code' => array('name'=>'close_code','type'=>'xsd:string'),
-        'close_note' => array('name'=>'close_note','type'=>'xsd:string'),
-        'project_id' => array('name'=>'project_id','type'=>'xsd:string'),
-        'lines' => array('name'=>'lines','type'=>'tns:LinesArray2')
-    )
+	'invoice',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id','type'=>'xsd:string'),
+		'ref' => array('name'=>'ref','type'=>'xsd:string'),
+		'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
+		'thirdparty_id' => array('name'=>'thirdparty_id','type'=>'xsd:int'),
+		'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:string'),
+		'fk_user_valid' => array('name'=>'fk_user_valid','type'=>'xsd:string'),
+		'date' => array('name'=>'date','type'=>'xsd:date'),
+		'date_due' => array('name'=>'date_due','type'=>'xsd:date'),
+		'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
+		'date_validation' => array('name'=>'date_validation','type'=>'xsd:dateTime'),
+		'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
+		'payment_mode_id' => array('name'=>'payment_mode_id','type'=>'xsd:string'),
+		'type' => array('name'=>'type','type'=>'xsd:int'),
+		'total_net' => array('name'=>'type','type'=>'xsd:double'),
+		'total_vat' => array('name'=>'type','type'=>'xsd:double'),
+		'total' => array('name'=>'type','type'=>'xsd:double'),
+		'note_private' => array('name'=>'note_private','type'=>'xsd:string'),
+		'note_public' => array('name'=>'note_public','type'=>'xsd:string'),
+		'status' => array('name'=>'status','type'=>'xsd:int'),
+		'close_code' => array('name'=>'close_code','type'=>'xsd:string'),
+		'close_note' => array('name'=>'close_note','type'=>'xsd:string'),
+		'project_id' => array('name'=>'project_id','type'=>'xsd:string'),
+		'lines' => array('name'=>'lines','type'=>'tns:LinesArray2')
+	)
 );
 /*
 $server->wsdl->addComplexType(
@@ -188,21 +188,21 @@ 
     'tns:invoice'
 );*/
 $server->wsdl->addComplexType(
-    'InvoicesArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'invoice' => array(
-            'name' => 'invoice',
-            'type' => 'tns:invoice',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    ),
-    null,
-    'tns:invoice'
+	'InvoicesArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'invoice' => array(
+			'name' => 'invoice',
+			'type' => 'tns:invoice',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	),
+	null,
+	'tns:invoice'
 );
 
 
@@ -216,40 +216,40 @@ 
 
 // Register WSDL
 $server->register(
-    'getInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','invoice'=>'tns:invoice'),
-    $ns,
-    $ns.'#getInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to get a particular invoice'
+	'getInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','invoice'=>'tns:invoice'),
+	$ns,
+	$ns.'#getInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to get a particular invoice'
 );
 $server->register(
-    'getInvoicesForThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication','idthirdparty'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','invoices'=>'tns:InvoicesArray2'),
-    $ns,
-    $ns.'#getInvoicesForThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to get all invoices of a third party'
+	'getInvoicesForThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication','idthirdparty'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','invoices'=>'tns:InvoicesArray2'),
+	$ns,
+	$ns.'#getInvoicesForThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to get all invoices of a third party'
 );
 $server->register(
-    'createInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication','invoice'=>'tns:invoice'),
-    // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    $ns,
-    $ns.'#createInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to create an invoice'
+	'createInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication','invoice'=>'tns:invoice'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+	$ns,
+	$ns.'#createInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to create an invoice'
 );
 $server->register(
 		'createInvoiceFromOrder',
@@ -264,16 +264,16 @@ 
 		'WS to create an invoice from an order'
 );
 $server->register(
-    'updateInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication','invoice'=>'tns:invoice'),
-    // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    $ns,
-    $ns.'#updateInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to update an invoice'
+	'updateInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication','invoice'=>'tns:invoice'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+	$ns,
+	$ns.'#updateInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to update an invoice'
 );
 
 
@@ -294,12 +294,12 @@ 
 
 	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
 	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
@@ -324,51 +324,51 @@ 
 					$linesresp[]=array(
 						'id'=>$line->rowid,
 						'type'=>$line->product_type,
-                                                'desc'=>dol_htmlcleanlastbr($line->desc),
-                                                'total_net'=>$line->total_ht,
-                                                'total_vat'=>$line->total_tva,
-                                                'total'=>$line->total_ttc,
-                                                'vat_rate'=>$line->tva_tx,
-                                                'qty'=>$line->qty,
-                                                'unitprice'=> $line->subprice,
-                                                'date_start'=> $line->date_start?dol_print_date($line->date_start,'dayrfc'):'',
-                                                'date_end'=> $line->date_end?dol_print_date($line->date_end,'dayrfc'):'',
-                                                'product_id'=>$line->fk_product,
-                                                'product_ref'=>$line->product_ref,
-                                                'product_label'=>$line->product_label,
-                                                'product_desc'=>$line->product_desc,
+												'desc'=>dol_htmlcleanlastbr($line->desc),
+												'total_net'=>$line->total_ht,
+												'total_vat'=>$line->total_tva,
+												'total'=>$line->total_ttc,
+												'vat_rate'=>$line->tva_tx,
+												'qty'=>$line->qty,
+												'unitprice'=> $line->subprice,
+												'date_start'=> $line->date_start?dol_print_date($line->date_start,'dayrfc'):'',
+												'date_end'=> $line->date_end?dol_print_date($line->date_end,'dayrfc'):'',
+												'product_id'=>$line->fk_product,
+												'product_ref'=>$line->product_ref,
+												'product_label'=>$line->product_label,
+												'product_desc'=>$line->product_desc,
 					);
 					$i++;
 				}
 
-			    // Create invoice
-			    $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'invoice'=>array(
-				    	'id' => $invoice->id,
+				// Create invoice
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'invoice'=>array(
+						'id' => $invoice->id,
 			   			'ref' => $invoice->ref,
-			        	'ref_ext' => $invoice->ref_ext?$invoice->ref_ext:'',   // If not defined, field is not added into soap
-			        	'thirdparty_id' => $invoice->socid,
-			        	'fk_user_author' => $invoice->user_author?$invoice->user_author:'',
-			        	'fk_user_valid' => $invoice->user_valid?$invoice->user_valid:'',
-			        	'date' => $invoice->date?dol_print_date($invoice->date,'dayrfc'):'',
-			        	'date_due' => $invoice->date_lim_reglement?dol_print_date($invoice->date_lim_reglement,'dayrfc'):'',
-			        	'date_creation' => $invoice->date_creation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
-			        	'date_validation' => $invoice->date_validation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
-			        	'date_modification' => $invoice->datem?dol_print_date($invoice->datem,'dayhourrfc'):'',
-			        	'type' => $invoice->type,
-			        	'total_net' => $invoice->total_ht,
-			        	'total_vat' => $invoice->total_tva,
-			        	'total' => $invoice->total_ttc,
-			        	'note_private' => $invoice->note_private?$invoice->note_private:'',
-			        	'note_public' => $invoice->note_public?$invoice->note_public:'',
-			        	'status' => $invoice->statut,
+						'ref_ext' => $invoice->ref_ext?$invoice->ref_ext:'',   // If not defined, field is not added into soap
+						'thirdparty_id' => $invoice->socid,
+						'fk_user_author' => $invoice->user_author?$invoice->user_author:'',
+						'fk_user_valid' => $invoice->user_valid?$invoice->user_valid:'',
+						'date' => $invoice->date?dol_print_date($invoice->date,'dayrfc'):'',
+						'date_due' => $invoice->date_lim_reglement?dol_print_date($invoice->date_lim_reglement,'dayrfc'):'',
+						'date_creation' => $invoice->date_creation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
+						'date_validation' => $invoice->date_validation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
+						'date_modification' => $invoice->datem?dol_print_date($invoice->datem,'dayhourrfc'):'',
+						'type' => $invoice->type,
+						'total_net' => $invoice->total_ht,
+						'total_vat' => $invoice->total_tva,
+						'total' => $invoice->total_ttc,
+						'note_private' => $invoice->note_private?$invoice->note_private:'',
+						'note_public' => $invoice->note_public?$invoice->note_public:'',
+						'status' => $invoice->statut,
 					'project_id' => $invoic->fk_project,
-			        	'close_code' => $invoice->close_code?$invoice->close_code:'',
-			        	'close_note' => $invoice->close_note?$invoice->close_note:'',
-			        	'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
-			        	'lines' => $linesresp
-			        ));
+						'close_code' => $invoice->close_code?$invoice->close_code:'',
+						'close_note' => $invoice->close_note?$invoice->close_note:'',
+						'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
+						'lines' => $linesresp
+					));
 			}
 			else
 			{
@@ -407,11 +407,11 @@ 
 
 	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
 	if ($fuser->socid) $socid=$fuser->socid;
 
@@ -438,76 +438,76 @@ 
 			$i=0;
 			while ($i < $num)
 			{
-                // En attendant remplissage par boucle
-			    $obj=$db->fetch_object($resql);
-
-			    $invoice=new Facture($db);
-			    $invoice->fetch($obj->facid);
-
-			    // Sécurité pour utilisateur externe
-			    if( $socid && ( $socid != $invoice->socid) )
-			    {
-			    	$error++;
-			    	$errorcode='PERMISSION_DENIED'; $errorlabel=$invoice->socid.' User does not have permission for this request';
-			    }
-
-			    if(!$error)
-			    {
-			    	// Define lines of invoice
-			    	$linesresp=array();
-			    	foreach($invoice->lines as $line)
-			    	{
-			    		$linesresp[]=array(
-	    					'id'=>$line->rowid,
-	    					'type'=>$line->product_type,
-	    					'total_net'=>$line->total_ht,
-	    					'total_vat'=>$line->total_tva,
-	    					'total'=>$line->total_ttc,
-			    			'vat_rate'=>$line->tva_tx,
-			    			'qty'=>$line->qty,
-                                                'unitprice'=> $line->subprice,
-                                                'date_start'=> $line->date_start?dol_print_date($line->date_start,'dayrfc'):'',
-                                                'date_end'=> $line->date_end?dol_print_date($line->date_end,'dayrfc'):'',
-                                                'product_id'=>$line->fk_product,
-			    			'product_ref'=>$line->product_ref,
-			    			'product_label'=>$line->product_label,
-			    			'product_desc'=>$line->product_desc,
-			    		);
-			    	}
-
-			    	// Now define invoice
-			    	$linesinvoice[]=array(
-			    		'id' => $invoice->id,
-			    		'ref' => $invoice->ref,
-			    		'ref_ext' => $invoice->ref_ext?$invoice->ref_ext:'',   // If not defined, field is not added into soap
-			    		'fk_user_author' => $invoice->user_author?$invoice->user_author:'',
-			    		'fk_user_valid' => $invoice->user_valid?$invoice->user_valid:'',
-			    		'date' => $invoice->date?dol_print_date($invoice->date,'dayrfc'):'',
-			    		'date_due' => $invoice->date_lim_reglement?dol_print_date($invoice->date_lim_reglement,'dayrfc'):'',
-                                        'date_creation' => $invoice->date_creation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
-			    		'date_validation' => $invoice->date_validation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
-			    		'date_modification' => $invoice->datem?dol_print_date($invoice->datem,'dayhourrfc'):'',
-			    		'type' => $invoice->type,
-			    		'total_net' => $invoice->total_ht,
-			    		'total_vat' => $invoice->total_tva,
-			    		'total' => $invoice->total_ttc,
-			    		'note_private' => $invoice->note_private?$invoice->note_private:'',
-			    		'note_public' => $invoice->note_public?$invoice->note_public:'',
-			    		'status'=> $invoice->statut,
-                                        'project_id' => $invoic->fk_project,
-			    		'close_code' => $invoice->close_code?$invoice->close_code:'',
-			    		'close_note' => $invoice->close_note?$invoice->close_note:'',
-			    		'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
-			    		'lines' => $linesresp
-			    	);
-			    }
-
-			    $i++;
+				// En attendant remplissage par boucle
+				$obj=$db->fetch_object($resql);
+
+				$invoice=new Facture($db);
+				$invoice->fetch($obj->facid);
+
+				// Sécurité pour utilisateur externe
+				if( $socid && ( $socid != $invoice->socid) )
+				{
+					$error++;
+					$errorcode='PERMISSION_DENIED'; $errorlabel=$invoice->socid.' User does not have permission for this request';
+				}
+
+				if(!$error)
+				{
+					// Define lines of invoice
+					$linesresp=array();
+					foreach($invoice->lines as $line)
+					{
+						$linesresp[]=array(
+							'id'=>$line->rowid,
+							'type'=>$line->product_type,
+							'total_net'=>$line->total_ht,
+							'total_vat'=>$line->total_tva,
+							'total'=>$line->total_ttc,
+							'vat_rate'=>$line->tva_tx,
+							'qty'=>$line->qty,
+												'unitprice'=> $line->subprice,
+												'date_start'=> $line->date_start?dol_print_date($line->date_start,'dayrfc'):'',
+												'date_end'=> $line->date_end?dol_print_date($line->date_end,'dayrfc'):'',
+												'product_id'=>$line->fk_product,
+							'product_ref'=>$line->product_ref,
+							'product_label'=>$line->product_label,
+							'product_desc'=>$line->product_desc,
+						);
+					}
+
+					// Now define invoice
+					$linesinvoice[]=array(
+						'id' => $invoice->id,
+						'ref' => $invoice->ref,
+						'ref_ext' => $invoice->ref_ext?$invoice->ref_ext:'',   // If not defined, field is not added into soap
+						'fk_user_author' => $invoice->user_author?$invoice->user_author:'',
+						'fk_user_valid' => $invoice->user_valid?$invoice->user_valid:'',
+						'date' => $invoice->date?dol_print_date($invoice->date,'dayrfc'):'',
+						'date_due' => $invoice->date_lim_reglement?dol_print_date($invoice->date_lim_reglement,'dayrfc'):'',
+										'date_creation' => $invoice->date_creation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
+						'date_validation' => $invoice->date_validation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
+						'date_modification' => $invoice->datem?dol_print_date($invoice->datem,'dayhourrfc'):'',
+						'type' => $invoice->type,
+						'total_net' => $invoice->total_ht,
+						'total_vat' => $invoice->total_tva,
+						'total' => $invoice->total_ttc,
+						'note_private' => $invoice->note_private?$invoice->note_private:'',
+						'note_public' => $invoice->note_public?$invoice->note_public:'',
+						'status'=> $invoice->statut,
+										'project_id' => $invoic->fk_project,
+						'close_code' => $invoice->close_code?$invoice->close_code:'',
+						'close_note' => $invoice->close_note?$invoice->close_note:'',
+						'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
+						'lines' => $linesresp
+					);
+				}
+
+				$i++;
 			}
 
 			$objectresp=array(
-		    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-		        'invoices'=>$linesinvoice
+				'result'=>array('result_code'=>'OK', 'result_label'=>''),
+				'invoices'=>$linesinvoice
 
 			);
 		}
@@ -536,114 +536,114 @@ 
  */
 function createInvoice($authentication,$invoice)
 {
-    global $db,$conf,$langs;
+	global $db,$conf,$langs;
 
-    $now=dol_now();
+	$now=dol_now();
 
-    dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
-    		", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
+	dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
+			", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-    // Check parameters
-    if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext']))	{
-    	$error++; $errorcode='KO'; $errorlabel="Invoice id or ref or ref_ext is mandatory.";
-    }
+	// Check parameters
+	if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext']))	{
+		$error++; $errorcode='KO'; $errorlabel="Invoice id or ref or ref_ext is mandatory.";
+	}
     
-    if (! $error)
-    {
-        $new_invoice=new Facture($db);
-        $new_invoice->socid=$invoice['thirdparty_id'];
-        $new_invoice->type=$invoice['type'];
-        $new_invoice->ref_ext=$invoice['ref_ext'];
-        $new_invoice->date=dol_stringtotime($invoice['date'],'dayrfc');
-        $new_invoice->note_private=$invoice['note_private'];
-        $new_invoice->note_public=$invoice['note_public'];
-        $new_invoice->statut= Facture::STATUS_DRAFT;	// We start with status draft
-        $new_invoice->fk_project=$invoice['project_id'];
-        $new_invoice->date_creation=$now;
+	if (! $error)
+	{
+		$new_invoice=new Facture($db);
+		$new_invoice->socid=$invoice['thirdparty_id'];
+		$new_invoice->type=$invoice['type'];
+		$new_invoice->ref_ext=$invoice['ref_ext'];
+		$new_invoice->date=dol_stringtotime($invoice['date'],'dayrfc');
+		$new_invoice->note_private=$invoice['note_private'];
+		$new_invoice->note_public=$invoice['note_public'];
+		$new_invoice->statut= Facture::STATUS_DRAFT;	// We start with status draft
+		$new_invoice->fk_project=$invoice['project_id'];
+		$new_invoice->date_creation=$now;
         
 	//take mode_reglement and cond_reglement from thirdparty
-        $soc = new Societe($db);
-        $res=$soc->fetch($new_invoice->socid);
-        if ($res > 0) {
-    	    $new_invoice->mode_reglement_id = ! empty($invoice['payment_mode_id'])?$invoice['payment_mode_id']:$soc->mode_reglement_id;
-            $new_invoice->cond_reglement_id  = $soc->cond_reglement_id; 
-        }
-        else $new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
-
-        // Trick because nusoap does not store data with same structure if there is one or several lines
-        $arrayoflines=array();
-        if (isset($invoice['lines']['line'][0])) $arrayoflines=$invoice['lines']['line'];
-        else $arrayoflines=$invoice['lines'];
-
-        foreach($arrayoflines as $key => $line)
-        {
-            // $key can be 'line' or '0','1',...
-            $newline=new FactureLigne($db);
-            $newline->product_type=$line['type'];
-            $newline->desc=$line['desc'];
-            $newline->fk_product=$line['fk_product'];
-            $newline->tva_tx=$line['vat_rate'];
-            $newline->qty=$line['qty'];
-            $newline->subprice=$line['unitprice'];
-            $newline->total_ht=$line['total_net'];
-            $newline->total_tva=$line['total_vat'];
-            $newline->total_ttc=$line['total'];
-            $newline->date_start=dol_stringtotime($line['date_start']);
-            $newline->date_end=dol_stringtotime($line['date_end']);
-            $newline->fk_product=$line['product_id'];
-            $new_invoice->lines[]=$newline;
-        }
-        //var_dump($newobject->date_lim_reglement); exit;
-        //var_dump($invoice['lines'][0]['type']);
-
-        $db->begin();
-
-        $result=$new_invoice->create($fuser,0,dol_stringtotime($invoice['date_due'],'dayrfc'));
-        if ($result < 0)
-        {
-            $error++;
-        }
-
-        if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED)   // We want invoice to have status validated
-        {
-            $result=$new_invoice->validate($fuser);
-            if ($result < 0)
-            {
-                $error++;
-            }
-        }
-
-        if (! $error)
-        {
-            $db->commit();
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_invoice->id,
-            		'ref'=>$new_invoice->ref,'ref_ext'=>$new_invoice->ref_ext);
-        }
-        else
-        {
-            $db->rollback();
-            $error++;
-            $errorcode='KO';
-            $errorlabel=$new_invoice->error;
-            dol_syslog("Function: createInvoice error while creating".$errorlabel);
-        }
-
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
+		$soc = new Societe($db);
+		$res=$soc->fetch($new_invoice->socid);
+		if ($res > 0) {
+			$new_invoice->mode_reglement_id = ! empty($invoice['payment_mode_id'])?$invoice['payment_mode_id']:$soc->mode_reglement_id;
+			$new_invoice->cond_reglement_id  = $soc->cond_reglement_id; 
+		}
+		else $new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
+
+		// Trick because nusoap does not store data with same structure if there is one or several lines
+		$arrayoflines=array();
+		if (isset($invoice['lines']['line'][0])) $arrayoflines=$invoice['lines']['line'];
+		else $arrayoflines=$invoice['lines'];
+
+		foreach($arrayoflines as $key => $line)
+		{
+			// $key can be 'line' or '0','1',...
+			$newline=new FactureLigne($db);
+			$newline->product_type=$line['type'];
+			$newline->desc=$line['desc'];
+			$newline->fk_product=$line['fk_product'];
+			$newline->tva_tx=$line['vat_rate'];
+			$newline->qty=$line['qty'];
+			$newline->subprice=$line['unitprice'];
+			$newline->total_ht=$line['total_net'];
+			$newline->total_tva=$line['total_vat'];
+			$newline->total_ttc=$line['total'];
+			$newline->date_start=dol_stringtotime($line['date_start']);
+			$newline->date_end=dol_stringtotime($line['date_end']);
+			$newline->fk_product=$line['product_id'];
+			$new_invoice->lines[]=$newline;
+		}
+		//var_dump($newobject->date_lim_reglement); exit;
+		//var_dump($invoice['lines'][0]['type']);
+
+		$db->begin();
+
+		$result=$new_invoice->create($fuser,0,dol_stringtotime($invoice['date_due'],'dayrfc'));
+		if ($result < 0)
+		{
+			$error++;
+		}
+
+		if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED)   // We want invoice to have status validated
+		{
+			$result=$new_invoice->validate($fuser);
+			if ($result < 0)
+			{
+				$error++;
+			}
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_invoice->id,
+					'ref'=>$new_invoice->ref,'ref_ext'=>$new_invoice->ref_ext);
+		}
+		else
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$new_invoice->error;
+			dol_syslog("Function: createInvoice error while creating".$errorlabel);
+		}
+
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
 }
 
 /**
@@ -671,7 +671,7 @@ 
 	$errorcode='';$errorlabel='';
 	$error=0;
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    if ($fuser->socid) $socid=$fuser->socid;
+	if ($fuser->socid) $socid=$fuser->socid;
 
 	// Check parameters
 	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order))	{
@@ -747,7 +747,7 @@ 
 	global $db,$conf,$langs;
 
 	dol_syslog("Function: updateInvoice login=".$authentication['login']." id=".$invoice['id'].
-    		", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
+			", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
 
 	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 

Braces +48 added lines, -31 removed lines

@@ -21,7 +21,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
@@ -292,7 +294,9 @@ 
 
 	dol_syslog("Function: getInvoice login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -369,14 +373,12 @@ 
 			        	'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
 			        	'lines' => $linesresp
 			        ));
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -405,7 +407,9 @@ 
 
 	dol_syslog("Function: getInvoicesForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -413,7 +417,9 @@ 
     $error=0;
     $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-	if ($fuser->socid) $socid=$fuser->socid;
+	if ($fuser->socid) {
+		$socid=$fuser->socid;
+	}
 
 	// Check parameters
 	if (! $error && empty($idthirdparty))
@@ -429,7 +435,9 @@ 
 		$sql ='SELECT f.rowid as facid, facnumber as ref, ref_ext, type, fk_statut as status, total_ttc, total, tva';
 		$sql.=' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql.=" WHERE f.entity = ".$conf->entity;
-		if ($idthirdparty != 'all' ) $sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+		if ($idthirdparty != 'all' ) {
+			$sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -510,8 +518,7 @@ 
 		        'invoices'=>$linesinvoice
 
 			);
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode=$db->lasterrno(); $errorlabel=$db->lasterror();
@@ -543,7 +550,9 @@ 
     dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
     		", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -575,13 +584,17 @@ 
         if ($res > 0) {
     	    $new_invoice->mode_reglement_id = ! empty($invoice['payment_mode_id'])?$invoice['payment_mode_id']:$soc->mode_reglement_id;
             $new_invoice->cond_reglement_id  = $soc->cond_reglement_id; 
+        } else {
+        	$new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
         }
-        else $new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
 
         // Trick because nusoap does not store data with same structure if there is one or several lines
         $arrayoflines=array();
-        if (isset($invoice['lines']['line'][0])) $arrayoflines=$invoice['lines']['line'];
-        else $arrayoflines=$invoice['lines'];
+        if (isset($invoice['lines']['line'][0])) {
+        	$arrayoflines=$invoice['lines']['line'];
+        } else {
+        	$arrayoflines=$invoice['lines'];
+        }
 
         foreach($arrayoflines as $key => $line)
         {
@@ -612,9 +625,11 @@ 
             $error++;
         }
 
-        if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED)   // We want invoice to have status validated
+        if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED) {
+        	// We want invoice to have status validated
         {
             $result=$new_invoice->validate($fuser);
+        }
             if ($result < 0)
             {
                 $error++;
@@ -626,8 +641,7 @@ 
             $db->commit();
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_invoice->id,
             		'ref'=>$new_invoice->ref,'ref_ext'=>$new_invoice->ref_ext);
-        }
-        else
+        } else
         {
             $db->rollback();
             $error++;
@@ -664,14 +678,18 @@ 
 	dol_syslog("Function: createInvoiceFromOrder login=".$authentication['login']." id=".$id_order.
 			", ref=".$ref_order.", ref_ext=".$ref_ext_order);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
 	$error=0;
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    if ($fuser->socid) $socid=$fuser->socid;
+    if ($fuser->socid) {
+    	$socid=$fuser->socid;
+    }
 
 	// Check parameters
 	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order))	{
@@ -709,14 +727,12 @@ 
 					}
 					
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -726,8 +742,7 @@ 
 	if ($error)
 	{
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-	}
-	else
+	} else
 	{
 		$objectresp= array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref,'ref_ext'=>$newobject->ref_ext);
 	}
@@ -749,7 +764,9 @@ 
 	dol_syslog("Function: updateInvoice login=".$authentication['login']." id=".$invoice['id'].
     		", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -796,8 +813,9 @@ 
 				{
 					$result = $object->set_paid($fuser,$invoice->close_code,$invoice->close_note);			
 				}
-				if ($invoice['status'] == Facture::STATUS_ABANDONED)
-					$result = $object->set_canceled($fuser,$invoice->close_code,$invoice->close_note);
+				if ($invoice['status'] == Facture::STATUS_ABANDONED) {
+									$result = $object->set_canceled($fuser,$invoice->close_code,$invoice->close_note);
+				}
 			}
 		}
 	
@@ -810,8 +828,7 @@ 
 					'ref'=>$object->ref,
 					'ref_ext'=>$object->ref_ext
 			);
-		}
-		elseif ($objectfound)
+		} elseif ($objectfound)
 		{
 			$db->rollback();
 			$error++;

Spacing +235 added lines, -235 removed lines

@@ -21,10 +21,10 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
 
 require_once '../master.inc.php';
-require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -42,18 +42,18 @@ 
 {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-	print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
 	print $langs->trans("ToActivateModule");
 	exit;
 }
 
 // Create the soap Object
 $server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrInvoice',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
+$server->soap_defencoding = 'UTF-8';
+$server->decode_utf8 = false;
+$ns = 'http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrInvoice', $ns);
+$server->wsdl->schemaTargetNamespace = $ns;
 
 
 // Define WSDL Authentication object
@@ -64,11 +64,11 @@ 
     'all',
     '',
     array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string')
+        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
+        'password' => array('name'=>'password', 'type'=>'xsd:string'),
+        'entity' => array('name'=>'entity', 'type'=>'xsd:string')
     )
 );
 // Define WSDL Return object
@@ -79,8 +79,8 @@ 
     'all',
     '',
     array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
     )
 );
 
@@ -92,22 +92,22 @@ 
     'all',
     '',
     array(
-        'id' => array('name'=>'id','type'=>'xsd:string'),
-        'type' => array('name'=>'type','type'=>'xsd:int'),
-        'desc' => array('name'=>'desc','type'=>'xsd:string'),
-        'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:double'),
-        'qty' => array('name'=>'qty','type'=>'xsd:double'),
-        'unitprice' => array('name'=>'unitprice','type'=>'xsd:double'),
-        'total_net' => array('name'=>'total_net','type'=>'xsd:double'),
-    	'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'),
-    	'total' => array('name'=>'total','type'=>'xsd:double'),
-        'date_start' => array('name'=>'date_start','type'=>'xsd:date'),
-        'date_end' => array('name'=>'date_end','type'=>'xsd:date'),
+        'id' => array('name'=>'id', 'type'=>'xsd:string'),
+        'type' => array('name'=>'type', 'type'=>'xsd:int'),
+        'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
+        'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
+        'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
+        'unitprice' => array('name'=>'unitprice', 'type'=>'xsd:double'),
+        'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
+    	'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
+    	'total' => array('name'=>'total', 'type'=>'xsd:double'),
+        'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
+        'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
         // From product
-        'product_id' => array('name'=>'product_id','type'=>'xsd:int'),
-        'product_ref' => array('name'=>'product_ref','type'=>'xsd:string'),
-        'product_label' => array('name'=>'product_label','type'=>'xsd:string'),
-        'product_desc' => array('name'=>'product_desc','type'=>'xsd:string')
+        'product_id' => array('name'=>'product_id', 'type'=>'xsd:int'),
+        'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
+        'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
+        'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
     )
 );
 
@@ -149,29 +149,29 @@ 
     'all',
     '',
     array(
-    	'id' => array('name'=>'id','type'=>'xsd:string'),
-        'ref' => array('name'=>'ref','type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-        'thirdparty_id' => array('name'=>'thirdparty_id','type'=>'xsd:int'),
-        'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:string'),
-        'fk_user_valid' => array('name'=>'fk_user_valid','type'=>'xsd:string'),
-        'date' => array('name'=>'date','type'=>'xsd:date'),
-        'date_due' => array('name'=>'date_due','type'=>'xsd:date'),
-        'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
-        'date_validation' => array('name'=>'date_validation','type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
-    	'payment_mode_id' => array('name'=>'payment_mode_id','type'=>'xsd:string'),
-        'type' => array('name'=>'type','type'=>'xsd:int'),
-        'total_net' => array('name'=>'type','type'=>'xsd:double'),
-        'total_vat' => array('name'=>'type','type'=>'xsd:double'),
-        'total' => array('name'=>'type','type'=>'xsd:double'),
-        'note_private' => array('name'=>'note_private','type'=>'xsd:string'),
-        'note_public' => array('name'=>'note_public','type'=>'xsd:string'),
-        'status' => array('name'=>'status','type'=>'xsd:int'),
-        'close_code' => array('name'=>'close_code','type'=>'xsd:string'),
-        'close_note' => array('name'=>'close_note','type'=>'xsd:string'),
-        'project_id' => array('name'=>'project_id','type'=>'xsd:string'),
-        'lines' => array('name'=>'lines','type'=>'tns:LinesArray2')
+    	'id' => array('name'=>'id', 'type'=>'xsd:string'),
+        'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+        'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+        'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
+        'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
+        'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:string'),
+        'date' => array('name'=>'date', 'type'=>'xsd:date'),
+        'date_due' => array('name'=>'date_due', 'type'=>'xsd:date'),
+        'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+        'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
+        'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+    	'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:string'),
+        'type' => array('name'=>'type', 'type'=>'xsd:int'),
+        'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
+        'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
+        'total' => array('name'=>'type', 'type'=>'xsd:double'),
+        'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
+        'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
+        'status' => array('name'=>'status', 'type'=>'xsd:int'),
+        'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
+        'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
+        'project_id' => array('name'=>'project_id', 'type'=>'xsd:string'),
+        'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray2')
     )
 );
 /*
@@ -210,17 +210,17 @@ 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
 // Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
 // http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
+$styledoc = 'rpc'; // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded'; // encoded/literal/literal wrapped
 // Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
 
 // Register WSDL
 $server->register(
     'getInvoice',
     // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','invoice'=>'tns:invoice'),
+    array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
     $ns,
     $ns.'#getInvoice',
     $styledoc,
@@ -230,9 +230,9 @@ 
 $server->register(
     'getInvoicesForThirdParty',
     // Entry values
-    array('authentication'=>'tns:authentication','idthirdparty'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','invoices'=>'tns:InvoicesArray2'),
+    array('result'=>'tns:result', 'invoices'=>'tns:InvoicesArray2'),
     $ns,
     $ns.'#getInvoicesForThirdParty',
     $styledoc,
@@ -242,9 +242,9 @@ 
 $server->register(
     'createInvoice',
     // Entry values
-    array('authentication'=>'tns:authentication','invoice'=>'tns:invoice'),
+    array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
     // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
     $ns,
     $ns.'#createInvoice',
     $styledoc,
@@ -254,9 +254,9 @@ 
 $server->register(
 		'createInvoiceFromOrder',
 		// Entry values
-		array('authentication'=>'tns:authentication','id_order'=>'xsd:string','ref_order'=>'xsd:string','ref_ext_order'=>'xsd:string'),
+		array('authentication'=>'tns:authentication', 'id_order'=>'xsd:string', 'ref_order'=>'xsd:string', 'ref_ext_order'=>'xsd:string'),
 		// Exit values
-		array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+		array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
 		$ns,
 		$ns.'#createInvoiceFromOrder',
 		$styledoc,
@@ -266,9 +266,9 @@ 
 $server->register(
     'updateInvoice',
     // Entry values
-    array('authentication'=>'tns:authentication','invoice'=>'tns:invoice'),
+    array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
     // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
     $ns,
     $ns.'#updateInvoice',
     $styledoc,
@@ -286,42 +286,42 @@ 
  * @param	string		$ref_ext			Ref_ext
  * @return	array							Array result
  */
-function getInvoice($authentication,$id='',$ref='',$ref_ext='')
+function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: getInvoice login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
-		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$fuser->getrights();
 
 		if ($fuser->rights->facture->lire)
 		{
-			$invoice=new Facture($db);
-			$result=$invoice->fetch($id,$ref,$ref_ext);
+			$invoice = new Facture($db);
+			$result = $invoice->fetch($id, $ref, $ref_ext);
 			if ($result > 0)
 			{
-				$linesresp=array();
-				$i=0;
-				foreach($invoice->lines as $line)
+				$linesresp = array();
+				$i = 0;
+				foreach ($invoice->lines as $line)
 				{
 					//var_dump($line); exit;
-					$linesresp[]=array(
+					$linesresp[] = array(
 						'id'=>$line->rowid,
 						'type'=>$line->product_type,
                                                 'desc'=>dol_htmlcleanlastbr($line->desc),
@@ -331,8 +331,8 @@ 
                                                 'vat_rate'=>$line->tva_tx,
                                                 'qty'=>$line->qty,
                                                 'unitprice'=> $line->subprice,
-                                                'date_start'=> $line->date_start?dol_print_date($line->date_start,'dayrfc'):'',
-                                                'date_end'=> $line->date_end?dol_print_date($line->date_end,'dayrfc'):'',
+                                                'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
+                                                'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
                                                 'product_id'=>$line->fk_product,
                                                 'product_ref'=>$line->product_ref,
                                                 'product_label'=>$line->product_label,
@@ -347,39 +347,39 @@ 
 			        'invoice'=>array(
 				    	'id' => $invoice->id,
 			   			'ref' => $invoice->ref,
-			        	'ref_ext' => $invoice->ref_ext?$invoice->ref_ext:'',   // If not defined, field is not added into soap
+			        	'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
 			        	'thirdparty_id' => $invoice->socid,
-			        	'fk_user_author' => $invoice->user_author?$invoice->user_author:'',
-			        	'fk_user_valid' => $invoice->user_valid?$invoice->user_valid:'',
-			        	'date' => $invoice->date?dol_print_date($invoice->date,'dayrfc'):'',
-			        	'date_due' => $invoice->date_lim_reglement?dol_print_date($invoice->date_lim_reglement,'dayrfc'):'',
-			        	'date_creation' => $invoice->date_creation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
-			        	'date_validation' => $invoice->date_validation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
-			        	'date_modification' => $invoice->datem?dol_print_date($invoice->datem,'dayhourrfc'):'',
+			        	'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
+			        	'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
+			        	'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
+			        	'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
+			        	'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+			        	'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+			        	'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
 			        	'type' => $invoice->type,
 			        	'total_net' => $invoice->total_ht,
 			        	'total_vat' => $invoice->total_tva,
 			        	'total' => $invoice->total_ttc,
-			        	'note_private' => $invoice->note_private?$invoice->note_private:'',
-			        	'note_public' => $invoice->note_public?$invoice->note_public:'',
+			        	'note_private' => $invoice->note_private ? $invoice->note_private : '',
+			        	'note_public' => $invoice->note_public ? $invoice->note_public : '',
 			        	'status' => $invoice->statut,
 					'project_id' => $invoic->fk_project,
-			        	'close_code' => $invoice->close_code?$invoice->close_code:'',
-			        	'close_note' => $invoice->close_note?$invoice->close_note:'',
-			        	'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
+			        	'close_code' => $invoice->close_code ? $invoice->close_code : '',
+			        	'close_note' => $invoice->close_note ? $invoice->close_note : '',
+			        	'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
 			        	'lines' => $linesresp
 			        ));
 			}
 			else
 			{
 				$error++;
-				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
 		else
 		{
 			$error++;
-			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -399,65 +399,65 @@ 
  * @param	int			$idthirdparty		Id thirdparty
  * @return	array							Array result
  */
-function getInvoicesForThirdParty($authentication,$idthirdparty)
+function getInvoicesForThirdParty($authentication, $idthirdparty)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: getInvoicesForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->socid) $socid=$fuser->socid;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
-	if (! $error && empty($idthirdparty))
+	if (!$error && empty($idthirdparty))
 	{
 		$error++;
-		$errorcode='BAD_PARAMETERS'; $errorlabel='Parameter idthirdparty is not provided';
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = 'Parameter idthirdparty is not provided';
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$linesinvoice=array();
+		$linesinvoice = array();
 
-		$sql ='SELECT f.rowid as facid, facnumber as ref, ref_ext, type, fk_statut as status, total_ttc, total, tva';
-		$sql.=' FROM '.MAIN_DB_PREFIX.'facture as f';
-		$sql.=" WHERE f.entity = ".$conf->entity;
-		if ($idthirdparty != 'all' ) $sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+		$sql = 'SELECT f.rowid as facid, facnumber as ref, ref_ext, type, fk_statut as status, total_ttc, total, tva';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
+		$sql .= " WHERE f.entity = ".$conf->entity;
+		if ($idthirdparty != 'all') $sql .= " AND f.fk_soc = ".$db->escape($idthirdparty);
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$num=$db->num_rows($resql);
-			$i=0;
+			$num = $db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
                 // En attendant remplissage par boucle
-			    $obj=$db->fetch_object($resql);
+			    $obj = $db->fetch_object($resql);
 
-			    $invoice=new Facture($db);
+			    $invoice = new Facture($db);
 			    $invoice->fetch($obj->facid);
 
 			    // Sécurité pour utilisateur externe
-			    if( $socid && ( $socid != $invoice->socid) )
+			    if ($socid && ($socid != $invoice->socid))
 			    {
 			    	$error++;
-			    	$errorcode='PERMISSION_DENIED'; $errorlabel=$invoice->socid.' User does not have permission for this request';
+			    	$errorcode = 'PERMISSION_DENIED'; $errorlabel = $invoice->socid.' User does not have permission for this request';
 			    }
 
-			    if(!$error)
+			    if (!$error)
 			    {
 			    	// Define lines of invoice
-			    	$linesresp=array();
-			    	foreach($invoice->lines as $line)
+			    	$linesresp = array();
+			    	foreach ($invoice->lines as $line)
 			    	{
-			    		$linesresp[]=array(
+			    		$linesresp[] = array(
 	    					'id'=>$line->rowid,
 	    					'type'=>$line->product_type,
 	    					'total_net'=>$line->total_ht,
@@ -466,8 +466,8 @@ 
 			    			'vat_rate'=>$line->tva_tx,
 			    			'qty'=>$line->qty,
                                                 'unitprice'=> $line->subprice,
-                                                'date_start'=> $line->date_start?dol_print_date($line->date_start,'dayrfc'):'',
-                                                'date_end'=> $line->date_end?dol_print_date($line->date_end,'dayrfc'):'',
+                                                'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
+                                                'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
                                                 'product_id'=>$line->fk_product,
 			    			'product_ref'=>$line->product_ref,
 			    			'product_label'=>$line->product_label,
@@ -476,28 +476,28 @@ 
 			    	}
 
 			    	// Now define invoice
-			    	$linesinvoice[]=array(
+			    	$linesinvoice[] = array(
 			    		'id' => $invoice->id,
 			    		'ref' => $invoice->ref,
-			    		'ref_ext' => $invoice->ref_ext?$invoice->ref_ext:'',   // If not defined, field is not added into soap
-			    		'fk_user_author' => $invoice->user_author?$invoice->user_author:'',
-			    		'fk_user_valid' => $invoice->user_valid?$invoice->user_valid:'',
-			    		'date' => $invoice->date?dol_print_date($invoice->date,'dayrfc'):'',
-			    		'date_due' => $invoice->date_lim_reglement?dol_print_date($invoice->date_lim_reglement,'dayrfc'):'',
-                                        'date_creation' => $invoice->date_creation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
-			    		'date_validation' => $invoice->date_validation?dol_print_date($invoice->date_creation,'dayhourrfc'):'',
-			    		'date_modification' => $invoice->datem?dol_print_date($invoice->datem,'dayhourrfc'):'',
+			    		'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
+			    		'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
+			    		'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
+			    		'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
+			    		'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
+                                        'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+			    		'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+			    		'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
 			    		'type' => $invoice->type,
 			    		'total_net' => $invoice->total_ht,
 			    		'total_vat' => $invoice->total_tva,
 			    		'total' => $invoice->total_ttc,
-			    		'note_private' => $invoice->note_private?$invoice->note_private:'',
-			    		'note_public' => $invoice->note_public?$invoice->note_public:'',
+			    		'note_private' => $invoice->note_private ? $invoice->note_private : '',
+			    		'note_public' => $invoice->note_public ? $invoice->note_public : '',
 			    		'status'=> $invoice->statut,
                                         'project_id' => $invoic->fk_project,
-			    		'close_code' => $invoice->close_code?$invoice->close_code:'',
-			    		'close_note' => $invoice->close_note?$invoice->close_note:'',
-			    		'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
+			    		'close_code' => $invoice->close_code ? $invoice->close_code : '',
+			    		'close_note' => $invoice->close_note ? $invoice->close_note : '',
+			    		'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
 			    		'lines' => $linesresp
 			    	);
 			    }
@@ -505,7 +505,7 @@ 
 			    $i++;
 			}
 
-			$objectresp=array(
+			$objectresp = array(
 		    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 		        'invoices'=>$linesinvoice
 
@@ -514,7 +514,7 @@ 
 		else
 		{
 			$error++;
-			$errorcode=$db->lasterrno(); $errorlabel=$db->lasterror();
+			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
 	}
 
@@ -534,79 +534,79 @@ 
  * @param	Facture		$invoice			Invoice
  * @return	array							Array result
  */
-function createInvoice($authentication,$invoice)
+function createInvoice($authentication, $invoice)
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
-    $now=dol_now();
+    $now = dol_now();
 
     dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
     		", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
     // Check parameters
-    if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext']))	{
-    	$error++; $errorcode='KO'; $errorlabel="Invoice id or ref or ref_ext is mandatory.";
+    if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext'])) {
+    	$error++; $errorcode = 'KO'; $errorlabel = "Invoice id or ref or ref_ext is mandatory.";
     }
     
-    if (! $error)
+    if (!$error)
     {
-        $new_invoice=new Facture($db);
-        $new_invoice->socid=$invoice['thirdparty_id'];
-        $new_invoice->type=$invoice['type'];
-        $new_invoice->ref_ext=$invoice['ref_ext'];
-        $new_invoice->date=dol_stringtotime($invoice['date'],'dayrfc');
-        $new_invoice->note_private=$invoice['note_private'];
-        $new_invoice->note_public=$invoice['note_public'];
-        $new_invoice->statut= Facture::STATUS_DRAFT;	// We start with status draft
-        $new_invoice->fk_project=$invoice['project_id'];
-        $new_invoice->date_creation=$now;
+        $new_invoice = new Facture($db);
+        $new_invoice->socid = $invoice['thirdparty_id'];
+        $new_invoice->type = $invoice['type'];
+        $new_invoice->ref_ext = $invoice['ref_ext'];
+        $new_invoice->date = dol_stringtotime($invoice['date'], 'dayrfc');
+        $new_invoice->note_private = $invoice['note_private'];
+        $new_invoice->note_public = $invoice['note_public'];
+        $new_invoice->statut = Facture::STATUS_DRAFT; // We start with status draft
+        $new_invoice->fk_project = $invoice['project_id'];
+        $new_invoice->date_creation = $now;
         
 	//take mode_reglement and cond_reglement from thirdparty
         $soc = new Societe($db);
-        $res=$soc->fetch($new_invoice->socid);
+        $res = $soc->fetch($new_invoice->socid);
         if ($res > 0) {
-    	    $new_invoice->mode_reglement_id = ! empty($invoice['payment_mode_id'])?$invoice['payment_mode_id']:$soc->mode_reglement_id;
+    	    $new_invoice->mode_reglement_id = !empty($invoice['payment_mode_id']) ? $invoice['payment_mode_id'] : $soc->mode_reglement_id;
             $new_invoice->cond_reglement_id  = $soc->cond_reglement_id; 
         }
         else $new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
 
         // Trick because nusoap does not store data with same structure if there is one or several lines
-        $arrayoflines=array();
-        if (isset($invoice['lines']['line'][0])) $arrayoflines=$invoice['lines']['line'];
-        else $arrayoflines=$invoice['lines'];
+        $arrayoflines = array();
+        if (isset($invoice['lines']['line'][0])) $arrayoflines = $invoice['lines']['line'];
+        else $arrayoflines = $invoice['lines'];
 
-        foreach($arrayoflines as $key => $line)
+        foreach ($arrayoflines as $key => $line)
         {
             // $key can be 'line' or '0','1',...
-            $newline=new FactureLigne($db);
-            $newline->product_type=$line['type'];
-            $newline->desc=$line['desc'];
-            $newline->fk_product=$line['fk_product'];
-            $newline->tva_tx=$line['vat_rate'];
-            $newline->qty=$line['qty'];
-            $newline->subprice=$line['unitprice'];
-            $newline->total_ht=$line['total_net'];
-            $newline->total_tva=$line['total_vat'];
-            $newline->total_ttc=$line['total'];
-            $newline->date_start=dol_stringtotime($line['date_start']);
-            $newline->date_end=dol_stringtotime($line['date_end']);
-            $newline->fk_product=$line['product_id'];
-            $new_invoice->lines[]=$newline;
+            $newline = new FactureLigne($db);
+            $newline->product_type = $line['type'];
+            $newline->desc = $line['desc'];
+            $newline->fk_product = $line['fk_product'];
+            $newline->tva_tx = $line['vat_rate'];
+            $newline->qty = $line['qty'];
+            $newline->subprice = $line['unitprice'];
+            $newline->total_ht = $line['total_net'];
+            $newline->total_tva = $line['total_vat'];
+            $newline->total_ttc = $line['total'];
+            $newline->date_start = dol_stringtotime($line['date_start']);
+            $newline->date_end = dol_stringtotime($line['date_end']);
+            $newline->fk_product = $line['product_id'];
+            $new_invoice->lines[] = $newline;
         }
         //var_dump($newobject->date_lim_reglement); exit;
         //var_dump($invoice['lines'][0]['type']);
 
         $db->begin();
 
-        $result=$new_invoice->create($fuser,0,dol_stringtotime($invoice['date_due'],'dayrfc'));
+        $result = $new_invoice->create($fuser, 0, dol_stringtotime($invoice['date_due'], 'dayrfc'));
         if ($result < 0)
         {
             $error++;
@@ -614,25 +614,25 @@ 
 
         if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED)   // We want invoice to have status validated
         {
-            $result=$new_invoice->validate($fuser);
+            $result = $new_invoice->validate($fuser);
             if ($result < 0)
             {
                 $error++;
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             $db->commit();
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_invoice->id,
-            		'ref'=>$new_invoice->ref,'ref_ext'=>$new_invoice->ref_ext);
+            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
+            		'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
         }
         else
         {
             $db->rollback();
             $error++;
-            $errorcode='KO';
-            $errorlabel=$new_invoice->error;
+            $errorcode = 'KO';
+            $errorlabel = $new_invoice->error;
             dol_syslog("Function: createInvoice error while creating".$errorlabel);
         }
 
@@ -655,51 +655,51 @@ 
  * @param	string      $ref_ext_order		ref_ext of order to copy invoice from
  * @return	array							Array result
  */
-function createInvoiceFromOrder($authentication,$id_order='', $ref_order='', $ref_ext_order='')
+function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = '', $ref_ext_order = '')
 {
-	global $db,$conf;
+	global $db, $conf;
 
-	$now=dol_now();
+	$now = dol_now();
 
 	dol_syslog("Function: createInvoiceFromOrder login=".$authentication['login']." id=".$id_order.
 			", ref=".$ref_order.", ref_ext=".$ref_ext_order);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
 	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    if ($fuser->socid) $socid=$fuser->socid;
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+    if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
-	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order))	{
-		$error++; $errorcode='KO'; $errorlabel="order id or ref or ref_ext is mandatory.";
+	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order)) {
+		$error++; $errorcode = 'KO'; $errorlabel = "order id or ref or ref_ext is mandatory.";
 	}
 	
 	//////////////////////
-	if (! $error)
+	if (!$error)
 	{
 		$fuser->getrights();
 	
 		if ($fuser->rights->commande->lire)
 		{
-			$order=new Commande($db);
-			$result=$order->fetch($id_order,$ref_order,$ref_ext_order);
+			$order = new Commande($db);
+			$result = $order->fetch($id_order, $ref_order, $ref_ext_order);
 			if ($result > 0)
 			{
 				// Security for external user
-				if( $socid && ( $socid != $order->socid) )
+				if ($socid && ($socid != $order->socid))
 				{
 					$error++;
-					$errorcode='PERMISSION_DENIED'; $errorlabel=$order->socid.'User does not have permission for this request';
+					$errorcode = 'PERMISSION_DENIED'; $errorlabel = $order->socid.'User does not have permission for this request';
 				}
 	
-				if(!$error)
+				if (!$error)
 				{
 					
-					$newobject=new Facture($db);
+					$newobject = new Facture($db);
 					$result = $newobject->createFromOrder($order);
 					
 					if ($result < 0)
@@ -713,13 +713,13 @@ 
 			else
 			{
 				$error++;
-				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
 			}
 		}
 		else
 		{
 			$error++;
-			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 	
@@ -729,7 +729,7 @@ 
 	}
 	else
 	{
-		$objectresp= array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref,'ref_ext'=>$newobject->ref_ext);
+		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref, 'ref_ext'=>$newobject->ref_ext);
 	}
 	
 	return $objectresp;
@@ -742,36 +742,36 @@ 
  * @param	Facture		$invoice			Invoice
  * @return	array							Array result
  */
-function updateInvoice($authentication,$invoice)
+function updateInvoice($authentication, $invoice)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: updateInvoice login=".$authentication['login']." id=".$invoice['id'].
     		", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
 	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	// Check parameters
-	if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext']))	{
-		$error++; $errorcode='KO'; $errorlabel="Invoice id or ref or ref_ext is mandatory.";
+	if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext'])) {
+		$error++; $errorcode = 'KO'; $errorlabel = "Invoice id or ref or ref_ext is mandatory.";
 	}
 	
-	if (! $error)
+	if (!$error)
 	{
-		$objectfound=false;
+		$objectfound = false;
 	
-		$object=new Facture($db);
-		$result=$object->fetch($invoice['id'],$invoice['ref'],$invoice['ref_ext'], '');
+		$object = new Facture($db);
+		$result = $object->fetch($invoice['id'], $invoice['ref'], $invoice['ref_ext'], '');
 	
 		if (!empty($object->id)) {
 	
-			$objectfound=true;
+			$objectfound = true;
 	
 			$db->begin();
 	
@@ -785,7 +785,7 @@ 
 				{
 					$result = $object->validate($fuser);
 						
-					if ($result	>= 0)
+					if ($result >= 0)
 					{
 						// Define output language
 						$outputlangs = $langs;
@@ -794,17 +794,17 @@ 
 				}
 				if ($invoice['status'] == Facture::STATUS_CLOSED)
 				{
-					$result = $object->set_paid($fuser,$invoice->close_code,$invoice->close_note);			
+					$result = $object->set_paid($fuser, $invoice->close_code, $invoice->close_note);			
 				}
 				if ($invoice['status'] == Facture::STATUS_ABANDONED)
-					$result = $object->set_canceled($fuser,$invoice->close_code,$invoice->close_note);
+					$result = $object->set_canceled($fuser, $invoice->close_code, $invoice->close_note);
 			}
 		}
 	
-		if ((! $error) && ($objectfound))
+		if ((!$error) && ($objectfound))
 		{
 			$db->commit();
-			$objectresp=array(
+			$objectresp = array(
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'id'=>$object->id,
 					'ref'=>$object->ref,
@@ -815,12 +815,12 @@ 
 		{
 			$db->rollback();
 			$error++;
-			$errorcode='KO';
-			$errorlabel=$object->error;
+			$errorcode = 'KO';
+			$errorlabel = $object->error;
 		} else {
 			$error++;
-			$errorcode='NOT_FOUND';
-			$errorlabel='Invoice id='.$invoice['id'].' ref='.$invoice['ref'].' ref_ext='.$invoice['ref_ext'].' cannot be found';
+			$errorcode = 'NOT_FOUND';
+			$errorlabel = 'Invoice id='.$invoice['id'].' ref='.$invoice['ref'].' ref_ext='.$invoice['ref_ext'].' cannot be found';
 		}
 	}
 	

htdocs/webservices/server_actioncomm.php

Indentation +139 added lines, -139 removed lines

@@ -39,11 +39,11 @@ 
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -57,36 +57,36 @@ 
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-    	'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+		'login' => array('name'=>'login','type'=>'xsd:string'),
+		'password' => array('name'=>'password','type'=>'xsd:string'),
+		'entity' => array('name'=>'entity','type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+	)
 );
 
 
 $actioncomm_fields= array(
-    'id' => array('name'=>'id','type'=>'xsd:string'),
+	'id' => array('name'=>'id','type'=>'xsd:string'),
 	'ref' => array('name'=>'ref','type'=>'xsd:string'),
 	'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
 	'type_id' => array('name'=>'type_id','type'=>'xsd:string'),
@@ -131,11 +131,11 @@ 
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'actioncomm',
-    'complexType',
-    'struct',
-    'all',
-    '',
+	'actioncomm',
+	'complexType',
+	'struct',
+	'all',
+	'',
 	$actioncomm_fields
 );
 
@@ -159,12 +159,12 @@ 
 	'sequence',
 	'',
 	 array(
-        'actioncommtype' => array(
-            'name' => 'actioncommtype',
-            'type' => 'tns:actioncommtype',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
+		'actioncommtype' => array(
+			'name' => 'actioncommtype',
+			'type' => 'tns:actioncommtype',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
 	)
 );
 
@@ -193,16 +193,16 @@ 
 
 // Register WSDL
 $server->register(
-    'getActionComm',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','actioncomm'=>'tns:actioncomm'),
-    $ns,
-    $ns.'#getActionComm',
-    $styledoc,
-    $styleuse,
-    'WS to get actioncomm'
+	'getActionComm',
+	// Entry values
+	array('authentication'=>'tns:authentication','id'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','actioncomm'=>'tns:actioncomm'),
+	$ns,
+	$ns.'#getActionComm',
+	$styledoc,
+	$styleuse,
+	'WS to get actioncomm'
 );
 
 // Register WSDL
@@ -245,97 +245,97 @@ 
  */
 function getActionComm($authentication,$id)
 {
-    global $db,$conf,$langs;
-
-    dol_syslog("Function: getActionComm login=".$authentication['login']." id=".$id);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if ($error || (! $id))
-    {
-        $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
-
-    if (! $error)
-    {
-        $fuser->getrights();
-
-        if ($fuser->rights->agenda->allactions->read)
-        {
-            $actioncomm=new ActionComm($db);
-            $result=$actioncomm->fetch($id);
-            if ($result > 0)
-            {
-
-            	$actioncomm_result_fields=array(
+	global $db,$conf,$langs;
+
+	dol_syslog("Function: getActionComm login=".$authentication['login']." id=".$id);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+	if ($error || (! $id))
+	{
+		$error++;
+		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
+
+	if (! $error)
+	{
+		$fuser->getrights();
+
+		if ($fuser->rights->agenda->allactions->read)
+		{
+			$actioncomm=new ActionComm($db);
+			$result=$actioncomm->fetch($id);
+			if ($result > 0)
+			{
+
+				$actioncomm_result_fields=array(
 						'id' => $actioncomm->id,
 						'ref'=> $actioncomm->ref,
-			        	'ref_ext'=> $actioncomm->ref_ext,
-			        	'type_id'=> $actioncomm->type_id,
-			        	'type_code'=> $actioncomm->type_code,
-			        	'type'=> $actioncomm->type,
-			        	'label'=> $actioncomm->label,
-			        	'datep'=> dol_print_date($actioncomm->datep,'dayhourrfc'),
-			        	'datef'=> dol_print_date($actioncomm->datef,'dayhourrfc'),
-			        	'datec'=> dol_print_date($actioncomm->datec,'dayhourrfc'),
-			        	'datem'=> dol_print_date($actioncomm->datem,'dayhourrfc'),
-			        	'note'=> $actioncomm->note,
-			        	'percentage'=> $actioncomm->percentage,
-			        	'author'=> $actioncomm->authorid,
-			        	'usermod'=> $actioncomm->usermodid,
-			        	'userownerid'=> $actioncomm->userownerid,
-			        	'priority'=> $actioncomm->priority,
-			        	'fulldayevent'=> $actioncomm->fulldayevent,
-			        	'location'=> $actioncomm->location,
-			        	'socid'=> $actioncomm->socid,
-			        	'contactid'=> $actioncomm->contactid,
-			        	'projectid'=> $actioncomm->fk_project,
-			        	'fk_element'=> $actioncomm->fk_element,
-			        	'elementtype'=> $actioncomm->elementtype);
-
-			        	//Retreive all extrafield for actioncomm
-			        	// fetch optionals attributes and labels
-			        	$extrafields=new ExtraFields($db);
-			        	$extralabels=$extrafields->fetch_name_optionals_label('actioncomm',true);
-			        	//Get extrafield values
-			        	$actioncomm->fetch_optionals($actioncomm->id,$extralabels);
-
-			        	foreach($extrafields->attribute_label as $key=>$label)
-			        	{
-			        		$actioncomm_result_fields=array_merge($actioncomm_result_fields,array('options_'.$key => $actioncomm->array_options['options_'.$key]));
-			        	}
-
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'actioncomm'=>$actioncomm_result_fields);
-            }
-            else
-            {
-                $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
+						'ref_ext'=> $actioncomm->ref_ext,
+						'type_id'=> $actioncomm->type_id,
+						'type_code'=> $actioncomm->type_code,
+						'type'=> $actioncomm->type,
+						'label'=> $actioncomm->label,
+						'datep'=> dol_print_date($actioncomm->datep,'dayhourrfc'),
+						'datef'=> dol_print_date($actioncomm->datef,'dayhourrfc'),
+						'datec'=> dol_print_date($actioncomm->datec,'dayhourrfc'),
+						'datem'=> dol_print_date($actioncomm->datem,'dayhourrfc'),
+						'note'=> $actioncomm->note,
+						'percentage'=> $actioncomm->percentage,
+						'author'=> $actioncomm->authorid,
+						'usermod'=> $actioncomm->usermodid,
+						'userownerid'=> $actioncomm->userownerid,
+						'priority'=> $actioncomm->priority,
+						'fulldayevent'=> $actioncomm->fulldayevent,
+						'location'=> $actioncomm->location,
+						'socid'=> $actioncomm->socid,
+						'contactid'=> $actioncomm->contactid,
+						'projectid'=> $actioncomm->fk_project,
+						'fk_element'=> $actioncomm->fk_element,
+						'elementtype'=> $actioncomm->elementtype);
+
+						//Retreive all extrafield for actioncomm
+						// fetch optionals attributes and labels
+						$extrafields=new ExtraFields($db);
+						$extralabels=$extrafields->fetch_name_optionals_label('actioncomm',true);
+						//Get extrafield values
+						$actioncomm->fetch_optionals($actioncomm->id,$extralabels);
+
+						foreach($extrafields->attribute_label as $key=>$label)
+						{
+							$actioncomm_result_fields=array_merge($actioncomm_result_fields,array('options_'.$key => $actioncomm->array_options['options_'.$key]));
+						}
+
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'actioncomm'=>$actioncomm_result_fields);
+			}
+			else
+			{
+				$error++;
+				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+			}
+		}
+		else
+		{
+			$error++;
+			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
 }
 
 
@@ -375,8 +375,8 @@ 
 				}
 
 				 $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'actioncommtypes'=>$resultarray);
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'actioncommtypes'=>$resultarray);
 
 			}
 			else

Spacing +177 added lines, -177 removed lines

@@ -23,10 +23,10 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
 
 require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
+require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
 require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
 
 require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
@@ -41,18 +41,18 @@ 
 {
     $langs->load("admin");
     dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
     print $langs->trans("ToActivateModule");
     exit;
 }
 
 // Create the soap Object
 $server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrActionComm',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
+$server->soap_defencoding = 'UTF-8';
+$server->decode_utf8 = false;
+$ns = 'http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrActionComm', $ns);
+$server->wsdl->schemaTargetNamespace = $ns;
 
 
 // Define WSDL Authentication object
@@ -63,11 +63,11 @@ 
     'all',
     '',
     array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-    	'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
+        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
+    	'password' => array('name'=>'password', 'type'=>'xsd:string'),
+        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
     )
 );
 
@@ -79,55 +79,55 @@ 
     'all',
     '',
     array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
     )
 );
 
 
-$actioncomm_fields= array(
-    'id' => array('name'=>'id','type'=>'xsd:string'),
-	'ref' => array('name'=>'ref','type'=>'xsd:string'),
-	'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-	'type_id' => array('name'=>'type_id','type'=>'xsd:string'),
-	'type_code' => array('name'=>'type_code','type'=>'xsd:string'),
-	'type' => array('name'=>'type','type'=>'xsd:string'),
-	'label' => array('name'=>'label','type'=>'xsd:string'),
-	'datep' => array('name'=>'datep','type'=>'xsd:dateTime'),
-	'datef' => array('name'=>'datef','type'=>'xsd:dateTime'),
-	'datec' => array('name'=>'datec','type'=>'xsd:dateTime'),
-	'datem' => array('name'=>'datem','type'=>'xsd:dateTime'),
-	'note' => array('name'=>'note','type'=>'xsd:string'),
-	'percentage' => array('name'=>'percentage','type'=>'xsd:string'),
-	'author' => array('name'=>'author','type'=>'xsd:string'),
-	'usermod' => array('name'=>'usermod','type'=>'xsd:string'),
-	'userownerid' => array('name'=>'userownerid','type'=>'xsd:string'),
-	'priority' => array('name'=>'priority','type'=>'xsd:string'),
-	'fulldayevent' => array('name'=>'fulldayevent','type'=>'xsd:string'),
-	'location' => array('name'=>'location','type'=>'xsd:string'),
-	'socid' => array('name'=>'socid','type'=>'xsd:string'),
-	'contactid' => array('name'=>'contactid','type'=>'xsd:string'),
-	'projectid' => array('name'=>'projectid','type'=>'xsd:string'),
-	'fk_element' => array('name'=>'fk_element','type'=>'xsd:string'),
-	'elementtype' => array('name'=>'elementtype','type'=>'xsd:string'));
+$actioncomm_fields = array(
+    'id' => array('name'=>'id', 'type'=>'xsd:string'),
+	'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+	'type_id' => array('name'=>'type_id', 'type'=>'xsd:string'),
+	'type_code' => array('name'=>'type_code', 'type'=>'xsd:string'),
+	'type' => array('name'=>'type', 'type'=>'xsd:string'),
+	'label' => array('name'=>'label', 'type'=>'xsd:string'),
+	'datep' => array('name'=>'datep', 'type'=>'xsd:dateTime'),
+	'datef' => array('name'=>'datef', 'type'=>'xsd:dateTime'),
+	'datec' => array('name'=>'datec', 'type'=>'xsd:dateTime'),
+	'datem' => array('name'=>'datem', 'type'=>'xsd:dateTime'),
+	'note' => array('name'=>'note', 'type'=>'xsd:string'),
+	'percentage' => array('name'=>'percentage', 'type'=>'xsd:string'),
+	'author' => array('name'=>'author', 'type'=>'xsd:string'),
+	'usermod' => array('name'=>'usermod', 'type'=>'xsd:string'),
+	'userownerid' => array('name'=>'userownerid', 'type'=>'xsd:string'),
+	'priority' => array('name'=>'priority', 'type'=>'xsd:string'),
+	'fulldayevent' => array('name'=>'fulldayevent', 'type'=>'xsd:string'),
+	'location' => array('name'=>'location', 'type'=>'xsd:string'),
+	'socid' => array('name'=>'socid', 'type'=>'xsd:string'),
+	'contactid' => array('name'=>'contactid', 'type'=>'xsd:string'),
+	'projectid' => array('name'=>'projectid', 'type'=>'xsd:string'),
+	'fk_element' => array('name'=>'fk_element', 'type'=>'xsd:string'),
+	'elementtype' => array('name'=>'elementtype', 'type'=>'xsd:string'));
 
 //Retreive all extrafield for actioncomm
 // fetch optionals attributes and labels
-$extrafields=new ExtraFields($db);
-$extralabels=$extrafields->fetch_name_optionals_label('actioncomm',true);
-if (count($extrafields)>0) {
+$extrafields = new ExtraFields($db);
+$extralabels = $extrafields->fetch_name_optionals_label('actioncomm', true);
+if (count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-foreach($extrafields->attribute_label as $key=>$label)
+foreach ($extrafields->attribute_label as $key=>$label)
 {
-	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	$type = $extrafields->attribute_type[$key];
+	if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
+	else {$type = 'xsd:string'; }
 
-	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
+	$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
 }
 
-$actioncomm_fields=array_merge($actioncomm_fields,$extrafield_array);
+$actioncomm_fields = array_merge($actioncomm_fields, $extrafield_array);
 
 // Define other specific objects
 $server->wsdl->addComplexType(
@@ -147,8 +147,8 @@ 
 	'sequence',
 	'',
 	array(
-	'code' => array('name'=>'code','type'=>'xsd:string'),
-	'libelle' => array('name'=>'libelle','type'=>'xsd:string')
+	'code' => array('name'=>'code', 'type'=>'xsd:string'),
+	'libelle' => array('name'=>'libelle', 'type'=>'xsd:string')
 	)
 );
 
@@ -172,8 +172,8 @@ 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
 // Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
 // http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
+$styledoc = 'rpc'; // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded'; // encoded/literal/literal wrapped
 // Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
 
 
@@ -183,7 +183,7 @@ 
 	// Entry values
 	array('authentication'=>'tns:authentication'),
 	// Exit values
-	array('result'=>'tns:result','actioncommtypes'=>'tns:actioncommtypes'),
+	array('result'=>'tns:result', 'actioncommtypes'=>'tns:actioncommtypes'),
 	$ns,
 	$ns.'#getListActionCommType',
 	$styledoc,
@@ -195,9 +195,9 @@ 
 $server->register(
     'getActionComm',
     // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'id'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','actioncomm'=>'tns:actioncomm'),
+    array('result'=>'tns:result', 'actioncomm'=>'tns:actioncomm'),
     $ns,
     $ns.'#getActionComm',
     $styledoc,
@@ -209,9 +209,9 @@ 
 $server->register(
 	'createActionComm',
 	// Entry values
-	array('authentication'=>'tns:authentication','actioncomm'=>'tns:actioncomm'),
+	array('authentication'=>'tns:authentication', 'actioncomm'=>'tns:actioncomm'),
 	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
+	array('result'=>'tns:result', 'id'=>'xsd:string'),
 	$ns,
 	$ns.'#createActionComm',
 	$styledoc,
@@ -223,9 +223,9 @@ 
 $server->register(
 	'updateActionComm',
 	// Entry values
-	array('authentication'=>'tns:authentication','actioncomm'=>'tns:actioncomm'),
+	array('authentication'=>'tns:authentication', 'actioncomm'=>'tns:actioncomm'),
 	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
+	array('result'=>'tns:result', 'id'=>'xsd:string'),
 	$ns,
 	$ns.'#updateActionComm',
 	$styledoc,
@@ -243,38 +243,38 @@ 
  * @param	int			$id					Id of object
  * @return	mixed
  */
-function getActionComm($authentication,$id)
+function getActionComm($authentication, $id)
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
     dol_syslog("Function: getActionComm login=".$authentication['login']." id=".$id);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-    if ($error || (! $id))
+    if ($error || (!$id))
     {
         $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
     }
 
-    if (! $error)
+    if (!$error)
     {
         $fuser->getrights();
 
         if ($fuser->rights->agenda->allactions->read)
         {
-            $actioncomm=new ActionComm($db);
-            $result=$actioncomm->fetch($id);
+            $actioncomm = new ActionComm($db);
+            $result = $actioncomm->fetch($id);
             if ($result > 0)
             {
 
-            	$actioncomm_result_fields=array(
+            	$actioncomm_result_fields = array(
 						'id' => $actioncomm->id,
 						'ref'=> $actioncomm->ref,
 			        	'ref_ext'=> $actioncomm->ref_ext,
@@ -282,10 +282,10 @@ 
 			        	'type_code'=> $actioncomm->type_code,
 			        	'type'=> $actioncomm->type,
 			        	'label'=> $actioncomm->label,
-			        	'datep'=> dol_print_date($actioncomm->datep,'dayhourrfc'),
-			        	'datef'=> dol_print_date($actioncomm->datef,'dayhourrfc'),
-			        	'datec'=> dol_print_date($actioncomm->datec,'dayhourrfc'),
-			        	'datem'=> dol_print_date($actioncomm->datem,'dayhourrfc'),
+			        	'datep'=> dol_print_date($actioncomm->datep, 'dayhourrfc'),
+			        	'datef'=> dol_print_date($actioncomm->datef, 'dayhourrfc'),
+			        	'datec'=> dol_print_date($actioncomm->datec, 'dayhourrfc'),
+			        	'datem'=> dol_print_date($actioncomm->datem, 'dayhourrfc'),
 			        	'note'=> $actioncomm->note,
 			        	'percentage'=> $actioncomm->percentage,
 			        	'author'=> $actioncomm->authorid,
@@ -302,14 +302,14 @@ 
 
 			        	//Retreive all extrafield for actioncomm
 			        	// fetch optionals attributes and labels
-			        	$extrafields=new ExtraFields($db);
-			        	$extralabels=$extrafields->fetch_name_optionals_label('actioncomm',true);
+			        	$extrafields = new ExtraFields($db);
+			        	$extralabels = $extrafields->fetch_name_optionals_label('actioncomm', true);
 			        	//Get extrafield values
-			        	$actioncomm->fetch_optionals($actioncomm->id,$extralabels);
+			        	$actioncomm->fetch_optionals($actioncomm->id, $extralabels);
 
-			        	foreach($extrafields->attribute_label as $key=>$label)
+			        	foreach ($extrafields->attribute_label as $key=>$label)
 			        	{
-			        		$actioncomm_result_fields=array_merge($actioncomm_result_fields,array('options_'.$key => $actioncomm->array_options['options_'.$key]));
+			        		$actioncomm_result_fields = array_merge($actioncomm_result_fields, array('options_'.$key => $actioncomm->array_options['options_'.$key]));
 			        	}
 
                 // Create
@@ -320,13 +320,13 @@ 
             else
             {
                 $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
         else
         {
             $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
     }
 
@@ -347,31 +347,31 @@ 
  */
 function getListActionCommType($authentication)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: getListActionCommType login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
 	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if (! $error)
+	if (!$error)
 	{
 		$fuser->getrights();
 
 		if ($fuser->rights->agenda->myactions->read)
 		{
-			$cactioncomm=new CActionComm($db);
-			$result=$cactioncomm->liste_array('','code');
+			$cactioncomm = new CActionComm($db);
+			$result = $cactioncomm->liste_array('', 'code');
 			if ($result > 0)
 			{
-				$resultarray=array();
-				foreach($cactioncomm->liste_array as $code=>$libeller) {
-					$resultarray[]=array('code'=>$code,'libelle'=>$libeller);
+				$resultarray = array();
+				foreach ($cactioncomm->liste_array as $code=>$libeller) {
+					$resultarray[] = array('code'=>$code, 'libelle'=>$libeller);
 				}
 
 				 $objectresp = array(
@@ -382,13 +382,13 @@ 
 			else
 			{
 				$error++;
-				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
 		else
 		{
 			$error++;
-			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -408,71 +408,71 @@ 
  * @param	ActionComm	$actioncomm		    $actioncomm
  * @return	array							Array result
  */
-function createActionComm($authentication,$actioncomm)
+function createActionComm($authentication, $actioncomm)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
-	$now=dol_now();
+	$now = dol_now();
 
 	dol_syslog("Function: createActionComm login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
 	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if (! $error)
+	if (!$error)
 	{
-		$newobject=new ActionComm($db);
-
-		$newobject->datep=$actioncomm['datep'];
-		$newobject->datef=$actioncomm['datef'];
-		$newobject->type_code=$actioncomm['type_code'];
-		$newobject->socid=$actioncomm['socid'];
-		$newobject->fk_project=$actioncomm['projectid'];
-		$newobject->note=$actioncomm['note'];
-		$newobject->contactid=$actioncomm['contactid'];
-		$newobject->userownerid=$actioncomm['userownerid'];
-		$newobject->label=$actioncomm['label'];
-		$newobject->percentage=$actioncomm['percentage'];
-		$newobject->priority=$actioncomm['priority'];
-		$newobject->fulldayevent=$actioncomm['fulldayevent'];
-		$newobject->location=$actioncomm['location'];
-		$newobject->fk_element=$actioncomm['fk_element'];
-		$newobject->elementtype=$actioncomm['elementtype'];
+		$newobject = new ActionComm($db);
+
+		$newobject->datep = $actioncomm['datep'];
+		$newobject->datef = $actioncomm['datef'];
+		$newobject->type_code = $actioncomm['type_code'];
+		$newobject->socid = $actioncomm['socid'];
+		$newobject->fk_project = $actioncomm['projectid'];
+		$newobject->note = $actioncomm['note'];
+		$newobject->contactid = $actioncomm['contactid'];
+		$newobject->userownerid = $actioncomm['userownerid'];
+		$newobject->label = $actioncomm['label'];
+		$newobject->percentage = $actioncomm['percentage'];
+		$newobject->priority = $actioncomm['priority'];
+		$newobject->fulldayevent = $actioncomm['fulldayevent'];
+		$newobject->location = $actioncomm['location'];
+		$newobject->fk_element = $actioncomm['fk_element'];
+		$newobject->elementtype = $actioncomm['elementtype'];
 
 		//Retreive all extrafield for actioncomm
 		// fetch optionals attributes and labels
-		$extrafields=new ExtraFields($db);
-		$extralabels=$extrafields->fetch_name_optionals_label('actioncomm',true);
-		foreach($extrafields->attribute_label as $key=>$label)
+		$extrafields = new ExtraFields($db);
+		$extralabels = $extrafields->fetch_name_optionals_label('actioncomm', true);
+		foreach ($extrafields->attribute_label as $key=>$label)
 		{
-			$key='options_'.$key;
-			$newobject->array_options[$key]=$actioncomm[$key];
+			$key = 'options_'.$key;
+			$newobject->array_options[$key] = $actioncomm[$key];
 		}
 
 		$db->begin();
 
-		$result=$newobject->create($fuser);
+		$result = $newobject->create($fuser);
 		if ($result <= 0)
 		{
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$db->commit();
-			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id);
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id);
 		}
 		else
 		{
 			$db->rollback();
 			$error++;
-			$errorcode='KO';
-			$errorlabel=$newobject->error;
+			$errorcode = 'KO';
+			$errorlabel = $newobject->error;
 		}
 	}
 
@@ -491,75 +491,75 @@ 
  * @param	ActionComm	$actioncomm		    $actioncomm
  * @return	array							Array result
  */
-function updateActionComm($authentication,$actioncomm)
+function updateActionComm($authentication, $actioncomm)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
-	$now=dol_now();
+	$now = dol_now();
 
 	dol_syslog("Function: updateActionComm login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
 	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
-	if (empty($actioncomm['id']))	{
-		$error++; $errorcode='KO'; $errorlabel="Actioncomm id is mandatory.";
+	if (empty($actioncomm['id'])) {
+		$error++; $errorcode = 'KO'; $errorlabel = "Actioncomm id is mandatory.";
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$objectfound=false;
+		$objectfound = false;
 
-		$object=new ActionComm($db);
-		$result=$object->fetch($actioncomm['id']);
+		$object = new ActionComm($db);
+		$result = $object->fetch($actioncomm['id']);
 
 		if (!empty($object->id)) {
 
-			$objectfound=true;
-
-			$object->datep=$actioncomm['datep'];
-			$object->datef=$actioncomm['datef'];
-			$object->type_code=$actioncomm['type_code'];
-			$object->socid=$actioncomm['socid'];
-			$object->contactid=$actioncomm['contactid'];
-			$object->fk_project=$actioncomm['projectid'];
-			$object->note=$actioncomm['note'];
-			$object->userownerid=$actioncomm['userownerid'];
-			$object->label=$actioncomm['label'];
-			$object->percentage=$actioncomm['percentage'];
-			$object->priority=$actioncomm['priority'];
-			$object->fulldayevent=$actioncomm['fulldayevent'];
-			$object->location=$actioncomm['location'];
-			$object->fk_element=$actioncomm['fk_element'];
-			$object->elementtype=$actioncomm['elementtype'];
+			$objectfound = true;
+
+			$object->datep = $actioncomm['datep'];
+			$object->datef = $actioncomm['datef'];
+			$object->type_code = $actioncomm['type_code'];
+			$object->socid = $actioncomm['socid'];
+			$object->contactid = $actioncomm['contactid'];
+			$object->fk_project = $actioncomm['projectid'];
+			$object->note = $actioncomm['note'];
+			$object->userownerid = $actioncomm['userownerid'];
+			$object->label = $actioncomm['label'];
+			$object->percentage = $actioncomm['percentage'];
+			$object->priority = $actioncomm['priority'];
+			$object->fulldayevent = $actioncomm['fulldayevent'];
+			$object->location = $actioncomm['location'];
+			$object->fk_element = $actioncomm['fk_element'];
+			$object->elementtype = $actioncomm['elementtype'];
 
 			//Retreive all extrafield for actioncomm
 			// fetch optionals attributes and labels
-			$extrafields=new ExtraFields($db);
-			$extralabels=$extrafields->fetch_name_optionals_label('actioncomm',true);
-			foreach($extrafields->attribute_label as $key=>$label)
+			$extrafields = new ExtraFields($db);
+			$extralabels = $extrafields->fetch_name_optionals_label('actioncomm', true);
+			foreach ($extrafields->attribute_label as $key=>$label)
 			{
-				$key='options_'.$key;
-				$object->array_options[$key]=$actioncomm[$key];
+				$key = 'options_'.$key;
+				$object->array_options[$key] = $actioncomm[$key];
 			}
 
 			$db->begin();
 
-			$result=$object->update($fuser);
+			$result = $object->update($fuser);
 			if ($result <= 0) {
 				$error++;
 			}
 		}
 
-		if ((! $error) && ($objectfound))
+		if ((!$error) && ($objectfound))
 		{
 			$db->commit();
-			$objectresp=array(
+			$objectresp = array(
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'id'=>$object->id
 			);
@@ -568,12 +568,12 @@ 
 		{
 			$db->rollback();
 			$error++;
-			$errorcode='KO';
-			$errorlabel=$object->error;
+			$errorcode = 'KO';
+			$errorlabel = $object->error;
 		} else {
 			$error++;
-			$errorcode='NOT_FOUND';
-			$errorlabel='Actioncomm id='.$actioncomm['id'].' cannot be found';
+			$errorcode = 'NOT_FOUND';
+			$errorlabel = 'Actioncomm id='.$actioncomm['id'].' cannot be found';
 		}
 	}
 

Braces +22 added lines, -19 removed lines

@@ -23,7 +23,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once("../master.inc.php");
 require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
@@ -121,8 +123,7 @@ 
 foreach($extrafields->attribute_label as $key=>$label)
 {
 	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} else {$type='xsd:string';}
 
 	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
 }
@@ -249,7 +250,9 @@ 
 
     dol_syslog("Function: getActionComm login=".$authentication['login']." id=".$id);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -316,14 +319,12 @@ 
                 $objectresp = array(
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncomm'=>$actioncomm_result_fields);
-            }
-            else
+            } else
             {
                 $error++;
                 $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -351,7 +352,9 @@ 
 
 	dol_syslog("Function: getListActionCommType login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -378,14 +381,12 @@ 
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncommtypes'=>$resultarray);
 
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -416,7 +417,9 @@ 
 
 	dol_syslog("Function: createActionComm login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -466,8 +469,7 @@ 
 		{
 			$db->commit();
 			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id);
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			$error++;
@@ -499,7 +501,9 @@ 
 
 	dol_syslog("Function: updateActionComm login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -563,8 +567,7 @@ 
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'id'=>$object->id
 			);
-		}
-		elseif ($objectfound)
+		} elseif ($objectfound)
 		{
 			$db->rollback();
 			$error++;

htdocs/webservices/server_productorservice.php

Indentation +587 added lines, -587 removed lines

@@ -44,11 +44,11 @@ 
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -62,72 +62,72 @@ 
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string')
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+		'login' => array('name'=>'login','type'=>'xsd:string'),
+		'password' => array('name'=>'password','type'=>'xsd:string'),
+		'entity' => array('name'=>'entity','type'=>'xsd:string')
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string')
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label','type'=>'xsd:string')
+	)
 );
 
 $productorservice_fields = array(
-    'id' => array('name'=>'id','type'=>'xsd:string'),
-    'ref' => array('name'=>'ref','type'=>'xsd:string'),
-    'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-    'type' => array('name'=>'type','type'=>'xsd:string'),
-    'label' => array('name'=>'label','type'=>'xsd:string'),
-    'description' => array('name'=>'description','type'=>'xsd:string'),
-    'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
-    'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
-    'note' => array('name'=>'note','type'=>'xsd:string'),
-    'status_tobuy' => array('name'=>'status_tobuy','type'=>'xsd:string'),
-    'status_tosell' => array('name'=>'status_tosell','type'=>'xsd:string'),
-    'barcode' => array('name'=>'barcode','type'=>'xsd:string'),
-    'barcode_type' => array('name'=>'barcode_type','type'=>'xsd:string'),
-    'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
-    'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
-    'customcode' => array('name'=>'customcode','type'=>'xsd:string'),
-
-    'price_net' => array('name'=>'price_net','type'=>'xsd:string'),
-    'price' => array('name'=>'price','type'=>'xsd:string'),
-    'price_min_net' => array('name'=>'price_min_net','type'=>'xsd:string'),
-    'price_min' => array('name'=>'price_min','type'=>'xsd:string'),
-
-    'price_base_type' => array('name'=>'price_base_type','type'=>'xsd:string'),
-
-    'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:string'),
-    'vat_npr' => array('name'=>'vat_npr','type'=>'xsd:string'),
-    'localtax1_tx' => array('name'=>'localtax1_tx','type'=>'xsd:string'),
-    'localtax2_tx' => array('name'=>'localtax2_tx','type'=>'xsd:string'),
-
-    'stock_alert' => array('name'=>'stock_alert','type'=>'xsd:string'),
-    'stock_real' => array('name'=>'stock_real','type'=>'xsd:string'),
-    'stock_pmp' => array('name'=>'stock_pmp','type'=>'xsd:string'),
-    'warehouse_ref' => array('name'=>'warehouse_ref','type'=>'xsd:string'),		// Used only for create or update to set which warehouse to use for stock correction if stock_real differs from database
-
-    'canvas' => array('name'=>'canvas','type'=>'xsd:string'),
-    'import_key' => array('name'=>'import_key','type'=>'xsd:string'),
-
-    'dir' => array('name'=>'dir','type'=>'xsd:string'),
-    'images' => array('name'=>'images','type'=>'tns:ImagesArray')
+	'id' => array('name'=>'id','type'=>'xsd:string'),
+	'ref' => array('name'=>'ref','type'=>'xsd:string'),
+	'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
+	'type' => array('name'=>'type','type'=>'xsd:string'),
+	'label' => array('name'=>'label','type'=>'xsd:string'),
+	'description' => array('name'=>'description','type'=>'xsd:string'),
+	'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
+	'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
+	'note' => array('name'=>'note','type'=>'xsd:string'),
+	'status_tobuy' => array('name'=>'status_tobuy','type'=>'xsd:string'),
+	'status_tosell' => array('name'=>'status_tosell','type'=>'xsd:string'),
+	'barcode' => array('name'=>'barcode','type'=>'xsd:string'),
+	'barcode_type' => array('name'=>'barcode_type','type'=>'xsd:string'),
+	'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
+	'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
+	'customcode' => array('name'=>'customcode','type'=>'xsd:string'),
+
+	'price_net' => array('name'=>'price_net','type'=>'xsd:string'),
+	'price' => array('name'=>'price','type'=>'xsd:string'),
+	'price_min_net' => array('name'=>'price_min_net','type'=>'xsd:string'),
+	'price_min' => array('name'=>'price_min','type'=>'xsd:string'),
+
+	'price_base_type' => array('name'=>'price_base_type','type'=>'xsd:string'),
+
+	'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:string'),
+	'vat_npr' => array('name'=>'vat_npr','type'=>'xsd:string'),
+	'localtax1_tx' => array('name'=>'localtax1_tx','type'=>'xsd:string'),
+	'localtax2_tx' => array('name'=>'localtax2_tx','type'=>'xsd:string'),
+
+	'stock_alert' => array('name'=>'stock_alert','type'=>'xsd:string'),
+	'stock_real' => array('name'=>'stock_real','type'=>'xsd:string'),
+	'stock_pmp' => array('name'=>'stock_pmp','type'=>'xsd:string'),
+	'warehouse_ref' => array('name'=>'warehouse_ref','type'=>'xsd:string'),		// Used only for create or update to set which warehouse to use for stock correction if stock_real differs from database
+
+	'canvas' => array('name'=>'canvas','type'=>'xsd:string'),
+	'import_key' => array('name'=>'import_key','type'=>'xsd:string'),
+
+	'dir' => array('name'=>'dir','type'=>'xsd:string'),
+	'images' => array('name'=>'images','type'=>'tns:ImagesArray')
 );
 
 //Retreive all extrafield for product
@@ -150,12 +150,12 @@ 
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'product',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    $productorservice_fields
+	'product',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	$productorservice_fields
 );
 
 
@@ -198,33 +198,33 @@ 
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'filterproduct',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        //'limit' => array('name'=>'limit','type'=>'xsd:string'),
+	'filterproduct',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		//'limit' => array('name'=>'limit','type'=>'xsd:string'),
 		'type' => array('name'=>'type','type'=>'xsd:string'),
-	    'status_tobuy' => array('name'=>'status_tobuy','type'=>'xsd:string'),
-	    'status_tosell' => array('name'=>'status_tosell','type'=>'xsd:string'),
-    )
+		'status_tobuy' => array('name'=>'status_tobuy','type'=>'xsd:string'),
+		'status_tosell' => array('name'=>'status_tosell','type'=>'xsd:string'),
+	)
 );
 
 $server->wsdl->addComplexType(
-    'ProductsArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'product' => array(
-            'name' => 'product',
-            'type' => 'tns:product',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    )
+	'ProductsArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'product' => array(
+			'name' => 'product',
+			'type' => 'tns:product',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	)
 );
 
 
@@ -239,72 +239,72 @@ 
 
 // Register WSDL
 $server->register(
-    'getProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string','lang'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','product'=>'tns:product'),
-    $ns,
-    $ns.'#getProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to get product or service'
+	'getProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string','lang'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','product'=>'tns:product'),
+	$ns,
+	$ns.'#getProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to get product or service'
 );
 
 // Register WSDL
 $server->register(
-    'createProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication','product'=>'tns:product'),
-    // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string'),
-    $ns,
-    $ns.'#createProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to create a product or service'
+	'createProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication','product'=>'tns:product'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string'),
+	$ns,
+	$ns.'#createProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to create a product or service'
 );
 
 // Register WSDL
 $server->register(
-    'updateProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication','product'=>'tns:product'),
-    // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string'),
-    $ns,
-    $ns.'#updateProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to update a product or service'
+	'updateProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication','product'=>'tns:product'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string'),
+	$ns,
+	$ns.'#updateProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to update a product or service'
 );
 
 // Register WSDL
 $server->register(
-    'deleteProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication','listofid'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','nbdeleted'=>'xsd:int'),
-    $ns,
-    $ns.'#deleteProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to delete a product or service'
+	'deleteProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication','listofid'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','nbdeleted'=>'xsd:int'),
+	$ns,
+	$ns.'#deleteProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to delete a product or service'
 );
 
 // Register WSDL
 $server->register(
-    'getListOfProductsOrServices',
-    // Entry values
-    array('authentication'=>'tns:authentication','filterproduct'=>'tns:filterproduct'),
-    // Exit values
-    array('result'=>'tns:result','products'=>'tns:ProductsArray2'),
-    $ns,
-    $ns.'#getListOfProductsOrServices',
-    $styledoc,
-    $styleuse,
-    'WS to get list of all products or services id and ref'
+	'getListOfProductsOrServices',
+	// Entry values
+	array('authentication'=>'tns:authentication','filterproduct'=>'tns:filterproduct'),
+	// Exit values
+	array('result'=>'tns:result','products'=>'tns:ProductsArray2'),
+	$ns,
+	$ns.'#getListOfProductsOrServices',
+	$styledoc,
+	$styleuse,
+	'WS to get list of all products or services id and ref'
 );
 
 // Register WSDL
@@ -334,128 +334,128 @@ 
  */
 function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang='')
 {
-    global $db,$conf,$langs;
+	global $db,$conf,$langs;
 
-    dol_syslog("Function: getProductOrService login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+	dol_syslog("Function: getProductOrService login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-    $langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
-    $langs->setDefaultLang($langcode);
+	$langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+	$langs->setDefaultLang($langcode);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	{
+		$error++;
+		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
+
+	if (! $error)
+	{
 
-    if (! $error)
-    {
+		$langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+		$langs->setDefaultLang($langcode);
 
-    	$langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
-    	$langs->setDefaultLang($langcode);
+		$fuser->getrights();
 
-        $fuser->getrights();
+		if ($fuser->rights->produit->lire || $fuser->rights->service->lire)
+		{
+			$product=new Product($db);
+			$result=$product->fetch($id,$ref,$ref_ext);
 
-        if ($fuser->rights->produit->lire || $fuser->rights->service->lire)
-        {
-            $product=new Product($db);
-            $result=$product->fetch($id,$ref,$ref_ext);
-
-            if ($result > 0)
-            {
-            	$product->load_stock();
-
-            	$dir = (!empty($conf->product->dir_output)?$conf->product->dir_output:$conf->service->dir_output);
-            	$pdir = get_exdir($product->id,2,0,0,$product,'product') . $product->ref . "/";
-            	$dir = $dir . '/'. $pdir;
-
-            	if (! empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label =  $product->multilangs[$langs->defaultlang]["label"];
-            	if (! empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description =  $product->multilangs[$langs->defaultlang]["description"];
-            	if (! empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note =  $product->multilangs[$langs->defaultlang]["note"];
-
-            	$productorservice_result_fields = array(
-	            	'id' => $product->id,
-	            	'ref' => $product->ref,
-	            	'ref_ext' => $product->ref_ext,
-	            	'label' => $product->label,
-	            	'description' => $product->description,
-	            	'date_creation' => dol_print_date($product->date_creation,'dayhourrfc'),
-	            	'date_modification' => dol_print_date($product->date_modification,'dayhourrfc'),
-	            	'note' => $product->note,
-	            	'status_tosell' => $product->status,
-	            	'status_tobuy' => $product->status_buy,
-	            	'type' => $product->type,
-	            	'barcode' => $product->barcode,
-	            	'barcode_type' => $product->barcode_type,
-	            	'country_id' => $product->country_id>0?$product->country_id:'',
-	            	'country_code' => $product->country_code,
-	            	'custom_code' => $product->customcode,
-
-	            	'price_net' => $product->price,
-	            	'price' => $product->price_ttc,
-	            	'price_min_net' => $product->price_min,
-	            	'price_min' => $product->price_min_ttc,
-	            	'price_base_type' => $product->price_base_type,
-	            	'vat_rate' => $product->tva_tx,
-	            	//! French VAT NPR
-	            	'vat_npr' => $product->tva_npr,
-	            	//! Spanish local taxes
-	            	'localtax1_tx' => $product->localtax1_tx,
-	            	'localtax2_tx' => $product->localtax2_tx,
-
-            	    'stock_real' => $product->stock_reel,
-            	    'stock_virtual' => $product->stock_theorique,
-	            	'stock_alert' => $product->seuil_stock_alerte,
-	            	'pmp' => $product->pmp,
-	            	'import_key' => $product->import_key,
-	            	'dir' => $pdir,
-	            	'images' => $product->liste_photos($dir,$nbmax=10)
-            	);
-
-                //Retreive all extrafield for thirdsparty
-            	// fetch optionals attributes and labels
-            	$extrafields=new ExtraFields($db);
-            	$extralabels=$extrafields->fetch_name_optionals_label('product',true);
-            	//Get extrafield values
-            	$product->fetch_optionals($product->id,$extralabels);
-
-            	foreach($extrafields->attribute_label as $key=>$label)
-            	{
-            		$productorservice_result_fields=array_merge($productorservice_result_fields,array('options_'.$key => $product->array_options['options_'.$key]));
-            	}
-
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'product'=>$productorservice_result_fields
-                );
-            }
-            else
-            {
-                $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+			if ($result > 0)
+			{
+				$product->load_stock();
+
+				$dir = (!empty($conf->product->dir_output)?$conf->product->dir_output:$conf->service->dir_output);
+				$pdir = get_exdir($product->id,2,0,0,$product,'product') . $product->ref . "/";
+				$dir = $dir . '/'. $pdir;
+
+				if (! empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label =  $product->multilangs[$langs->defaultlang]["label"];
+				if (! empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description =  $product->multilangs[$langs->defaultlang]["description"];
+				if (! empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note =  $product->multilangs[$langs->defaultlang]["note"];
+
+				$productorservice_result_fields = array(
+					'id' => $product->id,
+					'ref' => $product->ref,
+					'ref_ext' => $product->ref_ext,
+					'label' => $product->label,
+					'description' => $product->description,
+					'date_creation' => dol_print_date($product->date_creation,'dayhourrfc'),
+					'date_modification' => dol_print_date($product->date_modification,'dayhourrfc'),
+					'note' => $product->note,
+					'status_tosell' => $product->status,
+					'status_tobuy' => $product->status_buy,
+					'type' => $product->type,
+					'barcode' => $product->barcode,
+					'barcode_type' => $product->barcode_type,
+					'country_id' => $product->country_id>0?$product->country_id:'',
+					'country_code' => $product->country_code,
+					'custom_code' => $product->customcode,
+
+					'price_net' => $product->price,
+					'price' => $product->price_ttc,
+					'price_min_net' => $product->price_min,
+					'price_min' => $product->price_min_ttc,
+					'price_base_type' => $product->price_base_type,
+					'vat_rate' => $product->tva_tx,
+					//! French VAT NPR
+					'vat_npr' => $product->tva_npr,
+					//! Spanish local taxes
+					'localtax1_tx' => $product->localtax1_tx,
+					'localtax2_tx' => $product->localtax2_tx,
+
+					'stock_real' => $product->stock_reel,
+					'stock_virtual' => $product->stock_theorique,
+					'stock_alert' => $product->seuil_stock_alerte,
+					'pmp' => $product->pmp,
+					'import_key' => $product->import_key,
+					'dir' => $pdir,
+					'images' => $product->liste_photos($dir,$nbmax=10)
+				);
+
+				//Retreive all extrafield for thirdsparty
+				// fetch optionals attributes and labels
+				$extrafields=new ExtraFields($db);
+				$extralabels=$extrafields->fetch_name_optionals_label('product',true);
+				//Get extrafield values
+				$product->fetch_optionals($product->id,$extralabels);
+
+				foreach($extrafields->attribute_label as $key=>$label)
+				{
+					$productorservice_result_fields=array_merge($productorservice_result_fields,array('options_'.$key => $product->array_options['options_'.$key]));
+				}
+
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'product'=>$productorservice_result_fields
+				);
+			}
+			else
+			{
+				$error++;
+				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+			}
+		}
+		else
+		{
+			$error++;
+			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 	//var_dump($objectresp);exit;
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -468,54 +468,54 @@ 
  */
 function createProductOrService($authentication,$product)
 {
-    global $db,$conf,$langs;
+	global $db,$conf,$langs;
 
-    $now=dol_now();
+	$now=dol_now();
 
-    dol_syslog("Function: createProductOrService login=".$authentication['login']);
+	dol_syslog("Function: createProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type']='HT';
-    if ($product['price'] > 0)     $product['price_base_type']='TTC';
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+	if ($product['price_net'] > 0) $product['price_base_type']='HT';
+	if ($product['price'] > 0)     $product['price_base_type']='TTC';
 
-    if ($product['price_net'] > 0 && $product['price'] > 0)
-    {
-        $error++; $errorcode='KO'; $errorlabel="You must choose between price or price_net to provide price.";
-    }
+	if ($product['price_net'] > 0 && $product['price'] > 0)
+	{
+		$error++; $errorcode='KO'; $errorlabel="You must choose between price or price_net to provide price.";
+	}
 
-    if ($product['barcode'] && !$product['barcode_type'])
-    {
+	if ($product['barcode'] && !$product['barcode_type'])
+	{
 	$errror++; $errorcode='KO' ; $errorlabel="You must set a barcode type when setting a barcode.";
-    }
-
-
-
-    if (! $error)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-        $newobject=new Product($db);
-        $newobject->ref=$product['ref'];
-        $newobject->ref_ext=$product['ref_ext'];
-        $newobject->type=$product['type'];
-        $newobject->libelle=$product['label'];    // @deprecated
-        $newobject->label=$product['label'];
-        $newobject->description=$product['description'];
-        $newobject->note=$product['note'];
-        $newobject->status=$product['status_tosell'];
-        $newobject->status_buy=$product['status_tobuy'];
-        $newobject->price=$product['price_net'];
-        $newobject->price_ttc=$product['price'];
-        $newobject->tva_tx=$product['vat_rate'];
-        $newobject->price_base_type=$product['price_base_type'];
-        $newobject->date_creation=$now;
+	}
+
+
+
+	if (! $error)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+		$newobject=new Product($db);
+		$newobject->ref=$product['ref'];
+		$newobject->ref_ext=$product['ref_ext'];
+		$newobject->type=$product['type'];
+		$newobject->libelle=$product['label'];    // @deprecated
+		$newobject->label=$product['label'];
+		$newobject->description=$product['description'];
+		$newobject->note=$product['note'];
+		$newobject->status=$product['status_tosell'];
+		$newobject->status_buy=$product['status_tobuy'];
+		$newobject->price=$product['price_net'];
+		$newobject->price_ttc=$product['price'];
+		$newobject->tva_tx=$product['vat_rate'];
+		$newobject->price_base_type=$product['price_base_type'];
+		$newobject->date_creation=$now;
 
 		if ($product['barcode'])
 		{
@@ -523,16 +523,16 @@ 
 			$newobject->barcode_type = $product['barcode_type'];
 		}
 
-        $newobject->stock_reel=$product['stock_real'];
-        $newobject->pmp=$product['pmp'];
-        $newobject->seuil_stock_alert=$product['stock_alert'];
+		$newobject->stock_reel=$product['stock_real'];
+		$newobject->pmp=$product['pmp'];
+		$newobject->seuil_stock_alert=$product['stock_alert'];
 
-        $newobject->country_id=$product['country_id'];
-        if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
-        $newobject->customcode=$product['customcode'];
+		$newobject->country_id=$product['country_id'];
+		if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
+		$newobject->customcode=$product['customcode'];
 
-        $newobject->canvas=$product['canvas'];
-        /*foreach($product['lines'] as $line)
+		$newobject->canvas=$product['canvas'];
+		/*foreach($product['lines'] as $line)
         {
             $newline=new FactureLigne($db);
             $newline->type=$line['type'];
@@ -545,10 +545,10 @@ 
             $newline->qty=$line['qty'];
             $newline->fk_product=$line['product_id'];
         }*/
-        //var_dump($product['ref_ext']);
-        //var_dump($product['lines'][0]['type']);
+		//var_dump($product['ref_ext']);
+		//var_dump($product['lines'][0]['type']);
 
-        $extrafields=new ExtraFields($db);
+		$extrafields=new ExtraFields($db);
 		$extralabels=$extrafields->fetch_name_optionals_label('product',true);
 		foreach($extrafields->attribute_label as $key=>$label)
 		{
@@ -556,17 +556,17 @@ 
 			$newobject->array_options[$key]=$product[$key];
 		}
 
-        $db->begin();
+		$db->begin();
 
-        $result=$newobject->create($fuser,0);
-        if ($result <= 0)
-        {
-            $error++;
-        }
+		$result=$newobject->create($fuser,0);
+		if ($result <= 0)
+		{
+			$error++;
+		}
 
-        if (! $error)
-        {
-        	// Update stock if stock count is provided and differs from database after creation or update
+		if (! $error)
+		{
+			// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -604,27 +604,27 @@ 
 			}
 		}
 
-        if (! $error)
-        {
-            $db->commit();
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-        }
-        else
-        {
-            $db->rollback();
-            $error++;
-            $errorcode='KO';
-            $errorlabel=$newobject->error;
-        }
+		if (! $error)
+		{
+			$db->commit();
+			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+		}
+		else
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$newobject->error;
+		}
 
-    }
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -637,72 +637,72 @@ 
  */
 function updateProductOrService($authentication,$product)
 {
-    global $db,$conf,$langs;
-
-    $now=dol_now();
-
-    dol_syslog("Function: updateProductOrService login=".$authentication['login']);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type']='HT';
-    if ($product['price'] > 0)     $product['price_base_type']='TTC';
-
-    if ($product['price_net'] > 0 && $product['price'] > 0)
-    {
-        $error++; $errorcode='KO'; $errorlabel="You must choose between price or price_net to provide price.";
-    }
-
-
-    if ($product['barcode'] && !$product['barcode_type'])
-    {
-        $errror++; $errorcode='KO' ; $errorlabel="You must set a barcode type when setting a barcode.";
-    }
-
-    if (! $error)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-        $newobject=new Product($db);
-        $newobject->fetch($product['id']);
-
-        if (isset($product['ref']))     $newobject->ref=$product['ref'];
-        if (isset($product['ref_ext'])) $newobject->ref_ext=$product['ref_ext'];
-        $newobject->type=$product['type'];
-        $newobject->libelle=$product['label'];    // @deprecated
-        $newobject->label=$product['label'];
-        $newobject->description=$product['description'];
-        $newobject->note=$product['note'];
-        $newobject->status=$product['status_tosell'];
-        $newobject->status_buy=$product['status_tobuy'];
-        $newobject->price=$product['price_net'];
-        $newobject->price_ttc=$product['price'];
-        $newobject->tva_tx=$product['vat_rate'];
-        $newobject->price_base_type=$product['price_base_type'];
-        $newobject->date_creation=$now;
-
-        if ($product['barcode'])
-        {
-                $newobject->barcode = $product['barcode'];
-                $newobject->barcode_type = $product['barcode_type'];
-        }
+	global $db,$conf,$langs;
+
+	$now=dol_now();
+
+	dol_syslog("Function: updateProductOrService login=".$authentication['login']);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+	if ($product['price_net'] > 0) $product['price_base_type']='HT';
+	if ($product['price'] > 0)     $product['price_base_type']='TTC';
+
+	if ($product['price_net'] > 0 && $product['price'] > 0)
+	{
+		$error++; $errorcode='KO'; $errorlabel="You must choose between price or price_net to provide price.";
+	}
+
 
-        $newobject->stock_reel=$product['stock_real'];
-        $newobject->pmp=$product['pmp'];
-        $newobject->seuil_stock_alert=$product['stock_alert'];
+	if ($product['barcode'] && !$product['barcode_type'])
+	{
+		$errror++; $errorcode='KO' ; $errorlabel="You must set a barcode type when setting a barcode.";
+	}
 
-        $newobject->country_id=$product['country_id'];
-        if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
-        $newobject->customcode=$product['customcode'];
+	if (! $error)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+		$newobject=new Product($db);
+		$newobject->fetch($product['id']);
+
+		if (isset($product['ref']))     $newobject->ref=$product['ref'];
+		if (isset($product['ref_ext'])) $newobject->ref_ext=$product['ref_ext'];
+		$newobject->type=$product['type'];
+		$newobject->libelle=$product['label'];    // @deprecated
+		$newobject->label=$product['label'];
+		$newobject->description=$product['description'];
+		$newobject->note=$product['note'];
+		$newobject->status=$product['status_tosell'];
+		$newobject->status_buy=$product['status_tobuy'];
+		$newobject->price=$product['price_net'];
+		$newobject->price_ttc=$product['price'];
+		$newobject->tva_tx=$product['vat_rate'];
+		$newobject->price_base_type=$product['price_base_type'];
+		$newobject->date_creation=$now;
 
-        $newobject->canvas=$product['canvas'];
-        /*foreach($product['lines'] as $line)
+		if ($product['barcode'])
+		{
+				$newobject->barcode = $product['barcode'];
+				$newobject->barcode_type = $product['barcode_type'];
+		}
+
+		$newobject->stock_reel=$product['stock_real'];
+		$newobject->pmp=$product['pmp'];
+		$newobject->seuil_stock_alert=$product['stock_alert'];
+
+		$newobject->country_id=$product['country_id'];
+		if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
+		$newobject->customcode=$product['customcode'];
+
+		$newobject->canvas=$product['canvas'];
+		/*foreach($product['lines'] as $line)
         {
             $newline=new FactureLigne($db);
             $newline->type=$line['type'];
@@ -715,8 +715,8 @@ 
             $newline->qty=$line['qty'];
             $newline->fk_product=$line['product_id'];
         }*/
-        //var_dump($product['ref_ext']);
-        //var_dump($product['lines'][0]['type']);
+		//var_dump($product['ref_ext']);
+		//var_dump($product['lines'][0]['type']);
 
 		$extrafields=new ExtraFields($db);
 		$extralabels=$extrafields->fetch_name_optionals_label('product',true);
@@ -726,16 +726,16 @@ 
 			$newobject->array_options[$key]=$product[$key];
 		}
 
-        $db->begin();
+		$db->begin();
 
-        $result=$newobject->update($newobject->id,$fuser);
-        if ($result <= 0)
-        {
-            $error++;
-        }
-        else
+		$result=$newobject->update($newobject->id,$fuser);
+		if ($result <= 0)
+		{
+			$error++;
+		}
+		else
 		{
-        	// Update stock if stock count is provided and differs from database after creation or update
+			// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -771,49 +771,49 @@ 
 					}
 				}
 			}
-        }
+		}
 
-        if (! $error)
-        {
-            if ($newobject->price_base_type == 'HT')
-            {
-                $result=$newobject->updatePrice($newobject->price, $newobject->price_base_type,$fuser);
-                if ($result <= 0)
-                {
-                    $error++;
-                }
-            }
-            elseif ($newobject->price_base_type == 'TTC')
-            {
-                $result=$newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
-                if ($result <= 0)
-                {
-                    $error++;
-                }
-            }
-        }
-
-        if (! $error)
-        {
-            $db->commit();
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-        }
-        else
+		if (! $error)
 		{
-            $db->rollback();
-            $error++;
-            $errorcode='KO';
-            $errorlabel=$newobject->error;
-        }
+			if ($newobject->price_base_type == 'HT')
+			{
+				$result=$newobject->updatePrice($newobject->price, $newobject->price_base_type,$fuser);
+				if ($result <= 0)
+				{
+					$error++;
+				}
+			}
+			elseif ($newobject->price_base_type == 'TTC')
+			{
+				$result=$newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
+				if ($result <= 0)
+				{
+					$error++;
+				}
+			}
+		}
 
-    }
+		if (! $error)
+		{
+			$db->commit();
+			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+		}
+		else
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$newobject->error;
+		}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	}
 
-    return $objectresp;
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
 }
 
 
@@ -826,91 +826,91 @@ 
  */
 function deleteProductOrService($authentication,$listofidstring)
 {
-    global $db,$conf,$langs;
+	global $db,$conf,$langs;
 
-    $now=dol_now();
+	$now=dol_now();
 
-    dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
+	dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
 	// User must be defined to user authenticated
-    global $user;
-    $user=$fuser;
+	global $user;
+	$user=$fuser;
 
-    $listofid=explode(',',trim($listofidstring));
-    $listofiddeleted=array();
+	$listofid=explode(',',trim($listofidstring));
+	$listofiddeleted=array();
 
-    // Check parameters
-    if (count($listofid) == 0 || empty($listofid[0]))
-    {
-        $error++; $errorcode='KO'; $errorlabel="List of Id of products or services to delete are required.";
-    }
+	// Check parameters
+	if (count($listofid) == 0 || empty($listofid[0]))
+	{
+		$error++; $errorcode='KO'; $errorlabel="List of Id of products or services to delete are required.";
+	}
 
-    if (! $error)
-    {
-    	$firsterror='';
+	if (! $error)
+	{
+		$firsterror='';
 
 		$db->begin();
 
-    	foreach($listofid as $key => $id)
+		foreach($listofid as $key => $id)
 		{
-	        $newobject=new Product($db);
-	        $result=$newobject->fetch($id);
-
-	        if ($result == 0)
-	        {
-	        	$error++;
-		        $firsterror='Product or service with id '.$id.' not found';
-		        break;
-	        }
-	        else
+			$newobject=new Product($db);
+			$result=$newobject->fetch($id);
+
+			if ($result == 0)
 			{
-		        $result=$newobject->delete($user);
-		        if ($result <= 0)
-		        {
-		            $error++;
-		            $firsterror=$newobject->error;
-		            break;
-		        }
-
-		        $listofiddeleted[]=$id;
+				$error++;
+				$firsterror='Product or service with id '.$id.' not found';
+				break;
+			}
+			else
+			{
+				$result=$newobject->delete($user);
+				if ($result <= 0)
+				{
+					$error++;
+					$firsterror=$newobject->error;
+					break;
+				}
+
+				$listofiddeleted[]=$id;
 			}
 		}
 
-	    if (! $error)
-	    {
-	        $db->commit();
-            //$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
-	    }
-	    else
-	    {
-	    	$db->rollback();
-	        $error++;
-	        $errorcode='KO';
-	        $errorlabel=$firsterror;
+		if (! $error)
+		{
+			$db->commit();
+			//$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
+			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
 		}
-    }
-
-    if ($error)
-    {
-        //$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'listofid'=>$listofiddeleted);
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'nbdeleted'=>0);
-    }
-    else if (count($listofiddeleted) == 0)
-    {
+		else
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$firsterror;
+		}
+	}
+
+	if ($error)
+	{
+		//$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'listofid'=>$listofiddeleted);
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'nbdeleted'=>0);
+	}
+	else if (count($listofiddeleted) == 0)
+	{
    		//$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'listofid'=>$listofiddeleted);
    		$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'nbdeleted'=>0);
-    }
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -923,70 +923,70 @@ 
  */
 function getListOfProductsOrServices($authentication,$filterproduct)
 {
-    global $db,$conf,$langs;
+	global $db,$conf,$langs;
 
-    $now=dol_now();
+	$now=dol_now();
 
-    dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
+	dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $arrayproducts=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp=array();
+	$arrayproducts=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
 
-    if (! $error)
-    {
-        $sql ="SELECT rowid, ref, ref_ext";
-        $sql.=" FROM ".MAIN_DB_PREFIX."product";
-        $sql.=" WHERE entity=".$conf->entity;
-        foreach($filterproduct as $key => $val)
-        {
+	if (! $error)
+	{
+		$sql ="SELECT rowid, ref, ref_ext";
+		$sql.=" FROM ".MAIN_DB_PREFIX."product";
+		$sql.=" WHERE entity=".$conf->entity;
+		foreach($filterproduct as $key => $val)
+		{
 		if ($key == 'type' && $val >= 0)   	$sql.=" AND fk_product_type = ".$db->escape($val);
 		if ($key == 'status_tosell') 				$sql.=" AND tosell = ".$db->escape($val);
 		if ($key == 'status_tobuy')  				$sql.=" AND tobuy = ".$db->escape($val);
-        }
+		}
 		$resql=$db->query($sql);
-        if ($resql)
-        {
-         	$num=$db->num_rows($resql);
-
-         	$i=0;
-         	while ($i < $num)
-         	{
-         		$obj=$db->fetch_object($resql);
-         		$arrayproducts[]=array('id'=>$obj->rowid,'ref'=>$obj->ref,'ref_ext'=>$obj->ref_ext);
-         		$i++;
-         	}
-        }
-        else
-        {
-            $error++;
-            $errorcode=$db->lasterrno();
-            $errorlabel=$db->lasterror();
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array(
+		if ($resql)
+		{
+		 	$num=$db->num_rows($resql);
+
+		 	$i=0;
+		 	while ($i < $num)
+		 	{
+		 		$obj=$db->fetch_object($resql);
+		 		$arrayproducts[]=array('id'=>$obj->rowid,'ref'=>$obj->ref,'ref_ext'=>$obj->ref_ext);
+		 		$i++;
+		 	}
+		}
+		else
+		{
+			$error++;
+			$errorcode=$db->lasterrno();
+			$errorlabel=$db->lasterror();
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array(
 			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
-        	'products'=>$arrayproducts
-        );
-    }
-    else
-    {
-        $objectresp = array(
+			'products'=>$arrayproducts
+		);
+	}
+	else
+	{
+		$objectresp = array(
 			'result'=>array('result_code' => 'OK', 'result_label' => ''),
-        	'products'=>$arrayproducts
-        );
-    }
+			'products'=>$arrayproducts
+		);
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -1059,35 +1059,35 @@ 
 							$dir = $dir . '/'. $pdir;
 
 							$products[] = array(
-						    	'id' => $obj->id,
+								'id' => $obj->id,
 					   			'ref' => $obj->ref,
 					   			'ref_ext' => $obj->ref_ext,
-					    		'label' => ! empty($obj->multilangs[$langs->defaultlang]["label"]) ? $obj->multilangs[$langs->defaultlang]["label"] : $obj->label,
-					    		'description' => ! empty($obj->multilangs[$langs->defaultlang]["description"]) ? $obj->multilangs[$langs->defaultlang]["description"] : $obj->description,
-					    		'date_creation' => dol_print_date($obj->date_creation,'dayhourrfc'),
-					    		'date_modification' => dol_print_date($obj->date_modification,'dayhourrfc'),
-					            'note' => ! empty($obj->multilangs[$langs->defaultlang]["note"]) ? $obj->multilangs[$langs->defaultlang]["note"] : $obj->note,
-					            'status_tosell' => $obj->status,
-					            'status_tobuy' => $obj->status_buy,
-		                		'type' => $obj->type,
-						        'barcode' => $obj->barcode,
-						        'barcode_type' => $obj->barcode_type,
-		                		'country_id' => $obj->country_id>0?$obj->country_id:'',
-						        'country_code' => $obj->country_code,
-						        'custom_code' => $obj->customcode,
-
-						        'price_net' => $obj->price,
-						        'price' => $obj->price_ttc,
-						        'vat_rate' => $obj->tva_tx,
+								'label' => ! empty($obj->multilangs[$langs->defaultlang]["label"]) ? $obj->multilangs[$langs->defaultlang]["label"] : $obj->label,
+								'description' => ! empty($obj->multilangs[$langs->defaultlang]["description"]) ? $obj->multilangs[$langs->defaultlang]["description"] : $obj->description,
+								'date_creation' => dol_print_date($obj->date_creation,'dayhourrfc'),
+								'date_modification' => dol_print_date($obj->date_modification,'dayhourrfc'),
+								'note' => ! empty($obj->multilangs[$langs->defaultlang]["note"]) ? $obj->multilangs[$langs->defaultlang]["note"] : $obj->note,
+								'status_tosell' => $obj->status,
+								'status_tobuy' => $obj->status_buy,
+								'type' => $obj->type,
+								'barcode' => $obj->barcode,
+								'barcode_type' => $obj->barcode_type,
+								'country_id' => $obj->country_id>0?$obj->country_id:'',
+								'country_code' => $obj->country_code,
+								'custom_code' => $obj->customcode,
+
+								'price_net' => $obj->price,
+								'price' => $obj->price_ttc,
+								'vat_rate' => $obj->tva_tx,
 
 								'price_base_type' => $obj->price_base_type,
 
-						        'stock_real' => $obj->stock_reel,
-		                		'stock_alert' => $obj->seuil_stock_alerte,
-						        'pmp' => $obj->pmp,
-		                		'import_key' => $obj->import_key,
-		                		'dir' => $pdir,
-		                		'images' => $obj->liste_photos($dir,$nbmax=10)
+								'stock_real' => $obj->stock_reel,
+								'stock_alert' => $obj->seuil_stock_alerte,
+								'pmp' => $obj->pmp,
+								'import_key' => $obj->import_key,
+								'dir' => $pdir,
+								'images' => $obj->liste_photos($dir,$nbmax=10)
 							);
 
 							//Retreive all extrafield for thirdsparty

Spacing +308 added lines, -308 removed lines

@@ -23,10 +23,10 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
 
 require_once '../master.inc.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -46,18 +46,18 @@ 
 {
     $langs->load("admin");
     dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
     print $langs->trans("ToActivateModule");
     exit;
 }
 
 // Create the soap Object
 $server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrProductOrService',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
+$server->soap_defencoding = 'UTF-8';
+$server->decode_utf8 = false;
+$ns = 'http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrProductOrService', $ns);
+$server->wsdl->schemaTargetNamespace = $ns;
 
 
 // Define WSDL Authentication object
@@ -68,11 +68,11 @@ 
     'all',
     '',
     array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string')
+        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
+        'password' => array('name'=>'password', 'type'=>'xsd:string'),
+        'entity' => array('name'=>'entity', 'type'=>'xsd:string')
     )
 );
 // Define WSDL Return object
@@ -83,70 +83,70 @@ 
     'all',
     '',
     array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string')
+        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string')
     )
 );
 
 $productorservice_fields = array(
-    'id' => array('name'=>'id','type'=>'xsd:string'),
-    'ref' => array('name'=>'ref','type'=>'xsd:string'),
-    'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-    'type' => array('name'=>'type','type'=>'xsd:string'),
-    'label' => array('name'=>'label','type'=>'xsd:string'),
-    'description' => array('name'=>'description','type'=>'xsd:string'),
-    'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
-    'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
-    'note' => array('name'=>'note','type'=>'xsd:string'),
-    'status_tobuy' => array('name'=>'status_tobuy','type'=>'xsd:string'),
-    'status_tosell' => array('name'=>'status_tosell','type'=>'xsd:string'),
-    'barcode' => array('name'=>'barcode','type'=>'xsd:string'),
-    'barcode_type' => array('name'=>'barcode_type','type'=>'xsd:string'),
-    'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
-    'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
-    'customcode' => array('name'=>'customcode','type'=>'xsd:string'),
-
-    'price_net' => array('name'=>'price_net','type'=>'xsd:string'),
-    'price' => array('name'=>'price','type'=>'xsd:string'),
-    'price_min_net' => array('name'=>'price_min_net','type'=>'xsd:string'),
-    'price_min' => array('name'=>'price_min','type'=>'xsd:string'),
-
-    'price_base_type' => array('name'=>'price_base_type','type'=>'xsd:string'),
-
-    'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:string'),
-    'vat_npr' => array('name'=>'vat_npr','type'=>'xsd:string'),
-    'localtax1_tx' => array('name'=>'localtax1_tx','type'=>'xsd:string'),
-    'localtax2_tx' => array('name'=>'localtax2_tx','type'=>'xsd:string'),
-
-    'stock_alert' => array('name'=>'stock_alert','type'=>'xsd:string'),
-    'stock_real' => array('name'=>'stock_real','type'=>'xsd:string'),
-    'stock_pmp' => array('name'=>'stock_pmp','type'=>'xsd:string'),
-    'warehouse_ref' => array('name'=>'warehouse_ref','type'=>'xsd:string'),		// Used only for create or update to set which warehouse to use for stock correction if stock_real differs from database
-
-    'canvas' => array('name'=>'canvas','type'=>'xsd:string'),
-    'import_key' => array('name'=>'import_key','type'=>'xsd:string'),
-
-    'dir' => array('name'=>'dir','type'=>'xsd:string'),
-    'images' => array('name'=>'images','type'=>'tns:ImagesArray')
+    'id' => array('name'=>'id', 'type'=>'xsd:string'),
+    'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+    'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+    'type' => array('name'=>'type', 'type'=>'xsd:string'),
+    'label' => array('name'=>'label', 'type'=>'xsd:string'),
+    'description' => array('name'=>'description', 'type'=>'xsd:string'),
+    'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+    'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+    'note' => array('name'=>'note', 'type'=>'xsd:string'),
+    'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
+    'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
+    'barcode' => array('name'=>'barcode', 'type'=>'xsd:string'),
+    'barcode_type' => array('name'=>'barcode_type', 'type'=>'xsd:string'),
+    'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
+    'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
+    'customcode' => array('name'=>'customcode', 'type'=>'xsd:string'),
+
+    'price_net' => array('name'=>'price_net', 'type'=>'xsd:string'),
+    'price' => array('name'=>'price', 'type'=>'xsd:string'),
+    'price_min_net' => array('name'=>'price_min_net', 'type'=>'xsd:string'),
+    'price_min' => array('name'=>'price_min', 'type'=>'xsd:string'),
+
+    'price_base_type' => array('name'=>'price_base_type', 'type'=>'xsd:string'),
+
+    'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:string'),
+    'vat_npr' => array('name'=>'vat_npr', 'type'=>'xsd:string'),
+    'localtax1_tx' => array('name'=>'localtax1_tx', 'type'=>'xsd:string'),
+    'localtax2_tx' => array('name'=>'localtax2_tx', 'type'=>'xsd:string'),
+
+    'stock_alert' => array('name'=>'stock_alert', 'type'=>'xsd:string'),
+    'stock_real' => array('name'=>'stock_real', 'type'=>'xsd:string'),
+    'stock_pmp' => array('name'=>'stock_pmp', 'type'=>'xsd:string'),
+    'warehouse_ref' => array('name'=>'warehouse_ref', 'type'=>'xsd:string'), // Used only for create or update to set which warehouse to use for stock correction if stock_real differs from database
+
+    'canvas' => array('name'=>'canvas', 'type'=>'xsd:string'),
+    'import_key' => array('name'=>'import_key', 'type'=>'xsd:string'),
+
+    'dir' => array('name'=>'dir', 'type'=>'xsd:string'),
+    'images' => array('name'=>'images', 'type'=>'tns:ImagesArray')
 );
 
 //Retreive all extrafield for product
 // fetch optionals attributes and labels
-$extrafields=new ExtraFields($db);
-$extralabels=$extrafields->fetch_name_optionals_label('product',true);
-if (count($extrafields)>0) {
+$extrafields = new ExtraFields($db);
+$extralabels = $extrafields->fetch_name_optionals_label('product', true);
+if (count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-foreach($extrafields->attribute_label as $key=>$label)
+foreach ($extrafields->attribute_label as $key=>$label)
 {
-	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	$type = $extrafields->attribute_type[$key];
+	if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
+	else {$type = 'xsd:string'; }
 
-	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
+	$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
 }
 
-$productorservice_fields=array_merge($productorservice_fields,$extrafield_array);
+$productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
 
 // Define other specific objects
 $server->wsdl->addComplexType(
@@ -188,10 +188,10 @@ 
 	'all',
 	'',
 	array(
-		'photo' => array('name'=>'photo','type'=>'xsd:string'),
-		'photo_vignette' => array('name'=>'photo_vignette','type'=>'xsd:string'),
-		'imgWidth' => array('name'=>'imgWidth','type'=>'xsd:string'),
-		'imgHeight' => array('name'=>'imgHeight','type'=>'xsd:string')
+		'photo' => array('name'=>'photo', 'type'=>'xsd:string'),
+		'photo_vignette' => array('name'=>'photo_vignette', 'type'=>'xsd:string'),
+		'imgWidth' => array('name'=>'imgWidth', 'type'=>'xsd:string'),
+		'imgHeight' => array('name'=>'imgHeight', 'type'=>'xsd:string')
 	)
 );
 
@@ -205,9 +205,9 @@ 
     '',
     array(
         //'limit' => array('name'=>'limit','type'=>'xsd:string'),
-		'type' => array('name'=>'type','type'=>'xsd:string'),
-	    'status_tobuy' => array('name'=>'status_tobuy','type'=>'xsd:string'),
-	    'status_tosell' => array('name'=>'status_tosell','type'=>'xsd:string'),
+		'type' => array('name'=>'type', 'type'=>'xsd:string'),
+	    'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
+	    'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
     )
 );
 
@@ -232,8 +232,8 @@ 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
 // Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
 // http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
+$styledoc = 'rpc'; // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded'; // encoded/literal/literal wrapped
 // Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
 
 
@@ -241,9 +241,9 @@ 
 $server->register(
     'getProductOrService',
     // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string','lang'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string', 'lang'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','product'=>'tns:product'),
+    array('result'=>'tns:result', 'product'=>'tns:product'),
     $ns,
     $ns.'#getProductOrService',
     $styledoc,
@@ -255,9 +255,9 @@ 
 $server->register(
     'createProductOrService',
     // Entry values
-    array('authentication'=>'tns:authentication','product'=>'tns:product'),
+    array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
     // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string'),
+    array('result'=>'tns:result', 'id'=>'xsd:string'),
     $ns,
     $ns.'#createProductOrService',
     $styledoc,
@@ -269,9 +269,9 @@ 
 $server->register(
     'updateProductOrService',
     // Entry values
-    array('authentication'=>'tns:authentication','product'=>'tns:product'),
+    array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
     // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string'),
+    array('result'=>'tns:result', 'id'=>'xsd:string'),
     $ns,
     $ns.'#updateProductOrService',
     $styledoc,
@@ -283,9 +283,9 @@ 
 $server->register(
     'deleteProductOrService',
     // Entry values
-    array('authentication'=>'tns:authentication','listofid'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'listofid'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','nbdeleted'=>'xsd:int'),
+    array('result'=>'tns:result', 'nbdeleted'=>'xsd:int'),
     $ns,
     $ns.'#deleteProductOrService',
     $styledoc,
@@ -297,9 +297,9 @@ 
 $server->register(
     'getListOfProductsOrServices',
     // Entry values
-    array('authentication'=>'tns:authentication','filterproduct'=>'tns:filterproduct'),
+    array('authentication'=>'tns:authentication', 'filterproduct'=>'tns:filterproduct'),
     // Exit values
-    array('result'=>'tns:result','products'=>'tns:ProductsArray2'),
+    array('result'=>'tns:result', 'products'=>'tns:ProductsArray2'),
     $ns,
     $ns.'#getListOfProductsOrServices',
     $styledoc,
@@ -311,9 +311,9 @@ 
 $server->register(
 	'getProductsForCategory',
 	// Entry values
-	array('authentication'=>'tns:authentication','id'=>'xsd:string','lang'=>'xsd:string'),
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'lang'=>'xsd:string'),
 	// Exit values
-	array('result'=>'tns:result','products'=>'tns:ProductsArray2'),
+	array('result'=>'tns:result', 'products'=>'tns:ProductsArray2'),
 	$ns,
 	$ns.'#getProductsForCategory',
 	$styledoc,
@@ -332,53 +332,53 @@ 
  * @param   string      $lang               Lang to force
  * @return	mixed
  */
-function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang='')
+function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = '', $lang = '')
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
     dol_syslog("Function: getProductOrService login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-    $langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+    $langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
     $langs->setDefaultLang($langcode);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+    if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
     {
         $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
     }
 
-    if (! $error)
+    if (!$error)
     {
 
-    	$langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+    	$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
     	$langs->setDefaultLang($langcode);
 
         $fuser->getrights();
 
         if ($fuser->rights->produit->lire || $fuser->rights->service->lire)
         {
-            $product=new Product($db);
-            $result=$product->fetch($id,$ref,$ref_ext);
+            $product = new Product($db);
+            $result = $product->fetch($id, $ref, $ref_ext);
 
             if ($result > 0)
             {
             	$product->load_stock();
 
-            	$dir = (!empty($conf->product->dir_output)?$conf->product->dir_output:$conf->service->dir_output);
-            	$pdir = get_exdir($product->id,2,0,0,$product,'product') . $product->ref . "/";
-            	$dir = $dir . '/'. $pdir;
+            	$dir = (!empty($conf->product->dir_output) ? $conf->product->dir_output : $conf->service->dir_output);
+            	$pdir = get_exdir($product->id, 2, 0, 0, $product, 'product').$product->ref."/";
+            	$dir = $dir.'/'.$pdir;
 
-            	if (! empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label =  $product->multilangs[$langs->defaultlang]["label"];
-            	if (! empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description =  $product->multilangs[$langs->defaultlang]["description"];
-            	if (! empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note =  $product->multilangs[$langs->defaultlang]["note"];
+            	if (!empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label = $product->multilangs[$langs->defaultlang]["label"];
+            	if (!empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description = $product->multilangs[$langs->defaultlang]["description"];
+            	if (!empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note = $product->multilangs[$langs->defaultlang]["note"];
 
             	$productorservice_result_fields = array(
 	            	'id' => $product->id,
@@ -386,15 +386,15 @@ 
 	            	'ref_ext' => $product->ref_ext,
 	            	'label' => $product->label,
 	            	'description' => $product->description,
-	            	'date_creation' => dol_print_date($product->date_creation,'dayhourrfc'),
-	            	'date_modification' => dol_print_date($product->date_modification,'dayhourrfc'),
+	            	'date_creation' => dol_print_date($product->date_creation, 'dayhourrfc'),
+	            	'date_modification' => dol_print_date($product->date_modification, 'dayhourrfc'),
 	            	'note' => $product->note,
 	            	'status_tosell' => $product->status,
 	            	'status_tobuy' => $product->status_buy,
 	            	'type' => $product->type,
 	            	'barcode' => $product->barcode,
 	            	'barcode_type' => $product->barcode_type,
-	            	'country_id' => $product->country_id>0?$product->country_id:'',
+	            	'country_id' => $product->country_id > 0 ? $product->country_id : '',
 	            	'country_code' => $product->country_code,
 	            	'custom_code' => $product->customcode,
 
@@ -416,19 +416,19 @@ 
 	            	'pmp' => $product->pmp,
 	            	'import_key' => $product->import_key,
 	            	'dir' => $pdir,
-	            	'images' => $product->liste_photos($dir,$nbmax=10)
+	            	'images' => $product->liste_photos($dir, $nbmax = 10)
             	);
 
                 //Retreive all extrafield for thirdsparty
             	// fetch optionals attributes and labels
-            	$extrafields=new ExtraFields($db);
-            	$extralabels=$extrafields->fetch_name_optionals_label('product',true);
+            	$extrafields = new ExtraFields($db);
+            	$extralabels = $extrafields->fetch_name_optionals_label('product', true);
             	//Get extrafield values
-            	$product->fetch_optionals($product->id,$extralabels);
+            	$product->fetch_optionals($product->id, $extralabels);
 
-            	foreach($extrafields->attribute_label as $key=>$label)
+            	foreach ($extrafields->attribute_label as $key=>$label)
             	{
-            		$productorservice_result_fields=array_merge($productorservice_result_fields,array('options_'.$key => $product->array_options['options_'.$key]));
+            		$productorservice_result_fields = array_merge($productorservice_result_fields, array('options_'.$key => $product->array_options['options_'.$key]));
             	}
 
                 // Create
@@ -440,13 +440,13 @@ 
             else
             {
                 $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
         else
         {
             $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
     }
 
@@ -466,56 +466,56 @@ 
  * @param	Product		$product			Product
  * @return	array							Array result
  */
-function createProductOrService($authentication,$product)
+function createProductOrService($authentication, $product)
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
-    $now=dol_now();
+    $now = dol_now();
 
     dol_syslog("Function: createProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type']='HT';
-    if ($product['price'] > 0)     $product['price_base_type']='TTC';
+    if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
+    if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
 
     if ($product['price_net'] > 0 && $product['price'] > 0)
     {
-        $error++; $errorcode='KO'; $errorlabel="You must choose between price or price_net to provide price.";
+        $error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
     }
 
     if ($product['barcode'] && !$product['barcode_type'])
     {
-	$errror++; $errorcode='KO' ; $errorlabel="You must set a barcode type when setting a barcode.";
+	$errror++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
     }
 
 
 
-    if (! $error)
+    if (!$error)
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        $newobject=new Product($db);
-        $newobject->ref=$product['ref'];
-        $newobject->ref_ext=$product['ref_ext'];
-        $newobject->type=$product['type'];
-        $newobject->libelle=$product['label'];    // @deprecated
-        $newobject->label=$product['label'];
-        $newobject->description=$product['description'];
-        $newobject->note=$product['note'];
-        $newobject->status=$product['status_tosell'];
-        $newobject->status_buy=$product['status_tobuy'];
-        $newobject->price=$product['price_net'];
-        $newobject->price_ttc=$product['price'];
-        $newobject->tva_tx=$product['vat_rate'];
-        $newobject->price_base_type=$product['price_base_type'];
-        $newobject->date_creation=$now;
+        $newobject = new Product($db);
+        $newobject->ref = $product['ref'];
+        $newobject->ref_ext = $product['ref_ext'];
+        $newobject->type = $product['type'];
+        $newobject->libelle = $product['label']; // @deprecated
+        $newobject->label = $product['label'];
+        $newobject->description = $product['description'];
+        $newobject->note = $product['note'];
+        $newobject->status = $product['status_tosell'];
+        $newobject->status_buy = $product['status_tobuy'];
+        $newobject->price = $product['price_net'];
+        $newobject->price_ttc = $product['price'];
+        $newobject->tva_tx = $product['vat_rate'];
+        $newobject->price_base_type = $product['price_base_type'];
+        $newobject->date_creation = $now;
 
 		if ($product['barcode'])
 		{
@@ -523,15 +523,15 @@ 
 			$newobject->barcode_type = $product['barcode_type'];
 		}
 
-        $newobject->stock_reel=$product['stock_real'];
-        $newobject->pmp=$product['pmp'];
-        $newobject->seuil_stock_alert=$product['stock_alert'];
+        $newobject->stock_reel = $product['stock_real'];
+        $newobject->pmp = $product['pmp'];
+        $newobject->seuil_stock_alert = $product['stock_alert'];
 
-        $newobject->country_id=$product['country_id'];
-        if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
-        $newobject->customcode=$product['customcode'];
+        $newobject->country_id = $product['country_id'];
+        if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
+        $newobject->customcode = $product['customcode'];
 
-        $newobject->canvas=$product['canvas'];
+        $newobject->canvas = $product['canvas'];
         /*foreach($product['lines'] as $line)
         {
             $newline=new FactureLigne($db);
@@ -548,31 +548,31 @@ 
         //var_dump($product['ref_ext']);
         //var_dump($product['lines'][0]['type']);
 
-        $extrafields=new ExtraFields($db);
-		$extralabels=$extrafields->fetch_name_optionals_label('product',true);
-		foreach($extrafields->attribute_label as $key=>$label)
+        $extrafields = new ExtraFields($db);
+		$extralabels = $extrafields->fetch_name_optionals_label('product', true);
+		foreach ($extrafields->attribute_label as $key=>$label)
 		{
-			$key='options_'.$key;
-			$newobject->array_options[$key]=$product[$key];
+			$key = 'options_'.$key;
+			$newobject->array_options[$key] = $product[$key];
 		}
 
         $db->begin();
 
-        $result=$newobject->create($fuser,0);
+        $result = $newobject->create($fuser, 0);
         if ($result <= 0)
         {
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
         	// Update stock if stock count is provided and differs from database after creation or update
-			if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled))
+			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
-				$savstockreal=$newobject->stock_reel;
-				$newobject->load_stock('novirtual,nobatch');		// This overwrite ->stock_reel, surely 0 because we have just created product
+				$savstockreal = $newobject->stock_reel;
+				$newobject->load_stock('novirtual,nobatch'); // This overwrite ->stock_reel, surely 0 because we have just created product
 				$getstockreal = $newobject->stock_reel;
 
 				if ($savstockreal != $getstockreal)
@@ -583,38 +583,38 @@ 
 					{
 						if (($savstockreal - $getstockreal) > 0)
 						{
-							$result=$newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 0, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now,'dayhourlog'));
+							$result = $newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 0, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now, 'dayhourlog'));
 						}
 						if (($savstockreal - $getstockreal) > 0)
 						{
-							$result=$newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 1, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now,'dayhourlog'));
+							$result = $newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 1, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now, 'dayhourlog'));
 						}
 						if ($result <= 0)
 						{
 							$error++;
-							$newobject->error='You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
+							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
 					}
 					else
 					{
 						$error++;
-						$newobject->error='You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
+						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
 				}
 			}
 		}
 
-        if (! $error)
+        if (!$error)
         {
             $db->commit();
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
         else
         {
             $db->rollback();
             $error++;
-            $errorcode='KO';
-            $errorlabel=$newobject->error;
+            $errorcode = 'KO';
+            $errorlabel = $newobject->error;
         }
 
     }
@@ -635,57 +635,57 @@ 
  * @param	Product		$product			Product
  * @return	array							Array result
  */
-function updateProductOrService($authentication,$product)
+function updateProductOrService($authentication, $product)
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
-    $now=dol_now();
+    $now = dol_now();
 
     dol_syslog("Function: updateProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type']='HT';
-    if ($product['price'] > 0)     $product['price_base_type']='TTC';
+    if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
+    if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
 
     if ($product['price_net'] > 0 && $product['price'] > 0)
     {
-        $error++; $errorcode='KO'; $errorlabel="You must choose between price or price_net to provide price.";
+        $error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
     }
 
 
     if ($product['barcode'] && !$product['barcode_type'])
     {
-        $errror++; $errorcode='KO' ; $errorlabel="You must set a barcode type when setting a barcode.";
+        $errror++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
     }
 
-    if (! $error)
+    if (!$error)
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        $newobject=new Product($db);
+        $newobject = new Product($db);
         $newobject->fetch($product['id']);
 
-        if (isset($product['ref']))     $newobject->ref=$product['ref'];
-        if (isset($product['ref_ext'])) $newobject->ref_ext=$product['ref_ext'];
-        $newobject->type=$product['type'];
-        $newobject->libelle=$product['label'];    // @deprecated
-        $newobject->label=$product['label'];
-        $newobject->description=$product['description'];
-        $newobject->note=$product['note'];
-        $newobject->status=$product['status_tosell'];
-        $newobject->status_buy=$product['status_tobuy'];
-        $newobject->price=$product['price_net'];
-        $newobject->price_ttc=$product['price'];
-        $newobject->tva_tx=$product['vat_rate'];
-        $newobject->price_base_type=$product['price_base_type'];
-        $newobject->date_creation=$now;
+        if (isset($product['ref']))     $newobject->ref = $product['ref'];
+        if (isset($product['ref_ext'])) $newobject->ref_ext = $product['ref_ext'];
+        $newobject->type = $product['type'];
+        $newobject->libelle = $product['label']; // @deprecated
+        $newobject->label = $product['label'];
+        $newobject->description = $product['description'];
+        $newobject->note = $product['note'];
+        $newobject->status = $product['status_tosell'];
+        $newobject->status_buy = $product['status_tobuy'];
+        $newobject->price = $product['price_net'];
+        $newobject->price_ttc = $product['price'];
+        $newobject->tva_tx = $product['vat_rate'];
+        $newobject->price_base_type = $product['price_base_type'];
+        $newobject->date_creation = $now;
 
         if ($product['barcode'])
         {
@@ -693,15 +693,15 @@ 
                 $newobject->barcode_type = $product['barcode_type'];
         }
 
-        $newobject->stock_reel=$product['stock_real'];
-        $newobject->pmp=$product['pmp'];
-        $newobject->seuil_stock_alert=$product['stock_alert'];
+        $newobject->stock_reel = $product['stock_real'];
+        $newobject->pmp = $product['pmp'];
+        $newobject->seuil_stock_alert = $product['stock_alert'];
 
-        $newobject->country_id=$product['country_id'];
-        if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
-        $newobject->customcode=$product['customcode'];
+        $newobject->country_id = $product['country_id'];
+        if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
+        $newobject->customcode = $product['customcode'];
 
-        $newobject->canvas=$product['canvas'];
+        $newobject->canvas = $product['canvas'];
         /*foreach($product['lines'] as $line)
         {
             $newline=new FactureLigne($db);
@@ -718,17 +718,17 @@ 
         //var_dump($product['ref_ext']);
         //var_dump($product['lines'][0]['type']);
 
-		$extrafields=new ExtraFields($db);
-		$extralabels=$extrafields->fetch_name_optionals_label('product',true);
-		foreach($extrafields->attribute_label as $key=>$label)
+		$extrafields = new ExtraFields($db);
+		$extralabels = $extrafields->fetch_name_optionals_label('product', true);
+		foreach ($extrafields->attribute_label as $key=>$label)
 		{
-			$key='options_'.$key;
-			$newobject->array_options[$key]=$product[$key];
+			$key = 'options_'.$key;
+			$newobject->array_options[$key] = $product[$key];
 		}
 
         $db->begin();
 
-        $result=$newobject->update($newobject->id,$fuser);
+        $result = $newobject->update($newobject->id, $fuser);
         if ($result <= 0)
         {
             $error++;
@@ -736,12 +736,12 @@ 
         else
 		{
         	// Update stock if stock count is provided and differs from database after creation or update
-			if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled))
+			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
-				$savstockreal=$newobject->stock_reel;
-				$newobject->load_stock('novirtual,nobatch');		// This overwrite ->stock_reel
+				$savstockreal = $newobject->stock_reel;
+				$newobject->load_stock('novirtual,nobatch'); // This overwrite ->stock_reel
 				$getstockreal = $newobject->stock_reel;
 
 				if ($savstockreal != $getstockreal)
@@ -752,32 +752,32 @@ 
 					{
 						if (($savstockreal - $getstockreal) > 0)
 						{
-							$result=$newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 0, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now,'dayhourlog'));
+							$result = $newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 0, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now, 'dayhourlog'));
 						}
 						if (($savstockreal - $getstockreal) > 0)
 						{
-							$result=$newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 1, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now,'dayhourlog'));
+							$result = $newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 1, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now, 'dayhourlog'));
 						}
 						if ($result <= 0)
 						{
 							$error++;
-							$newobject->error='You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
+							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
 					}
 					else
 					{
 						$error++;
-						$newobject->error='You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
+						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
 				}
 			}
         }
 
-        if (! $error)
+        if (!$error)
         {
             if ($newobject->price_base_type == 'HT')
             {
-                $result=$newobject->updatePrice($newobject->price, $newobject->price_base_type,$fuser);
+                $result = $newobject->updatePrice($newobject->price, $newobject->price_base_type, $fuser);
                 if ($result <= 0)
                 {
                     $error++;
@@ -785,7 +785,7 @@ 
             }
             elseif ($newobject->price_base_type == 'TTC')
             {
-                $result=$newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
+                $result = $newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
                 if ($result <= 0)
                 {
                     $error++;
@@ -793,17 +793,17 @@ 
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             $db->commit();
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
         else
 		{
             $db->rollback();
             $error++;
-            $errorcode='KO';
-            $errorlabel=$newobject->error;
+            $errorcode = 'KO';
+            $errorlabel = $newobject->error;
         }
 
     }
@@ -824,78 +824,78 @@ 
  * @param	string		$listofidstring		List of id with comma
  * @return	array							Array result
  */
-function deleteProductOrService($authentication,$listofidstring)
+function deleteProductOrService($authentication, $listofidstring)
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
-    $now=dol_now();
+    $now = dol_now();
 
     dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	// User must be defined to user authenticated
     global $user;
-    $user=$fuser;
+    $user = $fuser;
 
-    $listofid=explode(',',trim($listofidstring));
-    $listofiddeleted=array();
+    $listofid = explode(',', trim($listofidstring));
+    $listofiddeleted = array();
 
     // Check parameters
     if (count($listofid) == 0 || empty($listofid[0]))
     {
-        $error++; $errorcode='KO'; $errorlabel="List of Id of products or services to delete are required.";
+        $error++; $errorcode = 'KO'; $errorlabel = "List of Id of products or services to delete are required.";
     }
 
-    if (! $error)
+    if (!$error)
     {
-    	$firsterror='';
+    	$firsterror = '';
 
 		$db->begin();
 
-    	foreach($listofid as $key => $id)
+    	foreach ($listofid as $key => $id)
 		{
-	        $newobject=new Product($db);
-	        $result=$newobject->fetch($id);
+	        $newobject = new Product($db);
+	        $result = $newobject->fetch($id);
 
 	        if ($result == 0)
 	        {
 	        	$error++;
-		        $firsterror='Product or service with id '.$id.' not found';
+		        $firsterror = 'Product or service with id '.$id.' not found';
 		        break;
 	        }
 	        else
 			{
-		        $result=$newobject->delete($user);
+		        $result = $newobject->delete($user);
 		        if ($result <= 0)
 		        {
 		            $error++;
-		            $firsterror=$newobject->error;
+		            $firsterror = $newobject->error;
 		            break;
 		        }
 
-		        $listofiddeleted[]=$id;
+		        $listofiddeleted[] = $id;
 			}
 		}
 
-	    if (! $error)
+	    if (!$error)
 	    {
 	        $db->commit();
             //$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
+            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
 	    }
 	    else
 	    {
 	    	$db->rollback();
 	        $error++;
-	        $errorcode='KO';
-	        $errorlabel=$firsterror;
+	        $errorcode = 'KO';
+	        $errorlabel = $firsterror;
 		}
     }
 
@@ -907,7 +907,7 @@ 
     else if (count($listofiddeleted) == 0)
     {
    		//$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'listofid'=>$listofiddeleted);
-   		$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'nbdeleted'=>0);
+   		$objectresp = array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',', $listofid).' found'), 'nbdeleted'=>0);
     }
 
     return $objectresp;
@@ -921,53 +921,53 @@ 
  * @param	array		$filterproduct		Filter fields
  * @return	array							Array result
  */
-function getListOfProductsOrServices($authentication,$filterproduct)
+function getListOfProductsOrServices($authentication, $filterproduct)
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
-    $now=dol_now();
+    $now = dol_now();
 
     dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $arrayproducts=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $arrayproducts = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
 
-    if (! $error)
+    if (!$error)
     {
-        $sql ="SELECT rowid, ref, ref_ext";
-        $sql.=" FROM ".MAIN_DB_PREFIX."product";
-        $sql.=" WHERE entity=".$conf->entity;
-        foreach($filterproduct as $key => $val)
+        $sql = "SELECT rowid, ref, ref_ext";
+        $sql .= " FROM ".MAIN_DB_PREFIX."product";
+        $sql .= " WHERE entity=".$conf->entity;
+        foreach ($filterproduct as $key => $val)
         {
-		if ($key == 'type' && $val >= 0)   	$sql.=" AND fk_product_type = ".$db->escape($val);
-		if ($key == 'status_tosell') 				$sql.=" AND tosell = ".$db->escape($val);
-		if ($key == 'status_tobuy')  				$sql.=" AND tobuy = ".$db->escape($val);
+		if ($key == 'type' && $val >= 0)   	$sql .= " AND fk_product_type = ".$db->escape($val);
+		if ($key == 'status_tosell') 				$sql .= " AND tosell = ".$db->escape($val);
+		if ($key == 'status_tobuy')  				$sql .= " AND tobuy = ".$db->escape($val);
         }
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
         if ($resql)
         {
-         	$num=$db->num_rows($resql);
+         	$num = $db->num_rows($resql);
 
-         	$i=0;
+         	$i = 0;
          	while ($i < $num)
          	{
-         		$obj=$db->fetch_object($resql);
-         		$arrayproducts[]=array('id'=>$obj->rowid,'ref'=>$obj->ref,'ref_ext'=>$obj->ref_ext);
+         		$obj = $db->fetch_object($resql);
+         		$arrayproducts[] = array('id'=>$obj->rowid, 'ref'=>$obj->ref, 'ref_ext'=>$obj->ref_ext);
          		$i++;
          	}
         }
         else
         {
             $error++;
-            $errorcode=$db->lasterrno();
-            $errorlabel=$db->lasterror();
+            $errorcode = $db->lasterrno();
+            $errorlabel = $db->lasterror();
         }
     }
 
@@ -998,53 +998,53 @@ 
  * @param	$lang		$lang				Force lang
  * @return	array							Array result
  */
-function getProductsForCategory($authentication,$id,$lang='')
+function getProductsForCategory($authentication, $id, $lang = '')
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
-	$langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+	$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 	$langs->setDefaultLang($langcode);
 
 	dol_syslog("Function: getProductsForCategory login=".$authentication['login']." id=".$id);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
 
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 
-	if (! $error && !$id)
+	if (!$error && !$id)
 	{
 		$error++;
-		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id must be provided.";
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id must be provided.";
 	}
 
 
-	if (! $error)
+	if (!$error)
 	{
-		$langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+		$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 		$langs->setDefaultLang($langcode);
 
 		$fuser->getrights();
 
 		if ($fuser->rights->produit->lire)
 		{
-			$categorie=new Categorie($db);
-			$result=$categorie->fetch($id);
+			$categorie = new Categorie($db);
+			$result = $categorie->fetch($id);
 			if ($result > 0)
 			{
 				$table = "product";
 				$field = "product";
 				$sql  = "SELECT fk_".$field." FROM ".MAIN_DB_PREFIX."categorie_".$table;
 				$sql .= " WHERE fk_categorie = ".$id;
-				$sql .= " ORDER BY fk_".$field." ASC" ;
+				$sql .= " ORDER BY fk_".$field." ASC";
 
 
 				dol_syslog("getProductsForCategory get id of product into category", LOG_DEBUG);
-				$res  = $db->query($sql);
+				$res = $db->query($sql);
 				if ($res)
 				{
 					while ($rec = $db->fetch_array($res))
@@ -1052,27 +1052,27 @@ 
 						$obj = new Product($db);
 						$obj->fetch($rec['fk_'.$field]);
 						$iProduct = 0;
-						if($obj->status > 0 )
+						if ($obj->status > 0)
 						{
-							$dir = (!empty($conf->product->dir_output)?$conf->product->dir_output:$conf->service->dir_output);
-							$pdir = get_exdir($obj->id,2,0,0,$product,'product') . $obj->id ."/photos/";
-							$dir = $dir . '/'. $pdir;
+							$dir = (!empty($conf->product->dir_output) ? $conf->product->dir_output : $conf->service->dir_output);
+							$pdir = get_exdir($obj->id, 2, 0, 0, $product, 'product').$obj->id."/photos/";
+							$dir = $dir.'/'.$pdir;
 
 							$products[] = array(
 						    	'id' => $obj->id,
 					   			'ref' => $obj->ref,
 					   			'ref_ext' => $obj->ref_ext,
-					    		'label' => ! empty($obj->multilangs[$langs->defaultlang]["label"]) ? $obj->multilangs[$langs->defaultlang]["label"] : $obj->label,
-					    		'description' => ! empty($obj->multilangs[$langs->defaultlang]["description"]) ? $obj->multilangs[$langs->defaultlang]["description"] : $obj->description,
-					    		'date_creation' => dol_print_date($obj->date_creation,'dayhourrfc'),
-					    		'date_modification' => dol_print_date($obj->date_modification,'dayhourrfc'),
-					            'note' => ! empty($obj->multilangs[$langs->defaultlang]["note"]) ? $obj->multilangs[$langs->defaultlang]["note"] : $obj->note,
+					    		'label' => !empty($obj->multilangs[$langs->defaultlang]["label"]) ? $obj->multilangs[$langs->defaultlang]["label"] : $obj->label,
+					    		'description' => !empty($obj->multilangs[$langs->defaultlang]["description"]) ? $obj->multilangs[$langs->defaultlang]["description"] : $obj->description,
+					    		'date_creation' => dol_print_date($obj->date_creation, 'dayhourrfc'),
+					    		'date_modification' => dol_print_date($obj->date_modification, 'dayhourrfc'),
+					            'note' => !empty($obj->multilangs[$langs->defaultlang]["note"]) ? $obj->multilangs[$langs->defaultlang]["note"] : $obj->note,
 					            'status_tosell' => $obj->status,
 					            'status_tobuy' => $obj->status_buy,
 		                		'type' => $obj->type,
 						        'barcode' => $obj->barcode,
 						        'barcode_type' => $obj->barcode_type,
-		                		'country_id' => $obj->country_id>0?$obj->country_id:'',
+		                		'country_id' => $obj->country_id > 0 ? $obj->country_id : '',
 						        'country_code' => $obj->country_code,
 						        'custom_code' => $obj->customcode,
 
@@ -1087,19 +1087,19 @@ 
 						        'pmp' => $obj->pmp,
 		                		'import_key' => $obj->import_key,
 		                		'dir' => $pdir,
-		                		'images' => $obj->liste_photos($dir,$nbmax=10)
+		                		'images' => $obj->liste_photos($dir, $nbmax = 10)
 							);
 
 							//Retreive all extrafield for thirdsparty
 							// fetch optionals attributes and labels
-							$extrafields=new ExtraFields($db);
-							$extralabels=$extrafields->fetch_name_optionals_label('product',true);
+							$extrafields = new ExtraFields($db);
+							$extralabels = $extrafields->fetch_name_optionals_label('product', true);
 							//Get extrafield values
-							$obj->fetch_optionals($obj->id,$extralabels);
+							$obj->fetch_optionals($obj->id, $extralabels);
 
-							foreach($extrafields->attribute_label as $key=>$label)
+							foreach ($extrafields->attribute_label as $key=>$label)
 							{
-								$products[$iProduct]=array_merge($products[$iProduct],array('options_'.$key => $obj->array_options['options_'.$key]));
+								$products[$iProduct] = array_merge($products[$iProduct], array('options_'.$key => $obj->array_options['options_'.$key]));
 							}
 
 							$iProduct++;
@@ -1116,7 +1116,7 @@ 
 				}
 				else
 				{
-					$errorcode='NORECORDS_FOR_ASSOCIATION'; $errorlabel='No products associated'.$sql;
+					$errorcode = 'NORECORDS_FOR_ASSOCIATION'; $errorlabel = 'No products associated'.$sql;
 					$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 					dol_syslog("getProductsForCategory:: ".$c->error, LOG_DEBUG);
 
@@ -1125,13 +1125,13 @@ 
 			else
 			{
 				$error++;
-				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
 			}
 		}
 		else
 		{
 			$error++;
-			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 

Braces +80 added lines, -55 removed lines

@@ -23,7 +23,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
@@ -140,8 +142,7 @@ 
 foreach($extrafields->attribute_label as $key=>$label)
 {
 	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} else {$type='xsd:string';}
 
 	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
 }
@@ -341,7 +342,9 @@ 
     $langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
     $langs->setDefaultLang($langcode);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -376,9 +379,15 @@ 
             	$pdir = get_exdir($product->id,2,0,0,$product,'product') . $product->ref . "/";
             	$dir = $dir . '/'. $pdir;
 
-            	if (! empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label =  $product->multilangs[$langs->defaultlang]["label"];
-            	if (! empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description =  $product->multilangs[$langs->defaultlang]["description"];
-            	if (! empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note =  $product->multilangs[$langs->defaultlang]["note"];
+            	if (! empty($product->multilangs[$langs->defaultlang]["label"])) {
+            		$product->label =  $product->multilangs[$langs->defaultlang]["label"];
+            	}
+            	if (! empty($product->multilangs[$langs->defaultlang]["description"])) {
+            		$product->description =  $product->multilangs[$langs->defaultlang]["description"];
+            	}
+            	if (! empty($product->multilangs[$langs->defaultlang]["note"])) {
+            		$product->note =  $product->multilangs[$langs->defaultlang]["note"];
+            	}
 
             	$productorservice_result_fields = array(
 	            	'id' => $product->id,
@@ -436,14 +445,12 @@ 
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'product'=>$productorservice_result_fields
                 );
-            }
-            else
+            } else
             {
                 $error++;
                 $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -474,7 +481,9 @@ 
 
     dol_syslog("Function: createProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -482,8 +491,12 @@ 
     $error=0;
     $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
     // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type']='HT';
-    if ($product['price'] > 0)     $product['price_base_type']='TTC';
+    if ($product['price_net'] > 0) {
+    	$product['price_base_type']='HT';
+    }
+    if ($product['price'] > 0) {
+    	$product['price_base_type']='TTC';
+    }
 
     if ($product['price_net'] > 0 && $product['price'] > 0)
     {
@@ -528,7 +541,9 @@ 
         $newobject->seuil_stock_alert=$product['stock_alert'];
 
         $newobject->country_id=$product['country_id'];
-        if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
+        if ($product['country_code']) {
+        	$newobject->country_id=getCountry($product['country_code'],3);
+        }
         $newobject->customcode=$product['customcode'];
 
         $newobject->canvas=$product['canvas'];
@@ -594,8 +609,7 @@ 
 							$error++;
 							$newobject->error='You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
-					}
-					else
+					} else
 					{
 						$error++;
 						$newobject->error='You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
@@ -608,8 +622,7 @@ 
         {
             $db->commit();
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-        }
-        else
+        } else
         {
             $db->rollback();
             $error++;
@@ -643,7 +656,9 @@ 
 
     dol_syslog("Function: updateProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -651,8 +666,12 @@ 
     $error=0;
     $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
     // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type']='HT';
-    if ($product['price'] > 0)     $product['price_base_type']='TTC';
+    if ($product['price_net'] > 0) {
+    	$product['price_base_type']='HT';
+    }
+    if ($product['price'] > 0) {
+    	$product['price_base_type']='TTC';
+    }
 
     if ($product['price_net'] > 0 && $product['price'] > 0)
     {
@@ -672,8 +691,12 @@ 
         $newobject=new Product($db);
         $newobject->fetch($product['id']);
 
-        if (isset($product['ref']))     $newobject->ref=$product['ref'];
-        if (isset($product['ref_ext'])) $newobject->ref_ext=$product['ref_ext'];
+        if (isset($product['ref'])) {
+        	$newobject->ref=$product['ref'];
+        }
+        if (isset($product['ref_ext'])) {
+        	$newobject->ref_ext=$product['ref_ext'];
+        }
         $newobject->type=$product['type'];
         $newobject->libelle=$product['label'];    // @deprecated
         $newobject->label=$product['label'];
@@ -698,7 +721,9 @@ 
         $newobject->seuil_stock_alert=$product['stock_alert'];
 
         $newobject->country_id=$product['country_id'];
-        if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
+        if ($product['country_code']) {
+        	$newobject->country_id=getCountry($product['country_code'],3);
+        }
         $newobject->customcode=$product['customcode'];
 
         $newobject->canvas=$product['canvas'];
@@ -732,8 +757,7 @@ 
         if ($result <= 0)
         {
             $error++;
-        }
-        else
+        } else
 		{
         	// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled))
@@ -763,8 +787,7 @@ 
 							$error++;
 							$newobject->error='You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
-					}
-					else
+					} else
 					{
 						$error++;
 						$newobject->error='You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
@@ -782,8 +805,7 @@ 
                 {
                     $error++;
                 }
-            }
-            elseif ($newobject->price_base_type == 'TTC')
+            } elseif ($newobject->price_base_type == 'TTC')
             {
                 $result=$newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
                 if ($result <= 0)
@@ -797,8 +819,7 @@ 
         {
             $db->commit();
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-        }
-        else
+        } else
 		{
             $db->rollback();
             $error++;
@@ -832,7 +853,9 @@ 
 
     dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -869,8 +892,7 @@ 
 	        	$error++;
 		        $firsterror='Product or service with id '.$id.' not found';
 		        break;
-	        }
-	        else
+	        } else
 			{
 		        $result=$newobject->delete($user);
 		        if ($result <= 0)
@@ -889,8 +911,7 @@ 
 	        $db->commit();
             //$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
-	    }
-	    else
+	    } else
 	    {
 	    	$db->rollback();
 	        $error++;
@@ -903,8 +924,7 @@ 
     {
         //$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'listofid'=>$listofiddeleted);
         $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'nbdeleted'=>0);
-    }
-    else if (count($listofiddeleted) == 0)
+    } else if (count($listofiddeleted) == 0)
     {
    		//$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'listofid'=>$listofiddeleted);
    		$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'nbdeleted'=>0);
@@ -929,7 +949,9 @@ 
 
     dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -946,9 +968,15 @@ 
         $sql.=" WHERE entity=".$conf->entity;
         foreach($filterproduct as $key => $val)
         {
-		if ($key == 'type' && $val >= 0)   	$sql.=" AND fk_product_type = ".$db->escape($val);
-		if ($key == 'status_tosell') 				$sql.=" AND tosell = ".$db->escape($val);
-		if ($key == 'status_tobuy')  				$sql.=" AND tobuy = ".$db->escape($val);
+		if ($key == 'type' && $val >= 0) {
+			$sql.=" AND fk_product_type = ".$db->escape($val);
+		}
+		if ($key == 'status_tosell') {
+			$sql.=" AND tosell = ".$db->escape($val);
+		}
+		if ($key == 'status_tobuy') {
+			$sql.=" AND tobuy = ".$db->escape($val);
+		}
         }
 		$resql=$db->query($sql);
         if ($resql)
@@ -962,8 +990,7 @@ 
          		$arrayproducts[]=array('id'=>$obj->rowid,'ref'=>$obj->ref,'ref_ext'=>$obj->ref_ext);
          		$i++;
          	}
-        }
-        else
+        } else
         {
             $error++;
             $errorcode=$db->lasterrno();
@@ -977,8 +1004,7 @@ 
 			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
         	'products'=>$arrayproducts
         );
-    }
-    else
+    } else
     {
         $objectresp = array(
 			'result'=>array('result_code' => 'OK', 'result_label' => ''),
@@ -1007,7 +1033,9 @@ 
 
 	dol_syslog("Function: getProductsForCategory login=".$authentication['login']." id=".$id);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
@@ -1113,22 +1141,19 @@ 
 					'products'=> $products
 					);
 
-				}
-				else
+				} else
 				{
 					$errorcode='NORECORDS_FOR_ASSOCIATION'; $errorlabel='No products associated'.$sql;
 					$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 					dol_syslog("getProductsForCategory:: ".$c->error, LOG_DEBUG);
 
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';

htdocs/webservices/server_payment.php

Indentation +126 added lines, -126 removed lines

@@ -44,11 +44,11 @@ 
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-       $langs->load("admin");
-       dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-       print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-       print $langs->trans("ToActivateModule");
-       exit;
+	   $langs->load("admin");
+	   dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	   print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+	   print $langs->trans("ToActivateModule");
+	   exit;
 }
 
 // Create the soap Object
@@ -62,50 +62,50 @@ 
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey'       => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-       'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-       'login'             => array('name'=>'login','type'=>'xsd:string'),
-        'password'          => array('name'=>'password','type'=>'xsd:string'),
-        'entity'            => array('name'=>'entity','type'=>'xsd:string')
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey'       => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+	   'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+	   'login'             => array('name'=>'login','type'=>'xsd:string'),
+		'password'          => array('name'=>'password','type'=>'xsd:string'),
+		'entity'            => array('name'=>'entity','type'=>'xsd:string')
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code'  => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code'  => array('name'=>'result_code','type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL for Payment object
 $server->wsdl->addComplexType(
-    'payment',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'amount'          => array('name'=>'amount','type'=>'xsd:double'),
-        'num_paiement'    => array('name'=>'num_paiement','type'=>'xsd:string'),
-        'thirdparty_id'   => array('name'=>'thirdparty_id','type'=>'xsd:int'),
-               'bank_account'    => array('name'=>'bank_account','type'=>'xsd:int'),
-               'payment_mode_id' => array('name'=>'payment_mode_id','type'=>'xsd:int'),
-               'invoice_id'      => array('name'=>'invoice_id','type'=>'xsd:int'),
-               'int_label'       => array('name'=>'int_label','type'=>'xsd:string'),
-               'emitter'         => array('name'=>'emitter','type'=>'xsd:string'),
-               'bank_source'     => array('name'=>'bank_source','type'=>'xsd:string'),
-    )
+	'payment',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'amount'          => array('name'=>'amount','type'=>'xsd:double'),
+		'num_paiement'    => array('name'=>'num_paiement','type'=>'xsd:string'),
+		'thirdparty_id'   => array('name'=>'thirdparty_id','type'=>'xsd:int'),
+			   'bank_account'    => array('name'=>'bank_account','type'=>'xsd:int'),
+			   'payment_mode_id' => array('name'=>'payment_mode_id','type'=>'xsd:int'),
+			   'invoice_id'      => array('name'=>'invoice_id','type'=>'xsd:int'),
+			   'int_label'       => array('name'=>'int_label','type'=>'xsd:string'),
+			   'emitter'         => array('name'=>'emitter','type'=>'xsd:string'),
+			   'bank_source'     => array('name'=>'bank_source','type'=>'xsd:string'),
+	)
 );
 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
@@ -117,16 +117,16 @@ 
 
 // Register WSDL
 $server->register(
-    'createPayment',
-    // Entry values
-    array('authentication'=>'tns:authentication','payment'=>'tns:payment'),
-    // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    $ns,
-    $ns.'#createPayment',
-    $styledoc,
-    $styleuse,
-    'WS to create a new payment'
+	'createPayment',
+	// Entry values
+	array('authentication'=>'tns:authentication','payment'=>'tns:payment'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+	$ns,
+	$ns.'#createPayment',
+	$styledoc,
+	$styleuse,
+	'WS to create a new payment'
 );
 
 
@@ -139,80 +139,80 @@ 
  */
 function createPayment($authentication, $payment)
 {
-    global $db,$conf,$langs;
-
-    $now = dol_now();
-
-    dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
-               ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode  = '';
-       $errorlabel = '';
-    $error      = 0;
-    $fuser      = check_authentication($authentication,$error,$errorcode,$errorlabel);
-
-    // Check parameters
-    if (empty($payment['amount']) && empty($payment['thirdparty_id'])) {
-       $error++;
-               $errorcode  ='KO';
-               $errorlabel ="You must specify the amount and the third party's ID.";
-    }
-
-    if (! $error)
-    {
-               $soc = new Societe($db);
-        $res = $soc->fetch($payment['thirdparty_id']);
-
-               $new_payment               = new Paiement($db);
-               $new_payment->amount       = doubleval($payment['amount']);
-               $new_payment->num_paiement = $payment['num_paiement'];
-               $new_payment->bank_account = intval($payment['bank_account']);
-               $new_payment->paiementid   = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;
-               $new_payment->datepaye     = $now;
-               $new_payment->author       = $payment['thirdparty_id'];
-               $new_payment->amounts      = array();
-
-               if(intval($payment['invoice_id']) > 0) {
-                       $new_payment->amounts[ $payment['invoice_id'] ] = $new_payment->amount;
-               }
-
-        $db->begin();
-               $result = $new_payment->create($fuser, true);
-
-               if($payment['bank_account']) {
-                       $new_payment->addPaymentToBank($fuser, 'payment', $payment['int_label'], $payment['bank_account'], $payment['emitter'], $payment['bank_source']);
-               }
-
-        if ($result < 0)
-        {
-            $error++;
-        }
-
-        if (! $error)
-        {
-            $db->commit();
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_payment->id);
-        }
-        else
-        {
-            $db->rollback();
-            $error++;
-            $errorcode='KO';
-            $errorlabel=$new_payment->error;
-            dol_syslog("Function: createInvoice error while creating".$errorlabel);
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
+	global $db,$conf,$langs;
+
+	$now = dol_now();
+
+	dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
+			   ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode  = '';
+	   $errorlabel = '';
+	$error      = 0;
+	$fuser      = check_authentication($authentication,$error,$errorcode,$errorlabel);
+
+	// Check parameters
+	if (empty($payment['amount']) && empty($payment['thirdparty_id'])) {
+	   $error++;
+			   $errorcode  ='KO';
+			   $errorlabel ="You must specify the amount and the third party's ID.";
+	}
+
+	if (! $error)
+	{
+			   $soc = new Societe($db);
+		$res = $soc->fetch($payment['thirdparty_id']);
+
+			   $new_payment               = new Paiement($db);
+			   $new_payment->amount       = doubleval($payment['amount']);
+			   $new_payment->num_paiement = $payment['num_paiement'];
+			   $new_payment->bank_account = intval($payment['bank_account']);
+			   $new_payment->paiementid   = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;
+			   $new_payment->datepaye     = $now;
+			   $new_payment->author       = $payment['thirdparty_id'];
+			   $new_payment->amounts      = array();
+
+			   if(intval($payment['invoice_id']) > 0) {
+					   $new_payment->amounts[ $payment['invoice_id'] ] = $new_payment->amount;
+			   }
+
+		$db->begin();
+			   $result = $new_payment->create($fuser, true);
+
+			   if($payment['bank_account']) {
+					   $new_payment->addPaymentToBank($fuser, 'payment', $payment['int_label'], $payment['bank_account'], $payment['emitter'], $payment['bank_source']);
+			   }
+
+		if ($result < 0)
+		{
+			$error++;
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_payment->id);
+		}
+		else
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$new_payment->error;
+			dol_syslog("Function: createInvoice error while creating".$errorlabel);
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
 }
 
 // Return the results.

Spacing +36 added lines, -36 removed lines

@@ -28,7 +28,7 @@ 
 set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 
 require_once '../master.inc.php';
-require_once NUSOAP_PATH.'/nusoap.php';                // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -46,7 +46,7 @@ 
 {
        $langs->load("admin");
        dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-       print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+       print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
        print $langs->trans("ToActivateModule");
        exit;
 }
@@ -56,7 +56,7 @@ 
 $server->soap_defencoding            = 'UTF-8';
 $server->decode_utf8                 = false;
 $ns                                  = 'http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrPayment',$ns);
+$server->configureWSDL('WebServicesDolibarrPayment', $ns);
 $server->wsdl->schemaTargetNamespace = $ns;
 
 
@@ -68,11 +68,11 @@ 
     'all',
     '',
     array(
-        'dolibarrkey'       => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-       'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-       'login'             => array('name'=>'login','type'=>'xsd:string'),
-        'password'          => array('name'=>'password','type'=>'xsd:string'),
-        'entity'            => array('name'=>'entity','type'=>'xsd:string')
+        'dolibarrkey'       => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+       'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+       'login'             => array('name'=>'login', 'type'=>'xsd:string'),
+        'password'          => array('name'=>'password', 'type'=>'xsd:string'),
+        'entity'            => array('name'=>'entity', 'type'=>'xsd:string')
     )
 );
 // Define WSDL Return object
@@ -83,8 +83,8 @@ 
     'all',
     '',
     array(
-        'result_code'  => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+        'result_code'  => array('name'=>'result_code', 'type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
     )
 );
 
@@ -96,32 +96,32 @@ 
     'all',
     '',
     array(
-        'amount'          => array('name'=>'amount','type'=>'xsd:double'),
-        'num_paiement'    => array('name'=>'num_paiement','type'=>'xsd:string'),
-        'thirdparty_id'   => array('name'=>'thirdparty_id','type'=>'xsd:int'),
-               'bank_account'    => array('name'=>'bank_account','type'=>'xsd:int'),
-               'payment_mode_id' => array('name'=>'payment_mode_id','type'=>'xsd:int'),
-               'invoice_id'      => array('name'=>'invoice_id','type'=>'xsd:int'),
-               'int_label'       => array('name'=>'int_label','type'=>'xsd:string'),
-               'emitter'         => array('name'=>'emitter','type'=>'xsd:string'),
-               'bank_source'     => array('name'=>'bank_source','type'=>'xsd:string'),
+        'amount'          => array('name'=>'amount', 'type'=>'xsd:double'),
+        'num_paiement'    => array('name'=>'num_paiement', 'type'=>'xsd:string'),
+        'thirdparty_id'   => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
+               'bank_account'    => array('name'=>'bank_account', 'type'=>'xsd:int'),
+               'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:int'),
+               'invoice_id'      => array('name'=>'invoice_id', 'type'=>'xsd:int'),
+               'int_label'       => array('name'=>'int_label', 'type'=>'xsd:string'),
+               'emitter'         => array('name'=>'emitter', 'type'=>'xsd:string'),
+               'bank_source'     => array('name'=>'bank_source', 'type'=>'xsd:string'),
     )
 );
 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
 // Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
 // http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc = 'rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse = 'encoded';   // encoded/literal/literal wrapped
+$styledoc = 'rpc'; // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded'; // encoded/literal/literal wrapped
 // Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
 
 // Register WSDL
 $server->register(
     'createPayment',
     // Entry values
-    array('authentication'=>'tns:authentication','payment'=>'tns:payment'),
+    array('authentication'=>'tns:authentication', 'payment'=>'tns:payment'),
     // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
     $ns,
     $ns.'#createPayment',
     $styledoc,
@@ -139,30 +139,30 @@ 
  */
 function createPayment($authentication, $payment)
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
     $now = dol_now();
 
     dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
                ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
     $objectresp = array();
     $errorcode  = '';
        $errorlabel = '';
     $error      = 0;
-    $fuser      = check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $fuser      = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
     // Check parameters
     if (empty($payment['amount']) && empty($payment['thirdparty_id'])) {
        $error++;
-               $errorcode  ='KO';
-               $errorlabel ="You must specify the amount and the third party's ID.";
+               $errorcode  = 'KO';
+               $errorlabel = "You must specify the amount and the third party's ID.";
     }
 
-    if (! $error)
+    if (!$error)
     {
                $soc = new Societe($db);
         $res = $soc->fetch($payment['thirdparty_id']);
@@ -176,14 +176,14 @@ 
                $new_payment->author       = $payment['thirdparty_id'];
                $new_payment->amounts      = array();
 
-               if(intval($payment['invoice_id']) > 0) {
-                       $new_payment->amounts[ $payment['invoice_id'] ] = $new_payment->amount;
+               if (intval($payment['invoice_id']) > 0) {
+                       $new_payment->amounts[$payment['invoice_id']] = $new_payment->amount;
                }
 
         $db->begin();
                $result = $new_payment->create($fuser, true);
 
-               if($payment['bank_account']) {
+               if ($payment['bank_account']) {
                        $new_payment->addPaymentToBank($fuser, 'payment', $payment['int_label'], $payment['bank_account'], $payment['emitter'], $payment['bank_source']);
                }
 
@@ -192,17 +192,17 @@ 
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
             $db->commit();
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_payment->id);
+            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_payment->id);
         }
         else
         {
             $db->rollback();
             $error++;
-            $errorcode='KO';
-            $errorlabel=$new_payment->error;
+            $errorcode = 'KO';
+            $errorlabel = $new_payment->error;
             dol_syslog("Function: createInvoice error while creating".$errorlabel);
         }
     }

Braces +4 added lines, -3 removed lines

@@ -146,7 +146,9 @@ 
     dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
                ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp = array();
@@ -196,8 +198,7 @@ 
         {
             $db->commit();
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_payment->id);
-        }
-        else
+        } else
         {
             $db->rollback();
             $error++;

htdocs/webservices/server_supplier_invoice.php

Indentation +205 added lines, -205 removed lines

@@ -55,127 +55,127 @@ 
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+		'login' => array('name'=>'login','type'=>'xsd:string'),
+		'password' => array('name'=>'password','type'=>'xsd:string'),
+		'entity' => array('name'=>'entity','type'=>'xsd:string'),
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+	)
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'line',
-    'element',
-    'struct',
-    'all',
-    '',
-    array(
-        'id' => array('name'=>'id','type'=>'xsd:string'),
-        'type' => array('name'=>'type','type'=>'xsd:int'),
-        'desc' => array('name'=>'desc','type'=>'xsd:string'),
-    	'fk_product' => array('name'=>'fk_product','type'=>'xsd:int'),
-        'total_net' => array('name'=>'total_net','type'=>'xsd:double'),
-    	'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'),
-    	'total' => array('name'=>'total','type'=>'xsd:double'),
-        'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:double'),
-        'qty' => array('name'=>'qty','type'=>'xsd:double'),
-        'date_start' => array('name'=>'date_start','type'=>'xsd:date'),
-        'date_end' => array('name'=>'date_end','type'=>'xsd:date'),
-        // From product
-        'product_ref' => array('name'=>'product_ref','type'=>'xsd:string'),
-        'product_label' => array('name'=>'product_label','type'=>'xsd:string'),
-        'product_desc' => array('name'=>'product_desc','type'=>'xsd:string')
-    )
+	'line',
+	'element',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id','type'=>'xsd:string'),
+		'type' => array('name'=>'type','type'=>'xsd:int'),
+		'desc' => array('name'=>'desc','type'=>'xsd:string'),
+		'fk_product' => array('name'=>'fk_product','type'=>'xsd:int'),
+		'total_net' => array('name'=>'total_net','type'=>'xsd:double'),
+		'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'),
+		'total' => array('name'=>'total','type'=>'xsd:double'),
+		'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:double'),
+		'qty' => array('name'=>'qty','type'=>'xsd:double'),
+		'date_start' => array('name'=>'date_start','type'=>'xsd:date'),
+		'date_end' => array('name'=>'date_end','type'=>'xsd:date'),
+		// From product
+		'product_ref' => array('name'=>'product_ref','type'=>'xsd:string'),
+		'product_label' => array('name'=>'product_label','type'=>'xsd:string'),
+		'product_desc' => array('name'=>'product_desc','type'=>'xsd:string')
+	)
 );
 
 $server->wsdl->addComplexType(
-    'LinesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:line[]')
-    ),
-    'tns:line'
+	'LinesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:line[]')
+	),
+	'tns:line'
 );
 
 $server->wsdl->addComplexType(
-    'invoice',
-    'element',		// If we put element here instead of complexType to have tag called invoice in getInvoicesForThirdParty we brek getInvoice
-    'struct',
-    'all',
-    '',
-    array(
-    	'id' => array('name'=>'id','type'=>'xsd:string'),
-        'ref' => array('name'=>'ref','type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-        'ref_supplier' => array('name'=>'ref_supplier','type'=>'xsd:string'),
-        'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:int'),
-        'fk_user_valid' => array('name'=>'fk_user_valid','type'=>'xsd:int'),
-        'fk_thirdparty' => array('name'=>'fk_thirdparty','type'=>'xsd:int'),
-        'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
-        'date_validation' => array('name'=>'date_validation','type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
-        'date_invoice' => array('name'=>'date_invoice','type'=>'xsd:date'),
-        'date_term' => array('name'=>'date_modification','type'=>'xsd:date'),
-        'type' => array('name'=>'type','type'=>'xsd:int'),
-        'total_net' => array('name'=>'type','type'=>'xsd:double'),
-        'total_vat' => array('name'=>'type','type'=>'xsd:double'),
-        'total' => array('name'=>'type','type'=>'xsd:double'),
-        'note_private' => array('name'=>'note_private','type'=>'xsd:string'),
-        'note_public' => array('name'=>'note_public','type'=>'xsd:string'),
-        'status' => array('name'=>'status','type'=>'xsd:int'),
-        'close_code' => array('name'=>'close_code','type'=>'xsd:string'),
-        'close_note' => array('name'=>'close_note','type'=>'xsd:string'),
-    	'lines' => array('name'=>'lines','type'=>'tns:LinesArray')
-    )
+	'invoice',
+	'element',		// If we put element here instead of complexType to have tag called invoice in getInvoicesForThirdParty we brek getInvoice
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id','type'=>'xsd:string'),
+		'ref' => array('name'=>'ref','type'=>'xsd:string'),
+		'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
+		'ref_supplier' => array('name'=>'ref_supplier','type'=>'xsd:string'),
+		'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:int'),
+		'fk_user_valid' => array('name'=>'fk_user_valid','type'=>'xsd:int'),
+		'fk_thirdparty' => array('name'=>'fk_thirdparty','type'=>'xsd:int'),
+		'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
+		'date_validation' => array('name'=>'date_validation','type'=>'xsd:dateTime'),
+		'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
+		'date_invoice' => array('name'=>'date_invoice','type'=>'xsd:date'),
+		'date_term' => array('name'=>'date_modification','type'=>'xsd:date'),
+		'type' => array('name'=>'type','type'=>'xsd:int'),
+		'total_net' => array('name'=>'type','type'=>'xsd:double'),
+		'total_vat' => array('name'=>'type','type'=>'xsd:double'),
+		'total' => array('name'=>'type','type'=>'xsd:double'),
+		'note_private' => array('name'=>'note_private','type'=>'xsd:string'),
+		'note_public' => array('name'=>'note_public','type'=>'xsd:string'),
+		'status' => array('name'=>'status','type'=>'xsd:int'),
+		'close_code' => array('name'=>'close_code','type'=>'xsd:string'),
+		'close_note' => array('name'=>'close_note','type'=>'xsd:string'),
+		'lines' => array('name'=>'lines','type'=>'tns:LinesArray')
+	)
 );
 
 $server->wsdl->addComplexType(
-    'InvoicesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:invoice[]')
-    ),
-    'tns:invoice'
+	'InvoicesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:invoice[]')
+	),
+	'tns:invoice'
 );
 
 $server->wsdl->addComplexType(
-    'invoices',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:invoice[]')
-    ),
-    'tns:invoice'
+	'invoices',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:invoice[]')
+	),
+	'tns:invoice'
 );
 
 
@@ -189,28 +189,28 @@ 
 
 // Register WSDL
 $server->register(
-    'getSupplierInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','invoice'=>'tns:invoice'),
-    $ns,
-    $ns.'#getSupplierInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to get SupplierInvoice'
+	'getSupplierInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','invoice'=>'tns:invoice'),
+	$ns,
+	$ns.'#getSupplierInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to get SupplierInvoice'
 );
 $server->register(
-    'getSupplierInvoicesForThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication','idthirdparty'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','invoices'=>'tns:invoices'),
-    $ns,
-    $ns.'#getSupplierInvoicesForThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to get SupplierInvoicesForThirdParty'
+	'getSupplierInvoicesForThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication','idthirdparty'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','invoices'=>'tns:invoices'),
+	$ns,
+	$ns.'#getSupplierInvoicesForThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to get SupplierInvoicesForThirdParty'
 );
 
 
@@ -231,12 +231,12 @@ 
 
 	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
 	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
@@ -264,44 +264,44 @@ 
 						'total_net'=>$line->total_ht,
 						'total_vat'=>$line->total_tva,
 						'total'=>$line->total_ttc,
-                        'vat_rate'=>$line->tva_tx,
-                        'qty'=>$line->qty
+						'vat_rate'=>$line->tva_tx,
+						'qty'=>$line->qty
 					);
 					$i++;
 				}
 
-			    // Create invoice
-			    $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'invoice'=>array(
-				    	'id' => $invoice->id,
+				// Create invoice
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'invoice'=>array(
+						'id' => $invoice->id,
 			   			'ref' => $invoice->ref,
-                        'ref_supplier'=>$invoice->ref_supplier,
-			            'ref_ext' => $invoice->ref_ext,
-			            'fk_user_author' => $invoice->fk_user_author,
-			            'fk_user_valid' => $invoice->fk_user_valid,
-                        'fk_thirdparty' => $invoice->fk_soc,
-                        'type'=>$invoice->type,
-                        'status'=>$invoice->statut,
-                        'total_net'=>$invoice->total_ht,
-                        'total_vat'=>$invoice->total_tva,
-                        'total'=>$invoice->total_ttc,
-                        'date_creation'=>dol_print_date($invoice->datec,'dayhourrfc'),
-                        'date_modification'=>dol_print_date($invoice->tms,'dayhourrfc'),
-                        'date_invoice'=>dol_print_date($invoice->date,'dayhourrfc'),
-                        'date_term'=>dol_print_date($invoice->date_echeance,'dayhourrfc'),
-                        'label'=>$invoice->libelle,
-                        'paid'=>$invoice->paye,
-                        'note_private'=>$invoice->note_private,
-                        'note_public'=>$invoice->note_public,
-                        'close_code'=>$invoice->close_code,
-                        'close_note'=>$invoice->close_note,
-
-                        'lines' => $linesresp
+						'ref_supplier'=>$invoice->ref_supplier,
+						'ref_ext' => $invoice->ref_ext,
+						'fk_user_author' => $invoice->fk_user_author,
+						'fk_user_valid' => $invoice->fk_user_valid,
+						'fk_thirdparty' => $invoice->fk_soc,
+						'type'=>$invoice->type,
+						'status'=>$invoice->statut,
+						'total_net'=>$invoice->total_ht,
+						'total_vat'=>$invoice->total_tva,
+						'total'=>$invoice->total_ttc,
+						'date_creation'=>dol_print_date($invoice->datec,'dayhourrfc'),
+						'date_modification'=>dol_print_date($invoice->tms,'dayhourrfc'),
+						'date_invoice'=>dol_print_date($invoice->date,'dayhourrfc'),
+						'date_term'=>dol_print_date($invoice->date_echeance,'dayhourrfc'),
+						'label'=>$invoice->libelle,
+						'paid'=>$invoice->paye,
+						'note_private'=>$invoice->note_private,
+						'note_public'=>$invoice->note_public,
+						'close_code'=>$invoice->close_code,
+						'close_note'=>$invoice->close_note,
+
+						'lines' => $linesresp
 //					        'lines' => array('0'=>array('id'=>222,'type'=>1),
 //				        				 '1'=>array('id'=>333,'type'=>1))
 
-			    ));
+				));
 			}
 			else
 			{
@@ -341,12 +341,12 @@ 
 
 	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
 	if (! $error && empty($idthirdparty))
 	{
 		$error++;
@@ -363,7 +363,7 @@ 
 		//$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid';
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
-        $sql.=" WHERE f.entity = ".$conf->entity;
+		$sql.=" WHERE f.entity = ".$conf->entity;
 		if ($idthirdparty != 'all') $sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
 
 		$resql=$db->query($sql);
@@ -373,11 +373,11 @@ 
 			$i=0;
 			while ($i < $num)
 			{
-                // En attendant remplissage par boucle
-			    $obj=$db->fetch_object($resql);
+				// En attendant remplissage par boucle
+				$obj=$db->fetch_object($resql);
 
-			    $invoice=new FactureFournisseur($db);
-			    $result=$invoice->fetch($obj->facid);
+				$invoice=new FactureFournisseur($db);
+				$result=$invoice->fetch($obj->facid);
 				if ($result < 0)
 				{
 					$error++;
@@ -389,55 +389,55 @@ 
 				$linesresp=array();
 				foreach($invoice->lines as $line)
 				{
-   				    $linesresp[]=array(
-    					'id'=>$line->rowid,
-    					'type'=>$line->product_type,
-                        'desc'=>dol_htmlcleanlastbr($line->description),
-    					'total_net'=>$line->total_ht,
-    					'total_vat'=>$line->total_tva,
-    					'total'=>$line->total_ttc,
-                        'vat_rate'=>$line->tva_tx,
-                        'qty'=>$line->qty,
-   				        'product_ref'=>$line->product_ref,
-                        'product_label'=>$line->product_label,
-                        'product_desc'=>$line->product_desc,
-   				    );
+   					$linesresp[]=array(
+						'id'=>$line->rowid,
+						'type'=>$line->product_type,
+						'desc'=>dol_htmlcleanlastbr($line->description),
+						'total_net'=>$line->total_ht,
+						'total_vat'=>$line->total_tva,
+						'total'=>$line->total_ttc,
+						'vat_rate'=>$line->tva_tx,
+						'qty'=>$line->qty,
+   						'product_ref'=>$line->product_ref,
+						'product_label'=>$line->product_label,
+						'product_desc'=>$line->product_desc,
+   					);
 				}
 
 				// Now define invoice
 				$linesinvoice[]=array(
 					'id'=>$invoice->id,
-				    'ref'=>$invoice->ref,
-				    'ref_supplier'=>$invoice->ref_supplier,
-				    'ref_ext'=>$invoice->ref_ext,
-                    'fk_user_author' => $invoice->fk_user_author,
-                    'fk_user_valid' => $invoice->fk_user_valid,
-                    'fk_thirdparty' => $invoice->fk_soc,
-				    'type'=>$invoice->type,
-                    'status'=>$invoice->statut,
-				    'total_net'=>$invoice->total_ht,
+					'ref'=>$invoice->ref,
+					'ref_supplier'=>$invoice->ref_supplier,
+					'ref_ext'=>$invoice->ref_ext,
+					'fk_user_author' => $invoice->fk_user_author,
+					'fk_user_valid' => $invoice->fk_user_valid,
+					'fk_thirdparty' => $invoice->fk_soc,
+					'type'=>$invoice->type,
+					'status'=>$invoice->statut,
+					'total_net'=>$invoice->total_ht,
 					'total_vat'=>$invoice->total_tva,
 					'total'=>$invoice->total_ttc,
-                    'date_creation'=>dol_print_date($invoice->datec,'dayhourrfc'),
-                    'date_modification'=>dol_print_date($invoice->tms,'dayhourrfc'),
-                    'date_invoice'=>dol_print_date($invoice->date,'dayhourrfc'),
-                    'date_term'=>dol_print_date($invoice->date_echeance,'dayhourrfc'),
-                    'label'=>$invoice->libelle,
-                    'paid'=>$invoice->paye,
-                    'note_private'=>$invoice->note_private,
-                    'note_public'=>$invoice->note_public,
-                    'close_code'=>$invoice->close_code,
-                    'close_note'=>$invoice->close_note,
-
-				    'lines' => $linesresp
+					'date_creation'=>dol_print_date($invoice->datec,'dayhourrfc'),
+					'date_modification'=>dol_print_date($invoice->tms,'dayhourrfc'),
+					'date_invoice'=>dol_print_date($invoice->date,'dayhourrfc'),
+					'date_term'=>dol_print_date($invoice->date_echeance,'dayhourrfc'),
+					'label'=>$invoice->libelle,
+					'paid'=>$invoice->paye,
+					'note_private'=>$invoice->note_private,
+					'note_public'=>$invoice->note_public,
+					'close_code'=>$invoice->close_code,
+					'close_note'=>$invoice->close_note,
+
+					'lines' => $linesresp
 				);
 
 				$i++;
 			}
 
 			$objectresp=array(
-		    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-		        'invoices'=>$linesinvoice
+				'result'=>array('result_code'=>'OK', 'result_label'=>''),
+				'invoices'=>$linesinvoice
 
 			);
 		}

Spacing +115 added lines, -115 removed lines

@@ -20,10 +20,10 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
 
 require_once '../master.inc.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
@@ -39,18 +39,18 @@ 
 {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-	print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
 	print $langs->trans("ToActivateModule");
 	exit;
 }
 
 // Create the soap Object
 $server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrSupplierInvoice',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
+$server->soap_defencoding = 'UTF-8';
+$server->decode_utf8 = false;
+$ns = 'http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrSupplierInvoice', $ns);
+$server->wsdl->schemaTargetNamespace = $ns;
 
 
 // Define WSDL Authentication object
@@ -61,11 +61,11 @@ 
     'all',
     '',
     array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
+        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
+        'password' => array('name'=>'password', 'type'=>'xsd:string'),
+        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
     )
 );
 // Define WSDL Return object
@@ -76,8 +76,8 @@ 
     'all',
     '',
     array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
     )
 );
 
@@ -89,21 +89,21 @@ 
     'all',
     '',
     array(
-        'id' => array('name'=>'id','type'=>'xsd:string'),
-        'type' => array('name'=>'type','type'=>'xsd:int'),
-        'desc' => array('name'=>'desc','type'=>'xsd:string'),
-    	'fk_product' => array('name'=>'fk_product','type'=>'xsd:int'),
-        'total_net' => array('name'=>'total_net','type'=>'xsd:double'),
-    	'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'),
-    	'total' => array('name'=>'total','type'=>'xsd:double'),
-        'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:double'),
-        'qty' => array('name'=>'qty','type'=>'xsd:double'),
-        'date_start' => array('name'=>'date_start','type'=>'xsd:date'),
-        'date_end' => array('name'=>'date_end','type'=>'xsd:date'),
+        'id' => array('name'=>'id', 'type'=>'xsd:string'),
+        'type' => array('name'=>'type', 'type'=>'xsd:int'),
+        'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
+    	'fk_product' => array('name'=>'fk_product', 'type'=>'xsd:int'),
+        'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
+    	'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
+    	'total' => array('name'=>'total', 'type'=>'xsd:double'),
+        'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
+        'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
+        'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
+        'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
         // From product
-        'product_ref' => array('name'=>'product_ref','type'=>'xsd:string'),
-        'product_label' => array('name'=>'product_label','type'=>'xsd:string'),
-        'product_desc' => array('name'=>'product_desc','type'=>'xsd:string')
+        'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
+        'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
+        'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
     )
 );
 
@@ -115,40 +115,40 @@ 
     'SOAP-ENC:Array',
     array(),
     array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:line[]')
+        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:line[]')
     ),
     'tns:line'
 );
 
 $server->wsdl->addComplexType(
     'invoice',
-    'element',		// If we put element here instead of complexType to have tag called invoice in getInvoicesForThirdParty we brek getInvoice
+    'element', // If we put element here instead of complexType to have tag called invoice in getInvoicesForThirdParty we brek getInvoice
     'struct',
     'all',
     '',
     array(
-    	'id' => array('name'=>'id','type'=>'xsd:string'),
-        'ref' => array('name'=>'ref','type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-        'ref_supplier' => array('name'=>'ref_supplier','type'=>'xsd:string'),
-        'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:int'),
-        'fk_user_valid' => array('name'=>'fk_user_valid','type'=>'xsd:int'),
-        'fk_thirdparty' => array('name'=>'fk_thirdparty','type'=>'xsd:int'),
-        'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
-        'date_validation' => array('name'=>'date_validation','type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
-        'date_invoice' => array('name'=>'date_invoice','type'=>'xsd:date'),
-        'date_term' => array('name'=>'date_modification','type'=>'xsd:date'),
-        'type' => array('name'=>'type','type'=>'xsd:int'),
-        'total_net' => array('name'=>'type','type'=>'xsd:double'),
-        'total_vat' => array('name'=>'type','type'=>'xsd:double'),
-        'total' => array('name'=>'type','type'=>'xsd:double'),
-        'note_private' => array('name'=>'note_private','type'=>'xsd:string'),
-        'note_public' => array('name'=>'note_public','type'=>'xsd:string'),
-        'status' => array('name'=>'status','type'=>'xsd:int'),
-        'close_code' => array('name'=>'close_code','type'=>'xsd:string'),
-        'close_note' => array('name'=>'close_note','type'=>'xsd:string'),
-    	'lines' => array('name'=>'lines','type'=>'tns:LinesArray')
+    	'id' => array('name'=>'id', 'type'=>'xsd:string'),
+        'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+        'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+        'ref_supplier' => array('name'=>'ref_supplier', 'type'=>'xsd:string'),
+        'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:int'),
+        'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:int'),
+        'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:int'),
+        'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+        'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
+        'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+        'date_invoice' => array('name'=>'date_invoice', 'type'=>'xsd:date'),
+        'date_term' => array('name'=>'date_modification', 'type'=>'xsd:date'),
+        'type' => array('name'=>'type', 'type'=>'xsd:int'),
+        'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
+        'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
+        'total' => array('name'=>'type', 'type'=>'xsd:double'),
+        'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
+        'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
+        'status' => array('name'=>'status', 'type'=>'xsd:int'),
+        'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
+        'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
+    	'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray')
     )
 );
 
@@ -160,7 +160,7 @@ 
     'SOAP-ENC:Array',
     array(),
     array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:invoice[]')
+        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
     ),
     'tns:invoice'
 );
@@ -173,7 +173,7 @@ 
     'SOAP-ENC:Array',
     array(),
     array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:invoice[]')
+        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
     ),
     'tns:invoice'
 );
@@ -183,17 +183,17 @@ 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
 // Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
 // http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
+$styledoc = 'rpc'; // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded'; // encoded/literal/literal wrapped
 // Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
 
 // Register WSDL
 $server->register(
     'getSupplierInvoice',
     // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','invoice'=>'tns:invoice'),
+    array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
     $ns,
     $ns.'#getSupplierInvoice',
     $styledoc,
@@ -203,9 +203,9 @@ 
 $server->register(
     'getSupplierInvoicesForThirdParty',
     // Entry values
-    array('authentication'=>'tns:authentication','idthirdparty'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','invoices'=>'tns:invoices'),
+    array('result'=>'tns:result', 'invoices'=>'tns:invoices'),
     $ns,
     $ns.'#getSupplierInvoicesForThirdParty',
     $styledoc,
@@ -223,42 +223,42 @@ 
  * @param	string		$ref_ext			Ref_ext
  * @return	array							Array result
  */
-function getSupplierInvoice($authentication,$id='',$ref='',$ref_ext='')
+function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: getSupplierInvoice login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
-		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$fuser->getrights();
 
 		if ($fuser->rights->fournisseur->facture->lire)
 		{
-			$invoice=new FactureFournisseur($db);
-			$result=$invoice->fetch($id,$ref,$ref_ext);
+			$invoice = new FactureFournisseur($db);
+			$result = $invoice->fetch($id, $ref, $ref_ext);
 			if ($result > 0)
 			{
-				$linesresp=array();
-				$i=0;
-				foreach($invoice->lines as $line)
+				$linesresp = array();
+				$i = 0;
+				foreach ($invoice->lines as $line)
 				{
 					//var_dump($line); exit;
-					$linesresp[]=array(
+					$linesresp[] = array(
 						'id'=>$line->rowid,
 						'type'=>$line->product_type,
 						'total_net'=>$line->total_ht,
@@ -286,10 +286,10 @@ 
                         'total_net'=>$invoice->total_ht,
                         'total_vat'=>$invoice->total_tva,
                         'total'=>$invoice->total_ttc,
-                        'date_creation'=>dol_print_date($invoice->datec,'dayhourrfc'),
-                        'date_modification'=>dol_print_date($invoice->tms,'dayhourrfc'),
-                        'date_invoice'=>dol_print_date($invoice->date,'dayhourrfc'),
-                        'date_term'=>dol_print_date($invoice->date_echeance,'dayhourrfc'),
+                        'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
+                        'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
+                        'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
+                        'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
                         'label'=>$invoice->libelle,
                         'paid'=>$invoice->paye,
                         'note_private'=>$invoice->note_private,
@@ -306,13 +306,13 @@ 
 			else
 			{
 				$error++;
-				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
 		else
 		{
 			$error++;
-			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -333,63 +333,63 @@ 
  * @return	array							Array result
  *
  */
-function getSupplierInvoicesForThirdParty($authentication,$idthirdparty)
+function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: getSupplierInvoicesForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-	if (! $error && empty($idthirdparty))
+	if (!$error && empty($idthirdparty))
 	{
 		$error++;
-		$errorcode='BAD_PARAMETERS'; $errorlabel='Parameter id is not provided';
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = 'Parameter id is not provided';
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$linesinvoice=array();
+		$linesinvoice = array();
 
-		$sql.='SELECT f.rowid as facid';
-		$sql.=' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
+		$sql .= 'SELECT f.rowid as facid';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
 		//$sql.=', '.MAIN_DB_PREFIX.'societe as s';
 		//$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid';
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
-        $sql.=" WHERE f.entity = ".$conf->entity;
-		if ($idthirdparty != 'all') $sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+        $sql .= " WHERE f.entity = ".$conf->entity;
+		if ($idthirdparty != 'all') $sql .= " AND f.fk_soc = ".$db->escape($idthirdparty);
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$num=$db->num_rows($resql);
-			$i=0;
+			$num = $db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
                 // En attendant remplissage par boucle
-			    $obj=$db->fetch_object($resql);
+			    $obj = $db->fetch_object($resql);
 
-			    $invoice=new FactureFournisseur($db);
-			    $result=$invoice->fetch($obj->facid);
+			    $invoice = new FactureFournisseur($db);
+			    $result = $invoice->fetch($obj->facid);
 				if ($result < 0)
 				{
 					$error++;
-					$errorcode=$result; $errorlabel=$invoice->error;
+					$errorcode = $result; $errorlabel = $invoice->error;
 					break;
 				}
 
 				// Define lines of invoice
-				$linesresp=array();
-				foreach($invoice->lines as $line)
+				$linesresp = array();
+				foreach ($invoice->lines as $line)
 				{
-   				    $linesresp[]=array(
+   				    $linesresp[] = array(
     					'id'=>$line->rowid,
     					'type'=>$line->product_type,
                         'desc'=>dol_htmlcleanlastbr($line->description),
@@ -405,7 +405,7 @@ 
 				}
 
 				// Now define invoice
-				$linesinvoice[]=array(
+				$linesinvoice[] = array(
 					'id'=>$invoice->id,
 				    'ref'=>$invoice->ref,
 				    'ref_supplier'=>$invoice->ref_supplier,
@@ -418,10 +418,10 @@ 
 				    'total_net'=>$invoice->total_ht,
 					'total_vat'=>$invoice->total_tva,
 					'total'=>$invoice->total_ttc,
-                    'date_creation'=>dol_print_date($invoice->datec,'dayhourrfc'),
-                    'date_modification'=>dol_print_date($invoice->tms,'dayhourrfc'),
-                    'date_invoice'=>dol_print_date($invoice->date,'dayhourrfc'),
-                    'date_term'=>dol_print_date($invoice->date_echeance,'dayhourrfc'),
+                    'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
+                    'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
+                    'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
+                    'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
                     'label'=>$invoice->libelle,
                     'paid'=>$invoice->paye,
                     'note_private'=>$invoice->note_private,
@@ -435,7 +435,7 @@ 
 				$i++;
 			}
 
-			$objectresp=array(
+			$objectresp = array(
 		    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 		        'invoices'=>$linesinvoice
 
@@ -444,7 +444,7 @@ 
 		else
 		{
 			$error++;
-			$errorcode=$db->lasterrno(); $errorlabel=$db->lasterror();
+			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
 	}
 

Braces +15 added lines, -10 removed lines

@@ -20,7 +20,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
@@ -229,7 +231,9 @@ 
 
 	dol_syslog("Function: getSupplierInvoice login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -302,14 +306,12 @@ 
 //				        				 '1'=>array('id'=>333,'type'=>1))
 
 			    ));
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -339,7 +341,9 @@ 
 
 	dol_syslog("Function: getSupplierInvoicesForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -364,7 +368,9 @@ 
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
         $sql.=" WHERE f.entity = ".$conf->entity;
-		if ($idthirdparty != 'all') $sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+		if ($idthirdparty != 'all') {
+			$sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -440,8 +446,7 @@ 
 		        'invoices'=>$linesinvoice
 
 			);
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode=$db->lasterrno(); $errorlabel=$db->lasterror();

htdocs/webservices/server_thirdparty.php

Indentation +370 added lines, -370 removed lines

@@ -56,69 +56,69 @@ 
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+		'login' => array('name'=>'login','type'=>'xsd:string'),
+		'password' => array('name'=>'password','type'=>'xsd:string'),
+		'entity' => array('name'=>'entity','type'=>'xsd:string'),
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+	)
 );
 
 
 $thirdparty_fields= array(
-    	'id' => array('name'=>'id','type'=>'xsd:string'),
-        'ref' => array('name'=>'name','type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-        'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:string'),
+		'id' => array('name'=>'id','type'=>'xsd:string'),
+		'ref' => array('name'=>'name','type'=>'xsd:string'),
+		'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
+		'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:string'),
 		'status' => array('name'=>'status','type'=>'xsd:string'),
-        'client' => array('name'=>'client','type'=>'xsd:string'),
-        'supplier' => array('name'=>'supplier','type'=>'xsd:string'),
-        'customer_code' => array('name'=>'customer_code','type'=>'xsd:string'),
-        'supplier_code' => array('name'=>'supplier_code','type'=>'xsd:string'),
-        'customer_code_accountancy' => array('name'=>'customer_code_accountancy','type'=>'xsd:string'),
-        'supplier_code_accountancy' => array('name'=>'supplier_code_accountancy','type'=>'xsd:string'),
-        'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
-        'note_private' => array('name'=>'note_private','type'=>'xsd:string'),
+		'client' => array('name'=>'client','type'=>'xsd:string'),
+		'supplier' => array('name'=>'supplier','type'=>'xsd:string'),
+		'customer_code' => array('name'=>'customer_code','type'=>'xsd:string'),
+		'supplier_code' => array('name'=>'supplier_code','type'=>'xsd:string'),
+		'customer_code_accountancy' => array('name'=>'customer_code_accountancy','type'=>'xsd:string'),
+		'supplier_code_accountancy' => array('name'=>'supplier_code_accountancy','type'=>'xsd:string'),
+		'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
+		'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
+		'note_private' => array('name'=>'note_private','type'=>'xsd:string'),
 		'note_public' => array('name'=>'note_public','type'=>'xsd:string'),
-    	'address' => array('name'=>'address','type'=>'xsd:string'),
-    	'zip' => array('name'=>'zip','type'=>'xsd:string'),
-    	'town' => array('name'=>'town','type'=>'xsd:string'),
-    	'province_id' => array('name'=>'province_id','type'=>'xsd:string'),
-    	'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
-    	'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
-    	'country' => array('name'=>'country','type'=>'xsd:string'),
-        'phone' => array('name'=>'phone','type'=>'xsd:string'),
-    	'fax' => array('name'=>'fax','type'=>'xsd:string'),
-    	'email' => array('name'=>'email','type'=>'xsd:string'),
-    	'url' => array('name'=>'url','type'=>'xsd:string'),
-    	'profid1' => array('name'=>'profid1','type'=>'xsd:string'),
-    	'profid2' => array('name'=>'profid2','type'=>'xsd:string'),
-    	'profid3' => array('name'=>'profid3','type'=>'xsd:string'),
-    	'profid4' => array('name'=>'profid4','type'=>'xsd:string'),
-    	'profid5' => array('name'=>'profid5','type'=>'xsd:string'),
-    	'profid6' => array('name'=>'profid6','type'=>'xsd:string'),
-        'capital' => array('name'=>'capital','type'=>'xsd:string'),
-    	'vat_used' => array('name'=>'vat_used','type'=>'xsd:string'),
-    	'vat_number' => array('name'=>'vat_number','type'=>'xsd:string'));
+		'address' => array('name'=>'address','type'=>'xsd:string'),
+		'zip' => array('name'=>'zip','type'=>'xsd:string'),
+		'town' => array('name'=>'town','type'=>'xsd:string'),
+		'province_id' => array('name'=>'province_id','type'=>'xsd:string'),
+		'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
+		'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
+		'country' => array('name'=>'country','type'=>'xsd:string'),
+		'phone' => array('name'=>'phone','type'=>'xsd:string'),
+		'fax' => array('name'=>'fax','type'=>'xsd:string'),
+		'email' => array('name'=>'email','type'=>'xsd:string'),
+		'url' => array('name'=>'url','type'=>'xsd:string'),
+		'profid1' => array('name'=>'profid1','type'=>'xsd:string'),
+		'profid2' => array('name'=>'profid2','type'=>'xsd:string'),
+		'profid3' => array('name'=>'profid3','type'=>'xsd:string'),
+		'profid4' => array('name'=>'profid4','type'=>'xsd:string'),
+		'profid5' => array('name'=>'profid5','type'=>'xsd:string'),
+		'profid6' => array('name'=>'profid6','type'=>'xsd:string'),
+		'capital' => array('name'=>'capital','type'=>'xsd:string'),
+		'vat_used' => array('name'=>'vat_used','type'=>'xsd:string'),
+		'vat_number' => array('name'=>'vat_number','type'=>'xsd:string'));
 
 // Retrieve all extrafields for thirdsparty
 // fetch optionals attributes and labels
@@ -141,55 +141,55 @@ 
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'thirdparty',
-    'complexType',
-    'struct',
-    'all',
-    '',
+	'thirdparty',
+	'complexType',
+	'struct',
+	'all',
+	'',
 	$thirdparty_fields
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'filterthirdparty',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        //'limit' => array('name'=>'limit','type'=>'xsd:string'),
-        'client' => array('name'=>'client','type'=>'xsd:string'),
-        'supplier' => array('name'=>'supplier','type'=>'xsd:string'),
-    	'category' => array('name'=>'category','type'=>'xsd:string')
-    )
+	'filterthirdparty',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		//'limit' => array('name'=>'limit','type'=>'xsd:string'),
+		'client' => array('name'=>'client','type'=>'xsd:string'),
+		'supplier' => array('name'=>'supplier','type'=>'xsd:string'),
+		'category' => array('name'=>'category','type'=>'xsd:string')
+	)
 );
 
 $server->wsdl->addComplexType(
-    'ThirdPartiesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:thirdparty[]')
-    ),
-    'tns:thirdparty'
+	'ThirdPartiesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:thirdparty[]')
+	),
+	'tns:thirdparty'
 );
 $server->wsdl->addComplexType(
-    'ThirdPartiesArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'thirdparty' => array(
-            'name' => 'thirdparty',
-            'type' => 'tns:thirdparty',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    )
+	'ThirdPartiesArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'thirdparty' => array(
+			'name' => 'thirdparty',
+			'type' => 'tns:thirdparty',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	)
 );
 
 
@@ -202,30 +202,30 @@ 
 
 // Register WSDL
 $server->register(
-    'getThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','thirdparty'=>'tns:thirdparty'),
-    $ns,
-    $ns.'#getThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to get a thirdparty from its id, ref or ref_ext'
+	'getThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','thirdparty'=>'tns:thirdparty'),
+	$ns,
+	$ns.'#getThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to get a thirdparty from its id, ref or ref_ext'
 );
 
 // Register WSDL
 $server->register(
-    'createThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication','thirdparty'=>'tns:thirdparty'),
-    // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string'),
-    $ns,
-    $ns.'#createThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to create a thirdparty'
+	'createThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication','thirdparty'=>'tns:thirdparty'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string'),
+	$ns,
+	$ns.'#createThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to create a thirdparty'
 );
 
 // Register WSDL
@@ -245,16 +245,16 @@ 
 
 // Register WSDL
 $server->register(
-    'getListOfThirdParties',
-    // Entry values
-    array('authentication'=>'tns:authentication','filterthirdparty'=>'tns:filterthirdparty'),
-    // Exit values
-    array('result'=>'tns:result','thirdparties'=>'tns:ThirdPartiesArray2'),
-    $ns,
-    $ns.'#getListOfThirdParties',
-    $styledoc,
-    $styleuse,
-    'WS to get list of thirdparties id and ref'
+	'getListOfThirdParties',
+	// Entry values
+	array('authentication'=>'tns:authentication','filterthirdparty'=>'tns:filterthirdparty'),
+	// Exit values
+	array('result'=>'tns:result','thirdparties'=>'tns:ThirdPartiesArray2'),
+	$ns,
+	$ns.'#getListOfThirdParties',
+	$styledoc,
+	$styleuse,
+	'WS to get list of thirdparties id and ref'
 );
 
 // Register WSDL
@@ -290,12 +290,12 @@ 
 
 	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
 	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
@@ -314,40 +314,40 @@ 
 			{
 
 				$thirdparty_result_fields=array(
-				    	'id' => $thirdparty->id,
+						'id' => $thirdparty->id,
 			   			'ref' => $thirdparty->name,
 			   			'ref_ext' => $thirdparty->ref_ext,
 			   			'status' => $thirdparty->status,
-			            'client' => $thirdparty->client,
-			            'supplier' => $thirdparty->fournisseur,
-				        'customer_code' => $thirdparty->code_client,
-			            'supplier_code' => $thirdparty->code_fournisseur,
-				        'customer_code_accountancy' => $thirdparty->code_compta,
-			            'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
-			            'fk_user_author' => $thirdparty->fk_user_author,
-			    		'date_creation' => dol_print_date($thirdparty->date_creation,'dayhourrfc'),
-			    		'date_modification' => dol_print_date($thirdparty->date_modification,'dayhourrfc'),
-			            'address' => $thirdparty->address,
-				        'zip' => $thirdparty->zip,
-				        'town' => $thirdparty->town,
-				        'province_id' => $thirdparty->state_id,
-				        'country_id' => $thirdparty->country_id,
-				        'country_code' => $thirdparty->country_code,
-				        'country' => $thirdparty->country,
-			            'phone' => $thirdparty->phone,
-				        'fax' => $thirdparty->fax,
-				        'email' => $thirdparty->email,
-				        'url' => $thirdparty->url,
-				        'profid1' => $thirdparty->idprof1,
-				        'profid2' => $thirdparty->idprof2,
-				        'profid3' => $thirdparty->idprof3,
-				        'profid4' => $thirdparty->idprof4,
-				        'profid5' => $thirdparty->idprof5,
-				        'profid6' => $thirdparty->idprof6,
-			            'capital' => $thirdparty->capital,
+						'client' => $thirdparty->client,
+						'supplier' => $thirdparty->fournisseur,
+						'customer_code' => $thirdparty->code_client,
+						'supplier_code' => $thirdparty->code_fournisseur,
+						'customer_code_accountancy' => $thirdparty->code_compta,
+						'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
+						'fk_user_author' => $thirdparty->fk_user_author,
+						'date_creation' => dol_print_date($thirdparty->date_creation,'dayhourrfc'),
+						'date_modification' => dol_print_date($thirdparty->date_modification,'dayhourrfc'),
+						'address' => $thirdparty->address,
+						'zip' => $thirdparty->zip,
+						'town' => $thirdparty->town,
+						'province_id' => $thirdparty->state_id,
+						'country_id' => $thirdparty->country_id,
+						'country_code' => $thirdparty->country_code,
+						'country' => $thirdparty->country,
+						'phone' => $thirdparty->phone,
+						'fax' => $thirdparty->fax,
+						'email' => $thirdparty->email,
+						'url' => $thirdparty->url,
+						'profid1' => $thirdparty->idprof1,
+						'profid2' => $thirdparty->idprof2,
+						'profid3' => $thirdparty->idprof3,
+						'profid4' => $thirdparty->idprof4,
+						'profid5' => $thirdparty->idprof5,
+						'profid6' => $thirdparty->idprof6,
+						'capital' => $thirdparty->capital,
 			   			'barcode' => $thirdparty->barcode,
-			            'vat_used' => $thirdparty->tva_assuj,
-				        'vat_number' => $thirdparty->tva_intra,
+						'vat_used' => $thirdparty->tva_assuj,
+						'vat_number' => $thirdparty->tva_intra,
 						'note_private' => $thirdparty->note_private,
 						'note_public' => $thirdparty->note_public);
 
@@ -363,10 +363,10 @@ 
 					$thirdparty_result_fields=array_merge($thirdparty_result_fields,array('options_'.$key => $thirdparty->array_options['options_'.$key]));
 				}
 
-			    // Create
-			    $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'thirdparty'=>$thirdparty_result_fields);
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'thirdparty'=>$thirdparty_result_fields);
 			}
 			else
 			{
@@ -400,121 +400,121 @@ 
  */
 function createThirdParty($authentication,$thirdparty)
 {
-    global $db,$conf,$langs;
-
-    $now=dol_now();
-
-    dol_syslog("Function: createThirdParty login=".$authentication['login']);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (empty($thirdparty['ref']))
-    {
-        $error++; $errorcode='KO'; $errorlabel="Name is mandatory.";
-    }
-
-
-    if (! $error)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-        $newobject=new Societe($db);
-        $newobject->ref=$thirdparty['ref'];
-        $newobject->name=$thirdparty['ref'];
-        $newobject->ref_ext=$thirdparty['ref_ext'];
-        $newobject->status=$thirdparty['status'];
-        $newobject->client=$thirdparty['client'];
-        $newobject->fournisseur=$thirdparty['supplier'];
-        $newobject->code_client=$thirdparty['customer_code'];
-        $newobject->code_fournisseur=$thirdparty['supplier_code'];
-        $newobject->code_compta=$thirdparty['customer_code_accountancy'];
-        $newobject->code_compta_fournisseur=$thirdparty['supplier_code_accountancy'];
-        $newobject->date_creation=$now;
-        $newobject->note_private=$thirdparty['note_private'];
-        $newobject->note_public=$thirdparty['note_public'];
-        $newobject->address=$thirdparty['address'];
-        $newobject->zip=$thirdparty['zip'];
-        $newobject->town=$thirdparty['town'];
-
-        $newobject->country_id=$thirdparty['country_id'];
-        if ($thirdparty['country_code']) $newobject->country_id=getCountry($thirdparty['country_code'],3);
-        $newobject->province_id=$thirdparty['province_id'];
-        //if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
-
-        $newobject->phone=$thirdparty['phone'];
-        $newobject->fax=$thirdparty['fax'];
-        $newobject->email=$thirdparty['email'];
-        $newobject->url=$thirdparty['url'];
-        $newobject->idprof1=$thirdparty['profid1'];
-        $newobject->idprof2=$thirdparty['profid2'];
-        $newobject->idprof3=$thirdparty['profid3'];
-        $newobject->idprof4=$thirdparty['profid4'];
-        $newobject->idprof5=$thirdparty['profid5'];
-        $newobject->idprof6=$thirdparty['profid6'];
-
-        $newobject->capital=$thirdparty['capital'];
-
-        $newobject->barcode=$thirdparty['barcode'];
-        $newobject->tva_assuj=$thirdparty['vat_used'];
-        $newobject->tva_intra=$thirdparty['vat_number'];
-
-        $newobject->canvas=$thirdparty['canvas'];
-        $newobject->particulier=$thirdparty['individual'];
-
-        // Retrieve all extrafields for thirdsparty
-        // fetch optionals attributes and labels
-        $extrafields=new ExtraFields($db);
-        $extralabels=$extrafields->fetch_name_optionals_label('societe',true);
-        foreach($extrafields->attribute_label as $key=>$label)
-        {
-        	$key='options_'.$key;
-        	$newobject->array_options[$key]=$thirdparty[$key];
-        }
-
-        $db->begin();
-
-        $result=$newobject->create($fuser);
-        if ($newobject->particulier && $result > 0) {
-            $newobject->firstname = $thirdparty['firstname'];
-            $newobject->name_bis = $thirdparty['lastname'];
-            $result = $newobject->create_individual($fuser);
-        }
-        if ($result <= 0)
-        {
-            $error++;
-        }
-
-        if (! $error)
-        {
-            $db->commit();
-
-            // Patch to add capability to associate (one) sale representative
-            if($thirdparty['commid'] && $thirdparty['commid']>0)
-                $newobject->add_commercial($fuser, $thirdparty["commid"]);
-
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-        }
-        else
-        {
-            $db->rollback();
-            $error++;
-            $errorcode='KO';
-            $errorlabel=$newobject->error;
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
+	global $db,$conf,$langs;
+
+	$now=dol_now();
+
+	dol_syslog("Function: createThirdParty login=".$authentication['login']);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+	if (empty($thirdparty['ref']))
+	{
+		$error++; $errorcode='KO'; $errorlabel="Name is mandatory.";
+	}
+
+
+	if (! $error)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+		$newobject=new Societe($db);
+		$newobject->ref=$thirdparty['ref'];
+		$newobject->name=$thirdparty['ref'];
+		$newobject->ref_ext=$thirdparty['ref_ext'];
+		$newobject->status=$thirdparty['status'];
+		$newobject->client=$thirdparty['client'];
+		$newobject->fournisseur=$thirdparty['supplier'];
+		$newobject->code_client=$thirdparty['customer_code'];
+		$newobject->code_fournisseur=$thirdparty['supplier_code'];
+		$newobject->code_compta=$thirdparty['customer_code_accountancy'];
+		$newobject->code_compta_fournisseur=$thirdparty['supplier_code_accountancy'];
+		$newobject->date_creation=$now;
+		$newobject->note_private=$thirdparty['note_private'];
+		$newobject->note_public=$thirdparty['note_public'];
+		$newobject->address=$thirdparty['address'];
+		$newobject->zip=$thirdparty['zip'];
+		$newobject->town=$thirdparty['town'];
+
+		$newobject->country_id=$thirdparty['country_id'];
+		if ($thirdparty['country_code']) $newobject->country_id=getCountry($thirdparty['country_code'],3);
+		$newobject->province_id=$thirdparty['province_id'];
+		//if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
+
+		$newobject->phone=$thirdparty['phone'];
+		$newobject->fax=$thirdparty['fax'];
+		$newobject->email=$thirdparty['email'];
+		$newobject->url=$thirdparty['url'];
+		$newobject->idprof1=$thirdparty['profid1'];
+		$newobject->idprof2=$thirdparty['profid2'];
+		$newobject->idprof3=$thirdparty['profid3'];
+		$newobject->idprof4=$thirdparty['profid4'];
+		$newobject->idprof5=$thirdparty['profid5'];
+		$newobject->idprof6=$thirdparty['profid6'];
+
+		$newobject->capital=$thirdparty['capital'];
+
+		$newobject->barcode=$thirdparty['barcode'];
+		$newobject->tva_assuj=$thirdparty['vat_used'];
+		$newobject->tva_intra=$thirdparty['vat_number'];
+
+		$newobject->canvas=$thirdparty['canvas'];
+		$newobject->particulier=$thirdparty['individual'];
+
+		// Retrieve all extrafields for thirdsparty
+		// fetch optionals attributes and labels
+		$extrafields=new ExtraFields($db);
+		$extralabels=$extrafields->fetch_name_optionals_label('societe',true);
+		foreach($extrafields->attribute_label as $key=>$label)
+		{
+			$key='options_'.$key;
+			$newobject->array_options[$key]=$thirdparty[$key];
+		}
+
+		$db->begin();
+
+		$result=$newobject->create($fuser);
+		if ($newobject->particulier && $result > 0) {
+			$newobject->firstname = $thirdparty['firstname'];
+			$newobject->name_bis = $thirdparty['lastname'];
+			$result = $newobject->create_individual($fuser);
+		}
+		if ($result <= 0)
+		{
+			$error++;
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+
+			// Patch to add capability to associate (one) sale representative
+			if($thirdparty['commid'] && $thirdparty['commid']>0)
+				$newobject->add_commercial($fuser, $thirdparty["commid"]);
+
+			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+		}
+		else
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$newobject->error;
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
 }
 
 /**
@@ -656,98 +656,98 @@ 
  */
 function getListOfThirdParties($authentication,$filterthirdparty)
 {
-    global $db,$conf,$langs;
-
-    $now=dol_now();
-
-    dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $arraythirdparties=array();
-
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-
-    if (! $error)
-    {
-        $sql  = "SELECT s.rowid as socRowid, s.nom as ref, s.ref_ext, s.address, s.zip, s.town, c.label as country, s.phone, s.fax, s.url, extra.*";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON s.fk_pays = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as extra ON s.rowid=fk_object";
-
-        $sql.=" WHERE entity=".$conf->entity;
-        foreach($filterthirdparty as $key => $val)
-        {
-            if ($key == 'name'     && $val != '')  $sql.=" AND s.name LIKE '%".$db->escape($val)."%'";
-        	if ($key == 'client'   && (int) $val > 0)  $sql.=" AND s.client = ".$db->escape($val);
-            if ($key == 'supplier' && (int) $val > 0)  $sql.=" AND s.fournisseur = ".$db->escape($val);
-            if ($key == 'category' && (int) $val > 0)  $sql.=" AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
-        }
-        dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
-
-        $extrafields=new ExtraFields($db);
-        $extralabels=$extrafields->fetch_name_optionals_label('societe',true);
-
-
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $num=$db->num_rows($resql);
-
-            $i=0;
-            while ($i < $num)
-            {
-                $extrafieldsOptions=array();
-                $obj=$db->fetch_object($resql);
-                foreach($extrafields->attribute_label as $key=>$label)
-                {
-                    $extrafieldsOptions['options_'.$key] = $obj->{$key};
-                }
-                $arraythirdparties[]=array('id'=>$obj->socRowid,
-                    'ref'=>$obj->ref,
-                    'ref_ext'=>$obj->ref_ext,
-                    'adress'=>$obj->adress,
-                    'zip'=>$obj->zip,
-                    'town'=>$obj->town,
-                    'country'=>$obj->country,
-                    'phone'=>$obj->phone,
-                    'fax'=>$obj->fax,
-                    'url'=>$obj->url
-                );
-                $arraythirdparties[$i] = array_merge($arraythirdparties[$i],$extrafieldsOptions);
-
-                $i++;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode=$db->lasterrno();
-            $errorlabel=$db->lasterror();
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array(
-            'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
-            'thirdparties'=>$arraythirdparties
-        );
-    }
-    else
-    {
-        $objectresp = array(
-            'result'=>array('result_code' => 'OK', 'result_label' => ''),
-            'thirdparties'=>$arraythirdparties
-        );
-    }
-
-    return $objectresp;
+	global $db,$conf,$langs;
+
+	$now=dol_now();
+
+	dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$arraythirdparties=array();
+
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+
+	if (! $error)
+	{
+		$sql  = "SELECT s.rowid as socRowid, s.nom as ref, s.ref_ext, s.address, s.zip, s.town, c.label as country, s.phone, s.fax, s.url, extra.*";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON s.fk_pays = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as extra ON s.rowid=fk_object";
+
+		$sql.=" WHERE entity=".$conf->entity;
+		foreach($filterthirdparty as $key => $val)
+		{
+			if ($key == 'name'     && $val != '')  $sql.=" AND s.name LIKE '%".$db->escape($val)."%'";
+			if ($key == 'client'   && (int) $val > 0)  $sql.=" AND s.client = ".$db->escape($val);
+			if ($key == 'supplier' && (int) $val > 0)  $sql.=" AND s.fournisseur = ".$db->escape($val);
+			if ($key == 'category' && (int) $val > 0)  $sql.=" AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
+		}
+		dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
+
+		$extrafields=new ExtraFields($db);
+		$extralabels=$extrafields->fetch_name_optionals_label('societe',true);
+
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$num=$db->num_rows($resql);
+
+			$i=0;
+			while ($i < $num)
+			{
+				$extrafieldsOptions=array();
+				$obj=$db->fetch_object($resql);
+				foreach($extrafields->attribute_label as $key=>$label)
+				{
+					$extrafieldsOptions['options_'.$key] = $obj->{$key};
+				}
+				$arraythirdparties[]=array('id'=>$obj->socRowid,
+					'ref'=>$obj->ref,
+					'ref_ext'=>$obj->ref_ext,
+					'adress'=>$obj->adress,
+					'zip'=>$obj->zip,
+					'town'=>$obj->town,
+					'country'=>$obj->country,
+					'phone'=>$obj->phone,
+					'fax'=>$obj->fax,
+					'url'=>$obj->url
+				);
+				$arraythirdparties[$i] = array_merge($arraythirdparties[$i],$extrafieldsOptions);
+
+				$i++;
+			}
+		}
+		else
+		{
+			$error++;
+			$errorcode=$db->lasterrno();
+			$errorlabel=$db->lasterror();
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array(
+			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
+			'thirdparties'=>$arraythirdparties
+		);
+	}
+	else
+	{
+		$objectresp = array(
+			'result'=>array('result_code' => 'OK', 'result_label' => ''),
+			'thirdparties'=>$arraythirdparties
+		);
+	}
+
+	return $objectresp;
 }
 
 /**

Spacing +264 added lines, -264 removed lines

@@ -20,10 +20,10 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
 
 require_once '../master.inc.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
@@ -40,18 +40,18 @@ 
 {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-	print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
 	print $langs->trans("ToActivateModule");
 	exit;
 }
 
 // Create the soap Object
 $server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrThirdParty',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
+$server->soap_defencoding = 'UTF-8';
+$server->decode_utf8 = false;
+$ns = 'http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrThirdParty', $ns);
+$server->wsdl->schemaTargetNamespace = $ns;
 
 
 // Define WSDL Authentication object
@@ -62,11 +62,11 @@ 
     'all',
     '',
     array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
+        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
+        'password' => array('name'=>'password', 'type'=>'xsd:string'),
+        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
     )
 );
 // Define WSDL Return object
@@ -77,67 +77,67 @@ 
     'all',
     '',
     array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
     )
 );
 
 
-$thirdparty_fields= array(
-    	'id' => array('name'=>'id','type'=>'xsd:string'),
-        'ref' => array('name'=>'name','type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-        'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:string'),
-		'status' => array('name'=>'status','type'=>'xsd:string'),
-        'client' => array('name'=>'client','type'=>'xsd:string'),
-        'supplier' => array('name'=>'supplier','type'=>'xsd:string'),
-        'customer_code' => array('name'=>'customer_code','type'=>'xsd:string'),
-        'supplier_code' => array('name'=>'supplier_code','type'=>'xsd:string'),
-        'customer_code_accountancy' => array('name'=>'customer_code_accountancy','type'=>'xsd:string'),
-        'supplier_code_accountancy' => array('name'=>'supplier_code_accountancy','type'=>'xsd:string'),
-        'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
-        'note_private' => array('name'=>'note_private','type'=>'xsd:string'),
-		'note_public' => array('name'=>'note_public','type'=>'xsd:string'),
-    	'address' => array('name'=>'address','type'=>'xsd:string'),
-    	'zip' => array('name'=>'zip','type'=>'xsd:string'),
-    	'town' => array('name'=>'town','type'=>'xsd:string'),
-    	'province_id' => array('name'=>'province_id','type'=>'xsd:string'),
-    	'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
-    	'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
-    	'country' => array('name'=>'country','type'=>'xsd:string'),
-        'phone' => array('name'=>'phone','type'=>'xsd:string'),
-    	'fax' => array('name'=>'fax','type'=>'xsd:string'),
-    	'email' => array('name'=>'email','type'=>'xsd:string'),
-    	'url' => array('name'=>'url','type'=>'xsd:string'),
-    	'profid1' => array('name'=>'profid1','type'=>'xsd:string'),
-    	'profid2' => array('name'=>'profid2','type'=>'xsd:string'),
-    	'profid3' => array('name'=>'profid3','type'=>'xsd:string'),
-    	'profid4' => array('name'=>'profid4','type'=>'xsd:string'),
-    	'profid5' => array('name'=>'profid5','type'=>'xsd:string'),
-    	'profid6' => array('name'=>'profid6','type'=>'xsd:string'),
-        'capital' => array('name'=>'capital','type'=>'xsd:string'),
-    	'vat_used' => array('name'=>'vat_used','type'=>'xsd:string'),
-    	'vat_number' => array('name'=>'vat_number','type'=>'xsd:string'));
+$thirdparty_fields = array(
+    	'id' => array('name'=>'id', 'type'=>'xsd:string'),
+        'ref' => array('name'=>'name', 'type'=>'xsd:string'),
+        'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+        'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
+		'status' => array('name'=>'status', 'type'=>'xsd:string'),
+        'client' => array('name'=>'client', 'type'=>'xsd:string'),
+        'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
+        'customer_code' => array('name'=>'customer_code', 'type'=>'xsd:string'),
+        'supplier_code' => array('name'=>'supplier_code', 'type'=>'xsd:string'),
+        'customer_code_accountancy' => array('name'=>'customer_code_accountancy', 'type'=>'xsd:string'),
+        'supplier_code_accountancy' => array('name'=>'supplier_code_accountancy', 'type'=>'xsd:string'),
+        'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+        'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+        'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
+		'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
+    	'address' => array('name'=>'address', 'type'=>'xsd:string'),
+    	'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
+    	'town' => array('name'=>'town', 'type'=>'xsd:string'),
+    	'province_id' => array('name'=>'province_id', 'type'=>'xsd:string'),
+    	'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
+    	'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
+    	'country' => array('name'=>'country', 'type'=>'xsd:string'),
+        'phone' => array('name'=>'phone', 'type'=>'xsd:string'),
+    	'fax' => array('name'=>'fax', 'type'=>'xsd:string'),
+    	'email' => array('name'=>'email', 'type'=>'xsd:string'),
+    	'url' => array('name'=>'url', 'type'=>'xsd:string'),
+    	'profid1' => array('name'=>'profid1', 'type'=>'xsd:string'),
+    	'profid2' => array('name'=>'profid2', 'type'=>'xsd:string'),
+    	'profid3' => array('name'=>'profid3', 'type'=>'xsd:string'),
+    	'profid4' => array('name'=>'profid4', 'type'=>'xsd:string'),
+    	'profid5' => array('name'=>'profid5', 'type'=>'xsd:string'),
+    	'profid6' => array('name'=>'profid6', 'type'=>'xsd:string'),
+        'capital' => array('name'=>'capital', 'type'=>'xsd:string'),
+    	'vat_used' => array('name'=>'vat_used', 'type'=>'xsd:string'),
+    	'vat_number' => array('name'=>'vat_number', 'type'=>'xsd:string'));
 
 // Retrieve all extrafields for thirdsparty
 // fetch optionals attributes and labels
-$extrafields=new ExtraFields($db);
-$extralabels=$extrafields->fetch_name_optionals_label('societe',true);
-if (count($extrafields)>0) {
+$extrafields = new ExtraFields($db);
+$extralabels = $extrafields->fetch_name_optionals_label('societe', true);
+if (count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-foreach($extrafields->attribute_label as $key=>$label)
+foreach ($extrafields->attribute_label as $key=>$label)
 {
 	//$value=$object->array_options["options_".$key];
-	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	$type = $extrafields->attribute_type[$key];
+	if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
+	else {$type = 'xsd:string'; }
 
-	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
+	$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
 }
 
-$thirdparty_fields=array_merge($thirdparty_fields,$extrafield_array);
+$thirdparty_fields = array_merge($thirdparty_fields, $extrafield_array);
 
 // Define other specific objects
 $server->wsdl->addComplexType(
@@ -158,9 +158,9 @@ 
     '',
     array(
         //'limit' => array('name'=>'limit','type'=>'xsd:string'),
-        'client' => array('name'=>'client','type'=>'xsd:string'),
-        'supplier' => array('name'=>'supplier','type'=>'xsd:string'),
-    	'category' => array('name'=>'category','type'=>'xsd:string')
+        'client' => array('name'=>'client', 'type'=>'xsd:string'),
+        'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
+    	'category' => array('name'=>'category', 'type'=>'xsd:string')
     )
 );
 
@@ -172,7 +172,7 @@ 
     'SOAP-ENC:Array',
     array(),
     array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:thirdparty[]')
+        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:thirdparty[]')
     ),
     'tns:thirdparty'
 );
@@ -196,17 +196,17 @@ 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
 // Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
 // http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
+$styledoc = 'rpc'; // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded'; // encoded/literal/literal wrapped
 // Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
 
 // Register WSDL
 $server->register(
     'getThirdParty',
     // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','thirdparty'=>'tns:thirdparty'),
+    array('result'=>'tns:result', 'thirdparty'=>'tns:thirdparty'),
     $ns,
     $ns.'#getThirdParty',
     $styledoc,
@@ -218,9 +218,9 @@ 
 $server->register(
     'createThirdParty',
     // Entry values
-    array('authentication'=>'tns:authentication','thirdparty'=>'tns:thirdparty'),
+    array('authentication'=>'tns:authentication', 'thirdparty'=>'tns:thirdparty'),
     // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string'),
+    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
     $ns,
     $ns.'#createThirdParty',
     $styledoc,
@@ -232,9 +232,9 @@ 
 $server->register(
 	'updateThirdParty',
 	// Entry values
-	array('authentication'=>'tns:authentication','thirdparty'=>'tns:thirdparty'),
+	array('authentication'=>'tns:authentication', 'thirdparty'=>'tns:thirdparty'),
 	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
+	array('result'=>'tns:result', 'id'=>'xsd:string'),
 	$ns,
 	$ns.'#updateThirdParty',
 	$styledoc,
@@ -247,9 +247,9 @@ 
 $server->register(
     'getListOfThirdParties',
     // Entry values
-    array('authentication'=>'tns:authentication','filterthirdparty'=>'tns:filterthirdparty'),
+    array('authentication'=>'tns:authentication', 'filterthirdparty'=>'tns:filterthirdparty'),
     // Exit values
-    array('result'=>'tns:result','thirdparties'=>'tns:ThirdPartiesArray2'),
+    array('result'=>'tns:result', 'thirdparties'=>'tns:ThirdPartiesArray2'),
     $ns,
     $ns.'#getListOfThirdParties',
     $styledoc,
@@ -261,9 +261,9 @@ 
 $server->register(
 		'deleteThirdParty',
 		// Entry values
-		array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+		array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
 		// Exit values
-		array('result'=>'tns:result','id'=>'xsd:string'),
+		array('result'=>'tns:result', 'id'=>'xsd:string'),
 		$ns,
 		$ns.'#deleteThirdParty',
 		$styledoc,
@@ -282,38 +282,38 @@ 
  * @param	string		$ref_ext	   		external reference
  * @return	array							Array result
  */
-function getThirdParty($authentication,$id='',$ref='',$ref_ext='')
+function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: getThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
-		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$fuser->getrights();
 
 		if ($fuser->rights->societe->lire)
 		{
-			$thirdparty=new Societe($db);
-			$result=$thirdparty->fetch($id,$ref,$ref_ext);
+			$thirdparty = new Societe($db);
+			$result = $thirdparty->fetch($id, $ref, $ref_ext);
 			if ($result > 0)
 			{
 
-				$thirdparty_result_fields=array(
+				$thirdparty_result_fields = array(
 				    	'id' => $thirdparty->id,
 			   			'ref' => $thirdparty->name,
 			   			'ref_ext' => $thirdparty->ref_ext,
@@ -325,8 +325,8 @@ 
 				        'customer_code_accountancy' => $thirdparty->code_compta,
 			            'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
 			            'fk_user_author' => $thirdparty->fk_user_author,
-			    		'date_creation' => dol_print_date($thirdparty->date_creation,'dayhourrfc'),
-			    		'date_modification' => dol_print_date($thirdparty->date_modification,'dayhourrfc'),
+			    		'date_creation' => dol_print_date($thirdparty->date_creation, 'dayhourrfc'),
+			    		'date_modification' => dol_print_date($thirdparty->date_modification, 'dayhourrfc'),
 			            'address' => $thirdparty->address,
 				        'zip' => $thirdparty->zip,
 				        'town' => $thirdparty->town,
@@ -353,14 +353,14 @@ 
 
 				// Retrieve all extrafields for thirdsparty
 				// fetch optionals attributes and labels
-				$extrafields=new ExtraFields($db);
-				$extralabels=$extrafields->fetch_name_optionals_label('societe',true);
+				$extrafields = new ExtraFields($db);
+				$extralabels = $extrafields->fetch_name_optionals_label('societe', true);
 				//Get extrafield values
-				$thirdparty->fetch_optionals($thirdparty->id,$extralabels);
+				$thirdparty->fetch_optionals($thirdparty->id, $extralabels);
 
-				foreach($extrafields->attribute_label as $key=>$label)
+				foreach ($extrafields->attribute_label as $key=>$label)
 				{
-					$thirdparty_result_fields=array_merge($thirdparty_result_fields,array('options_'.$key => $thirdparty->array_options['options_'.$key]));
+					$thirdparty_result_fields = array_merge($thirdparty_result_fields, array('options_'.$key => $thirdparty->array_options['options_'.$key]));
 				}
 
 			    // Create
@@ -371,13 +371,13 @@ 
 			else
 			{
 				$error++;
-				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
 		else
 		{
 			$error++;
-			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -398,88 +398,88 @@ 
  * @param	Societe		$thirdparty		    Thirdparty
  * @return	array							Array result
  */
-function createThirdParty($authentication,$thirdparty)
+function createThirdParty($authentication, $thirdparty)
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
-    $now=dol_now();
+    $now = dol_now();
 
     dol_syslog("Function: createThirdParty login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
     if (empty($thirdparty['ref']))
     {
-        $error++; $errorcode='KO'; $errorlabel="Name is mandatory.";
+        $error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
     }
 
 
-    if (! $error)
+    if (!$error)
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        $newobject=new Societe($db);
-        $newobject->ref=$thirdparty['ref'];
-        $newobject->name=$thirdparty['ref'];
-        $newobject->ref_ext=$thirdparty['ref_ext'];
-        $newobject->status=$thirdparty['status'];
-        $newobject->client=$thirdparty['client'];
-        $newobject->fournisseur=$thirdparty['supplier'];
-        $newobject->code_client=$thirdparty['customer_code'];
-        $newobject->code_fournisseur=$thirdparty['supplier_code'];
-        $newobject->code_compta=$thirdparty['customer_code_accountancy'];
-        $newobject->code_compta_fournisseur=$thirdparty['supplier_code_accountancy'];
-        $newobject->date_creation=$now;
-        $newobject->note_private=$thirdparty['note_private'];
-        $newobject->note_public=$thirdparty['note_public'];
-        $newobject->address=$thirdparty['address'];
-        $newobject->zip=$thirdparty['zip'];
-        $newobject->town=$thirdparty['town'];
-
-        $newobject->country_id=$thirdparty['country_id'];
-        if ($thirdparty['country_code']) $newobject->country_id=getCountry($thirdparty['country_code'],3);
-        $newobject->province_id=$thirdparty['province_id'];
+        $newobject = new Societe($db);
+        $newobject->ref = $thirdparty['ref'];
+        $newobject->name = $thirdparty['ref'];
+        $newobject->ref_ext = $thirdparty['ref_ext'];
+        $newobject->status = $thirdparty['status'];
+        $newobject->client = $thirdparty['client'];
+        $newobject->fournisseur = $thirdparty['supplier'];
+        $newobject->code_client = $thirdparty['customer_code'];
+        $newobject->code_fournisseur = $thirdparty['supplier_code'];
+        $newobject->code_compta = $thirdparty['customer_code_accountancy'];
+        $newobject->code_compta_fournisseur = $thirdparty['supplier_code_accountancy'];
+        $newobject->date_creation = $now;
+        $newobject->note_private = $thirdparty['note_private'];
+        $newobject->note_public = $thirdparty['note_public'];
+        $newobject->address = $thirdparty['address'];
+        $newobject->zip = $thirdparty['zip'];
+        $newobject->town = $thirdparty['town'];
+
+        $newobject->country_id = $thirdparty['country_id'];
+        if ($thirdparty['country_code']) $newobject->country_id = getCountry($thirdparty['country_code'], 3);
+        $newobject->province_id = $thirdparty['province_id'];
         //if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
 
-        $newobject->phone=$thirdparty['phone'];
-        $newobject->fax=$thirdparty['fax'];
-        $newobject->email=$thirdparty['email'];
-        $newobject->url=$thirdparty['url'];
-        $newobject->idprof1=$thirdparty['profid1'];
-        $newobject->idprof2=$thirdparty['profid2'];
-        $newobject->idprof3=$thirdparty['profid3'];
-        $newobject->idprof4=$thirdparty['profid4'];
-        $newobject->idprof5=$thirdparty['profid5'];
-        $newobject->idprof6=$thirdparty['profid6'];
+        $newobject->phone = $thirdparty['phone'];
+        $newobject->fax = $thirdparty['fax'];
+        $newobject->email = $thirdparty['email'];
+        $newobject->url = $thirdparty['url'];
+        $newobject->idprof1 = $thirdparty['profid1'];
+        $newobject->idprof2 = $thirdparty['profid2'];
+        $newobject->idprof3 = $thirdparty['profid3'];
+        $newobject->idprof4 = $thirdparty['profid4'];
+        $newobject->idprof5 = $thirdparty['profid5'];
+        $newobject->idprof6 = $thirdparty['profid6'];
 
-        $newobject->capital=$thirdparty['capital'];
+        $newobject->capital = $thirdparty['capital'];
 
-        $newobject->barcode=$thirdparty['barcode'];
-        $newobject->tva_assuj=$thirdparty['vat_used'];
-        $newobject->tva_intra=$thirdparty['vat_number'];
+        $newobject->barcode = $thirdparty['barcode'];
+        $newobject->tva_assuj = $thirdparty['vat_used'];
+        $newobject->tva_intra = $thirdparty['vat_number'];
 
-        $newobject->canvas=$thirdparty['canvas'];
-        $newobject->particulier=$thirdparty['individual'];
+        $newobject->canvas = $thirdparty['canvas'];
+        $newobject->particulier = $thirdparty['individual'];
 
         // Retrieve all extrafields for thirdsparty
         // fetch optionals attributes and labels
-        $extrafields=new ExtraFields($db);
-        $extralabels=$extrafields->fetch_name_optionals_label('societe',true);
-        foreach($extrafields->attribute_label as $key=>$label)
+        $extrafields = new ExtraFields($db);
+        $extralabels = $extrafields->fetch_name_optionals_label('societe', true);
+        foreach ($extrafields->attribute_label as $key=>$label)
         {
-        	$key='options_'.$key;
-        	$newobject->array_options[$key]=$thirdparty[$key];
+        	$key = 'options_'.$key;
+        	$newobject->array_options[$key] = $thirdparty[$key];
         }
 
         $db->begin();
 
-        $result=$newobject->create($fuser);
+        $result = $newobject->create($fuser);
         if ($newobject->particulier && $result > 0) {
             $newobject->firstname = $thirdparty['firstname'];
             $newobject->name_bis = $thirdparty['lastname'];
@@ -490,22 +490,22 @@ 
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
             $db->commit();
 
             // Patch to add capability to associate (one) sale representative
-            if($thirdparty['commid'] && $thirdparty['commid']>0)
+            if ($thirdparty['commid'] && $thirdparty['commid'] > 0)
                 $newobject->add_commercial($fuser, $thirdparty["commid"]);
 
-            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
         else
         {
             $db->rollback();
             $error++;
-            $errorcode='KO';
-            $errorlabel=$newobject->error;
+            $errorcode = 'KO';
+            $errorlabel = $newobject->error;
         }
     }
 
@@ -524,102 +524,102 @@ 
  * @param	Societe		$thirdparty		    Thirdparty
  * @return	array							Array result
  */
-function updateThirdParty($authentication,$thirdparty)
+function updateThirdParty($authentication, $thirdparty)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
-	$now=dol_now();
+	$now = dol_now();
 
 	dol_syslog("Function: updateThirdParty login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
 	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
-	if (empty($thirdparty['id']))	{
-		$error++; $errorcode='KO'; $errorlabel="Thirdparty id is mandatory.";
+	if (empty($thirdparty['id'])) {
+		$error++; $errorcode = 'KO'; $errorlabel = "Thirdparty id is mandatory.";
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$objectfound=false;
+		$objectfound = false;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-		$object=new Societe($db);
-		$result=$object->fetch($thirdparty['id']);
+		$object = new Societe($db);
+		$result = $object->fetch($thirdparty['id']);
 
 		if (!empty($object->id)) {
 
-			$objectfound=true;
-
-			$object->ref=$thirdparty['ref'];
-			$object->name=$thirdparty['ref'];
-			$object->ref_ext=$thirdparty['ref_ext'];
-			$object->status=$thirdparty['status'];
-			$object->client=$thirdparty['client'];
-			$object->fournisseur=$thirdparty['supplier'];
-			$object->code_client=$thirdparty['customer_code'];
-			$object->code_fournisseur=$thirdparty['supplier_code'];
-			$object->code_compta=$thirdparty['customer_code_accountancy'];
-			$object->code_compta_fournisseur=$thirdparty['supplier_code_accountancy'];
-			$object->date_creation=$now;
-			$object->note_private=$thirdparty['note_private'];
-			$object->note_public=$thirdparty['note_public'];
-			$object->address=$thirdparty['address'];
-			$object->zip=$thirdparty['zip'];
-			$object->town=$thirdparty['town'];
-
-			$object->country_id=$thirdparty['country_id'];
-			if ($thirdparty['country_code']) $object->country_id=getCountry($thirdparty['country_code'],3);
-			$object->province_id=$thirdparty['province_id'];
+			$objectfound = true;
+
+			$object->ref = $thirdparty['ref'];
+			$object->name = $thirdparty['ref'];
+			$object->ref_ext = $thirdparty['ref_ext'];
+			$object->status = $thirdparty['status'];
+			$object->client = $thirdparty['client'];
+			$object->fournisseur = $thirdparty['supplier'];
+			$object->code_client = $thirdparty['customer_code'];
+			$object->code_fournisseur = $thirdparty['supplier_code'];
+			$object->code_compta = $thirdparty['customer_code_accountancy'];
+			$object->code_compta_fournisseur = $thirdparty['supplier_code_accountancy'];
+			$object->date_creation = $now;
+			$object->note_private = $thirdparty['note_private'];
+			$object->note_public = $thirdparty['note_public'];
+			$object->address = $thirdparty['address'];
+			$object->zip = $thirdparty['zip'];
+			$object->town = $thirdparty['town'];
+
+			$object->country_id = $thirdparty['country_id'];
+			if ($thirdparty['country_code']) $object->country_id = getCountry($thirdparty['country_code'], 3);
+			$object->province_id = $thirdparty['province_id'];
 			//if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
 
-			$object->phone=$thirdparty['phone'];
-			$object->fax=$thirdparty['fax'];
-			$object->email=$thirdparty['email'];
-			$object->url=$thirdparty['url'];
-			$object->idprof1=$thirdparty['profid1'];
-			$object->idprof2=$thirdparty['profid2'];
-			$object->idprof3=$thirdparty['profid3'];
-			$object->idprof4=$thirdparty['profid4'];
-			$object->idprof5=$thirdparty['profid5'];
-			$object->idprof6=$thirdparty['profid6'];
+			$object->phone = $thirdparty['phone'];
+			$object->fax = $thirdparty['fax'];
+			$object->email = $thirdparty['email'];
+			$object->url = $thirdparty['url'];
+			$object->idprof1 = $thirdparty['profid1'];
+			$object->idprof2 = $thirdparty['profid2'];
+			$object->idprof3 = $thirdparty['profid3'];
+			$object->idprof4 = $thirdparty['profid4'];
+			$object->idprof5 = $thirdparty['profid5'];
+			$object->idprof6 = $thirdparty['profid6'];
 
-			$object->capital=$thirdparty['capital'];
+			$object->capital = $thirdparty['capital'];
 
-			$object->barcode=$thirdparty['barcode'];
-			$object->tva_assuj=$thirdparty['vat_used'];
-			$object->tva_intra=$thirdparty['vat_number'];
+			$object->barcode = $thirdparty['barcode'];
+			$object->tva_assuj = $thirdparty['vat_used'];
+			$object->tva_intra = $thirdparty['vat_number'];
 
-			$object->canvas=$thirdparty['canvas'];
+			$object->canvas = $thirdparty['canvas'];
 
 			// Retrieve all extrafields for thirdsparty
 			// fetch optionals attributes and labels
-			$extrafields=new ExtraFields($db);
-			$extralabels=$extrafields->fetch_name_optionals_label('societe',true);
-			foreach($extrafields->attribute_label as $key=>$label)
+			$extrafields = new ExtraFields($db);
+			$extralabels = $extrafields->fetch_name_optionals_label('societe', true);
+			foreach ($extrafields->attribute_label as $key=>$label)
 			{
-				$key='options_'.$key;
-				$object->array_options[$key]=$thirdparty[$key];
+				$key = 'options_'.$key;
+				$object->array_options[$key] = $thirdparty[$key];
 			}
 
 			$db->begin();
 
-			$result=$object->update($thirdparty['id'],$fuser);
+			$result = $object->update($thirdparty['id'], $fuser);
 			if ($result <= 0) {
 				$error++;
 			}
 		}
 
-		if ((! $error) && ($objectfound))
+		if ((!$error) && ($objectfound))
 		{
 			$db->commit();
-			$objectresp=array(
+			$objectresp = array(
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'id'=>$object->id
 			);
@@ -628,12 +628,12 @@ 
 		{
 			$db->rollback();
 			$error++;
-			$errorcode='KO';
-			$errorlabel=$object->error;
+			$errorcode = 'KO';
+			$errorlabel = $object->error;
 		} else {
 			$error++;
-			$errorcode='NOT_FOUND';
-			$errorlabel='Thirdparty id='.$thirdparty['id'].' cannot be found';
+			$errorcode = 'NOT_FOUND';
+			$errorlabel = 'Thirdparty id='.$thirdparty['id'].' cannot be found';
 		}
 	}
 
@@ -654,61 +654,61 @@ 
  * @param	array		$filterthirdparty	Filter fields (key=>value to filer on. For example 'client'=>2, 'supplier'=>1, 'category'=>idcateg, 'name'=>'searchstring', ...)
  * @return	array							Array result
  */
-function getListOfThirdParties($authentication,$filterthirdparty)
+function getListOfThirdParties($authentication, $filterthirdparty)
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
-    $now=dol_now();
+    $now = dol_now();
 
     dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $arraythirdparties=array();
+    $objectresp = array();
+    $arraythirdparties = array();
 
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
 
-    if (! $error)
+    if (!$error)
     {
         $sql  = "SELECT s.rowid as socRowid, s.nom as ref, s.ref_ext, s.address, s.zip, s.town, c.label as country, s.phone, s.fax, s.url, extra.*";
         $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
         $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON s.fk_pays = c.rowid";
         $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as extra ON s.rowid=fk_object";
 
-        $sql.=" WHERE entity=".$conf->entity;
-        foreach($filterthirdparty as $key => $val)
+        $sql .= " WHERE entity=".$conf->entity;
+        foreach ($filterthirdparty as $key => $val)
         {
-            if ($key == 'name'     && $val != '')  $sql.=" AND s.name LIKE '%".$db->escape($val)."%'";
-        	if ($key == 'client'   && (int) $val > 0)  $sql.=" AND s.client = ".$db->escape($val);
-            if ($key == 'supplier' && (int) $val > 0)  $sql.=" AND s.fournisseur = ".$db->escape($val);
-            if ($key == 'category' && (int) $val > 0)  $sql.=" AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
+            if ($key == 'name' && $val != '')  $sql .= " AND s.name LIKE '%".$db->escape($val)."%'";
+        	if ($key == 'client' && (int) $val > 0)  $sql .= " AND s.client = ".$db->escape($val);
+            if ($key == 'supplier' && (int) $val > 0)  $sql .= " AND s.fournisseur = ".$db->escape($val);
+            if ($key == 'category' && (int) $val > 0)  $sql .= " AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
         }
         dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
 
-        $extrafields=new ExtraFields($db);
-        $extralabels=$extrafields->fetch_name_optionals_label('societe',true);
+        $extrafields = new ExtraFields($db);
+        $extralabels = $extrafields->fetch_name_optionals_label('societe', true);
 
 
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
-            $num=$db->num_rows($resql);
+            $num = $db->num_rows($resql);
 
-            $i=0;
+            $i = 0;
             while ($i < $num)
             {
-                $extrafieldsOptions=array();
-                $obj=$db->fetch_object($resql);
-                foreach($extrafields->attribute_label as $key=>$label)
+                $extrafieldsOptions = array();
+                $obj = $db->fetch_object($resql);
+                foreach ($extrafields->attribute_label as $key=>$label)
                 {
                     $extrafieldsOptions['options_'.$key] = $obj->{$key};
                 }
-                $arraythirdparties[]=array('id'=>$obj->socRowid,
+                $arraythirdparties[] = array('id'=>$obj->socRowid,
                     'ref'=>$obj->ref,
                     'ref_ext'=>$obj->ref_ext,
                     'adress'=>$obj->adress,
@@ -719,7 +719,7 @@ 
                     'fax'=>$obj->fax,
                     'url'=>$obj->url
                 );
-                $arraythirdparties[$i] = array_merge($arraythirdparties[$i],$extrafieldsOptions);
+                $arraythirdparties[$i] = array_merge($arraythirdparties[$i], $extrafieldsOptions);
 
                 $i++;
             }
@@ -727,8 +727,8 @@ 
         else
         {
             $error++;
-            $errorcode=$db->lasterrno();
-            $errorlabel=$db->lasterror();
+            $errorcode = $db->lasterrno();
+            $errorlabel = $db->lasterror();
         }
     }
 
@@ -759,42 +759,42 @@ 
  * @param	string		$ref_ext	   		external reference
  * @return	array							Array result
  */
-function deleteThirdParty($authentication,$id='',$ref='',$ref_ext='')
+function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	dol_syslog("Function: deleteThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
 	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
-	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		dol_syslog("Function: deleteThirdParty checkparam");
 		$error++;
-		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 	dol_syslog("Function: deleteThirdParty 1");
 	
-	if (! $error)
+	if (!$error)
 	{
 		$fuser->getrights();
 
 		if ($fuser->rights->societe->lire && $fuser->rights->societe->supprimer)
 		{
-			$thirdparty=new Societe($db);
-			$result=$thirdparty->fetch($id,$ref,$ref_ext);
+			$thirdparty = new Societe($db);
+			$result = $thirdparty->fetch($id, $ref, $ref_ext);
 				
 			if ($result > 0)
 			{
 				$db->begin();
 				
-				$result=$thirdparty->delete($thirdparty->id, $fuser);
+				$result = $thirdparty->delete($thirdparty->id, $fuser);
 				
 				if ($result > 0)
 				{
@@ -806,22 +806,22 @@ 
 				{						
 					$db->rollback();
 					$error++;
-					$errorcode='KO';
-					$errorlabel=$thirdparty->error;
+					$errorcode = 'KO';
+					$errorlabel = $thirdparty->error;
 					dol_syslog("Function: deleteThirdParty cant delete");
 				}
 			}
 			else
 			{
 				$error++;
-				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 				
 			}
 		}
 		else
 		{
 			$error++;
-			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 

Braces +49 added lines, -34 removed lines

@@ -20,7 +20,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
@@ -131,8 +133,7 @@ 
 {
 	//$value=$object->array_options["options_".$key];
 	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} else {$type='xsd:string';}
 
 	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
 }
@@ -288,7 +289,9 @@ 
 
 	dol_syslog("Function: getThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -367,14 +370,12 @@ 
 			    $objectresp = array(
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'thirdparty'=>$thirdparty_result_fields);
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -406,7 +407,9 @@ 
 
     dol_syslog("Function: createThirdParty login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -443,7 +446,9 @@ 
         $newobject->town=$thirdparty['town'];
 
         $newobject->country_id=$thirdparty['country_id'];
-        if ($thirdparty['country_code']) $newobject->country_id=getCountry($thirdparty['country_code'],3);
+        if ($thirdparty['country_code']) {
+        	$newobject->country_id=getCountry($thirdparty['country_code'],3);
+        }
         $newobject->province_id=$thirdparty['province_id'];
         //if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
 
@@ -495,12 +500,12 @@ 
             $db->commit();
 
             // Patch to add capability to associate (one) sale representative
-            if($thirdparty['commid'] && $thirdparty['commid']>0)
-                $newobject->add_commercial($fuser, $thirdparty["commid"]);
+            if($thirdparty['commid'] && $thirdparty['commid']>0) {
+                            $newobject->add_commercial($fuser, $thirdparty["commid"]);
+            }
 
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-        }
-        else
+        } else
         {
             $db->rollback();
             $error++;
@@ -532,7 +537,9 @@ 
 
 	dol_syslog("Function: updateThirdParty login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -575,7 +582,9 @@ 
 			$object->town=$thirdparty['town'];
 
 			$object->country_id=$thirdparty['country_id'];
-			if ($thirdparty['country_code']) $object->country_id=getCountry($thirdparty['country_code'],3);
+			if ($thirdparty['country_code']) {
+				$object->country_id=getCountry($thirdparty['country_code'],3);
+			}
 			$object->province_id=$thirdparty['province_id'];
 			//if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
 
@@ -623,8 +632,7 @@ 
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'id'=>$object->id
 			);
-		}
-		elseif ($objectfound)
+		} elseif ($objectfound)
 		{
 			$db->rollback();
 			$error++;
@@ -662,7 +670,9 @@ 
 
     dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -683,10 +693,18 @@ 
         $sql.=" WHERE entity=".$conf->entity;
         foreach($filterthirdparty as $key => $val)
         {
-            if ($key == 'name'     && $val != '')  $sql.=" AND s.name LIKE '%".$db->escape($val)."%'";
-        	if ($key == 'client'   && (int) $val > 0)  $sql.=" AND s.client = ".$db->escape($val);
-            if ($key == 'supplier' && (int) $val > 0)  $sql.=" AND s.fournisseur = ".$db->escape($val);
-            if ($key == 'category' && (int) $val > 0)  $sql.=" AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
+            if ($key == 'name'     && $val != '') {
+            	$sql.=" AND s.name LIKE '%".$db->escape($val)."%'";
+            }
+        	if ($key == 'client'   && (int) $val > 0) {
+        		$sql.=" AND s.client = ".$db->escape($val);
+        	}
+            if ($key == 'supplier' && (int) $val > 0) {
+            	$sql.=" AND s.fournisseur = ".$db->escape($val);
+            }
+            if ($key == 'category' && (int) $val > 0) {
+            	$sql.=" AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
+            }
         }
         dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
 
@@ -723,8 +741,7 @@ 
 
                 $i++;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode=$db->lasterrno();
@@ -738,8 +755,7 @@ 
             'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
             'thirdparties'=>$arraythirdparties
         );
-    }
-    else
+    } else
     {
         $objectresp = array(
             'result'=>array('result_code' => 'OK', 'result_label' => ''),
@@ -765,7 +781,9 @@ 
 
 	dol_syslog("Function: deleteThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -801,8 +819,7 @@ 
 					$db->commit();
 						
 					$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
-				}
-				else
+				} else
 				{						
 					$db->rollback();
 					$error++;
@@ -810,15 +827,13 @@ 
 					$errorlabel=$thirdparty->error;
 					dol_syslog("Function: deleteThirdParty cant delete");
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 				
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';

htdocs/webservices/server_project.php

Indentation +297 added lines, -297 removed lines

@@ -39,29 +39,29 @@ 
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create associated types array, with each table
 $listofreferent=array(
-    'propal' => 'propal',
-    'order' => 'commande',
-    'invoice' => 'facture',
-    'invoice_predefined' => 'facture_rec',
-    'proposal_supplier' => 'commande_fournisseur',
-    'order_supplier' => 'commande_fournisseur',
-    'invoice_supplier' => 'facture_fourn',
-    'contract' => 'contrat',
-    'intervention' => 'fichinter',
-    'trip' => 'deplacement',
-    'expensereport' => 'expensereport_det',
-    'donation' => 'don',
-    'agenda' => 'actioncomm',
-    'project_task' => 'projet_task',
+	'propal' => 'propal',
+	'order' => 'commande',
+	'invoice' => 'facture',
+	'invoice_predefined' => 'facture_rec',
+	'proposal_supplier' => 'commande_fournisseur',
+	'order_supplier' => 'commande_fournisseur',
+	'invoice_supplier' => 'facture_fourn',
+	'contract' => 'contrat',
+	'intervention' => 'fichinter',
+	'trip' => 'deplacement',
+	'expensereport' => 'expensereport_det',
+	'donation' => 'don',
+	'agenda' => 'actioncomm',
+	'project_task' => 'projet_task',
 );
 
 // Create the soap Object
@@ -74,89 +74,89 @@ 
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-        'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-        'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+		'login' => array('name'=>'login','type'=>'xsd:string'),
+		'password' => array('name'=>'password','type'=>'xsd:string'),
+		'entity' => array('name'=>'entity','type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+	)
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'element',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'id' => array('name'=>'id','type'=>'xsd:int'),
-        'user' => array('name'=>'user','type'=>'xsd:int'),
-    )
+	'element',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id','type'=>'xsd:int'),
+		'user' => array('name'=>'user','type'=>'xsd:int'),
+	)
 );
 
 $server->wsdl->addComplexType(
-    'elementsArray',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'elements' => array(
-            'name' => 'elementsArray',
-            'type' => 'tns:element',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    )
+	'elementsArray',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'elements' => array(
+			'name' => 'elementsArray',
+			'type' => 'tns:element',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	)
 );
 
 $project_elements = array();
 foreach($listofreferent as $key => $_)
 {
-    $project_elements[$key] = array('name'=>$key,'type'=>'tns:elementsArray');
+	$project_elements[$key] = array('name'=>$key,'type'=>'tns:elementsArray');
 }
 $server->wsdl->addComplexType(
-    'elements',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    $project_elements
+	'elements',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	$project_elements
 );
 
 // Define project
 $project_fields = array(
-    'id' => array('name'=>'id','type'=>'xsd:string'),
-    'ref' => array('name'=>'ref','type'=>'xsd:string'),
-    'label' => array('name'=>'label','type'=>'xsd:string'),
-    'thirdparty_id' => array('name'=>'thirdparty_id','type'=>'xsd:int'),
-    'public' => array('name'=>'public','type'=>'xsd:int'),
-    'status' => array('name'=>'status','type'=>'xsd:int'),
-    'date_start' => array('name'=>'date_start','type'=>'xsd:date'),
-    'date_end' => array('name'=>'date_end','type'=>'xsd:date'),
-    'budget' => array('name'=>'budget','type'=>'xsd:int'),
-    'description' => array('name'=>'description','type'=>'xsd:string'),
-    'elements' => array('name'=>'elements','type'=>'tns:elements')
+	'id' => array('name'=>'id','type'=>'xsd:string'),
+	'ref' => array('name'=>'ref','type'=>'xsd:string'),
+	'label' => array('name'=>'label','type'=>'xsd:string'),
+	'thirdparty_id' => array('name'=>'thirdparty_id','type'=>'xsd:int'),
+	'public' => array('name'=>'public','type'=>'xsd:int'),
+	'status' => array('name'=>'status','type'=>'xsd:int'),
+	'date_start' => array('name'=>'date_start','type'=>'xsd:date'),
+	'date_end' => array('name'=>'date_end','type'=>'xsd:date'),
+	'budget' => array('name'=>'budget','type'=>'xsd:int'),
+	'description' => array('name'=>'description','type'=>'xsd:string'),
+	'elements' => array('name'=>'elements','type'=>'tns:elements')
 );
 
 //Retreive all extrafield for thirdsparty
@@ -164,25 +164,25 @@ 
 $extrafields=new ExtraFields($db);
 $extralabels=$extrafields->fetch_name_optionals_label('project',true);
 if (count($extrafields)>0) {
-    $extrafield_array = array();
+	$extrafield_array = array();
 }
 foreach($extrafields->attribute_label as $key=>$label)
 {
-    //$value=$object->array_options["options_".$key];
-    $type =$extrafields->attribute_type[$key];
-    if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-    else {$type='xsd:string';}
-    $extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
+	//$value=$object->array_options["options_".$key];
+	$type =$extrafields->attribute_type[$key];
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
+	else {$type='xsd:string';}
+	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
 }
 $project_fields=array_merge($project_fields,$extrafield_array);
 
 $server->wsdl->addComplexType(
-    'project',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    $project_fields
+	'project',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	$project_fields
 );
 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
@@ -194,30 +194,30 @@ 
 
 // Register WSDL
 $server->register(
-    'createProject',
-    // Entry values
-    array('authentication'=>'tns:authentication','project'=>'tns:project'),
-    // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string'),
-    $ns,
-    $ns.'#createProject',
-    $styledoc,
-    $styleuse,
-    'WS to create project'
+	'createProject',
+	// Entry values
+	array('authentication'=>'tns:authentication','project'=>'tns:project'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string'),
+	$ns,
+	$ns.'#createProject',
+	$styledoc,
+	$styleuse,
+	'WS to create project'
 );
 
 // Register WSDL
 $server->register(
-    'getProject',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','project'=>'tns:project'),
-    $ns,
-    $ns.'#getProject',
-    $styledoc,
-    $styleuse,
-    'WS to get project'
+	'getProject',
+	// Entry values
+	array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result','project'=>'tns:project'),
+	$ns,
+	$ns.'#getProject',
+	$styledoc,
+	$styleuse,
+	'WS to get project'
 );
 
 // Full methods code
@@ -230,94 +230,94 @@ 
  */
 function createProject($authentication, $project)
 {
-    global $db,$conf;
-
-    dol_syslog("Function: createProject login=".$authentication['login']);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (empty($project['ref']))
-    {
-        $error++; $errorcode='KO'; $errorlabel="Name is mandatory.";
-    }
-
-
-    if (! $error)
-    {
-        $fuser->getrights();
-
-        if ($fuser->rights->projet->creer)
-        {
-            $newobject=new Project($db);
-            $newobject->ref=$project['ref'];
-            $newobject->title=$project['label'];
-            $newobject->socid=$project['thirdparty_id'];
-            $newobject->public=$project['public'];
-            $newobject->statut=$project['status'];
-            $newobject->date_start=dol_stringtotime($project['date_start'],'dayrfc');
-            $newobject->date_end=dol_stringtotime($project['date_end'],'dayrfc');
-            $newobject->budget_amount=$project['budget'];
-            $newobject->description=$project['description'];
-
-            // Retrieve all extrafields for project
-            // fetch optionals attributes and labels
-            $extrafields=new ExtraFields($db);
-            $extralabels=$extrafields->fetch_name_optionals_label('project',true);
-            foreach($extrafields->attribute_label as $key=>$label)
-            {
-                $key='options_'.$key;
-                $newobject->array_options[$key]=$project[$key];
-            }
-
-            $db->begin();
-
-            $result = $newobject->create($fuser);
-            if (! $error && $result > 0)
-            {
-                // Add myself as project leader
-                $result = $newobject->add_contact($fuser->id, 'PROJECTLEADER', 'internal');
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-            else
-            {
-                $error++;
-            }
-
-            if (! $error)
-            {
-                $db->commit();
-                $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-            }
-            else
-            {
-                $db->rollback();
-                $error++;
-                $errorcode='KO';
-                $errorlabel=$newobject->error;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
+	global $db,$conf;
+
+	dol_syslog("Function: createProject login=".$authentication['login']);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+	if (empty($project['ref']))
+	{
+		$error++; $errorcode='KO'; $errorlabel="Name is mandatory.";
+	}
+
+
+	if (! $error)
+	{
+		$fuser->getrights();
+
+		if ($fuser->rights->projet->creer)
+		{
+			$newobject=new Project($db);
+			$newobject->ref=$project['ref'];
+			$newobject->title=$project['label'];
+			$newobject->socid=$project['thirdparty_id'];
+			$newobject->public=$project['public'];
+			$newobject->statut=$project['status'];
+			$newobject->date_start=dol_stringtotime($project['date_start'],'dayrfc');
+			$newobject->date_end=dol_stringtotime($project['date_end'],'dayrfc');
+			$newobject->budget_amount=$project['budget'];
+			$newobject->description=$project['description'];
+
+			// Retrieve all extrafields for project
+			// fetch optionals attributes and labels
+			$extrafields=new ExtraFields($db);
+			$extralabels=$extrafields->fetch_name_optionals_label('project',true);
+			foreach($extrafields->attribute_label as $key=>$label)
+			{
+				$key='options_'.$key;
+				$newobject->array_options[$key]=$project[$key];
+			}
+
+			$db->begin();
+
+			$result = $newobject->create($fuser);
+			if (! $error && $result > 0)
+			{
+				// Add myself as project leader
+				$result = $newobject->add_contact($fuser->id, 'PROJECTLEADER', 'internal');
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+			else
+			{
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$db->commit();
+				$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+			}
+			else
+			{
+				$db->rollback();
+				$error++;
+				$errorcode='KO';
+				$errorlabel=$newobject->error;
+			}
+		}
+		else
+		{
+			$error++;
+			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
 }
 
 /**
@@ -330,103 +330,103 @@ 
  */
 function getProject($authentication,$id='',$ref='')
 {
-    global $db,$conf,$langs;
-
-    dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (! $error && (($id && $ref)))
-    {
-        $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id and ref can't be both provided. You must choose one or other but not both.";
-    }
-
-    if (! $error)
-    {
-        $fuser->getrights();
-
-        if ($fuser->rights->projet->lire)
-        {
-            $project=new Project($db);
-            $result=$project->fetch($id,$ref);
-            if ($result > 0)
-            {
-                $project_result_fields=array(
-                    'id' => $project->id,
-                    'ref' => $project->ref,
-                    'label' => $project->title,
-                    'thirdparty_id' => $project->socid,
-                    'public' => $project->public,
-                    'status' => $project->statut,
-                    'date_start' => $project->date_start ? dol_print_date($project->date_start, 'dayrfc') : '',
-                    'date_end' => $project->date_end ? dol_print_date($project->date_end, 'dayrfc') : '',
-                    'budget' => $project->budget_amount,
-                    'description' => $project->description,
-                );
-
-                //Retrieve all extrafields for project
-                $extrafields=new ExtraFields($db);
-                $extralabels=$extrafields->fetch_name_optionals_label('societe',true);
-
-                //Get extrafield values
-                $project->fetch_optionals($project->id,$extralabels);
-                foreach($extrafields->attribute_label as $key=>$label)
-                {
-                    $project_result_fields=array_merge($project_result_fields,array('options_'.$key => $project->array_options['options_'.$key]));
-                }
-
-                //Get linked elements
-                global $listofreferent;
-                $elements = array();
-                foreach ($listofreferent as $key => $tablename)
-                {
-                    $elements[$key] = array();
-                    $element_array = $project->get_element_list($key, $tablename);
-                    if (count($element_array) > 0 && is_array($element_array))
-                    {
-                        foreach ($element_array as $element)
-                        {
-                            $tmp = explode('_', $element);
-                            $idofelement = count($tmp) > 0? $tmp[0] : "";
-                            $idofelementuser = count($tmp) > 1? $tmp[1] : "";
-                            $elements[$key][] = array('id' => $idofelement, 'user' => $idofelementuser);
-                        }
-                    }
-                }
-                $project_result_fields['elements'] = $elements;
-
-                //Result
-                $objectresp = array(
-                    'result'=>array('result_code'=>'OK', 'result_label'=>''),
-                    'project'=>$project_result_fields
-                );
-            }
-            else
-            {
-                $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
+	global $db,$conf,$langs;
+
+	dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+	if (! $error && (($id && $ref)))
+	{
+		$error++;
+		$errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id and ref can't be both provided. You must choose one or other but not both.";
+	}
+
+	if (! $error)
+	{
+		$fuser->getrights();
+
+		if ($fuser->rights->projet->lire)
+		{
+			$project=new Project($db);
+			$result=$project->fetch($id,$ref);
+			if ($result > 0)
+			{
+				$project_result_fields=array(
+					'id' => $project->id,
+					'ref' => $project->ref,
+					'label' => $project->title,
+					'thirdparty_id' => $project->socid,
+					'public' => $project->public,
+					'status' => $project->statut,
+					'date_start' => $project->date_start ? dol_print_date($project->date_start, 'dayrfc') : '',
+					'date_end' => $project->date_end ? dol_print_date($project->date_end, 'dayrfc') : '',
+					'budget' => $project->budget_amount,
+					'description' => $project->description,
+				);
+
+				//Retrieve all extrafields for project
+				$extrafields=new ExtraFields($db);
+				$extralabels=$extrafields->fetch_name_optionals_label('societe',true);
+
+				//Get extrafield values
+				$project->fetch_optionals($project->id,$extralabels);
+				foreach($extrafields->attribute_label as $key=>$label)
+				{
+					$project_result_fields=array_merge($project_result_fields,array('options_'.$key => $project->array_options['options_'.$key]));
+				}
+
+				//Get linked elements
+				global $listofreferent;
+				$elements = array();
+				foreach ($listofreferent as $key => $tablename)
+				{
+					$elements[$key] = array();
+					$element_array = $project->get_element_list($key, $tablename);
+					if (count($element_array) > 0 && is_array($element_array))
+					{
+						foreach ($element_array as $element)
+						{
+							$tmp = explode('_', $element);
+							$idofelement = count($tmp) > 0? $tmp[0] : "";
+							$idofelementuser = count($tmp) > 1? $tmp[1] : "";
+							$elements[$key][] = array('id' => $idofelement, 'user' => $idofelementuser);
+						}
+					}
+				}
+				$project_result_fields['elements'] = $elements;
+
+				//Result
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'project'=>$project_result_fields
+				);
+			}
+			else
+			{
+				$error++;
+				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref;
+			}
+		}
+		else
+		{
+			$error++;
+			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
 }
 
 // Return the results.

Spacing +97 added lines, -97 removed lines

@@ -21,10 +21,10 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
 
 require_once '../master.inc.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -41,13 +41,13 @@ 
 {
     $langs->load("admin");
     dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
     print $langs->trans("ToActivateModule");
     exit;
 }
 
 // Create associated types array, with each table
-$listofreferent=array(
+$listofreferent = array(
     'propal' => 'propal',
     'order' => 'commande',
     'invoice' => 'facture',
@@ -66,11 +66,11 @@ 
 
 // Create the soap Object
 $server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrOther',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
+$server->soap_defencoding = 'UTF-8';
+$server->decode_utf8 = false;
+$ns = 'http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrOther', $ns);
+$server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
@@ -80,11 +80,11 @@ 
     'all',
     '',
     array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-        'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-        'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
+        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+        'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+        'login' => array('name'=>'login', 'type'=>'xsd:string'),
+        'password' => array('name'=>'password', 'type'=>'xsd:string'),
+        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
     )
 );
 
@@ -96,8 +96,8 @@ 
     'all',
     '',
     array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
     )
 );
 
@@ -109,8 +109,8 @@ 
     'all',
     '',
     array(
-        'id' => array('name'=>'id','type'=>'xsd:int'),
-        'user' => array('name'=>'user','type'=>'xsd:int'),
+        'id' => array('name'=>'id', 'type'=>'xsd:int'),
+        'user' => array('name'=>'user', 'type'=>'xsd:int'),
     )
 );
 
@@ -131,9 +131,9 @@ 
 );
 
 $project_elements = array();
-foreach($listofreferent as $key => $_)
+foreach ($listofreferent as $key => $_)
 {
-    $project_elements[$key] = array('name'=>$key,'type'=>'tns:elementsArray');
+    $project_elements[$key] = array('name'=>$key, 'type'=>'tns:elementsArray');
 }
 $server->wsdl->addComplexType(
     'elements',
@@ -146,35 +146,35 @@ 
 
 // Define project
 $project_fields = array(
-    'id' => array('name'=>'id','type'=>'xsd:string'),
-    'ref' => array('name'=>'ref','type'=>'xsd:string'),
-    'label' => array('name'=>'label','type'=>'xsd:string'),
-    'thirdparty_id' => array('name'=>'thirdparty_id','type'=>'xsd:int'),
-    'public' => array('name'=>'public','type'=>'xsd:int'),
-    'status' => array('name'=>'status','type'=>'xsd:int'),
-    'date_start' => array('name'=>'date_start','type'=>'xsd:date'),
-    'date_end' => array('name'=>'date_end','type'=>'xsd:date'),
-    'budget' => array('name'=>'budget','type'=>'xsd:int'),
-    'description' => array('name'=>'description','type'=>'xsd:string'),
-    'elements' => array('name'=>'elements','type'=>'tns:elements')
+    'id' => array('name'=>'id', 'type'=>'xsd:string'),
+    'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+    'label' => array('name'=>'label', 'type'=>'xsd:string'),
+    'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
+    'public' => array('name'=>'public', 'type'=>'xsd:int'),
+    'status' => array('name'=>'status', 'type'=>'xsd:int'),
+    'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
+    'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
+    'budget' => array('name'=>'budget', 'type'=>'xsd:int'),
+    'description' => array('name'=>'description', 'type'=>'xsd:string'),
+    'elements' => array('name'=>'elements', 'type'=>'tns:elements')
 );
 
 //Retreive all extrafield for thirdsparty
 // fetch optionals attributes and labels
-$extrafields=new ExtraFields($db);
-$extralabels=$extrafields->fetch_name_optionals_label('project',true);
-if (count($extrafields)>0) {
+$extrafields = new ExtraFields($db);
+$extralabels = $extrafields->fetch_name_optionals_label('project', true);
+if (count($extrafields) > 0) {
     $extrafield_array = array();
 }
-foreach($extrafields->attribute_label as $key=>$label)
+foreach ($extrafields->attribute_label as $key=>$label)
 {
     //$value=$object->array_options["options_".$key];
-    $type =$extrafields->attribute_type[$key];
-    if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-    else {$type='xsd:string';}
-    $extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
+    $type = $extrafields->attribute_type[$key];
+    if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
+    else {$type = 'xsd:string'; }
+    $extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
 }
-$project_fields=array_merge($project_fields,$extrafield_array);
+$project_fields = array_merge($project_fields, $extrafield_array);
 
 $server->wsdl->addComplexType(
     'project',
@@ -188,17 +188,17 @@ 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
 // Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
 // http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
+$styledoc = 'rpc'; // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded'; // encoded/literal/literal wrapped
 // Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
 
 // Register WSDL
 $server->register(
     'createProject',
     // Entry values
-    array('authentication'=>'tns:authentication','project'=>'tns:project'),
+    array('authentication'=>'tns:authentication', 'project'=>'tns:project'),
     // Exit values
-    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string'),
+    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
     $ns,
     $ns.'#createProject',
     $styledoc,
@@ -210,9 +210,9 @@ 
 $server->register(
     'getProject',
     // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string'),
+    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
     // Exit values
-    array('result'=>'tns:result','project'=>'tns:project'),
+    array('result'=>'tns:result', 'project'=>'tns:project'),
     $ns,
     $ns.'#getProject',
     $styledoc,
@@ -230,55 +230,55 @@ 
  */
 function createProject($authentication, $project)
 {
-    global $db,$conf;
+    global $db, $conf;
 
     dol_syslog("Function: createProject login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
     if (empty($project['ref']))
     {
-        $error++; $errorcode='KO'; $errorlabel="Name is mandatory.";
+        $error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
     }
 
 
-    if (! $error)
+    if (!$error)
     {
         $fuser->getrights();
 
         if ($fuser->rights->projet->creer)
         {
-            $newobject=new Project($db);
-            $newobject->ref=$project['ref'];
-            $newobject->title=$project['label'];
-            $newobject->socid=$project['thirdparty_id'];
-            $newobject->public=$project['public'];
-            $newobject->statut=$project['status'];
-            $newobject->date_start=dol_stringtotime($project['date_start'],'dayrfc');
-            $newobject->date_end=dol_stringtotime($project['date_end'],'dayrfc');
-            $newobject->budget_amount=$project['budget'];
-            $newobject->description=$project['description'];
+            $newobject = new Project($db);
+            $newobject->ref = $project['ref'];
+            $newobject->title = $project['label'];
+            $newobject->socid = $project['thirdparty_id'];
+            $newobject->public = $project['public'];
+            $newobject->statut = $project['status'];
+            $newobject->date_start = dol_stringtotime($project['date_start'], 'dayrfc');
+            $newobject->date_end = dol_stringtotime($project['date_end'], 'dayrfc');
+            $newobject->budget_amount = $project['budget'];
+            $newobject->description = $project['description'];
 
             // Retrieve all extrafields for project
             // fetch optionals attributes and labels
-            $extrafields=new ExtraFields($db);
-            $extralabels=$extrafields->fetch_name_optionals_label('project',true);
-            foreach($extrafields->attribute_label as $key=>$label)
+            $extrafields = new ExtraFields($db);
+            $extralabels = $extrafields->fetch_name_optionals_label('project', true);
+            foreach ($extrafields->attribute_label as $key=>$label)
             {
-                $key='options_'.$key;
-                $newobject->array_options[$key]=$project[$key];
+                $key = 'options_'.$key;
+                $newobject->array_options[$key] = $project[$key];
             }
 
             $db->begin();
 
             $result = $newobject->create($fuser);
-            if (! $error && $result > 0)
+            if (!$error && $result > 0)
             {
                 // Add myself as project leader
                 $result = $newobject->add_contact($fuser->id, 'PROJECTLEADER', 'internal');
@@ -292,23 +292,23 @@ 
                 $error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $db->commit();
-                $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+                $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
             }
             else
             {
                 $db->rollback();
                 $error++;
-                $errorcode='KO';
-                $errorlabel=$newobject->error;
+                $errorcode = 'KO';
+                $errorlabel = $newobject->error;
             }
         }
         else
         {
             $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
     }
 
@@ -328,37 +328,37 @@ 
  * @param	string		$ref		    	internal reference
  * @return	array							Array result
  */
-function getProject($authentication,$id='',$ref='')
+function getProject($authentication, $id = '', $ref = '')
 {
-    global $db,$conf,$langs;
+    global $db, $conf, $langs;
 
     dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
     // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    $objectresp = array();
+    $errorcode = ''; $errorlabel = '';
+    $error = 0;
+    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
     // Check parameters
-    if (! $error && (($id && $ref)))
+    if (!$error && (($id && $ref)))
     {
         $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id and ref can't be both provided. You must choose one or other but not both.";
+        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref can't be both provided. You must choose one or other but not both.";
     }
 
-    if (! $error)
+    if (!$error)
     {
         $fuser->getrights();
 
         if ($fuser->rights->projet->lire)
         {
-            $project=new Project($db);
-            $result=$project->fetch($id,$ref);
+            $project = new Project($db);
+            $result = $project->fetch($id, $ref);
             if ($result > 0)
             {
-                $project_result_fields=array(
+                $project_result_fields = array(
                     'id' => $project->id,
                     'ref' => $project->ref,
                     'label' => $project->title,
@@ -372,14 +372,14 @@ 
                 );
 
                 //Retrieve all extrafields for project
-                $extrafields=new ExtraFields($db);
-                $extralabels=$extrafields->fetch_name_optionals_label('societe',true);
+                $extrafields = new ExtraFields($db);
+                $extralabels = $extrafields->fetch_name_optionals_label('societe', true);
 
                 //Get extrafield values
-                $project->fetch_optionals($project->id,$extralabels);
-                foreach($extrafields->attribute_label as $key=>$label)
+                $project->fetch_optionals($project->id, $extralabels);
+                foreach ($extrafields->attribute_label as $key=>$label)
                 {
-                    $project_result_fields=array_merge($project_result_fields,array('options_'.$key => $project->array_options['options_'.$key]));
+                    $project_result_fields = array_merge($project_result_fields, array('options_'.$key => $project->array_options['options_'.$key]));
                 }
 
                 //Get linked elements
@@ -394,8 +394,8 @@ 
                         foreach ($element_array as $element)
                         {
                             $tmp = explode('_', $element);
-                            $idofelement = count($tmp) > 0? $tmp[0] : "";
-                            $idofelementuser = count($tmp) > 1? $tmp[1] : "";
+                            $idofelement = count($tmp) > 0 ? $tmp[0] : "";
+                            $idofelementuser = count($tmp) > 1 ? $tmp[1] : "";
                             $elements[$key][] = array('id' => $idofelement, 'user' => $idofelementuser);
                         }
                     }
@@ -411,13 +411,13 @@ 
             else
             {
                 $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref;
+                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
             }
         }
         else
         {
             $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
     }
 

Braces +15 added lines, -15 removed lines

@@ -21,7 +21,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
@@ -170,8 +172,7 @@ 
 {
     //$value=$object->array_options["options_".$key];
     $type =$extrafields->attribute_type[$key];
-    if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-    else {$type='xsd:string';}
+    if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} else {$type='xsd:string';}
     $extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
 }
 $project_fields=array_merge($project_fields,$extrafield_array);
@@ -234,7 +235,9 @@ 
 
     dol_syslog("Function: createProject login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -286,8 +289,7 @@ 
                 {
                     $error++;
                 }
-            }
-            else
+            } else
             {
                 $error++;
             }
@@ -296,16 +298,14 @@ 
             {
                 $db->commit();
                 $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-            }
-            else
+            } else
             {
                 $db->rollback();
                 $error++;
                 $errorcode='KO';
                 $errorlabel=$newobject->error;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -334,7 +334,9 @@ 
 
     dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -407,14 +409,12 @@ 
                     'result'=>array('result_code'=>'OK', 'result_label'=>''),
                     'project'=>$project_result_fields
                 );
-            }
-            else
+            } else
             {
                 $error++;
                 $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';