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

Refactor: PAIEMENT_SALARY_* trigger

Browse Source
This commit is contained in:
KreizIT 2014-07-11 14:54:32 +02:00
parent c1a004106d
commit a7afb5bdae
1 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
htdocs/compta/salaries/class/paymentsalary.class.php
View File

@ -124,14 +124,12 @@ class PaymentSalary extends CommonObject
if (! $notrigger) if (! $notrigger)
{ {
// Start triggers // Call trigger
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $result=$this->call_trigger('PAYMENT_SALARY_MODIFY',$user);
$interface=new Interfaces($this->db); if ($result < 0) $error++;
$result=$interface->run_triggers('PAYMENT_SALARY_MODIFY',$this,$user,$langs,$conf); // End call triggers
if ($result < 0) {
$error++; $this->errors=$interface->errors; //FIXME: Add rollback if trigger fail
}
// End triggers
} }
return 1; return 1;
@ -225,6 +223,12 @@ class PaymentSalary extends CommonObject
$error=0; $error=0;
// Call trigger
$result=$this->call_trigger('PAYMENT_SALARY_DELETE',$user);
if ($result < 0) return -1;
// End call triggers
$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary";
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;
@ -236,15 +240,6 @@ class PaymentSalary extends CommonObject
return -1; return -1;
} }
// Start triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('PAYMENT_SALARY_DELETE',$this,$user,$langs,$conf);
if ($result < 0) {
$error++; $this->errors=$interface->errors;
}
// End triggers
return 1; return 1;
} }
@ -428,34 +423,21 @@ class PaymentSalary extends CommonObject
} }
} }
// Start triggers // Call trigger
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $result=$this->call_trigger('PAYMENT_SALARY_CREATE',$user);
$interface=new Interfaces($this->db); if ($result < 0) $ok=0;
$result=$interface->run_triggers('PAYMENT_SALARY_CREATE',$this,$user,$langs,$conf); // End call triggers
if ($result < 0) {
$error++; $this->errors=$interface->errors;
}
// End triggers
} }
else $ok=0; else $ok=0;
if ($ok) if ($ok)
{ {
if ($ok) $this->db->commit();
{ return $this->id;
$this->db->commit();
return $this->id;
}
else
{
$this->db->rollback();
return -3;
}
} }
else else
{ {
$this->error=$this->db->error();
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }