Merge pull request #622 from jfefe/webservices

Missing societe_id for user when called by webservice
This commit is contained in:
Regis Houssin 2013-01-21 05:33:14 -08:00
commit 5b34f6ba4e
2 changed files with 3 additions and 2 deletions

View File

@ -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'];

View File

@ -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'),
'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'),
@ -303,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,