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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2016-10-07 19:09:56 +02:00
commit 5b09737f13
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 * Delete line in database
* *
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 if ko, >0 if ok * @return int <0 if ko, >0 if ok
*/ */
function delete() function delete($notrigger=0)
{ {
global $conf,$user; global $conf,$user;
@ -3773,13 +3774,16 @@ class PropaleLigne extends CommonObjectLine
} }
} }
// Call trigger if (! $error && ! $notrigger)
$result=$this->call_trigger('LINEPROPAL_DELETE',$user); {
if ($result < 0) // Call trigger
{ $result=$this->call_trigger('LINEPROPAL_DELETE',$user);
$this->db->rollback(); if ($result < 0)
return -1; {
} $this->db->rollback();
return -1;
}
}
// End call triggers // End call triggers
$this->db->commit(); $this->db->commit();