lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Florian HENRY 2014-05-14 14:19:51 +02:00
commit c57c7fdca6
10 changed files with 258 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/exe/doliwamp/doliwamp.iss
View File

@ -17,9 +17,9 @@
; ----- Change this ----- ; ----- Change this -----
AppName=DoliWamp AppName=DoliWamp
; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
AppVerName=DoliWamp-3.6.0-alpha AppVerName=DoliWamp-3.6.0-beta
; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
OutputBaseFilename=DoliWamp-3.6.0-alpha OutputBaseFilename=DoliWamp-3.6.0-beta
; ----- End of change ; ----- End of change
;OutputManifestFile=build\doliwampbuild.log ;OutputManifestFile=build\doliwampbuild.log
; Define full path from which all relative path are defined ; Define full path from which all relative path are defined

4
htdocs/contrat/class/contrat.class.php
View File

@ -1151,11 +1151,11 @@ class Contrat extends CommonObject
$this->db->begin(); $this->db->begin();
// Calcul du total TTC et de la TVA pour la ligne a partir de // Calcul du total TTC et de la TVA pour la ligne a partir de
// qty, pu, remise_percent et txtva // qty, pu, remise_percent et tvatx
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva. // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
$localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc); $localtaxes_type=getLocalTaxesFromRate($tvatx,0,$mysoc);
$tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtaxtx1, $txlocaltaxtx2, 0, $price_base_type, $info_bits, 1, '', $localtaxes_type); $tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtaxtx1, $txlocaltaxtx2, 0, $price_base_type, $info_bits, 1, '', $localtaxes_type);
$total_ht = $tabprice[0]; $total_ht = $tabprice[0];

2
htdocs/core/class/commonobject.class.php
View File

@ -3292,6 +3292,8 @@ abstract class CommonObject
* *
* @param int $resource_id Resource id * @param int $resource_id Resource id
* @param string $resource_element Resource element * @param string $resource_element Resource element
* @param int $busy Busy or not
* @param int $mandatory Mandatory or not
* @return int <=0 if KO, >0 if OK * @return int <=0 if KO, >0 if OK
*/ */
function add_element_resource($resource_id,$resource_element,$busy=0,$mandatory=0) function add_element_resource($resource_id,$resource_element,$busy=0,$mandatory=0)

2
htdocs/core/class/html.form.class.php
View File

