Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6

ChangeLog

@@ -20,7 +20,9 @@ For users:
 - Fix: Extrafield feature select from table should try to translate multiple column when not needed 
 - Fix: cents for indian ruppes are calle paisa and paise.
 - Fix: Invoices payments may be older than invoices.
+- Fix: Withdrawal total amount is double
 - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line
+- Fix: Web service categorie WDSL declaration is correct
 
 ***** ChangeLog for 3.6 compared to 3.5.* *****
 For users:

htdocs/compta/prelevement/class/bonprelevement.class.php

@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014 		Ferran Marcet       <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1411,7 +1412,7 @@ class BonPrelevement extends CommonObject
 			fputs($this->file, '	</CstmrDrctDbtInitn>'.$CrLf);
 			fputs($this->file, '</Document>'.$CrLf);
 
-			$sql = "SELECT pl.amount";
+			/*$sql = "SELECT pl.amount";
 			$sql.= " FROM";
 			$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
 			$sql.= " ".MAIN_DB_PREFIX."facture as f,";
@@ -1437,7 +1438,7 @@ class BonPrelevement extends CommonObject
 			else
 			{
 				$result = -2;
-			}
+			}*/
 
         }
 

htdocs/webservices/server_category.php

@@ -106,56 +106,41 @@ $server->wsdl->addComplexType(
     'tns:categorie'
 );
 
-/*
+ /*
- * Tableau des catégories
+  * Image of product
-
-$server->wsdl->addComplexType(
-    'categories',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('id'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:categorie[]')
-    ),
-    'tns:categories'
-);
  */
-
+ $server->wsdl->addComplexType(
-/*
- * Les photos  de la catégorie (un tableau indéxé qui contient les images avec leur vignette)
- */
-$server->wsdl->addComplexType(
  		'PhotosArray',
  		'complexType',
  		'array',
+ 		'sequence',
  		'',
-    'SOAP-ENC:Array',
-    array(),
  		array(
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:image[]')
+ 				'image' => array(
-    ),
+ 						'name' => 'image',
-	''
+ 						'type' => 'tns:image',
-);
+ 						'minOccurs' => '0',
+ 						'maxOccurs' => 'unbounded'
+ 				)
+ 		)
+ );
  
-/*
+ /*
- * Une photo ( nom image / nom_vignette )
+  * An image
  */
-$server->wsdl->addComplexType(
+ $server->wsdl->addComplexType(
  		'image',
  		'complexType',
- 	'array',
+ 		'struct',
+ 		'all',
  		'',
- 	'SOAP-ENC:Array',
- 	array(),
  		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')
  		)
-);
+ );
 
 /*
  * Retour