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

htdocs/comm/propal/list.php

@@ -296,9 +296,6 @@ if ($result)
 	print '<input class="flat" type="text" size="16" name="search_societe" value="'.$search_societe.'">';
 	print '</td>';
 	print '<td class="liste_titre"><input class="flat" type="text" size="16" name="search_town" value="'.$search_town.'"></td>';
-	print '<td class="liste_titre">';
-	print '<input class="flat" size="10" type="text" name="search_refcustomer" value="'.$search_refcustomer.'">';
-	print '</td>';
 	print '<td class="liste_titre" colspan="1" align="center">';
 	print $langs->trans('Month').': <input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
 	print '&nbsp;'.$langs->trans('Year').': ';

htdocs/core/class/translate.class.php

@@ -784,6 +784,16 @@ class Translate
 			return -1;
 		}
 	}
+
+	function get_translations_for_substitutions() {
+		$substitutionarray = array();
+		
+		foreach($this->tab_translate as $code => $label) {
+			$substitutionarray['lang_'.$code] = $label;
+		}
+		
+		return $substitutionarray;
+	}
 }
 
 ?>

htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php

@@ -74,7 +74,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		$this->option_modereg = 0;                 // Affiche mode reglement
 		$this->option_condreg = 0;                 // Affiche conditions reglement
 		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // Dispo en plusieurs langues
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
 		$this->option_escompte = 0;                // Affiche si il y a eu escompte
 		$this->option_credit_note = 0;             // Support credit notes
 		$this->option_freetext = 1;				   // Support add of a personalised text
@@ -534,6 +534,18 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
+				
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
 
 				// Call the beforeODTSave hook
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);

htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

@@ -74,7 +74,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		$this->option_modereg = 0;                 // Affiche mode reglement
 		$this->option_condreg = 0;                 // Affiche conditions reglement
 		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // Dispo en plusieurs langues
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
 		$this->option_escompte = 0;                // Affiche si il y a eu escompte
 		$this->option_credit_note = 0;             // Support credit notes
 		$this->option_freetext = 1;				   // Support add of a personalised text
@@ -534,6 +534,18 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
+				
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
 
 				// Call the beforeODTSave hook
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);

htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php

@@ -74,7 +74,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$this->option_modereg = 0;                 // Affiche mode reglement
 		$this->option_condreg = 0;                 // Affiche conditions reglement
 		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // Dispo en plusieurs langues
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
 		$this->option_escompte = 0;                // Affiche si il y a eu escompte
 		$this->option_credit_note = 0;             // Support credit notes
 		$this->option_freetext = 1;				   // Support add of a personalised text
@@ -514,6 +514,18 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
+				
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
 
 				// Call the beforeODTSave hook
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);

htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php

@@ -90,7 +90,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$this->option_modereg = 0;                 // Affiche mode reglement
 		$this->option_condreg = 0;                 // Affiche conditions reglement
 		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // Dispo en plusieurs langues
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
 		$this->option_escompte = 0;                // Affiche si il y a eu escompte
 		$this->option_credit_note = 0;             // Support credit notes
 		$this->option_freetext = 1;				   // Support add of a personalised text
@@ -976,6 +976,18 @@ class doc_generic_project_odt extends ModelePDFProjects
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
+				
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
 
 				// Call the beforeODTSave hook
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);

htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php

@@ -74,7 +74,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$this->option_modereg = 0;                 // Affiche mode reglement
 		$this->option_condreg = 0;                 // Affiche conditions reglement
 		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // Dispo en plusieurs langues
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
 		$this->option_escompte = 0;                // Affiche si il y a eu escompte
 		$this->option_credit_note = 0;             // Support credit notes
 		$this->option_freetext = 1;				   // Support add of a personalised text
@@ -487,6 +487,18 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
+				
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
 
 				// Call the beforeODTSave hook
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);

htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

@@ -318,6 +318,18 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                         // setVars failed, probably because key not found
 					}
 				}
+				
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
 
                                 // Call the beforeODTSave hook
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);

htdocs/langs/fr_FR/categories.lang

