Skip to content

Commit

Permalink
Doxygen
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Aug 28, 2014
1 parent 911cccb commit 8bdf02b
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions htdocs/fichinter/class/fichinter.class.php
Expand Up @@ -167,17 +167,17 @@ function create($user, $notrigger=0)
$resql=$this->db->query($sql);
if (! $resql) $error++;
}

if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{

$result=$this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
}

// Add linked object
if (! $error && $this->origin && $this->origin_id)
{
Expand Down Expand Up @@ -864,11 +864,12 @@ function set_contrat($user, $contractid)
* @param string $desc Line description
* @param date $date_intervention Intervention date
* @param int $duration Intervention duration
* @param array $array_option Array option
* @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)
{
Expand All @@ -887,15 +888,14 @@ function addline($user,$fichinterid, $desc, $date_intervention, $duration, $arra
}

$result=$line->insert($user);

if ($result >= 0)
{

$this->db->commit();
return 1;
}
else
{
{
$this->error=$this->db->error();
$this->db->rollback();
return -1;
Expand Down Expand Up @@ -1007,7 +1007,7 @@ class FichinterLigne extends CommonObjectLine
public $element='fichinterdet';
public $table_element='fichinterdet';
public $fk_element='fk_fichinter';

/**
* Constructor
*
Expand Down Expand Up @@ -1103,8 +1103,8 @@ function insert($user, $notrigger=0)
$resql=$this->db->query($sql);
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
{
$this->id=$this->rowid;
Expand All @@ -1113,11 +1113,11 @@ function insert($user, $notrigger=0)
{
$error++;
}
}
}


$result=$this->update_total();

if ($result > 0)
{
$this->rang=$rangToUse;
Expand Down Expand Up @@ -1175,7 +1175,7 @@ function update($user,$notrigger=0)
$resql=$this->db->query($sql);
if ($resql)
{

if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$this->id=$this->rowid;
Expand All @@ -1185,7 +1185,7 @@ function update($user,$notrigger=0)
$error++;
}
}

$result=$this->update_total();
if ($result > 0)
{
Expand Down

0 comments on commit 8bdf02b

Please sign in to comment.