diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 150832351af9a708a0234fa91a20a3090b4d9681..bfafaeb57ae42f2b0c6953a96ddcdedb02647bd4 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -376,7 +376,7 @@ class Project extends CommonObject * Delete a project from database * @param user User * @param notrigger Disable triggers - * @return int <0 if KO, 0 if not possible, >0 if OK + * @return int <0 if KO, 0 if not possible, >0 if OK */ function delete($user, $notrigger=0) { @@ -400,9 +400,16 @@ class Project extends CommonObject } } - $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task"; + $sql.= " WHERE fk_projet=".$this->id; + + dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG); + $resql = $this->db->query($sql); + + $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet"; $sql.= " WHERE rowid=".$this->id; + dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index d7d7a7a9bd944a3a20cca511f914c9cbb2cac460..ca0be1c3bd79498d1360fc6fa79441d6ca880d7a 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -239,6 +239,7 @@ if (GETPOST("action") == 'confirm_delete' && GETPOST("confirm") == "yes" && $use } else { + dol_syslog($project->error,LOG_DEBUG); $mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>'; } }