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

Merge pull request #5848 from atm-florian/develop

Browse Source 
FIX delete line with no triggers
This commit is contained in:
Laurent Destailleur 2016-10-07 17:18:07 +02:00 committed by GitHub
commit 4ae3d7e034
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/comm/propal/class/propal.class.php
View File

@ -3747,9 +3747,10 @@ class PropaleLigne extends CommonObjectLine
/**
* Delete line in database
*
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 if ko, >0 if ok
*/
function delete()
function delete($notrigger=0)
{
global $conf,$user;
@ -3773,13 +3774,16 @@ class PropaleLigne extends CommonObjectLine
}
}
// Call trigger
$result=$this->call_trigger('LINEPROPAL_DELETE',$user);
if ($result < 0)
{
$this->db->rollback();
return -1;
}
if (! $error && ! $notrigger)
{
// Call trigger
$result=$this->call_trigger('LINEPROPAL_DELETE',$user);
if ($result < 0)
{
$this->db->rollback();
return -1;
}
}
// End call triggers
$this->db->commit();