diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index f007cbdbf81..4dea3053d23 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -938,7 +938,7 @@ class Propal extends CommonObject
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
         $sql.= ")";
-
+        
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 40dcb1fe77d..9d3e6ee1b63 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -2240,3 +2240,25 @@ function getModuleDirForApiClass($module)
 
     return $moduledirforclass;
 }
+
+/*
+ * Return 2 hexa code randomly
+ * 
+ * @param	$min	int	Between 0 and 255
+ * @param	$max	int	Between 0 and 255
+ * @return String
+ */
+function random_color_part($min=0,$max=255) {
+	return str_pad( dechex( mt_rand( $min, $max) ), 2, '0', STR_PAD_LEFT);
+}
+
+/*
+ * Return hexadecimal color randomly
+ * 
+ * @param	$min	int	Between 0 and 255
+ * @param	$max	int	Between 0 and 255
+ * @return String
+ */
+function random_color($min=0, $max=255) {
+	return random_color_part($min, $max) . random_color_part($min, $max) . random_color_part($min, $max);
+}
\ No newline at end of file
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 035b7eac57b..189c37dbe32 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -175,6 +175,17 @@ function task_prepare_head($object)
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'task');
+	
+	// Manage discussion
+	if (empty($conf->global->MAIN_ALLOW_COMMENT_ON_TASK))
+	{
+		$nbComments= $object->getNbComments();
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+		$head[$h][1] = $langs->trans("TaskCommentLinks");
+		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		$head[$h][2] = 'task_comment';
+		$h++;
+	}
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
@@ -187,7 +198,7 @@ function task_prepare_head($object)
 		$head[$h][2] = 'task_notes';
 		$h++;
     }
-
+    
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index be89142cecb..b0e585aeacd 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -224,6 +224,17 @@ UPDATE llx_accounting_account SET pcg_type = 'INCOME'  where pcg_type = 'VENTAS_
 UPDATE llx_accounting_account SET pcg_type = 'EXPENSE' where pcg_type = 'COMPRAS_GASTOS';
 
 
+CREATE TABLE llx_projet_task_comment (
+    rowid integer AUTO_INCREMENT PRIMARY KEY,
+    datec datetime  DEFAULT NULL,
+    tms timestamp,
+    description text NOT NULL,
+    fk_user integer DEFAULT NULL,
+    fk_task integer DEFAULT NULL,
+    entity integer DEFAULT 1,
+    import_key varchar(125) DEFAULT NULL
+);
+
 -- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) CHARACTER SET utf8;
 -- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci;
 -- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_bookkeeping MODIFY numero_compte VARCHAR(20) CHARACTER SET utf8;
diff --git a/htdocs/install/mysql/tables/llx_projet_task_comment.sql b/htdocs/install/mysql/tables/llx_projet_task_comment.sql
new file mode 100644
index 00000000000..42fe572958a
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_projet_task_comment.sql
@@ -0,0 +1,28 @@
+-- ===========================================================================
+-- Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===========================================================================
+
+CREATE TABLE llx_projet_task_comment (
+    rowid integer AUTO_INCREMENT PRIMARY KEY,
+    datec datetime  DEFAULT NULL,
+    tms timestamp,
+    description text NOT NULL,
+    fk_user integer DEFAULT NULL,
+    fk_task integer DEFAULT NULL,
+    entity integer DEFAULT 1,
+    import_key varchar(125) DEFAULT NULL
+);
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 92282fd29f0..57406704bf4 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -208,3 +208,8 @@ OppStatusPENDING=Pending
 OppStatusWON=Won
 OppStatusLOST=Lost
 Budget=Budget
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+TaskCommentLinks=Comments
+TaskNbComments=Number of comments
+TaskComment=Task's comments space
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 746fbd59c38..ece3272c743 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -207,3 +207,8 @@ OppStatusPENDING=En attente
 OppStatusWON=Gagné
 OppStatusLOST=Perdu
 Budget=Budget
