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

addline must return id of contract

Browse Source
This commit is contained in:
Laurent Destailleur 2017-09-03 12:02:48 +02:00
parent e549e6cde1
commit acb87ad8ea
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/contrat/class/contrat.class.php
View File

@ -1464,6 +1464,8 @@ class Contrat extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$contractlineid = $this->db->last_insert_id(MAIN_DB_PREFIX.$contractline->table_element);
$result=$this->update_statut($user); $result=$this->update_statut($user);
if ($result > 0) if ($result > 0)
{ {
@ -1472,7 +1474,7 @@ class Contrat extends CommonObject
{ {
$contractline = new ContratLigne($this->db); $contractline = new ContratLigne($this->db);
$contractline->array_options=$array_options; $contractline->array_options=$array_options;
$contractline->id= $this->db->last_insert_id(MAIN_DB_PREFIX.$contractline->table_element); $contractline->id=$contractlineid;
$result=$contractline->insertExtraFields(); $result=$contractline->insertExtraFields();
if ($result < 0) if ($result < 0)
{ {
@ -1485,14 +1487,21 @@ class Contrat extends CommonObject
// Call trigger // Call trigger
$result=$this->call_trigger('LINECONTRACT_INSERT',$user); $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
if ($result < 0) if ($result < 0)
{
$error++;
}
// End call triggers
}
if ($error)
{ {
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
// End call triggers else
{
$this->db->commit(); $this->db->commit();
return 1; return $contractlineid;
} }
} }
else else