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

Doxygen

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-28 14:48:16 +02:00
parent 911cccba80
commit 8bdf02b340
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/fichinter/class/fichinter.class.php
View File

@ -167,17 +167,17 @@ class Fichinter extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if (! $resql) $error++; if (! $resql) $error++;
} }
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{ {
$result=$this->insertExtraFields(); $result=$this->insertExtraFields();
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
} }
} }
// Add linked object // Add linked object
if (! $error && $this->origin && $this->origin_id) if (! $error && $this->origin && $this->origin_id)
{ {
@ -864,11 +864,12 @@ class Fichinter extends CommonObject
* @param string $desc Line description * @param string $desc Line description
* @param date $date_intervention Intervention date * @param date $date_intervention Intervention date
* @param int $duration Intervention duration * @param int $duration Intervention duration
* @param array $array_option Array option
* @return int >0 if ok, <0 if ko * @return int >0 if ok, <0 if ko
*/ */
function addline($user,$fichinterid, $desc, $date_intervention, $duration, $array_option=0) function addline($user,$fichinterid, $desc, $date_intervention, $duration, $array_option='')
{ {
dol_syslog("Fichinter::Addline $fichinterid, $desc, $date_intervention, $duration"); dol_syslog(get_class($this)."::addline $fichinterid, $desc, $date_intervention, $duration");
if ($this->statut == 0) if ($this->statut == 0)
{ {
@ -887,15 +888,14 @@ class Fichinter extends CommonObject
} }
$result=$line->insert($user); $result=$line->insert($user);
if ($result >= 0) if ($result >= 0)
{ {
$this->db->commit(); $this->db->commit();
return 1; return 1;
} }
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
@ -1007,7 +1007,7 @@ class FichinterLigne extends CommonObjectLine
public $element='fichinterdet'; public $element='fichinterdet';
public $table_element='fichinterdet'; public $table_element='fichinterdet';
public $fk_element='fk_fichinter'; public $fk_element='fk_fichinter';
/** /**
* Constructor * Constructor
* *
@ -1103,8 +1103,8 @@ class FichinterLigne extends CommonObjectLine
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet'); $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{ {
$this->id=$this->rowid; $this->id=$this->rowid;
@ -1113,11 +1113,11 @@ class FichinterLigne extends CommonObjectLine
{ {
$error++; $error++;
} }
} }
$result=$this->update_total(); $result=$this->update_total();
if ($result > 0) if ($result > 0)
{ {
$this->rang=$rangToUse; $this->rang=$rangToUse;
@ -1175,7 +1175,7 @@ class FichinterLigne extends CommonObjectLine
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{ {
$this->id=$this->rowid; $this->id=$this->rowid;
@ -1185,7 +1185,7 @@ class FichinterLigne extends CommonObjectLine
$error++; $error++;
} }
} }
$result=$this->update_total(); $result=$this->update_total();
if ($result > 0) if ($result > 0)
{ {