Merge pull request #8929 from ATM-Marc/FIX_7.0_extrafields_intervention

FIX: intervention: extrafield error when calling insertExtrafields
This commit is contained in:
Laurent Destailleur 2018-06-13 20:00:48 +02:00 committed by GitHub
commit f07408c6c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1395,11 +1395,11 @@ class FichinterLigne extends CommonObjectLine
$resql=$this->db->query($sql);
if ($resql)
{
$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
$this->rowid=$this->id;
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$this->id=$this->id;
$result=$this->insertExtraFields();
if ($result < 0)
{
@ -1470,7 +1470,6 @@ class FichinterLigne extends CommonObjectLine
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$this->id=$this->id;
$result=$this->insertExtraFields();
if ($result < 0)
{