Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1354 from csalvador/webservices-debug

Browse Source 
Webservices debug
This commit is contained in:
Laurent Destailleur
2013-12-23 02:20:15 -08:00
parent 11353786a1 18b163c6db
commit aad7d32f7d
6 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/class/product.class.php
View File

@@ -2946,7 +2946,7 @@ class Product extends CommonObject
// Objet
$obj=array();
$obj['photo']=$photo;
if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']=$photo_vignette;
if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']=$dirthumb . $photo_vignette;
else $obj['photo_vignette']="";
$tabobj[$nbphoto-1]=$obj;

19
htdocs/societe/class/societe.class.php
View File

@@ -297,6 +297,25 @@ class Societe extends CommonObject
}
}
function create_individual($user) {
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
$contact=new Contact($this->db);
$contact->name = $this->name_bis;
$contact->firstname = $this->firstname;
$contact->socid = $this->id; // fk_soc
$contact->statut = 1;
$contact->priv = 0;
$result = $contact->create($user);
if ($result < 0) {
$this->error = $contact->error;
$this->errors = $contact->errors;
dol_syslog("Societe::create_individual ERROR:" . $this->error, LOG_ERR);
}
return $result;
}
/**
* Check properties of third party are ok (like name, third party codes, ...)
*

22
htdocs/societe/soc.php
View File

@@ -255,28 +255,10 @@ if (empty($reshook))
if ($object->particulier)
{
dol_syslog("This thirdparty is a personal people",LOG_DEBUG);
$contact=new Contact($db);
$contact->civilite_id = $object->civilite_id;
$contact->name = $object->name_bis;
$contact->firstname = $object->firstname;
$contact->address = $object->address;
$contact->zip = $object->zip;
$contact->town = $object->town;
$contact->state_id = $object->state_id;
$contact->country_id = $object->country_id;
$contact->socid = $object->id; // fk_soc
$contact->statut = 1;
$contact->email = $object->email;
$contact->skype = $object->skype;
$contact->phone_pro = $object->phone;
$contact->fax = $object->fax;
$contact->priv = 0;
$result=$contact->create($user);
$result=$object->create_individual($user);
if (! $result >= 0)
{
$error=$contact->error; $errors=$contact->errors;
$error=$object->error; $errors=$object->errors;
}
}

18
htdocs/webservices/server_order.php
View File

@@ -637,7 +637,7 @@ function createOrder($authentication,$order)
$newobject->date_lim_reglement=dol_stringtotime($order['date_due'],'dayrfc');
$newobject->note_private=$order['note_private'];
$newobject->note_public=$order['note_public'];
$newobject->statut=$order['status'];
$newobject->statut=0;
$newobject->facturee=$order['facturee'];
$newobject->fk_project=$order['project_id'];
$newobject->cond_reglement_id=$order['cond_reglement_id'];
@@ -669,30 +669,36 @@ function createOrder($authentication,$order)
$db->begin();
$result=$newobject->create($fuser,0,0);
dol_syslog("Webservice server_order:: order creation start", LOG_DEBUG);
$result=$newobject->create($fuser);
dol_syslog('Webservice server_order:: order creation done with $result='.$result, LOG_DEBUG);
if ($result < 0)
{
dol_syslog("Webservice server_order:: order creation failed", LOG_ERR);
$error++;
}
if ($newobject->statut == 1) // We want order validated
if ($order['status'] == 1) // We want order validated
{
$result=$newobject->validate($fuser);
dol_syslog("Webservice server_order:: order validation start", LOG_DEBUG);
$result=$newobject->valid($fuser);
if ($result < 0)
{
dol_syslog("Webservice server_order:: order validation failed", LOG_ERR);
$error++;
}
}
if (! $error)
if ($result >= 0)
{
dol_syslog("Webservice server_order:: order creation & validation succeeded, commit", LOG_DEBUG);
$db->commit();
$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
}
else
{
dol_syslog("Webservice server_order:: order creation or validation failed, rollback", LOG_ERR);
$db->rollback();
$error++;
$errorcode='KO';

2
htdocs/webservices/server_other.php
View File

@@ -224,7 +224,7 @@ function getDocument($authentication, $modulepart, $file, $refname='')
if (empty($refname)) $refname=basename(dirname($original_file)."/");
// Security check
$check_access = dol_check_secure_access_document($modulepart,$original_file,$conf->entity,$refname,$fuser);
$check_access = dol_check_secure_access_document($modulepart,$original_file,$conf->entity,$fuser,$refname);
$accessallowed = $check_access['accessallowed'];
$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
$original_file = $check_access['original_file'];

6
htdocs/webservices/server_thirdparty.php
View File

@@ -443,6 +443,7 @@ function createThirdParty($authentication,$thirdparty)
$newobject->tva_intra=$thirdparty['vat_number'];
$newobject->canvas=$thirdparty['canvas'];
$newobject->particulier=$thirdparty['individual'];
//Retreive all extrafield for thirdsparty
// fetch optionals attributes and labels
@@ -457,6 +458,11 @@ function createThirdParty($authentication,$thirdparty)
$db->begin();
$result=$newobject->create($fuser);
if ($newobject->particulier && $result > 0) {
$newobject->firstname = $thirdparty['firstname'];
$newobject->name_bis = $thirdparty['ref'];
$result = $newobject->create_individual($fuser);
}
if ($result <= 0)
{
$error++;