Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries

This commit is contained in:
Gauthier PC portable 024 2021-02-09 16:07:41 +01:00
commit 3b8e804412

View File

@ -293,8 +293,8 @@ class Salary extends CommonObject
if ($result < 0) return -1; if ($result < 0) return -1;
// End call triggers // End call triggers
// Delete donation // Delete extrafields
if (!$error) /*if (!$error)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."salary_extrafields"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."salary_extrafields";
$sql .= " WHERE fk_object=".$this->id; $sql .= " WHERE fk_object=".$this->id;
@ -305,7 +305,7 @@ class Salary extends CommonObject
$this->errors[] = $this->db->lasterror(); $this->errors[] = $this->db->lasterror();
$error++; $error++;
} }
} }*/
$sql = "DELETE FROM ".MAIN_DB_PREFIX."salary"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."salary";
$sql .= " WHERE rowid=".$this->id; $sql .= " WHERE rowid=".$this->id;