@@ -79,10 +79,10 @@ ProductsCategoryShort=Catégorie produits
 MembersCategoryShort=Catégorie adhérent
 SuppliersCategoriesShort=Catégories fournisseurs
 CustomersCategoriesShort=Catégories clients
-CustomersProspectsCategoriesShort=Catégories clients/prospects
+CustomersProspectsCategoriesShort=Catégories clients/prosp.
 ProductsCategoriesShort=Catégories produits
 MembersCategoriesShort=Catégories adhérents
-ContactCategoriesShort=Catégorie Contacts
+ContactCategoriesShort=Catégories contacts
 ThisCategoryHasNoProduct=Cette catégorie ne contient aucun produit.
 ThisCategoryHasNoSupplier=Cette catégorie ne contient aucun fournisseur.
 ThisCategoryHasNoCustomer=Cette catégorie ne contient aucun client.

test/soapui/Dolibarr-soapui-project.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <con:soapui-project name="Dolibarr" soapui-version="4.0.1" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="WebServicesDolibarrOtherBinding" type="wsdl" bindingName="{http://www.dolibarr.org/ns/}WebServicesDolibarrOtherBinding" soapVersion="1_1" anonymous="optional" definition="http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl"><con:part><con:url>http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl</con:url><con:content><![CDATA[<definitions targetNamespace="http://www.dolibarr.org/ns/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.dolibarr.org/ns/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
   <types>
     <xsd:schema targetNamespace="http://www.dolibarr.org/ns/">
@@ -757,211 +757,211 @@
          <idthirdparty xsi:type="xsd:string">all</idthirdparty>
       </ns:getSupplierInvoicesForThirdParty>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getSupplierInvoicesForThirdParty"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="WebServicesDolibarrProductOrServiceBinding" type="wsdl" bindingName="{http://www.dolibarr.org/ns/}WebServicesDolibarrProductOrServiceBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost/dolibarr/htdocs/webservices/server_productorservice.php?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost/dolibarr/htdocs/webservices/server_productorservice.php?wsdl"><con:part><con:url>http://localhost/dolibarr/htdocs/webservices/server_productorservice.php?wsdl</con:url><con:content><![CDATA[<definitions targetNamespace="http://www.dolibarr.org/ns/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.dolibarr.org/ns/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <types>
-    <xsd:schema targetNamespace="http://www.dolibarr.org/ns/">
-      <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/"/>
-      <xsd:complexType name="authentication">
-        <xsd:all>
-          <xsd:element name="dolibarrkey" type="xsd:string"/>
-          <xsd:element name="sourceapplication" type="xsd:string"/>
-          <xsd:element name="login" type="xsd:string"/>
-          <xsd:element name="password" type="xsd:string"/>
-          <xsd:element name="entity" type="xsd:string"/>
-        </xsd:all>
-      </xsd:complexType>
-      <xsd:complexType name="result">
-        <xsd:all>
-          <xsd:element name="result_code" type="xsd:string"/>
-          <xsd:element name="result_label" type="xsd:string"/>
-        </xsd:all>
-      </xsd:complexType>
-      <xsd:complexType name="product">
-        <xsd:all>
-          <xsd:element name="id" type="xsd:string"/>
-          <xsd:element name="ref" type="xsd:string"/>
-          <xsd:element name="ref_ext" type="xsd:string"/>
-          <xsd:element name="type" type="xsd:string"/>
-          <xsd:element name="label" type="xsd:string"/>
-          <xsd:element name="description" type="xsd:string"/>
-          <xsd:element name="date_creation" type="xsd:dateTime"/>
-          <xsd:element name="date_modification" type="xsd:dateTime"/>
-          <xsd:element name="note" type="xsd:string"/>
-          <xsd:element name="status_tobuy" type="xsd:string"/>
-          <xsd:element name="status_tosell" type="xsd:string"/>
-          <xsd:element name="barcode" type="xsd:string"/>
-          <xsd:element name="barcode_type" type="xsd:string"/>
-          <xsd:element name="country_id" type="xsd:string"/>
-          <xsd:element name="country_code" type="xsd:string"/>
-          <xsd:element name="customcode" type="xsd:string"/>
-          <xsd:element name="price_net" type="xsd:string"/>
-          <xsd:element name="price" type="xsd:string"/>
-          <xsd:element name="price_min_net" type="xsd:string"/>
-          <xsd:element name="price_min" type="xsd:string"/>
-          <xsd:element name="price_base_type" type="xsd:string"/>
-          <xsd:element name="vat_rate" type="xsd:string"/>
-          <xsd:element name="vat_npr" type="xsd:string"/>
-          <xsd:element name="localtax1_tx" type="xsd:string"/>
-          <xsd:element name="localtax2_tx" type="xsd:string"/>
-          <xsd:element name="stock_alert" type="xsd:string"/>
-          <xsd:element name="stock_real" type="xsd:string"/>
-          <xsd:element name="stock_pmp" type="xsd:string"/>
-          <xsd:element name="canvas" type="xsd:string"/>
-          <xsd:element name="import_key" type="xsd:string"/>
-          <xsd:element name="dir" type="xsd:string"/>
-          <xsd:element name="images" type="tns:ImagesArray"/>
-        </xsd:all>
-      </xsd:complexType>
-      <xsd:complexType name="ImagesArray">
-        <xsd:sequence>
-          <xsd:element name="image" type="tns:image" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:complexType name="image">
-        <xsd:all>
-          <xsd:element name="photo" type="xsd:string"/>
-          <xsd:element name="photo_vignette" type="xsd:string"/>
-          <xsd:element name="imgWidth" type="xsd:string"/>
-          <xsd:element name="imgHeight" type="xsd:string"/>
-        </xsd:all>
-      </xsd:complexType>
-      <xsd:complexType name="filterproduct">
-        <xsd:all>
-          <xsd:element name="type" type="xsd:string"/>
-          <xsd:element name="status_tobuy" type="xsd:string"/>
-          <xsd:element name="status_tosell" type="xsd:string"/>
-        </xsd:all>
-      </xsd:complexType>
-      <xsd:complexType name="ProductsArray2">
-        <xsd:sequence>
-          <xsd:element name="product" type="tns:product" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-    </xsd:schema>
-  </types>
-  <message name="getProductOrServiceRequest">
-    <part name="authentication" type="tns:authentication"/>
-    <part name="id" type="xsd:string"/>
-    <part name="ref" type="xsd:string"/>
-    <part name="ref_ext" type="xsd:string"/>
-  </message>
-  <message name="getProductOrServiceResponse">
-    <part name="result" type="tns:result"/>
-    <part name="product" type="tns:product"/>
-  </message>
-  <message name="createProductOrServiceRequest">
-    <part name="authentication" type="tns:authentication"/>
-    <part name="product" type="tns:product"/>
-  </message>
-  <message name="createProductOrServiceResponse">
-    <part name="result" type="tns:result"/>
-    <part name="id" type="xsd:string"/>
-  </message>
-  <message name="updateProductOrServiceRequest">
-    <part name="authentication" type="tns:authentication"/>
-    <part name="product" type="tns:product"/>
-  </message>
-  <message name="updateProductOrServiceResponse">
-    <part name="result" type="tns:result"/>
-    <part name="id" type="xsd:string"/>
-  </message>
-  <message name="getListOfProductsOrServicesRequest">
-    <part name="authentication" type="tns:authentication"/>
-    <part name="filterproduct" type="tns:filterproduct"/>
-  </message>
-  <message name="getListOfProductsOrServicesResponse">
-    <part name="result" type="tns:result"/>
-    <part name="products" type="tns:ProductsArray2"/>
-  </message>
-  <message name="getProductsForCategoryRequest">
-    <part name="authentication" type="tns:authentication"/>
-    <part name="id" type="xsd:string"/>
-  </message>
-  <message name="getProductsForCategoryResponse">
-    <part name="result" type="tns:result"/>
-    <part name="products" type="tns:ProductsArray2"/>
-  </message>
-  <portType name="WebServicesDolibarrProductOrServicePortType">
-    <operation name="getProductOrService">
-      <documentation>WS to get product or service</documentation>
-      <input message="tns:getProductOrServiceRequest"/>
-      <output message="tns:getProductOrServiceResponse"/>
-    </operation>
-    <operation name="createProductOrService">
-      <documentation>WS to create a product or service</documentation>
-      <input message="tns:createProductOrServiceRequest"/>
-      <output message="tns:createProductOrServiceResponse"/>
-    </operation>
-    <operation name="updateProductOrService">
-      <documentation>WS to update a product or service</documentation>
-      <input message="tns:updateProductOrServiceRequest"/>
-      <output message="tns:updateProductOrServiceResponse"/>
-    </operation>
-    <operation name="getListOfProductsOrServices">
-      <documentation>WS to get list of all products or services id and ref</documentation>
-      <input message="tns:getListOfProductsOrServicesRequest"/>
-      <output message="tns:getListOfProductsOrServicesResponse"/>
-    </operation>
-    <operation name="getProductsForCategory">
-      <documentation>WS to get list of all products or services for a category</documentation>
-      <input message="tns:getProductsForCategoryRequest"/>
-      <output message="tns:getProductsForCategoryResponse"/>
-    </operation>
-  </portType>
-  <binding name="WebServicesDolibarrProductOrServiceBinding" type="tns:WebServicesDolibarrProductOrServicePortType">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="getProductOrService">
-      <soap:operation soapAction="http://www.dolibarr.org/ns/#getProductOrService" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="createProductOrService">
-      <soap:operation soapAction="http://www.dolibarr.org/ns/#createProductOrService" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="updateProductOrService">
-      <soap:operation soapAction="http://www.dolibarr.org/ns/#updateProductOrService" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="getListOfProductsOrServices">
-      <soap:operation soapAction="http://www.dolibarr.org/ns/#getListOfProductsOrServices" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-    <operation name="getProductsForCategory">
-      <soap:operation soapAction="http://www.dolibarr.org/ns/#getProductsForCategory" style="rpc"/>
-      <input>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-  </binding>
-  <service name="WebServicesDolibarrProductOrService">
-    <port name="WebServicesDolibarrProductOrServicePort" binding="tns:WebServicesDolibarrProductOrServiceBinding">
-      <soap:address location="http://localhost/dolibarr/htdocs/webservices/server_productorservice.php"/>
-    </port>
-  </service>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getSupplierInvoicesForThirdParty"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="WebServicesDolibarrProductOrServiceBinding" type="wsdl" bindingName="{http://www.dolibarr.org/ns/}WebServicesDolibarrProductOrServiceBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost/dolibarr/htdocs/webservices/server_productorservice.php?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost/dolibarr/htdocs/webservices/server_productorservice.php?wsdl"><con:part><con:url>http://localhost/dolibarr/htdocs/webservices/server_productorservice.php?wsdl</con:url><con:content><![CDATA[<definitions targetNamespace="http://www.dolibarr.org/ns/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.dolibarr.org/ns/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="http://www.dolibarr.org/ns/">
+      <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+      <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/"/>
+      <xsd:complexType name="authentication">
+        <xsd:all>
+          <xsd:element name="dolibarrkey" type="xsd:string"/>
+          <xsd:element name="sourceapplication" type="xsd:string"/>
+          <xsd:element name="login" type="xsd:string"/>
+          <xsd:element name="password" type="xsd:string"/>
+          <xsd:element name="entity" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="result">
+        <xsd:all>
+          <xsd:element name="result_code" type="xsd:string"/>
+          <xsd:element name="result_label" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="product">
+        <xsd:all>
+          <xsd:element name="id" type="xsd:string"/>
+          <xsd:element name="ref" type="xsd:string"/>
+          <xsd:element name="ref_ext" type="xsd:string"/>
+          <xsd:element name="type" type="xsd:string"/>
+          <xsd:element name="label" type="xsd:string"/>
+          <xsd:element name="description" type="xsd:string"/>
+          <xsd:element name="date_creation" type="xsd:dateTime"/>
+          <xsd:element name="date_modification" type="xsd:dateTime"/>
+          <xsd:element name="note" type="xsd:string"/>
+          <xsd:element name="status_tobuy" type="xsd:string"/>
+          <xsd:element name="status_tosell" type="xsd:string"/>
+          <xsd:element name="barcode" type="xsd:string"/>
+          <xsd:element name="barcode_type" type="xsd:string"/>
+          <xsd:element name="country_id" type="xsd:string"/>
+          <xsd:element name="country_code" type="xsd:string"/>
+          <xsd:element name="customcode" type="xsd:string"/>
+          <xsd:element name="price_net" type="xsd:string"/>
+          <xsd:element name="price" type="xsd:string"/>
+          <xsd:element name="price_min_net" type="xsd:string"/>
+          <xsd:element name="price_min" type="xsd:string"/>
+          <xsd:element name="price_base_type" type="xsd:string"/>
+          <xsd:element name="vat_rate" type="xsd:string"/>
+          <xsd:element name="vat_npr" type="xsd:string"/>
+          <xsd:element name="localtax1_tx" type="xsd:string"/>
+          <xsd:element name="localtax2_tx" type="xsd:string"/>
+          <xsd:element name="stock_alert" type="xsd:string"/>
+          <xsd:element name="stock_real" type="xsd:string"/>
+          <xsd:element name="stock_pmp" type="xsd:string"/>
+          <xsd:element name="canvas" type="xsd:string"/>
+          <xsd:element name="import_key" type="xsd:string"/>
+          <xsd:element name="dir" type="xsd:string"/>
+          <xsd:element name="images" type="tns:ImagesArray"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="ImagesArray">
+        <xsd:sequence>
+          <xsd:element name="image" type="tns:image" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:complexType>
+      <xsd:complexType name="image">
+        <xsd:all>
+          <xsd:element name="photo" type="xsd:string"/>
+          <xsd:element name="photo_vignette" type="xsd:string"/>
+          <xsd:element name="imgWidth" type="xsd:string"/>
+          <xsd:element name="imgHeight" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="filterproduct">
+        <xsd:all>
+          <xsd:element name="type" type="xsd:string"/>
+          <xsd:element name="status_tobuy" type="xsd:string"/>
+          <xsd:element name="status_tosell" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="ProductsArray2">
+        <xsd:sequence>
+          <xsd:element name="product" type="tns:product" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:complexType>
+    </xsd:schema>
+  </types>
+  <message name="getProductOrServiceRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="id" type="xsd:string"/>
+    <part name="ref" type="xsd:string"/>
+    <part name="ref_ext" type="xsd:string"/>
+  </message>
+  <message name="getProductOrServiceResponse">
+    <part name="result" type="tns:result"/>
+    <part name="product" type="tns:product"/>
+  </message>
+  <message name="createProductOrServiceRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="product" type="tns:product"/>
+  </message>
+  <message name="createProductOrServiceResponse">
+    <part name="result" type="tns:result"/>
+    <part name="id" type="xsd:string"/>
+  </message>
+  <message name="updateProductOrServiceRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="product" type="tns:product"/>
+  </message>
+  <message name="updateProductOrServiceResponse">
+    <part name="result" type="tns:result"/>
+    <part name="id" type="xsd:string"/>
+  </message>
+  <message name="getListOfProductsOrServicesRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="filterproduct" type="tns:filterproduct"/>
+  </message>
+  <message name="getListOfProductsOrServicesResponse">
+    <part name="result" type="tns:result"/>
+    <part name="products" type="tns:ProductsArray2"/>
+  </message>
+  <message name="getProductsForCategoryRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="id" type="xsd:string"/>
+  </message>
+  <message name="getProductsForCategoryResponse">
+    <part name="result" type="tns:result"/>
+    <part name="products" type="tns:ProductsArray2"/>
+  </message>
+  <portType name="WebServicesDolibarrProductOrServicePortType">
+    <operation name="getProductOrService">
+      <documentation>WS to get product or service</documentation>
+      <input message="tns:getProductOrServiceRequest"/>
+      <output message="tns:getProductOrServiceResponse"/>
+    </operation>
+    <operation name="createProductOrService">
+      <documentation>WS to create a product or service</documentation>
+      <input message="tns:createProductOrServiceRequest"/>
+      <output message="tns:createProductOrServiceResponse"/>
+    </operation>
+    <operation name="updateProductOrService">
+      <documentation>WS to update a product or service</documentation>
+      <input message="tns:updateProductOrServiceRequest"/>
+      <output message="tns:updateProductOrServiceResponse"/>
+    </operation>
+    <operation name="getListOfProductsOrServices">
+      <documentation>WS to get list of all products or services id and ref</documentation>
+      <input message="tns:getListOfProductsOrServicesRequest"/>
+      <output message="tns:getListOfProductsOrServicesResponse"/>
+    </operation>
+    <operation name="getProductsForCategory">
+      <documentation>WS to get list of all products or services for a category</documentation>
+      <input message="tns:getProductsForCategoryRequest"/>
+      <output message="tns:getProductsForCategoryResponse"/>
+    </operation>
+  </portType>
+  <binding name="WebServicesDolibarrProductOrServiceBinding" type="tns:WebServicesDolibarrProductOrServicePortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="getProductOrService">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#getProductOrService" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="createProductOrService">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#createProductOrService" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="updateProductOrService">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#updateProductOrService" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="getListOfProductsOrServices">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#getListOfProductsOrServices" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="getProductsForCategory">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#getProductsForCategory" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="WebServicesDolibarrProductOrService">
+    <port name="WebServicesDolibarrProductOrServicePort" binding="tns:WebServicesDolibarrProductOrServiceBinding">
+      <soap:address location="http://localhost/dolibarr/htdocs/webservices/server_productorservice.php"/>
+    </port>
+  </service>
 </definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhost/dolibarr/htdocs/webservices/server_productorservice.php</con:endpoint><con:endpoint>http://localhostdolibarr/dolibarrnew/webservices/server_productorservice.php</con:endpoint><con:endpoint>http://localhost/dolibarr/htdocs/webservices/server_productorservice.php</con:endpoint></con:endpoints><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#createProductOrService" name="createProductOrService" bindingOperationName="createProductOrService" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost/dolibarr/htdocs/webservices/server_productorservice.php</con:endpoint><con:request><![CDATA[<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/">
    <SOAP-ENV:Body>
       <ns8543:createProductOrService xmlns:ns8543="http://www.Dolibarr.org/ns/">
@@ -1127,57 +1127,57 @@
          <id xsi:type="xsd:string">5</id>
       </ns:getProductsForCategory>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getProductsForCategory"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#updateProductOrService" name="updateProductOrService" bindingOperationName="updateProductOrService" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost/dolibarr/htdocs/webservices/server_productorservice.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <ns:updateProductOrService soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-         <authentication xsi:type="ns:authentication">
-            <!--You may enter the following 5 items in any order-->
-            <dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey>
-            <sourceapplication xsi:type="xsd:string">aaa</sourceapplication>
-            <login xsi:type="xsd:string">admin</login>
-            <password xsi:type="xsd:string">admin</password>
-            <entity xsi:type="xsd:string"></entity>
-         </authentication>
-         <product xsi:type="ns:product">
-            <!--You may enter the following 32 items in any order-->
-            <id xsi:type="xsd:string">1</id>
-            <ref xsi:type="xsd:string"></ref>
-            <ref_ext xsi:type="xsd:string">111</ref_ext>
-            <type xsi:type="xsd:string"></type>
-            <label xsi:type="xsd:string"></label>
-            <description xsi:type="xsd:string"></description>
-            <date_creation xsi:type="xsd:dateTime"></date_creation>
-            <date_modification xsi:type="xsd:dateTime"></date_modification>
-            <note xsi:type="xsd:string"></note>
-            <status_tobuy xsi:type="xsd:string"></status_tobuy>
-            <status_tosell xsi:type="xsd:string"></status_tosell>
-            <barcode xsi:type="xsd:string"></barcode>
-            <barcode_type xsi:type="xsd:string"></barcode_type>
-            <country_id xsi:type="xsd:string"></country_id>
-            <country_code xsi:type="xsd:string"></country_code>
-            <customcode xsi:type="xsd:string"></customcode>
-            <price_net xsi:type="xsd:string"></price_net>
-            <price xsi:type="xsd:string"></price>
-            <price_min_net xsi:type="xsd:string"></price_min_net>
-            <price_min xsi:type="xsd:string"></price_min>
-            <price_base_type xsi:type="xsd:string"></price_base_type>
-            <vat_rate xsi:type="xsd:string"></vat_rate>
-            <vat_npr xsi:type="xsd:string"></vat_npr>
-            <localtax1_tx xsi:type="xsd:string"></localtax1_tx>
-            <localtax2_tx xsi:type="xsd:string"></localtax2_tx>
-            <stock_alert xsi:type="xsd:string"></stock_alert>
-            <stock_real xsi:type="xsd:string"></stock_real>
-            <stock_pmp xsi:type="xsd:string"></stock_pmp>
-            <canvas xsi:type="xsd:string"></canvas>
-            <import_key xsi:type="xsd:string"></import_key>
-            <dir xsi:type="xsd:string"></dir>
-            <images xsi:type="ns:ImagesArray">
-               <!--Zero or more repetitions:-->
-            </images>
-         </product>
-      </ns:updateProductOrService>
-   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getProductsForCategory"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#updateProductOrService" name="updateProductOrService" bindingOperationName="updateProductOrService" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost/dolibarr/htdocs/webservices/server_productorservice.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:updateProductOrService soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string">aaa</sourceapplication>
+            <login xsi:type="xsd:string">admin</login>
+            <password xsi:type="xsd:string">admin</password>
+            <entity xsi:type="xsd:string"></entity>
+         </authentication>
+         <product xsi:type="ns:product">
+            <!--You may enter the following 32 items in any order-->
+            <id xsi:type="xsd:string">1</id>
+            <ref xsi:type="xsd:string"></ref>
+            <ref_ext xsi:type="xsd:string">111</ref_ext>
+            <type xsi:type="xsd:string"></type>
+            <label xsi:type="xsd:string"></label>
+            <description xsi:type="xsd:string"></description>
+            <date_creation xsi:type="xsd:dateTime"></date_creation>
+            <date_modification xsi:type="xsd:dateTime"></date_modification>
+            <note xsi:type="xsd:string"></note>
+            <status_tobuy xsi:type="xsd:string"></status_tobuy>
+            <status_tosell xsi:type="xsd:string"></status_tosell>
+            <barcode xsi:type="xsd:string"></barcode>
+            <barcode_type xsi:type="xsd:string"></barcode_type>
+            <country_id xsi:type="xsd:string"></country_id>
+            <country_code xsi:type="xsd:string"></country_code>
+            <customcode xsi:type="xsd:string"></customcode>
+            <price_net xsi:type="xsd:string"></price_net>
+            <price xsi:type="xsd:string"></price>
+            <price_min_net xsi:type="xsd:string"></price_min_net>
+            <price_min xsi:type="xsd:string"></price_min>
+            <price_base_type xsi:type="xsd:string"></price_base_type>
+            <vat_rate xsi:type="xsd:string"></vat_rate>
+            <vat_npr xsi:type="xsd:string"></vat_npr>
+            <localtax1_tx xsi:type="xsd:string"></localtax1_tx>
+            <localtax2_tx xsi:type="xsd:string"></localtax2_tx>
+            <stock_alert xsi:type="xsd:string"></stock_alert>
+            <stock_real xsi:type="xsd:string"></stock_real>
+            <stock_pmp xsi:type="xsd:string"></stock_pmp>
+            <canvas xsi:type="xsd:string"></canvas>
+            <import_key xsi:type="xsd:string"></import_key>
+            <dir xsi:type="xsd:string"></dir>
+            <images xsi:type="ns:ImagesArray">
+               <!--Zero or more repetitions:-->
+            </images>
+         </product>
+      </ns:updateProductOrService>
+   </soapenv:Body>
 </soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#updateProductOrService"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="WebServicesDolibarrUserBinding" type="wsdl" bindingName="{http://www.dolibarr.org/ns/}WebServicesDolibarrUserBinding" soapVersion="1_1" anonymous="optional" definition="http://localhostdolibarr/webservices/server_user.php?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhostdolibarr/webservices/server_user.php?wsdl"><con:part><con:url>http://localhostdolibarr/webservices/server_user.php?wsdl</con:url><con:content><![CDATA[<definitions targetNamespace="http://www.dolibarr.org/ns/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.dolibarr.org/ns/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
   <types>
     <xsd:schema targetNamespace="http://www.dolibarr.org/ns/">