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

Can remove a project if project has task.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-18 12:20:34 +00:00
parent 62e680cbf2
commit af0a8fccc8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/projet/class/project.class.php
View File

@ -376,7 +376,7 @@ class Project extends CommonObject
* Delete a project from database * Delete a project from database
* @param user User * @param user User
* @param notrigger Disable triggers * @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) 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; $sql.= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {

1
htdocs/projet/fiche.php
View File

@ -239,6 +239,7 @@ if (GETPOST("action") == 'confirm_delete' && GETPOST("confirm") == "yes" && $use
} }
else else
{ {
dol_syslog($project->error,LOG_DEBUG);
$mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>'; $mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>';
} }
} }