+#Comments trans
+AllowCommentOnTask=Autoriser les commentaires entre utilisateurs sur les tâches
+TaskCommentLinks=Commentaires
+TaskNbComments=Nombre de commentaires
+TaskComment=Tâches espace commentaires
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 744e52e0f2f..0c0da27457e 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -918,6 +918,15 @@ print '</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 print '</tr>';
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("AllowCommentOnTask").'</td>';
+
+print '<td align="center" width="300">';
+echo ajax_constantonoff('PROJECT_ALLOW_COMMENT_ON_TASK');
+print '</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '</tr>';
+
 print '</table></form>';
 
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 17d1b5fcf45..258805f9970 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -35,7 +35,7 @@ class Task extends CommonObject
     public $table_element='projet_task';	//!< Name of table without prefix where object is stored
     public $fk_element='fk_task';
     public $picto = 'task';
-    protected $childtables=array('projet_task_time');    // To test if we can delete object
+    protected $childtables=array('projet_task_time','projet_task_comment');    // To test if we can delete object
 
     var $fk_task_parent;
     var $label;
@@ -69,6 +69,8 @@ class Task extends CommonObject
     var $timespent_withhour;		// 1 = we entered also start hours for timesheet line
     var $timespent_fk_user;
     var $timespent_note;
+    
+    var $comments = array();
 
     public $oldcopy;
 
@@ -1777,4 +1779,331 @@ class Task extends CommonObject
 
         return ($datetouse > 0 && ($datetouse < ($now - $conf->projet->task->warning_delay)));
 	}
