From a9eb2a9da9dc09a9f1595db76bb4cb86b53c35f2 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 30 Apr 2010 05:51:23 +0000
Subject: [PATCH] Add a common function to delete the linked contact

---
 htdocs/projet/class/project.class.php | 15 +++++++++++++++
 htdocs/projet/class/task.class.php    | 13 +++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 334aa357a7a..2ab0e78d7da 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -354,8 +354,23 @@ class Project extends CommonObject
 	function delete($user, $notrigger=0)
 	{
 		global $conf;
+		
+		$error=0;
 
 		$this->db->begin();
+		
+		if (! $error)
+		{
+			// Delete linked contacts
+			$res = $this->delete_linked_contact();
+			if ($res < 0)
+			{
+				$this->error='ErrorFailToDeleteLinkedContact';
+				//$error++;
+				$this->db->rollback();
+				return 0;
+			}
+		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet";
 		$sql.= " WHERE rowid=".$this->id;
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index c4f1554acfd..c6d66f37ae8 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -320,6 +320,19 @@ class Task extends CommonObject
 			$this->db->rollback();
 			return 0;
 		}
+		
+		if (! $error)
+		{
+			// Delete linked contacts
+			$res = $this->delete_linked_contact();
+			if ($res < 0)
+			{
+				$this->error='ErrorFailToDeleteLinkedContact';
+				//$error++;
+				$this->db->rollback();
+				return 0;
+			}
+		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
 		$sql.= " WHERE rowid=".$this->id;