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

Fix : [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action

Browse Source 
Change trigger call to new function call_trigger
This commit is contained in:
KreizIT 2014-06-27 13:39:01 +02:00
parent 773caf808e
commit a153480bc6
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -5,8 +5,8 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.7 compared to 3.6.* ***** ***** ChangeLog for 3.7 compared to 3.6.* *****
For users: For users:
New: [ task #867 ] Remove ESAEB external module code from core - New: [ task #867 ] Remove ESAEB external module code from core
- - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
For translators: For translators:
- Update language files. - Update language files.

26
htdocs/compta/paiement/class/paiement.class.php
View File

@ -240,10 +240,8 @@ class Paiement extends CommonObject
if (! $error) if (! $error)
{ {
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $result=$this->call_trigger('PAYMENT_CUSTOMER_CREATE', $user);
$interface=new Interfaces($this->db); if ($result < 0) { $error++; }
$result=$interface->run_triggers('PAYMENT_CUSTOMER_CREATE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
} }
} }
@ -355,11 +353,13 @@ class Paiement extends CommonObject
if (! $notrigger) if (! $notrigger)
{ {
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $result=$this->call_trigger('PAYMENT_DELETE', $user);
$interface=new Interfaces($this->db); if ($result < 0)
$result=$interface->run_triggers('PAYMENT_DELETE',$this,$user,$langs,$conf); {
if ($result < 0) { $error++; $this->errors=$interface->errors; } $this->db->rollback();
// Fin appel triggers return -1;
}
// Fin appel triggers
} }
$this->db->commit(); $this->db->commit();
@ -508,11 +508,9 @@ class Paiement extends CommonObject
if (! $error && ! $notrigger) if (! $error && ! $notrigger)
{ {
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $result=$this->call_trigger('PAYMENT_ADD_TO_BANK', $user);
$interface=new Interfaces($this->db); if ($result < 0) { $error++; }
$result=$interface->run_triggers('PAYMENT_ADD_TO_BANK',$this,$user,$langs,$conf); // Fin appel triggers
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
} }
} }
else else