From b76fd1804b71d3cb049271dc6024f2e93b976010 Mon Sep 17 00:00:00 2001 From: jfefe Date: Sun, 20 Jan 2013 15:31:24 +0100 Subject: [PATCH 1/3] Missing societe_id for user when called by webservice --- htdocs/webservices/server_user.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php index 777f0d9b5b2..a21b9713a7a 100644 --- a/htdocs/webservices/server_user.php +++ b/htdocs/webservices/server_user.php @@ -109,6 +109,7 @@ $server->wsdl->addComplexType( 'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted','type'=>'xsd:string'), 'datec' => array('name'=>'datec','type'=>'xsd:dateTime'), 'datem' => array('name'=>'datem','type'=>'xsd:dateTime'), + 'societe_id' => array('name'=>'societe_id','type'=>'xsd:string'), 'fk_socpeople' => array('name'=>'fk_socpeople','type'=>'xsd:string'), 'fk_member' => array('name'=>'fk_member','type'=>'xsd:string'), 'datelastlogin' => array('name'=>'datelastlogin','type'=>'xsd:dateTime'), From 8d8e649646fdd013a51b0619da35e23a39c7dc64 Mon Sep 17 00:00:00 2001 From: jfefe Date: Mon, 21 Jan 2013 11:42:25 +0100 Subject: [PATCH 2/3] Rename societe_id -> id_thirdparty in webservice method to get an user --- htdocs/webservices/server_user.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php index a21b9713a7a..49f95b33a08 100644 --- a/htdocs/webservices/server_user.php +++ b/htdocs/webservices/server_user.php @@ -109,7 +109,7 @@ $server->wsdl->addComplexType( 'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted','type'=>'xsd:string'), 'datec' => array('name'=>'datec','type'=>'xsd:dateTime'), 'datem' => array('name'=>'datem','type'=>'xsd:dateTime'), - 'societe_id' => array('name'=>'societe_id','type'=>'xsd:string'), + 'id_thirdparty' => array('name'=>'id_thirdparty','type'=>'xsd:string'), 'fk_socpeople' => array('name'=>'fk_socpeople','type'=>'xsd:string'), 'fk_member' => array('name'=>'fk_member','type'=>'xsd:string'), 'datelastlogin' => array('name'=>'datelastlogin','type'=>'xsd:dateTime'), @@ -304,7 +304,7 @@ function getUser($authentication,$id,$ref='',$ref_ext='') 'pass_indatabase_crypted' => $user->pass_indatabase_crypted, 'datec' => dol_print_date($user->datec,'dayhourrfc'), 'datem' => dol_print_date($user->datem,'dayhourrfc'), -'societe_id' => $user->societe_id, +'id_thirdparty' => $user->societe_id, 'fk_socpeople' => $user->fk_socpeople, 'fk_member' => $user->fk_member, 'webcal_login' => $user->webcal_login, From a201d8cea070d6d7410bfca96d113405a2013dd1 Mon Sep 17 00:00:00 2001 From: jfefe Date: Mon, 21 Jan 2013 11:43:22 +0100 Subject: [PATCH 3/3] Fix : bad classname in webservice to create an order --- htdocs/webservices/server_order.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php index 9f53dd07025..463f1c0f288 100644 --- a/htdocs/webservices/server_order.php +++ b/htdocs/webservices/server_order.php @@ -653,7 +653,7 @@ function createOrder($authentication,$order) foreach($arrayoflines as $key => $line) { // $key can be 'line' or '0','1',... - $newline=new OrderLigne($db); + $newline=new OrderLine($db); $newline->type=$line['type']; $newline->desc=$line['desc'];