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

Update commonobject.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-05 15:40:18 +01:00 committed by GitHub
parent def89d30ae
commit 9a0dca57af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/class/commonobject.class.php
View File

@ -4564,11 +4564,11 @@ abstract class CommonObject
* Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...) * Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
* This function delete record with all extrafields and insert them again from the array $this->array_options. * This function delete record with all extrafields and insert them again from the array $this->array_options.
* *
* @param bool $notrigger false=launch triggers after, true=disable triggers * @param string $trigger If defined, call also the trigger (for example COMPANY_MODIFY)
* @param User $userused Object user * @param User $userused Object user
* @return int -1=error, O=did nothing, 1=OK * @return int -1=error, O=did nothing, 1=OK
*/ */
function insertExtraFields($notrigger=false, $userused=null) function insertExtraFields($trigger='', $userused=null)
{ {
global $conf,$langs,$user; global $conf,$langs,$user;
@ -4703,17 +4703,15 @@ abstract class CommonObject
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
$error++; $error++;
} }
else
{ if (!$error && !$trigger)
if (!$notrigger)
{ {
// Call trigger // Call trigger
$this->context=array('extrafieldaddupdate'=>1); $this->context=array('extrafieldaddupdate'=>1);
$result=$this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused); $result=$this->call_trigger(strtoupper($trigger, $userused);
if ($result < 0) $error++; if ($result < 0) $error++;
// End call trigger // End call trigger
} }
}
if ($error) if ($error)
{ {