@ -3264,7 +3264,7 @@ class Form
{ {
global $conf,$langs,$user; global $conf,$langs,$user;
$langs->load_cache_currencies(''); $langs->loadCacheCurrencies('');
$out=''; $out='';

6
htdocs/core/class/translate.class.php
View File

@ -722,7 +722,7 @@ class Translate
if (function_exists("mb_convert_encoding")) if (function_exists("mb_convert_encoding"))
{ {
$this->load_cache_currencies($forceloadall?'':$currency_code); $this->loadCacheCurrencies($forceloadall?'':$currency_code);
if (isset($this->cache_currencies[$currency_code]) && ! empty($this->cache_currencies[$currency_code]['unicode']) && is_array($this->cache_currencies[$currency_code]['unicode'])) if (isset($this->cache_currencies[$currency_code]) && ! empty($this->cache_currencies[$currency_code]['unicode']) && is_array($this->cache_currencies[$currency_code]['unicode']))
{ {
@ -742,7 +742,7 @@ class Translate
* @param string $currency_code Get only currency. Get all if ''. * @param string $currency_code Get only currency. Get all if ''.
* @return int Nb of loaded lines, 0 if already loaded, <0 if KO * @return int Nb of loaded lines, 0 if already loaded, <0 if KO
*/ */
public function load_cache_currencies($currency_code) public function loadCacheCurrencies($currency_code)
{ {
global $db; global $db;
@ -754,7 +754,7 @@ class Translate
if (! empty($currency_code)) $sql.=" AND code_iso = '".$currency_code."'"; if (! empty($currency_code)) $sql.=" AND code_iso = '".$currency_code."'";
//$sql.= " ORDER BY code_iso ASC"; // Not required, a sort is done later //$sql.= " ORDER BY code_iso ASC"; // Not required, a sort is done later
dol_syslog(get_class($this).'::load_cache_currencies sql='.$sql, LOG_DEBUG); dol_syslog(get_class($this).'::loadCacheCurrencies sql='.$sql, LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {

8
htdocs/core/lib/resource.lib.php
View File

@ -17,11 +17,17 @@
*/ */
/** /**
* \file lib/resource.lib.php * \file htdocs/core/lib/resource.lib.php
* \ingroup resource * \ingroup resource
* \brief This file is library for resource module * \brief This file is library for resource module
*/ */
/**
* Prepare head for tabs
*
* @param Object $object Object
* @return array Array of head entries
*/
function resourcePrepareHead($object) function resourcePrepareHead($object)
{ {
global $langs, $conf, $user; global $langs, $conf, $user;

4
htdocs/core/modules/modResource.class.php
View File

@ -61,7 +61,7 @@ class modResource extends DolibarrModules
// (where XXX is value of numeric property 'numero' of module) // (where XXX is value of numeric property 'numero' of module)
$this->description = "Description of module Resource"; $this->description = "Description of module Resource";
// Possible values for version are: 'development', 'experimental' or version // Possible values for version are: 'development', 'experimental' or version
$this->version = 'experimental'; $this->version = 'development';
// Key used in llx_const table to save module status enabled/disabled // Key used in llx_const table to save module status enabled/disabled
// (where MYMODULE is value of property name of module in uppercase) // (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name); $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
@ -94,7 +94,7 @@ class modResource extends DolibarrModules
// Set this to relative path of css if module has its own css file // Set this to relative path of css if module has its own css file
//'css' => '/resource/css/resource.css.php', //'css' => '/resource/css/resource.css.php',
// Set here all hooks context managed by module // Set here all hooks context managed by module
'hooks' => array('actioncard','actioncommdao','resource_card','element_resource') // 'hooks' => array('actioncard','actioncommdao','resource_card','element_resource')
// Set here all workflow context managed by module // Set here all workflow context managed by module
//'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE')) //'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE'))
); );

2
htdocs/filefunc.inc.php
View File

@ -29,7 +29,7 @@
* \brief File that include conf.php file and commons lib like functions.lib.php * \brief File that include conf.php file and commons lib like functions.lib.php
*/ */
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.0-alpha'); if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.0-beta');
if (! defined('EURO')) define('EURO',chr(128)); if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants // Define syslog constants

11
htdocs/resource/class/actions_resource.class.php
View File

@ -23,6 +23,7 @@
/** /**
* Actions class file for resources * Actions class file for resources
* *
* TODO Remove this class and replace a method into commonobject
*/ */
class ActionsResource class ActionsResource
{ {
@ -45,9 +46,11 @@ class ActionsResource
* doActions for resource module * doActions for resource module
* *
* @param array $parameters parameters * @param array $parameters parameters
* @param Object $object object * @param Object &$object object
* @param string $action action * @param string &$action action
* @return void
*/ */
/* Why a hook action ? TODO Remove this class and replace a method into commonobject
function doActions($parameters, &$object, &$action) function doActions($parameters, &$object, &$action)
{ {
global $langs,$user; global $langs,$user;
@ -160,8 +163,6 @@ class ActionsResource
} }
} }
} }
}
} }
}*/
} }

329
test/soapui/Dolibarr-soapui-project.xml
View File

@ -225,7 +225,7 @@
<soap:address location="http://localhost/dolibarrnew/webservices/server_invoice.php"/> <soap:address location="http://localhost/dolibarrnew/webservices/server_invoice.php"/>
</port> </port>
</service> </service>
</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php</con:endpoint><con:endpoint>http://localhost/dolibarrnew/webservices/server_invoice.php</con:endpoint></con:endpoints><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#createInvoice" name="createInvoice" bindingOperationName="createInvoice" 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/dolibarrnew/webservices/server_invoice.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/"> </definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhostdolibarr/dolibarr_new/webservices/server_invoice.php</con:endpoint><con:endpoint>http://localhost/dolibarrnew/webservices/server_invoice.php</con:endpoint></con:endpoints><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#createInvoice" name="createInvoice" bindingOperationName="createInvoice" 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/dolibarrnew/webservices/server_invoice.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:Header/>
<soapenv:Body> <soapenv:Body>
<ns:createInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <ns:createInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
@ -324,7 +324,7 @@
</invoice> </invoice>
</ns:createInvoice> </ns:createInvoice>
</soapenv:Body> </soapenv:Body>
</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createInvoice"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/dolibarrnew/webservices/server_invoice.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:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createInvoice"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/dolibarr_new/webservices/server_invoice.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:Header/>
<soapenv:Body> <soapenv:Body>
<ns:createInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <ns:createInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
@ -383,7 +383,7 @@
</invoice> </invoice>
</ns:createInvoice> </ns:createInvoice>
</soapenv:Body> </soapenv:Body>
</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createInvoice"/></con:call><con:call name="Request 4"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/dolibarrnew/webservices/server_invoice.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:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createInvoice"/></con:call><con:call name="Request 4"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/dolibarr_new/webservices/server_invoice.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:Header/>
<soapenv:Body> <soapenv:Body>
<ns:createInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <ns:createInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
@ -442,66 +442,132 @@
</invoice> </invoice>
</ns:createInvoice> </ns:createInvoice>
</soapenv:Body> </soapenv:Body>
</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createInvoice"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 5"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/dolibarrnew/webservices/server_invoice.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:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createInvoice"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Req johan complete"><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://localhostdolibarr/dolibarr_new/webservices/server_invoice.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/">
<soapenv:Header/> <SOAP-ENV:Body>
<soapenv:Body> <ns1160:createInvoice xmlns:ns1160="http://www.Dolibarr.org/ns/">
<ns:createInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <authentication>
<authentication xsi:type="ns:authentication"> <dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey>
<!--You may enter the following 5 items in any order--> <sourceapplication xsi:type="xsd:string">PRESTASHOP</sourceapplication>
<dolibarrkey xsi:type="xsd:string">?</dolibarrkey> <login xsi:type="xsd:string">admin</login>
<sourceapplication xsi:type="xsd:string">?</sourceapplication> <password xsi:type="xsd:string">admin</password>
<login xsi:type="xsd:string">?</login> <entity xsi:type="xsd:string"/>
<password xsi:type="xsd:string">?</password>
<entity xsi:type="xsd:string">?</entity>
</authentication> </authentication>
<invoice xsi:type="ns:invoice"> <invoice>
<!--You may enter the following 22 items in any order--> <ref_ext xsi:type="xsd:string">NFS0000000007</ref_ext>
<id xsi:type="xsd:string">?</id> <thirdparty_id xsi:type="xsd:string">30</thirdparty_id>
<ref xsi:type="xsd:string">?</ref> <date xsi:type="xsd:string">2014-04-23 15:59:24</date>
<ref_ext xsi:type="xsd:string">?</ref_ext> <type xsi:type="xsd:string">0</type>
<thirdparty_id xsi:type="xsd:int">?</thirdparty_id> <note_private xsi:type="xsd:string">imported by Prestashop</note_private>
<fk_user_author xsi:type="xsd:string">?</fk_user_author> <note_public xsi:nil="true"/>
<fk_user_valid xsi:type="xsd:string">?</fk_user_valid> <status xsi:type="xsd:string">1</status>
<date xsi:type="xsd:date">?</date> <project_id xsi:nil="true"/>
<date_due xsi:type="xsd:date">?</date_due> <lines xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="unnamed_struct_use_soapval[6]">
<date_creation xsi:type="xsd:dateTime">?</date_creation> <item>
<date_validation xsi:type="xsd:dateTime">?</date_validation> <type xsi:type="xsd:string">0</type>
<date_modification xsi:type="xsd:dateTime">?</date_modification> <desc xsi:type="xsd:string">Product</desc>
<type xsi:type="xsd:int">?</type> <unitprice xsi:type="xsd:float">66.05</unitprice>
<total_net xsi:type="xsd:double">?</total_net> <total_net xsi:type="xsd:string">198.150000</total_net>
<total_vat xsi:type="xsd:double">?</total_vat> <total_vat xsi:type="xsd:float">38.85</total_vat>
<total xsi:type="xsd:double">?</total> <total xsi:type="xsd:string">237.000000</total>
<note xsi:type="xsd:string">?</note> <vat_rate xsi:type="xsd:string">19.600</vat_rate>
<note_public xsi:type="xsd:string">?</note_public> <qty xsi:type="xsd:string">3</qty>
<status xsi:type="xsd:int">?</status> <product_id xsi:type="xsd:string">1</product_id>
<close_code xsi:type="xsd:string">?</close_code> </item>
<close_note xsi:type="xsd:string">?</close_note> <item>
<project_id xsi:type="xsd:string">?</project_id> <type xsi:type="xsd:string">0</type>
<lines xsi:type="ns:LinesArray2"> <desc xsi:type="xsd:string">Product</desc>
<!--Zero or more repetitions:--> <unitprice xsi:type="xsd:float">66.05</unitprice>
<line xsi:type="ns:line"> <total_net xsi:type="xsd:string">132.100000</total_net>
<!--You may enter the following 15 items in any order--> <total_vat xsi:type="xsd:float">25.9</total_vat>
<id xsi:type="xsd:string">?</id> <total xsi:type="xsd:string">158.000000</total>
<type xsi:type="xsd:int">?</type> <vat_rate xsi:type="xsd:string">19.600</vat_rate>
<desc xsi:type="xsd:string">?</desc> <qty xsi:type="xsd:string">2</qty>
<vat_rate xsi:type="xsd:double">?</vat_rate> <product_id xsi:type="xsd:string">1</product_id>
<qty xsi:type="xsd:double">?</qty> </item>
<unitprice xsi:type="xsd:double">?</unitprice> <item>
<total_net xsi:type="xsd:double">?</total_net> <type xsi:type="xsd:string">0</type>
<total_vat xsi:type="xsd:double">?</total_vat> <desc xsi:type="xsd:string">Product</desc>
<total xsi:type="xsd:double">?</total> <unitprice xsi:type="xsd:float">1170.57</unitprice>
<date_start xsi:type="xsd:date">?</date_start> <total_net xsi:type="xsd:string">1170.570000</total_net>
<date_end xsi:type="xsd:date">?</date_end> <total_vat xsi:type="xsd:float">229.43</total_vat>
<product_id xsi:type="xsd:int">?</product_id> <total xsi:type="xsd:string">1400.000000</total>
<product_ref xsi:type="xsd:string">?</product_ref> <vat_rate xsi:type="xsd:string">19.600</vat_rate>
<product_label xsi:type="xsd:string">?</product_label> <qty xsi:type="xsd:string">1</qty>
<product_desc xsi:type="xsd:string">?</product_desc> <product_id xsi:type="xsd:string">1</product_id>
</line> </item>
<item>
<type xsi:type="xsd:string">0</type>
<desc xsi:type="xsd:string">Product</desc>
<unitprice xsi:type="xsd:float">25.04</unitprice>
<total_net xsi:type="xsd:string">25.040000</total_net>
<total_vat xsi:type="xsd:float">4.91</total_vat>
<total xsi:type="xsd:string">29.950000</total>
<vat_rate xsi:type="xsd:string">19.600</vat_rate>
<qty xsi:type="xsd:string">1</qty>
<product_id xsi:type="xsd:string">1</product_id>
</item>
<item>
<type xsi:type="xsd:string">0</type>
<desc xsi:type="xsd:string">Product</desc>
<unitprice xsi:type="xsd:float">124.58</unitprice>
<total_net xsi:type="xsd:string">124.580000</total_net>
<total_vat xsi:type="xsd:float">24.42</total_vat>
<total xsi:type="xsd:string">149.000000</total>
<vat_rate xsi:type="xsd:string">19.600</vat_rate>
<qty xsi:type="xsd:string">1</qty>
<product_id xsi:type="xsd:string">1</product_id>
</item>
<item>
<type xsi:type="xsd:string">1</type>
<desc xsi:type="xsd:string">Transport</desc>
<unitprice xsi:type="xsd:string">2.00</unitprice>
<total_net xsi:type="xsd:string">2.00</total_net>
<total_vat xsi:type="xsd:float">0.39</total_vat>
<total xsi:type="xsd:string">2.39</total>
<vat_rate xsi:type="xsd:string">19.600</vat_rate>
<qty xsi:type="xsd:string">1</qty>
<product_id xsi:type="xsd:string"/>
</item>
</lines> </lines>
</invoice> </invoice>
</ns:createInvoice> </ns1160:createInvoice>
</soapenv:Body> </SOAP-ENV:Body>
</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createInvoice"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#getInvoice" name="getInvoice" bindingOperationName="getInvoice" 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/dolibarrnew/webservices/server_invoice.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/"> </SOAP-ENV:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createInvoice"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Req Johan seul"><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://localhostdolibarr/dolibarr_new/webservices/server_invoice.php</con:endpoint><con:request><![CDATA[<SOAP-ENV:Envelope 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>
<ns1160:createInvoice xmlns:ns1160="http://www.Dolibarr.org/ns/">
<authentication>
<dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey>
<sourceapplication xsi:type="xsd:string">PRESTASHOP</sourceapplication>
<login xsi:type="xsd:string">admin</login>
<password xsi:type="xsd:string">admin</password>
<entity xsi:type="xsd:string"/>
</authentication>
<invoice>
<ref_ext xsi:type="xsd:string">WSTESTCREATEINVOICE1</ref_ext>
<thirdparty_id xsi:type="xsd:string">1</thirdparty_id>
<date xsi:type="xsd:string">2014-04-23 15:59:24</date>
<type xsi:type="xsd:string">0</type>
<note_private xsi:type="xsd:string">Created from WS</note_private>
<note_public xsi:nil="true"/>
<status xsi:type="xsd:string">1</status>
<project_id xsi:nil="true"/>
<lines xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="unnamed_struct_use_soapval[6]">
<item>
<type xsi:type="xsd:string">0</type>
<desc xsi:type="xsd:string">Product</desc>
<unitprice xsi:type="xsd:float">66.05</unitprice>
<total_net xsi:type="xsd:string">198.150000</total_net>
<total_vat xsi:type="xsd:float">38.85</total_vat>
<total xsi:type="xsd:string">237.000000</total>
<vat_rate xsi:type="xsd:string">19.600</vat_rate>
<qty xsi:type="xsd:string">3</qty>
<product_id xsi:type="xsd:string">1</product_id>
</item>
</lines>
</invoice>
</ns1160:createInvoice>
</SOAP-ENV:Body>
</SOAP-ENV:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createInvoice"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#getInvoice" name="getInvoice" bindingOperationName="getInvoice" 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/dolibarrnew/webservices/server_invoice.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:Header/>
<soapenv:Body> <soapenv:Body>
<ns:getInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <ns:getInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
@ -518,7 +584,7 @@
<ref_ext xsi:type="xsd:string"></ref_ext> <ref_ext xsi:type="xsd:string"></ref_ext>
</ns:getInvoice> </ns:getInvoice>
</soapenv:Body> </soapenv:Body>
</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getInvoice"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/dolibarrnew/webservices/server_invoice.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:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getInvoice"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/dolibarr_new/webservices/server_invoice.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:Header/>
<soapenv:Body> <soapenv:Body>
<ns:getInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <ns:getInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
@ -550,7 +616,7 @@
<idthirdparty xsi:type="xsd:string">4</idthirdparty> <idthirdparty xsi:type="xsd:string">4</idthirdparty>
</ns:getInvoicesForThirdParty> </ns:getInvoicesForThirdParty>
</soapenv:Body> </soapenv:Body>
</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getInvoicesForThirdParty"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/dolibarrnew/webservices/server_invoice.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:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getInvoicesForThirdParty"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/dolibarr_new/webservices/server_invoice.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:Header/>
<soapenv:Body> <soapenv:Body>
<ns:getInvoicesForThirdParty soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <ns:getInvoicesForThirdParty soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
@ -986,64 +1052,97 @@
<soap:address location="http://localhost/dolibarr_new/webservices/server_productorservice.php"/> <soap:address location="http://localhost/dolibarr_new/webservices/server_productorservice.php"/>
</port> </port>
</service> </service>
</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhost/dolibarr_new/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:endpoint>http://localhost/dolibarr_new/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_new/webservices/server_productorservice.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 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/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"> </definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhost/dolibarr_new/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:endpoint>http://localhost/dolibarr_new/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_new/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/">
<soapenv:Header/> <SOAP-ENV:Body>
<soapenv:Body> <ns1160:createInvoice xmlns:ns1160="http://www.Dolibarr.org/ns/">
<ns:createProductOrService soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns7853="http://www.dolibarr.org/ns/"> <authentication>
<authentication xsi:type="ns:authentication">
<!--You may enter the following 5 items in any order-->
<dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey> <dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey>
<sourceapplication xsi:type="xsd:string">DEMO</sourceapplication> <sourceapplication xsi:type="xsd:string">PRESTASHOP</sourceapplication>
<login xsi:type="xsd:string">admin</login> <login xsi:type="xsd:string">admin</login>
<password xsi:type="xsd:string">admin</password> <password xsi:type="xsd:string">admin</password>
<entity xsi:type="xsd:string"/> <entity xsi:type="xsd:string"/>
</authentication> </authentication>
<product xsi:type="ns:product"> <invoice>
<!--You may enter the following 32 items in any order--> <ref_ext xsi:type="xsd:string">NFS0000000007</ref_ext>
<id xsi:type="xsd:string">?</id> <thirdparty_id xsi:type="xsd:string">30</thirdparty_id>
<ref xsi:type="xsd:string">NewProductFromWS</ref> <date xsi:type="xsd:string">2014-04-23 15:59:24</date>
<ref_ext xsi:type="xsd:string">?</ref_ext> <type xsi:type="xsd:string">0</type>
<type xsi:type="xsd:int">1</type> <note_private xsi:type="xsd:string">imported by Prestashop</note_private>
<label xsi:type="xsd:string">New Product From WS</label> <note_public xsi:nil="true"/>
<description xsi:type="xsd:string">This is a new product created from WS PHPUnit test case</description> <status xsi:type="xsd:string">1</status>
<date_creation xsi:type="xsd:dateTime">?</date_creation> <project_id xsi:nil="true"/>
<date_modification xsi:type="xsd:dateTime">?</date_modification> <lines xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="unnamed_struct_use_soapval[6]">
<note xsi:type="xsd:string">?</note> <item>
<status_tobuy xsi:type="xsd:string">?</status_tobuy> <type xsi:type="xsd:string">0</type>
<status_tosell xsi:type="xsd:string">?</status_tosell> <desc xsi:type="xsd:string">Product</desc>
<barcode xsi:type="xsd:string">?</barcode> <unitprice xsi:type="xsd:float">66.05</unitprice>
<barcode_type xsi:type="xsd:string">?</barcode_type> <total_net xsi:type="xsd:string">198.150000</total_net>
<country_id xsi:type="xsd:string">?</country_id> <total_vat xsi:type="xsd:float">38.85</total_vat>
<country_code xsi:type="xsd:string">?</country_code> <total xsi:type="xsd:string">237.000000</total>
<customcode xsi:type="xsd:string">?</customcode> <vat_rate xsi:type="xsd:string">19.600</vat_rate>
<price_net xsi:type="xsd:string">?</price_net> <qty xsi:type="xsd:string">3</qty>
<price xsi:type="xsd:string">?</price> <product_id xsi:type="xsd:string">48</product_id>
<price_min_net xsi:type="xsd:string">?</price_min_net> </item>
<price_min xsi:type="xsd:string">?</price_min> <item>
<price_base_type xsi:type="xsd:string">?</price_base_type> <type xsi:type="xsd:string">0</type>
<vat_rate xsi:type="xsd:string">?</vat_rate> <desc xsi:type="xsd:string">Product</desc>
<vat_npr xsi:type="xsd:string">?</vat_npr> <unitprice xsi:type="xsd:float">66.05</unitprice>
<localtax1_tx xsi:type="xsd:string">?</localtax1_tx> <total_net xsi:type="xsd:string">132.100000</total_net>
<localtax2_tx xsi:type="xsd:string">?</localtax2_tx> <total_vat xsi:type="xsd:float">25.9</total_vat>
<stock_alert xsi:type="xsd:string">?</stock_alert> <total xsi:type="xsd:string">158.000000</total>
<stock_real xsi:type="xsd:string">?</stock_real> <vat_rate xsi:type="xsd:string">19.600</vat_rate>
<stock_pmp xsi:type="xsd:string">?</stock_pmp> <qty xsi:type="xsd:string">2</qty>
<canvas xsi:type="xsd:string">?</canvas> <product_id xsi:type="xsd:string">50</product_id>
<import_key xsi:type="xsd:string">?</import_key> </item>
<dir xsi:type="xsd:string">?</dir> <item>
<images xsi:type="ns:ImagesArray"><!--Zero or more repetitions:--> <type xsi:type="xsd:string">0</type>
<image xsi:type="ns:image"> <desc xsi:type="xsd:string">Product</desc>
<!--You may enter the following 4 items in any order--> <unitprice xsi:type="xsd:float">1170.57</unitprice>
<photo xsi:type="xsd:string">?</photo> <total_net xsi:type="xsd:string">1170.570000</total_net>
<photo_vignette xsi:type="xsd:string">?</photo_vignette> <total_vat xsi:type="xsd:float">229.43</total_vat>
<imgWidth xsi:type="xsd:string">?</imgWidth> <total xsi:type="xsd:string">1400.000000</total>
<imgHeight xsi:type="xsd:string">?</imgHeight> <vat_rate xsi:type="xsd:string">19.600</vat_rate>
</image> <qty xsi:type="xsd:string">1</qty>
</images> <product_id xsi:type="xsd:string">51</product_id>
</product> </item>
</ns:createProductOrService> <item>
</soapenv:Body> <type xsi:type="xsd:string">0</type>
</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createProductOrService"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 2"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost/dolibarr_new/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/"> <desc xsi:type="xsd:string">Product</desc>
<unitprice xsi:type="xsd:float">25.04</unitprice>
<total_net xsi:type="xsd:string">25.040000</total_net>
<total_vat xsi:type="xsd:float">4.91</total_vat>
<total xsi:type="xsd:string">29.950000</total>
<vat_rate xsi:type="xsd:string">19.600</vat_rate>
<qty xsi:type="xsd:string">1</qty>
<product_id xsi:type="xsd:string">72</product_id>
</item>
<item>
<type xsi:type="xsd:string">0</type>
<desc xsi:type="xsd:string">Product</desc>
<unitprice xsi:type="xsd:float">124.58</unitprice>
<total_net xsi:type="xsd:string">124.580000</total_net>
<total_vat xsi:type="xsd:float">24.42</total_vat>
<total xsi:type="xsd:string">149.000000</total>
<vat_rate xsi:type="xsd:string">19.600</vat_rate>
<qty xsi:type="xsd:string">1</qty>
<product_id xsi:type="xsd:string">46</product_id>
</item>
<item>
<type xsi:type="xsd:string">1</type>
<desc xsi:type="xsd:string">Transport</desc>
<unitprice xsi:type="xsd:string">2.00</unitprice>
<total_net xsi:type="xsd:string">2.00</total_net>
<total_vat xsi:type="xsd:float">0.39</total_vat>
<total xsi:type="xsd:string">2.39</total>
<vat_rate xsi:type="xsd:string">19.600</vat_rate>
<qty xsi:type="xsd:string">1</qty>
<product_id xsi:type="xsd:string"/>
</item>
</lines>
</invoice>
</ns1160:createInvoice>
</SOAP-ENV:Body>
</SOAP-ENV:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createProductOrService"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 2"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost/dolibarr_new/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:Header/>
<soapenv:Body> <soapenv:Body>
<ns:createProductOrService soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <ns:createProductOrService soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">