From 0391dbf1c10496fad07d191d6a1307841833c189 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 29 Jan 2010 09:23:28 +0000
Subject: [PATCH] Works on enhancement of project tasks

---
 htdocs/install/mysql/migration/2.7.0-2.8.0.sql  | 1 +
 htdocs/install/mysql/tables/llx_projet_task.sql | 2 +-
 htdocs/projet/tasks/fiche.php                   | 4 +---
 htdocs/projet/tasks/task.class.php              | 8 ++++++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
index 9079562fb4c..bb7b4f201dc 100755
--- a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
+++ b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
@@ -119,6 +119,7 @@ ALTER TABLE llx_projet_task ADD COLUMN datev datetime AFTER datee;
 ALTER TABLE llx_projet_task CHANGE title label varchar(255) NOT NULL;
 ALTER TABLE llx_projet_task ADD COLUMN description text AFTER label;
 ALTER TABLE llx_projet_task MODIFY description text;
+ALTER TABLE llx_projet_task MODIFY duration_effective real DEFAULT 0 NOT NULL;
 ALTER TABLE llx_projet_task ADD COLUMN progress	integer	DEFAULT 0 AFTER duration_effective;
 ALTER TABLE llx_projet_task ADD COLUMN priority	integer	DEFAULT 0 AFTER progress;
 ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer AFTER fk_user_creat;
diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql
index 7ab302cca87..ca28fcb5a6d 100644
--- a/htdocs/install/mysql/tables/llx_projet_task.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task.sql
@@ -31,7 +31,7 @@ create table llx_projet_task
   datev					datetime,						-- date validation
   label					varchar(255) NOT NULL,
   description			text,
-  duration_effective	real NOT NULL,
+  duration_effective	real DEFAULT 0 NOT NULL,
   progress				integer	DEFAULT 0,				-- percentage increase
   priority				integer	DEFAULT 0,				-- priority
   fk_user_creat			integer,						-- user who created the task
diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php
index 109be4cd16f..d82c1d91de2 100644
--- a/htdocs/projet/tasks/fiche.php
+++ b/htdocs/projet/tasks/fiche.php
@@ -77,9 +77,7 @@ if ($_POST["action"] == 'createtask' && $user->rights->projet->creer)
 			$taskid = $task->create($user);
 			
 			if ($taskid > 0)
-			{
-				$task->update($user);
-				
+			{	
 				$result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal');
 			}
 		}
diff --git a/htdocs/projet/tasks/task.class.php b/htdocs/projet/tasks/task.class.php
index 5dda1ec81e6..262c06c2327 100644
--- a/htdocs/projet/tasks/task.class.php
+++ b/htdocs/projet/tasks/task.class.php
@@ -93,14 +93,22 @@ class Task extends CommonObject
 		$sql.= "fk_projet";
 		$sql.= ", fk_task_parent";
 		$sql.= ", label";
+		$sql.= ", description";
 		$sql.= ", datec";
 		$sql.= ", fk_user_creat";
+		$sql.= ", dateo";
+		$sql.= ", datee";
+		$sql.= ", progress";
         $sql.= ") VALUES (";
 		$sql.= $this->fk_project;
 		$sql.= ", ".$this->fk_task_parent;
 		$sql.= ", '".addslashes($this->label)."'";
+		$sql.= ", '".addslashes($this->description)."'";
 		$sql.= ", ".$this->db->idate($this->date_c);
 		$sql.= ", ".$user->id;
+		$sql.= ", ".($this->date_start!=''?$this->db->idate($this->date_start):'null');
+		$sql.= ", ".($this->date_end!=''?$this->db->idate($this->date_end):'null');
+		$sql.= ", ".$this->progress;
 		$sql.= ")";
 
 		$this->db->begin();
-- 
GitLab