Dolibarr / dolibarr

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.

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;
 }
 
 /**

htdocs/webservices/server_other.php

Indentation +38 added lines, -38 removed lines

@@ -55,30 +55,30 @@ 
 
 // 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 Return object for document
@@ -109,16 +109,16 @@ 
 
 // Register WSDL
 $server->register(
-    'getVersions',
-    // Entry values
-    array('authentication'=>'tns:authentication'),
-    // Exit values
-    array('result'=>'tns:result','dolibarr'=>'xsd:string','os'=>'xsd:string','php'=>'xsd:string','webserver'=>'xsd:string'),
-    $ns,
-    $ns.'#getVersions',
-    $styledoc,
-    $styleuse,
-    'WS to get Versions'
+	'getVersions',
+	// Entry values
+	array('authentication'=>'tns:authentication'),
+	// Exit values
+	array('result'=>'tns:result','dolibarr'=>'xsd:string','os'=>'xsd:string','php'=>'xsd:string','webserver'=>'xsd:string'),
+	$ns,
+	$ns.'#getVersions',
+	$styledoc,
+	$styleuse,
+	'WS to get Versions'
 );
 
 // Register WSDL
@@ -146,15 +146,15 @@ 
 
 	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)
+	if (! $error)
 	{
 		$objectresp['result']=array('result_code'=>'OK', 'result_label'=>'');
 		$objectresp['dolibarr']=version_dolibarr();

htdocs/webservices/server_category.php

Indentation +17 added lines, -17 removed lines

@@ -93,16 +93,16 @@ 
  * Les catégories filles, sous tableau dez la catégorie
  */
  $server->wsdl->addComplexType(
-    'FillesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:categorie[]')
-    ),
-    'tns:categorie'
+	'FillesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:categorie[]')
+	),
+	'tns:categorie'
 );
 
  /*
@@ -172,10 +172,10 @@ 
 	// Exit values
 	array('result'=>'tns:result','categorie'=>'tns:categorie'),
 	$ns,
-    $ns.'#getCategory',
-    $styledoc,
-    $styleuse,
-    'WS to get category'
+	$ns.'#getCategory',
+	$styledoc,
+	$styleuse,
+	'WS to get category'
 );
 
 
@@ -229,7 +229,7 @@ 
 						'type' => $categorie->type,
 						'dir' => $pdir,
 						'photos' => $categorie->liste_photos($dir,$nbmax=10)
-			    	);
+					);
 
 					$cats = $categorie->get_filles();
 					if (count($cats) > 0)
@@ -255,8 +255,8 @@ 
 
 					}
 
-			    // Create
-			    $objectresp = array(
+				// Create
+				$objectresp = array(
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'categorie'=> $cat
 			   );

htdocs/webservices/admin/index.php

Indentation +17 added lines, -17 removed lines

@@ -37,22 +37,22 @@ 
 // Sauvegardes parametres
 if ($actionsave)
 {
-    $i=0;
-
-    $db->begin();
-
-    $i+=dolibarr_set_const($db,'WEBSERVICES_KEY',trim(GETPOST("WEBSERVICES_KEY")),'chaine',0,'',$conf->entity);
-
-    if ($i >= 1)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	$i=0;
+
+	$db->begin();
+
+	$i+=dolibarr_set_const($db,'WEBSERVICES_KEY',trim(GETPOST("WEBSERVICES_KEY")),'chaine',0,'',$conf->entity);
+
+	if ($i >= 1)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -110,7 +110,7 @@ 
 		'actioncomm'		=> '!empty($conf->agenda->enabled)',
 		'category'			=> '!empty($conf->categorie->enabled)',
 		'project'			=> '!empty($conf->projet->enabled)',
-        'other'				=> ''
+		'other'				=> ''
 );
 
 

htdocs/core/ajax/security.php

Indentation +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
 {
 	if ($_GET['action'] == 'getrandompassword' && $user->admin)
 	{
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-	    $generic = $_GET['generic'] ? true : false;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+		$generic = $_GET['generic'] ? true : false;
 		echo getRandomPassword($generic);
 	}
 }

htdocs/core/ajax/check_notifications.php

Indentation +59 added lines, -59 removed lines

@@ -46,73 +46,73 @@
 // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened.
 if ($time >= $_SESSION['auto_check_events_not_before']) 
 {
-    $time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY;   // Always defined
-    if (! empty($_SESSION['auto_check_events_not_before'])) 
-    {
-        // We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer),
-        // then we are not losing periods 
-        $starttime = $_SESSION['auto_check_events_not_before'];
-        // Protection to avoid too long sessions
-        if ($starttime < ($time - (int) $conf->global->MAIN_SESSION_TIMEOUT)) 
-        {
-            dol_syslog("We ask to check browser notification on a too large period. We fix this with current date.");
-            $starttime = $time;
-        }
-    }
-    else 
-    {
-        $starttime = $time;
-    }
+	$time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY;   // Always defined
+	if (! empty($_SESSION['auto_check_events_not_before'])) 
+	{
+		// We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer),
+		// then we are not losing periods 
+		$starttime = $_SESSION['auto_check_events_not_before'];
+		// Protection to avoid too long sessions
+		if ($starttime < ($time - (int) $conf->global->MAIN_SESSION_TIMEOUT)) 
+		{
+			dol_syslog("We ask to check browser notification on a too large period. We fix this with current date.");
+			$starttime = $time;
+		}
+	}
+	else 
+	{
+		$starttime = $time;
+	}
     
-    $_SESSION['auto_check_events_not_before'] = $time + $time_update;
+	$_SESSION['auto_check_events_not_before'] = $time + $time_update;
     
-    // Force save of session change we did. 
-    // WARNING: Any change in sessions after that will not be saved !
-    session_write_close();
+	// Force save of session change we did. 
+	// WARNING: Any change in sessions after that will not be saved !
+	session_write_close();
     
-    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 	
     
-    dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.$_SESSION['auto_check_events_not_before']);
+	dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.$_SESSION['auto_check_events_not_before']);
     
-    $sql = 'SELECT id';
-    $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm a, ' . MAIN_DB_PREFIX . 'actioncomm_resources ar';
-    $sql .= ' WHERE a.id = ar.fk_actioncomm';
-    // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened.
-    // This need to extend period to be sure to not miss and save in session what we notified to avoid duplicate (save is not done yet).
-    $sql .= " AND datep BETWEEN '" . $db->idate($starttime) . "' AND '" . $db->idate($time + $time_update - 1) . "'";
-    $sql .= ' AND a.code <> "AC_OTH_AUTO"';
-    $sql .= ' AND ar.element_type = "user"';
-    $sql .= ' AND ar.fk_element = ' . $user->id;
-    $sql .= ' LIMIT 10';    // Avoid too many notification at once
-
-    $resql = $db->query($sql);
-    if ($resql) {
-
-        $actionmod = new ActionComm($db);
-
-        while ($obj = $db->fetch_object($resql)) 
-        {
-            $langs->load("agenda");
-            $langs->load("commercial");
+	$sql = 'SELECT id';
+	$sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm a, ' . MAIN_DB_PREFIX . 'actioncomm_resources ar';
+	$sql .= ' WHERE a.id = ar.fk_actioncomm';
+	// TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened.
+	// This need to extend period to be sure to not miss and save in session what we notified to avoid duplicate (save is not done yet).
+	$sql .= " AND datep BETWEEN '" . $db->idate($starttime) . "' AND '" . $db->idate($time + $time_update - 1) . "'";
+	$sql .= ' AND a.code <> "AC_OTH_AUTO"';
+	$sql .= ' AND ar.element_type = "user"';
+	$sql .= ' AND ar.fk_element = ' . $user->id;
+	$sql .= ' LIMIT 10';    // Avoid too many notification at once
+
+	$resql = $db->query($sql);
+	if ($resql) {
+
+		$actionmod = new ActionComm($db);
+
+		while ($obj = $db->fetch_object($resql)) 
+		{
+			$langs->load("agenda");
+			$langs->load("commercial");
             
-            $actionmod->fetch($obj->id);
-
-            // Message must be formated and translated to be used with javascript directly
-            $event = array();
-            $event['type'] = 'agenda';
-            $event['id'] = $actionmod->id;
-            $event['tipo'] = $langs->transnoentities('Action' . $actionmod->code);
-            $event['titulo'] = $actionmod->label;
-            $event['location'] = $langs->transnoentities('Location').': '.$actionmod->location;
+			$actionmod->fetch($obj->id);
+
+			// Message must be formated and translated to be used with javascript directly
+			$event = array();
+			$event['type'] = 'agenda';
+			$event['id'] = $actionmod->id;
+			$event['tipo'] = $langs->transnoentities('Action' . $actionmod->code);
+			$event['titulo'] = $actionmod->label;
+			$event['location'] = $langs->transnoentities('Location').': '.$actionmod->location;
             
-            $eventfound[] = $event;
-        }
-    }
-    else
-    {
-        dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
-    }
+			$eventfound[] = $event;
+		}
+	}
+	else
+	{
+		dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
+	}
 
 }
 

htdocs/core/ajax/objectonoff.php

Indentation +1 added lines, -1 removed lines

@@ -46,4 +46,4 @@
 
 // Registering new values
 if (($action == 'set') && ! empty($id))
-    $object->setValueFrom($field, $value, $element, $id);
+	$object->setValueFrom($field, $value, $element, $id);

htdocs/core/ajax/box.php

Indentation +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 	$nbboxonright=substr_count($tmp[1],',');
 	print $nbboxonleft.'-'.$nbboxonright;
 	if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
-    else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
+	else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move
@@ -72,11 +72,11 @@ 
 	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
 	if ($result > 0) 
 	{
-	    $langs->load("boxes");
-	    if (! GETPOST('closing'))
-	    {
-	       setEventMessages($langs->trans("BoxAdded"), null);
-	    }
+		$langs->load("boxes");
+		if (! GETPOST('closing'))
+		{
+		   setEventMessages($langs->trans("BoxAdded"), null);
+		}
 	}
 }