+	
+	/**
+	 * Return nb comments already posted
+	 *
+	 * @return int
+	 */
+	public function getNbComments()
+	{
+		return count($this->comments);
+	}
+	
+	/**
+	 * Load comments linked with current task
+	 *
+	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchComments()
+	{		
+		$sql = "SELECT";
+		$sql.= " c.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_comment as c";
+		$sql.= " WHERE c.fk_task = ".$this->id;
+		$sql.= " ORDER BY c.tms DESC";
+		
+		dol_syslog(get_class($this)."::fetchComments", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num_rows = $this->db->num_rows($resql);
+			if ($num_rows > 0)
+			{
+				while($obj = $this->db->fetch_object($resql))
+				{
+					$comment = new TaskComment($this->db);
+					$comment->fetch($obj->rowid);
+					$this->comments[] = $comment;
+				}
+				return $num_rows;
+			}else{
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 }
+
+/**
+ * 	Class to manage tasks
+ */
+class TaskComment extends CommonObject
+{
+	public $element='project_task_comment';		//!< Id that identify managed objects
+	public $table_element='projet_task_comment';	//!< Name of table without prefix where object is stored
+	public $fk_element='fk_task';
+	public $picto = 'task';
+	
+	var $fk_task;
+	
+	var $description;
+	
+	var $tms;
+	
+	var $datec;
+	
+	var $fk_user;
+	
+	var $entity;
+	
+	var $import_key;
+	
+	public $oldcopy;
+	
+	
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+	}
+	
+	
+	/**
+	 *  Create into database
+	 *
+	 *  @param	User	$user        	User that create
+	 *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int 		        	<0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		
+		$error=0;
+		
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_comment (";
+		$sql.= "description";
+		$sql.= ", datec";
+		$sql.= ", fk_task";
+		$sql.= ", fk_user";
+		$sql.= ", entity";
+		$sql.= ", import_key";
+		$sql.= ") VALUES (";
+		$sql.= "'".$this->db->escape($this->description)."'";
+		$sql.= ", ".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null');
+		$sql.= ", '".(isset($this->fk_task)?$this->fk_task:"null")."'";
+		$sql.= ", '".(isset($this->fk_user)?$this->fk_user:"null")."'";
+		$sql.= ", ".(!empty($this->entity)?$this->entity:'1');
+		$sql.= ", ".(!empty($this->import_key)?"'".$this->import_key."'":"null");
+		$sql.= ")";
+		
+		var_dump($this->db);
+		echo $sql;
+		
+		$this->db->begin();
+		
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		
+		if (! $error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_comment");
+			
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('TASK_COMMENT_CREATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+				
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+	
+	
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id			Id object
+	 *  @param	int		$ref		ref object
+	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
+	 */
+	function fetch($id)
+	{
+		global $langs;
+		
+		$sql = "SELECT";
+		$sql.= " c.rowid,";
+		$sql.= " c.description,";
+		$sql.= " c.datec,";
+		$sql.= " c.tms,";
+		$sql.= " c.fk_task,";
+		$sql.= " c.fk_user,";
+		$sql.= " c.entity,";
+		$sql.= " c.import_key";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_comment as c";
+		$sql.= " WHERE c.rowid = ".$id;
+		
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num_rows = $this->db->num_rows($resql);
+			
+			if ($num_rows)
+			{
+				$obj = $this->db->fetch_object($resql);
+				
+				$this->id					= $obj->rowid;
+				$this->description			= $obj->description;
+				$this->datec				= $this->db->jdate($obj->datec);
+				$this->tms					= $obj->tms;
+				$this->fk_user				= $obj->fk_user;
+				$this->fk_task				= $obj->fk_task;
+				$this->entity				= $obj->entity;
+				$this->import_key			= $obj->import_key;
+			}
+			
+			$this->db->free($resql);
+			
+			if ($num_rows) return 1;
+			else return 0;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+	
+	
+	/**
+	 *  Update database
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int			         	<=0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+		
+		// Clean parameters
+		if (isset($this->fk_task)) $this->fk_project=trim($this->fk_task);
+		if (isset($this->fk_user)) $this->fk_project=trim($this->fk_user);
+		if (isset($this->description)) $this->description=trim($this->description);
+		
+		
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_comment SET";
+		$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
+		$sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
+		$sql.= " fk_task=".(isset($this->fk_task)?$this->fk_task:"null").",";
+		$sql.= " fk_user=".(isset($this->fk_user)?$this->fk_user:"null").",";
+		$sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
+		$sql.= " import_key=".(!empty($this->import_key)?"'".$this->import_key."'":"null");
+		$sql.= " WHERE rowid=".$this->id;
+		
+		$this->db->begin();
+		
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('TASK_COMMENT_MODIFY',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+		
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+	
+	
+	/**
+	 *	Delete task from database
+	 *
+	 *	@param	User	$user        	User that delete
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		
+		$error=0;
+		
+		$this->db->begin();
+		
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_comment";
+		$sql.= " WHERE rowid=".$this->id;
+		
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('TASK_COMMENT_DELETE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+		
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}else{
+			$this->db->commit();
+			return 1;
+		}
+	}
+}
\ No newline at end of file
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
new file mode 100644
index 00000000000..0446cc71ea6
--- /dev/null
+++ b/htdocs/projet/tasks/comment.php
@@ -0,0 +1,394 @@
+<?php
+/* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/projet/tasks/task.php
+ *	\ingroup    project
+ *	\brief      Page of a project task
+ */
+
+require ("../../main.inc.php");
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+
+$langs->load("projects");
+$langs->load("companies");
+
+$id=GETPOST('id','int');
+$idcomment=GETPOST('idcomment','int');
+$ref=GETPOST("ref",'alpha',1);          // task ref
+$taskref=GETPOST("taskref",'alpha');    // task ref
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+$withproject=GETPOST('withproject','int');
+$project_ref=GETPOST('project_ref','alpha');
+$planned_workload=((GETPOST('planned_workloadhour','int')!='' || GETPOST('planned_workloadmin','int')!='') ? (GETPOST('planned_workloadhour','int')>0?GETPOST('planned_workloadhour','int')*3600:0) + (GETPOST('planned_workloadmin','int')>0?GETPOST('planned_workloadmin','int')*60:0) : '');
+
+// Security check
+$socid=0;
+//if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+if (! $user->rights->projet->lire) accessforbidden();
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('projecttaskcard','globalcard'));
+
+$task = new Task($db);
+$object = new TaskComment($db);
+$extrafields = new ExtraFields($db);
+$projectstatic = new Project($db);
+$userstatic = new User($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($task->table_element);
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'addcomment')
+{
+	if (!empty($_POST['comment_description']))
+	{
+		$object->description = GETPOST('comment_description');
+		$object->datec = time();
+		$object->fk_task = $id;
+		$object->fk_user = $user->id;
+		$object->entity = $conf->entity;
+		if ($object->create($user) > 0)
+		{
+			header('Location: '.DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$id.($withproject?'&withproject=1':''));
+			exit;
+		}
+		else
+		{
+			setEventMessages($task->error,$task->errors,'errors');
+			$action='';
+		}
+	}
+}
+if ($action == 'deletecomment')
+{
+	if ($object->fetch($idcomment) >= 0)
+	{
+		if ($object->delete($user) > 0)
+		{
+			header('Location: '.DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$id.($withproject?'&withproject=1':''));
+			exit;
+		}
+		else
+		{
+			setEventMessages($task->error,$task->errors,'errors');
+			$action='';
+		}
+	}
+}
+
+// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+if (! empty($project_ref) && ! empty($withproject))
+{
+	if ($projectstatic->fetch('',$project_ref) > 0)
+	{
+		$tasksarray=$task->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
+		if (count($tasksarray) > 0)
+		{
+			$id=$tasksarray[0]->id;
+		}
+		else
+		{
+			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode)?'':'&mode='.$mode));
+		}
+	}
+}
+
+/*
+ * View
+*/
+
+
+llxHeader('', $langs->trans("TaskComment"));
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formfile = new FormFile($db);
+
+if ($id > 0 || ! empty($ref))
+{
+	if ($task->fetch($id,$ref) > 0)
+	{
+		$res=$task->fetch_optionals($task->id,$extralabels);
+		$res = $task->fetchComments();
+
+		$result=$projectstatic->fetch($task->fk_project);
+		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+
+		$task->project = clone $projectstatic;
+
+		$userWrite  = $projectstatic->restrictedProjectArea($user,'write');
+
+		if (! empty($withproject))
+		{
+			// Tabs for project
+			$tab='tasks';
+			$head=project_prepare_head($projectstatic);
+			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
+
+			$param=($mode=='mine'?'&mode=mine':'');
+
+			// Project card
+
+            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+            $morehtmlref='<div class="refidno">';
+            // Title
+            $morehtmlref.=$projectstatic->title;
+            // Thirdparty
+            if ($projectstatic->thirdparty->id > 0)
+            {
+                $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
+            }
+            $morehtmlref.='</div>';
+
+            // Define a complementary filter for search of next/prev ref.
+            if (! $user->rights->projet->all->lire)
+            {
+                $tasksListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
+                $projectstatic->next_prev_filter=" rowid in (".(count($tasksListId)?join(',',array_keys($tasksListId)):'0').")";
+            }
+
+            dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+            print '<div class="fichecenter">';
+            print '<div class="fichehalfleft">';
+            print '<div class="underbanner clearboth"></div>';
+
+            print '<table class="border" width="100%">';
+
+            // Visibility
+            print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+            if ($projectstatic->public) print $langs->trans('SharedProject');
+            else print $langs->trans('PrivateProject');
+            print '</td></tr>';
+
+            // Date start - end
+            print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+            print dol_print_date($projectstatic->date_start,'day');
+            $end=dol_print_date($projectstatic->date_end,'day');
+            if ($end) print ' - '.$end;
+            print '</td></tr>';
+
+            // Budget
+            print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+            if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
+            print '</td></tr>';
+
+            // Other attributes
+            $cols = 2;
+            //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+            print '</table>';
+
+            print '</div>';
+            print '<div class="fichehalfright">';
+            print '<div class="ficheaddleft">';
+            print '<div class="underbanner clearboth"></div>';
+
+            print '<table class="border" width="100%">';
+
+            // Description
+            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+            print nl2br($projectstatic->description);
+            print '</td></tr>';
+
+            // Categories
+            if($conf->categorie->enabled) {
+                print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
+                print $form->showCategories($projectstatic->id,'project',1);
+                print "</td></tr>";
+            }
+
+            print '</table>';
+
+            print '</div>';
+            print '</div>';
+            print '</div>';
+
+            print '<div class="clearboth"></div>';
+
+			dol_fiche_end();
+
+			print '<br>';
+		}
+
+		$head=task_prepare_head($task);
+
+		/*
+		 * Fiche tache en mode visu
+		 */
+		$param=($withproject?'&withproject=1':'');
+		$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>':'';
+
+		dol_fiche_head($head, 'task_comment', $langs->trans("Task"), -1, 'projecttask');
+
+		if ($action == 'delete')
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject,$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete");
+		}
+		
+		if (! GETPOST('withproject') || empty($projectstatic->id))
+		{
+		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+		    $task->next_prev_filter=" fk_projet in (".$projectsListId.")";
+		}
+		else $task->next_prev_filter=" fk_projet = ".$projectstatic->id;
+
+		$morehtmlref='';
+
+		// Project
+		if (empty($withproject))
+		{
+		    $morehtmlref.='<div class="refidno">';
+		    $morehtmlref.=$langs->trans("Project").': ';
+		    $morehtmlref.=$projectstatic->getNomUrl(1);
+		    $morehtmlref.='<br>';
+
+		    // Third party
+		    $morehtmlref.=$langs->trans("ThirdParty").': ';
+		    if (!empty($projectstatic->thirdparty)) {
+                   $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+		    }
+		    $morehtmlref.='</div>';
+		}
+
+		dol_banner_tab($task, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
+		
+		print '<div class="fichecenter">';
+
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border" width="100%">';
+		
+		// Nb comments
+		print '<td class="tdtop">'.$langs->trans("TaskNbComments").'</td><td>';
+		print $task->getNbComments();
+		print '</td></tr>';
+
+		// Other attributes
+		$cols = 3;
+		$parameyers=array('socid'=>$socid);
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+		print '</table>';
+
+		print '</div>';
+
+		dol_fiche_end();
+		
+		
+		print '<br>';
+		print '<div id="comment">';
+		
+		// Add comment
+		
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="addcomment">';
+		print '<input type="hidden" name="id" value="'.$task->id.'">';
+		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		
+		print '<table class="noborder nohover" width="100%">';
+		
+		print '<tr class="liste_titre">';
+		print '<td width="25%">'.$langs->trans("Comments").'</td>';
+		print '<td width="25%"></td>';
+		print '<td width="25%"></td>';
+		print '<td width="25%"></td>';
+		print "</tr>\n";
+		
+		print '<tr class="oddeven">';
+		print '<td></td>';
+		
+		// Description
+		print '<td colspan="2">';
+		
+		$desc = ($_POST['comment_description']?$_POST['comment_description']:'');
+		
+		$doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '100%');
+		print $doleditor->Create(1);
+		
+		print '</td>';
+		
+		print '<td align="center">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+		print '</td></tr>';
+		print '</table></form>';
+		
+		// List of comments
+		if(!empty($task->comments)) {
+			// Default color for current user
+			$TColors = array($user->id => 'efefef');
+			$first = true;
+			foreach($task->comments as $comment) {
+				$fk_user = $comment->fk_user;
+				$userstatic->fetch($fk_user);
+				if(empty($TColors[$fk_user])) {
+					$TColors[$fk_user] = random_color(180,240);
+				}
+				print '<div class="width100p clearboth">';
+				if($comment->fk_user == $user->id) {
+					print '<div class="width25p float">&nbsp;</div>';
+				}
+				
+				print '<div class="width75p float comment" style="background-color:#'.$TColors[$fk_user].'">';
+				print '<div class="comment-description">';
+				print $comment->description;
+				print '</div>';
+				print '<div class="comment-info">';
+				print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br/>';
+				print $langs->trans('Date').' : '.dol_print_date($comment->datec,'dayhoursec');
+				if($first && $fk_user == $user->id) {
+					print '<br/> <a href="?action=deletecomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'">'.$langs->trans('Delete').'</a>';
+				}
+				print '</div>';
+				print '</div>';
+				
+				if($comment->fk_user != $user->id) {
+					print '<div class="width25p float">&nbsp;</div>';
+				}
+				
+				$first = false;
+			}
+		}
+		
+		print '<br>';
+		print '</div>';
+
+	}
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1b0d04469c3..ccec30b0a34 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -826,6 +826,16 @@ div.fiche>form>div.div-table-responsive {
 .titlefieldmiddle { width: 50%; }
 .imgmaxwidth180 { max-width: 180px; }
 
+.width20p { width:20%; }
+.width25p { width:25%; }
+.width40p { width:40%; }
+.width50p { width:50%; }
+.width60p { width:60%; }
+.width75p { width:75%; }
+.width80p { width:80%; }
+.width100p { width:100%; }
+
+
 /* Force values for small screen 1400 */
 @media only screen and (max-width: 1400px)
 {
@@ -3799,6 +3809,29 @@ pre#editfilecontentaceeditorid {
 }
 
 
+/* ============================================================================== */
+/*  Comments                                                                   	  */
+/* ============================================================================== */
+
+#comment div {
+	box-sizing:border-box;
+}
+
+#comment .comment {
+    border-radius:7px;
+    padding:7px 10px;
+    margin-bottom:10px;
+}
+#comment .comment-info {
+    font-size:0.8em;
+    color:#555;
+    margin-top:5px;
+}
+#comment textarea {
+    width: 100%;
+}
+
+
 
 /* ============================================================================== */
 /*  JSGantt                                                                       */