diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index fde26fa2e19..d085ca66563 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7842,4 +7842,171 @@ class Form
 
         return $out;
     }
+
+	/**
+	 *  Output a combo list with invoices qualified for a third party
+	 *
+	 *  @param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+	 *  @param  int		$selected   	Id invoice preselected
+	 *  @param  string	$htmlname   	Name of HTML select
+	 *	@param	int		$maxlength		Maximum length of label
+	 *	@param	int		$option_only	Return only html options lines without the select tag
+	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
+	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
+     *  @param	int		$forcefocus		Force focus on field (works with javascript only)
+     *  @param	int		$disabled		Disabled
+	 *  @param	string	$morecss        More css added to the select component
+	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
+	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
+	 *  @param	User	$usertofilter	User object to use for filtering
+	 *	@return int         			Nbr of project if OK, <0 if KO
+	 */
+    public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
+	{
+		global $user,$conf,$langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+		if (is_null($usertofilter))
+		{
+			$usertofilter = $user;
+		}
+
+		$out='';
+
+		$hideunselectables = false;
+		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+
+		if (empty($projectsListId))
+		{
+			if (empty($usertofilter->rights->projet->all->lire))
+			{
+				$projectstatic=new Project($this->db);
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1);
+			}
+		}
+
+		// Search all projects
+        $sql = 'SELECT f.rowid, f.ref as fref, "nolabel" as flabel, p.rowid as pid, f.ref,
+            p.title, p.fk_soc, p.fk_statut, p.public,';
+		$sql.= ' s.nom as name';
+		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
+		$sql.= ' '.MAIN_DB_PREFIX.'facture as f';
+		$sql.= " WHERE p.entity IN (".getEntity('project').")";
+		$sql.= " AND f.fk_projet = p.rowid AND f.fk_statut=0"; //Brouillons seulement
+		//if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		//if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		//if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		$sql.= " GROUP BY f.ref ORDER BY p.ref, f.ref ASC";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			// Use select2 selector
+			if (! empty($conf->use_javascript_ajax))
+			{
+				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+            	$out.=$comboenhancement;
+            	$morecss='minwidth200imp maxwidth500';
+			}
+
+			if (empty($option_only)) {
+				$out.= '<select class="valignmiddle flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'">';
+			}
+			if (! empty($show_empty)) {
+				$out.= '<option value="0" class="optiongrey">';
+				if (! is_numeric($show_empty)) $out.=$show_empty;
+				else $out.='&nbsp;';
+				$out.= '</option>';
+			}
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
+					{
+						// Do nothing
+					}
+					else
+					{
+						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
+						{
+							$i++;
+							continue;
+						}
+
+						$labeltoshow = '';
+
+						if ($showproject == 'all')
+						{
+							$labeltoshow.=dol_trunc($obj->ref, 18);     // Invoice ref
+							if ($obj->name) $labeltoshow.=' - '.$obj->name; // Soc name
+
+							$disabled=0;
+							if ($obj->fk_statut == Project::STATUS_DRAFT)
+							{
+								$disabled=1;
+								$labeltoshow.=' - '.$langs->trans("Draft");
+							}
+							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							{
+								if ($discard_closed == 2) $disabled=1;
+								$labeltoshow.=' - '.$langs->trans("Closed");
+							}
+							elseif ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							{
+								$disabled=1;
+								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+							}
+						}
+
+						if (!empty($selected) && $selected == $obj->rowid)
+						{
+							$out.= '<option value="'.$obj->rowid.'" selected';
+							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
+							$out.= '>'.$labeltoshow.'</option>';
+						}
+						else
+						{
+							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
+							{
+								$resultat='';
+							}
+							else
+							{
+								$resultat='<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat.=' disabled';
+								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
+								//else $labeltoshow.=' ('.$langs->trans("Private").')';
+								$resultat.='>';
+								$resultat.=$labeltoshow;
+								$resultat.='</option>';
+							}
+							$out.= $resultat;
+						}
+					}
+					$i++;
+				}
+			}
+			if (empty($option_only)) {
+				$out.= '</select>';
+			}
+
+			print $out;
+
+			$this->db->free($resql);
+			return $num;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 6857eddf44a..e382d63566d 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -21,6 +21,8 @@
  *	\brief      Fichier de la classe des fonctions predefinie de composants html autre
  */
 
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
 
 /**
  *	Classe permettant la generation de composants html autre
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8e7856759a7..7e16c83a71a 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018		Frédéric France			<frederic.france@netlogic.fr>
  *
  * 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
@@ -21,9 +21,9 @@
  */
 
 /**
- *	\file       htdocs/projet/tasks/time.php
- *	\ingroup    project
- *	\brief      Page to add new time spent on a task
+ *	\file		htdocs/projet/tasks/time.php
+ *	\ingroup	project
+ *	\brief		Page to add new time spent on a task
  */
 
 require '../../main.inc.php';
@@ -38,18 +38,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'bills', 'orders'));
 
-$action     = GETPOST('action', 'alpha');
+$action		= GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$confirm    = GETPOST('confirm', 'alpha');
-$cancel     = GETPOST('cancel', 'alpha');
-$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$confirm	= GETPOST('confirm', 'alpha');
+$cancel		= GETPOST('cancel', 'alpha');
+$toselect	= GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$optioncss  = GETPOST('optioncss', 'alpha');
+$optioncss	= GETPOST('optioncss', 'alpha');
 
-$id         = GETPOST('id', 'int');
-$projectid  = GETPOST('projectid', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$id			= GETPOST('id', 'int');
+$projectid	= GETPOST('projectid', 'int');
+$ref		= GETPOST('ref', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
 
@@ -68,14 +68,14 @@ $search_valuebilled = GETPOST('search_valuebilled', 'int');
 
 // Security check
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+//if ($user->socid > 0) $socid = $user->socid;	  // 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();
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) { $page = 0; }		// If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -113,20 +113,20 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_month = '';
 	$search_year = '';
 	$search_date = '';
-    $search_datehour = '';
-    $search_datewithhour = '';
-    $search_note = '';
-    $search_duration = '';
-    $search_value = '';
-    $search_date_creation = '';
-    $search_date_update = '';
-    $search_task_ref = '';
-    $search_task_label = '';
-    $search_user = 0;
-    $search_valuebilled = '';
-    $toselect = '';
-    $search_array_options = array();
-    $action = '';
+	$search_datehour = '';
+	$search_datewithhour = '';
+	$search_note = '';
+	$search_duration = '';
+	$search_value = '';
+	$search_date_creation = '';
+	$search_date_update = '';
+	$search_task_ref = '';
+	$search_task_label = '';
+	$search_user = 0;
+	$search_valuebilled = '';
+	$toselect = '';
+	$search_array_options = array();
+	$action = '';
 }
 
 if ($action == 'addtimespent' && $user->rights->projet->lire)
@@ -149,61 +149,61 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 
 	if (!$error)
 	{
-	    if ($id || $ref)
+		if ($id || $ref)
 		{
 			$object->fetch($id, $ref);
 		}
 		else
 		{
-		    if (!GETPOST('taskid', 'int') || GETPOST('taskid', 'int') < 0)
-		    {
-		        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), null, 'errors');
-		        $action = 'createtime';
-		        $error++;
-		    }
-            else
-            {
-                $object->fetch(GETPOST('taskid', 'int'));
-            }
+			if (!GETPOST('taskid', 'int') || GETPOST('taskid', 'int') < 0)
+			{
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), null, 'errors');
+				$action = 'createtime';
+				$error++;
+			}
+			else
+			{
+				$object->fetch(GETPOST('taskid', 'int'));
+			}
 		}
 
 		if (!$error)
 		{
-    		$object->fetch_projet();
+			$object->fetch_projet();
 
-    		if (empty($object->project->statut))
-    		{
-    			setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
-    			$action = 'createtime';
-    			$error++;
-    		}
-    		else
-    		{
-    			$object->timespent_note = $_POST["timespent_note"];
-    			if (GETPOST('progress', 'int') > 0) $object->progress = GETPOST('progress', 'int'); // If progress is -1 (not defined), we do not change value
-    			$object->timespent_duration = $_POST["timespent_durationhour"] * 60 * 60; // We store duration in seconds
-    			$object->timespent_duration += ($_POST["timespent_durationmin"] ? $_POST["timespent_durationmin"] : 0) * 60; // We store duration in seconds
-    	        if (GETPOST("timehour") != '' && GETPOST("timehour") >= 0)	// If hour was entered
-    	        {
-    				$object->timespent_date = dol_mktime(GETPOST("timehour"), GETPOST("timemin"), 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
-    				$object->timespent_withhour = 1;
-    	        }
-    	        else
-    			{
-    				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
-    			}
-    			$object->timespent_fk_user = $_POST["userid"];
-    			$result = $object->addTimeSpent($user);
-    			if ($result >= 0)
-    			{
-    				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-    			}
-    			else
-    			{
-    				setEventMessages($langs->trans($object->error), null, 'errors');
-    				$error++;
-    			}
-    		}
+			if (empty($object->project->statut))
+			{
+				setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
+				$action = 'createtime';
+				$error++;
+			}
+			else
+			{
+				$object->timespent_note = $_POST["timespent_note"];
+				if (GETPOST('progress', 'int') > 0) $object->progress = GETPOST('progress', 'int'); // If progress is -1 (not defined), we do not change value
+				$object->timespent_duration = $_POST["timespent_durationhour"] * 60 * 60; // We store duration in seconds
+				$object->timespent_duration += ($_POST["timespent_durationmin"] ? $_POST["timespent_durationmin"] : 0) * 60; // We store duration in seconds
+				if (GETPOST("timehour") != '' && GETPOST("timehour") >= 0)	// If hour was entered
+				{
+					$object->timespent_date = dol_mktime(GETPOST("timehour"), GETPOST("timemin"), 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
+					$object->timespent_withhour = 1;
+				}
+				else
+				{
+					$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
+				}
+				$object->timespent_fk_user = $_POST["userid"];
+				$result = $object->addTimeSpent($user);
+				if ($result >= 0)
+				{
+					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+				}
+				else
+				{
+					setEventMessages($langs->trans($object->error), null, 'errors');
+					$error++;
+				}
+			}
 		}
 	}
 	else
@@ -233,12 +233,12 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 		$object->timespent_old_duration = $_POST["old_duration"];
 		$object->timespent_duration = $_POST["new_durationhour"] * 60 * 60; // We store duration in seconds
 		$object->timespent_duration += $_POST["new_durationmin"] * 60; // We store duration in seconds
-        if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0)	// If hour was entered
-        {
+		if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0)	// If hour was entered
+		{
 			$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			$object->timespent_withhour = 1;
-        }
-        else
+		}
+		else
 		{
 			$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 		}
@@ -305,24 +305,24 @@ if (GETPOST('projectid', 'int') > 0)
 	$projectidforalltimes = GETPOST('projectid', 'int');
 
 	$result = $projectstatic->fetch($projectidforalltimes);
-    if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
-    $res = $projectstatic->fetch_optionals();
+	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+	$res = $projectstatic->fetch_optionals();
 }
 elseif (GETPOST('project_ref', 'alpha'))
 {
-    $projectstatic->fetch(0, GETPOST('project_ref', 'alpha'));
-    $projectidforalltimes = $projectstatic->id;
-    $withproject = 1;
+	$projectstatic->fetch(0, GETPOST('project_ref', 'alpha'));
+	$projectidforalltimes = $projectstatic->id;
+	$withproject = 1;
 }
 elseif ($id > 0)
 {
-    $object->fetch($id);
-    $result = $projectstatic->fetch($object->fk_project);
+	$object->fetch($id);
+	$result = $projectstatic->fetch($object->fk_project);
 }
 
 if ($action == 'confirm_generateinvoice')
 {
-    if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 
 
 	if (!($projectstatic->thirdparty->id > 0))
@@ -342,9 +342,26 @@ if ($action == 'confirm_generateinvoice')
 
 		$db->begin();
 		$idprod = GETPOST('productid', 'int');
+		$generateinvoicemode = GETPOST('generateinvoicemode', 'string');
+        $invoiceToUse = GETPOST('invoiceid', 'int');
+
+        $prodDurationHours = 1.0;
 		if ($idprod > 0)
 		{
 			$tmpproduct->fetch($idprod);
+            if ($tmpproduct->duration_unit=='i')
+                $prodDurationHours = 1./60;
+            if ($tmpproduct->duration_unit=='h')
+                $prodDurationHours = 1.;
+            if ($tmpproduct->duration_unit=='d')
+                $prodDurationHours = 24.;
+            if ($tmpproduct->duration_unit=='w')
+                $prodDurationHours = 24.*7;
+            if ($tmpproduct->duration_unit=='m')
+                $prodDurationHours = 24.*30;
+            if ($tmpproduct->duration_unit=='y')
+                $prodDurationHours = 24.*365;
+            $prodDurationHours *= $tmpproduct->duration_value;
 
 			$dataforprice = $tmpproduct->getSellPrice($mysoc, $projectstatic->thirdparty, 0);
 			$pu_ht = empty($dataforprice['pu_ht']) ? 0 : $dataforprice['pu_ht'];
@@ -354,73 +371,165 @@ if ($action == 'confirm_generateinvoice')
 		}
 		else
 		{
-		    $pu_ht = 0;
-		    $txtva = get_default_tva($mysoc, $projectstatic->thirdparty);
-		    $localtax1 = get_default_localtax($mysoc, $projectstatic->thirdparty, 1);
-		    $localtax2 = get_default_localtax($mysoc, $projectstatic->thirdparty, 2);
+			$pu_ht = 0;
+			$txtva = get_default_tva($mysoc, $projectstatic->thirdparty);
+			$localtax1 = get_default_localtax($mysoc, $projectstatic->thirdparty, 1);
+			$localtax2 = get_default_localtax($mysoc, $projectstatic->thirdparty, 2);
 		}
 
 		$tmpinvoice->socid = $projectstatic->thirdparty->id;
 		$tmpinvoice->date = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$tmpinvoice->fk_project = $projectstatic->id;
 
-		$result = $tmpinvoice->create($user);
-		if ($result <= 0)
-		{
-		    $error++;
-		    setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
-		}
+        if ($invoiceToUse) {
+            $tmpinvoice->fetch($invoiceToUse);
+        }
+        else {
+		    $result = $tmpinvoice->create($user);
+		    if ($result <= 0)
+		    {
+		    	$error++;
+		    	setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
+		    }
+        }
 
 		if (!$error)
 		{
-			$arrayoftasks = array();
-			foreach ($toselect as $key => $value)
-			{
-				// Get userid, timepent
-				$object->fetchTimeSpent($value);
-				$arrayoftasks[$object->timespent_fk_user]['timespent'] += $object->timespent_duration;
-				$arrayoftasks[$object->timespent_fk_user]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
-			}
-
-			foreach ($arrayoftasks as $userid => $value)
-			{
-				$fuser->fetch($userid);
-				//$pu_ht = $value['timespent'] * $fuser->thm;
-				$username = $fuser->getFullName($langs);
-
-				// Define qty per hour
-				$qtyhour = round($value['timespent'] / 3600, 2);
-				$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
-
-				// If no unit price known
-				if (empty($pu_ht))
-				{
-				    $pu_ht = price2num($value['totalvaluetodivideby3600'] / 3600, 'MU');
+			if ($generateinvoicemode=='onelineperuser') {
+					$arrayoftasks = array();
+				foreach ($toselect as $key => $value)
+					{
+					// Get userid, timepent
+					$object->fetchTimeSpent($value);
+					$arrayoftasks[$object->timespent_fk_user]['timespent'] += $object->timespent_duration;
+					$arrayoftasks[$object->timespent_fk_user]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
 				}
 
-				// Add lines
-				$lineid = $tmpinvoice->addline($langs->trans("TimeSpentForInvoice", $username).' : '.$qtyhourtext, $pu_ht, $qtyhour, $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
-
-				// Update lineid into line of timespent
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
-				$sql .= ' WHERE rowid in ('.join(',', $toselect).') AND fk_user = '.$userid;
-				$result = $db->query($sql);
-				if (!$result)
+				foreach ($arrayoftasks as $userid => $value)
 				{
-				    $error++;
-				    setEventMessages($db->lasterror(), null, 'errors');
-				    break;
+					$fuser->fetch($userid);
+					//$pu_ht = $value['timespent'] * $fuser->thm;
+					$username = $fuser->getFullName($langs);
+
+					// Define qty per hour
+					$qtyhour = $value['timespent'] / 3600;
+					$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+
+					// If no unit price known
+					if (empty($pu_ht))
+					{
+						$pu_ht = price2num($value['totalvaluetodivideby3600'] / 3600, 'MU');
+					}
+
+					// Add lines
+					$lineid = $tmpinvoice->addline($langs->trans("TimeSpentForInvoice", $username).' : '.$qtyhourtext, $pu_ht, round($qtyhour/$prodDurationHours, 2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
+
+					// Update lineid into line of timespent
+					$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
+					$sql .= ' WHERE rowid in ('.join(',', $toselect).') AND fk_user = '.$userid;
+					$result = $db->query($sql);
+					if (!$result)
+					{
+						$error++;
+						setEventMessages($db->lasterror(), null, 'errors');
+						break;
+					}
+				}
+			}
+			elseif ($generateinvoicemode=='onelineperperiod') {
+					$arrayoftasks = array();
+				foreach ($toselect as $key => $value)
+					{
+					// Get userid, timepent
+					$object->fetchTimeSpent($value);
+					$arrayoftasks[$object->timespent_id]['timespent'] = $object->timespent_duration;
+					$arrayoftasks[$object->timespent_id]['totalvaluetodivideby3600'] = $object->timespent_duration * $object->timespent_thm;
+					$arrayoftasks[$object->timespent_id]['note'] = $object->timespent_note;
+					$arrayoftasks[$object->timespent_id]['user'] = $object->timespent_fk_user;
+				}
+
+				foreach ($arrayoftasks as $timespent_id => $value)
+				{
+					$userid = $value['user'];
+					$fuser->fetch($userid);
+					//$pu_ht = $value['timespent'] * $fuser->thm;
+					$username = $fuser->getFullName($langs);
+
+					// Define qty per hour
+					$qtyhour = $value['timespent'] / 3600;
+					$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+
+					// If no unit price known
+					if (empty($pu_ht))
+					{
+						$pu_ht = price2num($value['totalvaluetodivideby3600'] / 3600, 'MU');
+					}
+
+					// Add lines
+					$lineid = $tmpinvoice->addline($value['note'], $pu_ht, round($qtyhour/$prodDurationHours, 2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
+
+					// Update lineid into line of timespent
+					$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
+					$sql .= ' WHERE rowid in ('.join(',', $toselect).') AND fk_user = '.$userid;
+					$result = $db->query($sql);
+					if (!$result)
+					{
+						$error++;
+						setEventMessages($db->lasterror(), null, 'errors');
+						break;
+					}
+				}
+			}
+			elseif ($generateinvoicemode=='onelinepertask') {
+					$arrayoftasks = array();
+				foreach ($toselect as $key => $value)
+					{
+					// Get userid, timepent
+					$object->fetchTimeSpent($value);
+					// $object->id is the task id
+					$arrayoftasks[$object->id]['timespent'] += $object->timespent_duration;
+					$arrayoftasks[$object->id]['totalvaluetodivideby3600'] += $object->timespent_duration * $object->timespent_thm;
+				}
+
+				foreach ($arrayoftasks as $task_id => $value)
+				{
+					$ftask = new Task($db);
+					$ftask->fetch($task_id);
+					// Define qty per hour
+					$qtyhour = $value['timespent'] / 3600;
+					$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+
+					// If no unit price known
+					if (empty($pu_ht))
+					{
+						$pu_ht = price2num($value['totalvaluetodivideby3600'] / 3600, 'MU');
+					}
+
+					// Add lines
+					$lineName = $ftask->ref.' - '.$ftask->label;
+					$lineid = $tmpinvoice->addline($lineName, $pu_ht, round($qtyhour/$prodDurationHours, 2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
+
+					// Update lineid into line of timespent
+					$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
+					$sql .= ' WHERE rowid in ('.join(',', $toselect).')';
+					$result = $db->query($sql);
+					if (!$result)
+					{
+						$error++;
+						setEventMessages($db->lasterror(), null, 'errors');
+						break;
+					}
 				}
 			}
 		}
 
 		if (!$error)
 		{
-		    $urltoinvoice = $tmpinvoice->getNomUrl(0);
-		    setEventMessages($langs->trans("InvoiceGeneratedFromTimeSpent", $urltoinvoice), null, 'mesgs');
-		    //var_dump($tmpinvoice);
+			$urltoinvoice = $tmpinvoice->getNomUrl(0);
+			setEventMessages($langs->trans("InvoiceGeneratedFromTimeSpent", $urltoinvoice), null, 'mesgs');
+			//var_dump($tmpinvoice);
 
-		    $db->commit();
+			$db->commit();
 		}
 		else
 		{
@@ -447,14 +556,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 {
 	/*
 	 * Fiche projet en mode visu
- 	 */
-    if ($projectidforalltimes > 0)
-    {
-        $result = $projectstatic->fetch($projectidforalltimes);
-        if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
-        $res = $projectstatic->fetch_optionals();
-    }
-    elseif ($object->fetch($id, $ref) >= 0)
+	 */
+	if ($projectidforalltimes > 0)
+	{
+		$result = $projectstatic->fetch($projectidforalltimes);
+		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+		$res = $projectstatic->fetch_optionals();
+	}
+	elseif ($object->fetch($id, $ref) >= 0)
 	{
 		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
 		$result = $projectstatic->fetch($object->fk_project);
@@ -463,10 +572,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$res = $projectstatic->fetch_optionals();
 
 		$object->project = clone $projectstatic;
-    }
+	}
 
-    $userRead = $projectstatic->restrictedProjectArea($user, 'read');
-    $linktocreatetime = '';
+	$userRead = $projectstatic->restrictedProjectArea($user, 'read');
+	$linktocreatetime = '';
 
 	if ($projectstatic->id > 0)
 	{
@@ -482,122 +591,122 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 			// Project card
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+			$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>';
+			$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)
-            {
-                $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-                $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-            }
+			// Define a complementary filter for search of next/prev ref.
+			if (!$user->rights->projet->all->lire)
+			{
+				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			}
 
-            dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			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 '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border tableforfield centpercent">';
+			print '<table class="border tableforfield centpercent">';
 
-            // Usage
-            print '<tr><td class="tdtop">';
-            print $langs->trans("Usage");
-            print '</td>';
-            print '<td>';
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowOpportunity");
-            	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-            	print '<br>';
-            }
-            if (empty($conf->global->PROJECT_HIDE_TASKS))
-            {
-            	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowTasks");
-            	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-            	print '<br>';
-            }
-            if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-            	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectBillTimeDescription");
-            	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-            	print '<br>';
-            }
-            print '</td></tr>';
+			// Usage
+			print '<tr><td class="tdtop">';
+			print $langs->trans("Usage");
+			print '</td>';
+			print '<td>';
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowOpportunity");
+				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+				print '<br>';
+			}
+			if (empty($conf->global->PROJECT_HIDE_TASKS))
+			{
+				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowTasks");
+				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+				print '<br>';
+			}
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+			{
+				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectBillTimeDescription");
+				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+				print '<br>';
+			}
+			print '</td></tr>';
 
-            // 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>';
+			// 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>';
-            $start = dol_print_date($projectstatic->date_start, 'day');
-            print ($start ? $start : '?');
-            $end = dol_print_date($projectstatic->date_end, 'day');
-            print ' - ';
-            print ($end ? $end : '?');
-            if ($projectstatic->hasDelay()) print img_warning("Late");
-            print '</td></tr>';
+			// Date start - end
+			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+			$start = dol_print_date($projectstatic->date_start, 'day');
+			print ($start ? $start : '?');
+			$end = dol_print_date($projectstatic->date_end, 'day');
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($projectstatic->hasDelay()) print img_warning("Late");
+			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>';
+			// 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';
+			// Other attributes
+			$cols = 2;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '<div class="fichehalfright">';
-            print '<div class="ficheaddleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '</div>';
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border tableforfield" width="100%">';
+			print '<table class="border tableforfield" width="100%">';
 
-            // Description
-            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-            print nl2br($projectstatic->description);
-            print '</td></tr>';
+			// Description
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+			print nl2br($projectstatic->description);
+			print '</td></tr>';
 
-            // Bill time
-            if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-	            print '<tr><td>'.$langs->trans("BillTime").'</td><td>';
-	            print yn($projectstatic->usage_bill_time);
-	            print '</td></tr>';
-            }
+			// Bill time
+			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
+			{
+				print '<tr><td>'.$langs->trans("BillTime").'</td><td>';
+				print yn($projectstatic->usage_bill_time);
+				print '</td></tr>';
+			}
 
-            // Categories
-            if ($conf->categorie->enabled) {
-                print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id, 'project', 1);
-                print "</td></tr>";
-            }
+			// Categories
+			if ($conf->categorie->enabled) {
+				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+				print $form->showCategories($projectstatic->id, 'project', 1);
+				print "</td></tr>";
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '</div>';
-            print '</div>';
+			print '</div>';
+			print '</div>';
+			print '</div>';
 
-            print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 
 			dol_fiche_end();
 
@@ -605,46 +714,46 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		}
 
 		// Link to create time
-        $linktocreatetimeBtnStatus = 0;
-        $linktocreatetimeUrl = '';
-        $linktocreatetimeHelpText = '';
-        if ($user->rights->projet->all->lire || $user->rights->projet->lire)	// To enter time, read permission is enough
+		$linktocreatetimeBtnStatus = 0;
+		$linktocreatetimeUrl = '';
+		$linktocreatetimeHelpText = '';
+		if ($user->rights->projet->all->lire || $user->rights->projet->lire)	// To enter time, read permission is enough
 		{
 			if ($projectstatic->public || $userRead > 0)
-		    {
-                $linktocreatetimeBtnStatus = 1;
+			{
+				$linktocreatetimeBtnStatus = 1;
 
-		    	if (!empty($projectidforalltimes))		// We are on tab 'Time Spent' of project
-		    	{
-		    		$backtourl = $_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.($withproject ? '&withproject=1' : '');
-                    $linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
-		    	}
-		    	else									// We are on tab 'Time Spent' of task
-		    	{
-		    		$backtourl = $_SERVER['PHP_SELF'].'?id='.$object->id.($withproject ? '&withproject=1' : '');
-                    $linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
-		    	}
-		    }
-		    else
-		    {
-                $linktocreatetimeBtnStatus = -2;
-                $linktocreatetimeHelpText = $langs->trans("NotOwnerOfProject");
-		    }
+				if (!empty($projectidforalltimes))		// We are on tab 'Time Spent' of project
+				{
+					$backtourl = $_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.($withproject ? '&withproject=1' : '');
+					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
+				}
+				else									// We are on tab 'Time Spent' of task
+				{
+					$backtourl = $_SERVER['PHP_SELF'].'?id='.$object->id.($withproject ? '&withproject=1' : '');
+					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
+				}
+			}
+			else
+			{
+				$linktocreatetimeBtnStatus = -2;
+				$linktocreatetimeHelpText = $langs->trans("NotOwnerOfProject");
+			}
 		}
 
-        $linktocreatetime = dolGetButtonTitle($langs->trans('AddTimeSpent'), $linktocreatetimeHelpText, 'fa fa-plus-circle', $linktocreatetimeUrl, '', $linktocreatetimeBtnStatus);
-    }
+		$linktocreatetime = dolGetButtonTitle($langs->trans('AddTimeSpent'), $linktocreatetimeHelpText, 'fa fa-plus-circle', $linktocreatetimeUrl, '', $linktocreatetimeBtnStatus);
+	}
 
 	$massactionbutton = '';
 	if ($projectstatic->usage_bill_time)
 	{
-	    $arrayofmassactions = array(
-	        'generateinvoice'=>$langs->trans("GenerateBill"),
-	        //'builddoc'=>$langs->trans("PDFMerge"),
-	    );
-	    //if ($user->rights->projet->creer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	    if (in_array($massaction, array('presend', 'predelete', 'generateinvoice'))) $arrayofmassactions = array();
-	    $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+		$arrayofmassactions = array(
+			'generateinvoice'=>$langs->trans("GenerateBill"),
+			//'builddoc'=>$langs->trans("PDFMerge"),
+		);
+		//if ($user->rights->projet->creer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+		if (in_array($massaction, array('presend', 'predelete', 'generateinvoice'))) $arrayofmassactions = array();
+		$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 	}
 
 	// Show section with information of task. If id of task is not defined and project id defined, then $projectidforalltimes is not empty.
@@ -673,17 +782,17 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		// Project
 		if (empty($withproject))
 		{
-		    $morehtmlref .= '<div class="refidno">';
-		    $morehtmlref .= $langs->trans("Project").': ';
-		    $morehtmlref .= $projectstatic->getNomUrl(1);
-		    $morehtmlref .= '<br>';
+			$morehtmlref .= '<div class="refidno">';
+			$morehtmlref .= $langs->trans("Project").': ';
+			$morehtmlref .= $projectstatic->getNomUrl(1);
+			$morehtmlref .= '<br>';
 
-		    // Third party
-	    	$morehtmlref .= $langs->trans("ThirdParty").': ';
-	    	if (is_object($projectstatic->thirdparty)) {
-	    		$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-	    	}
-		    $morehtmlref .= '</div>';
+			// Third party
+			$morehtmlref .= $langs->trans("ThirdParty").': ';
+			if (is_object($projectstatic->thirdparty)) {
+				$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+			}
+			$morehtmlref .= '</div>';
 		}
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -691,7 +800,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield centpercent">';
 
 		// Date start - Date end
@@ -757,126 +866,136 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST('lineid', 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_delete", '', '', 1);
 		}
 
-	    // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-	    $hookmanager->initHooks(array('tasktimelist'));
+		// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+		$hookmanager->initHooks(array('tasktimelist'));
 
-	    // Definition of fields for list
-	    $arrayfields = array();
-	    $arrayfields['t.task_date'] = array('label'=>$langs->trans("Date"), 'checked'=>1);
-		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-	    {
-    	    $arrayfields['t.task_ref'] = array('label'=>$langs->trans("RefTask"), 'checked'=>1);
-    	    $arrayfields['t.task_label'] = array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
-	    }
-	    $arrayfields['author'] = array('label'=>$langs->trans("By"), 'checked'=>1);
-	    $arrayfields['t.note'] = array('label'=>$langs->trans("Note"), 'checked'=>1);
-	    $arrayfields['t.task_duration'] = array('label'=>$langs->trans("Duration"), 'checked'=>1);
-	    $arrayfields['value'] = array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled) ? 0 : 1));
-	    $arrayfields['valuebilled'] = array('label'=>$langs->trans("Billed"), 'checked'=>1, 'enabled'=>(((!empty($conf->global->PROJECT_HIDE_TASKS) || empty($conf->global->PROJECT_BILL_TIME_SPENT)) ? 0 : 1) && $projectstatic->usage_bill_time));
-	    // Extra fields
-	    if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-	    {
-	    	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	    	{
-	    		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-	    			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	    	}
-	    }
-	    $arrayfields = dol_sort_array($arrayfields, 'position');
+		// Definition of fields for list
+		$arrayfields = array();
+		$arrayfields['t.task_date'] = array('label'=>$langs->trans("Date"), 'checked'=>1);
+		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
+		{
+			$arrayfields['t.task_ref'] = array('label'=>$langs->trans("RefTask"), 'checked'=>1);
+			$arrayfields['t.task_label'] = array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
+		}
+		$arrayfields['author'] = array('label'=>$langs->trans("By"), 'checked'=>1);
+		$arrayfields['t.note'] = array('label'=>$langs->trans("Note"), 'checked'=>1);
+		$arrayfields['t.task_duration'] = array('label'=>$langs->trans("Duration"), 'checked'=>1);
+		$arrayfields['value'] = array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled) ? 0 : 1));
+		$arrayfields['valuebilled'] = array('label'=>$langs->trans("Billed"), 'checked'=>1, 'enabled'=>(((!empty($conf->global->PROJECT_HIDE_TASKS) || empty($conf->global->PROJECT_BILL_TIME_SPENT)) ? 0 : 1) && $projectstatic->usage_bill_time));
+		// Extra fields
+		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
+		{
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+			{
+				if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
+					$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+			}
+		}
+		$arrayfields = dol_sort_array($arrayfields, 'position');
 
-	    $param = '';
-	    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	    if ($search_month > 0) $param .= '&search_month='.urlencode($search_month);
-	    if ($search_year > 0) $param .= '&search_year='.urlencode($search_year);
-	    if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
-	    if ($search_task_ref != '') $param .= '&search_task_ref='.urlencode($search_task_ref);
-	    if ($search_task_label != '') $param .= '&search_task_label='.urlencode($search_task_label);
-	    if ($search_note != '') $param .= '&search_note='.urlencode($search_note);
-	    if ($search_duration != '') $param .= '&amp;search_field2='.urlencode($search_duration);
-	    if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-	    /*
-	     // Add $param from extra fields
-	     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-	     */
-	    if ($id) $param .= '&id='.urlencode($id);
-	    if ($projectid) $param .= '&projectid='.urlencode($projectid);
-	    if ($withproject) $param .= '&withproject='.urlencode($withproject);
+		$param = '';
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+		if ($search_month > 0) $param .= '&search_month='.urlencode($search_month);
+		if ($search_year > 0) $param .= '&search_year='.urlencode($search_year);
+		if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
+		if ($search_task_ref != '') $param .= '&search_task_ref='.urlencode($search_task_ref);
+		if ($search_task_label != '') $param .= '&search_task_label='.urlencode($search_task_label);
+		if ($search_note != '') $param .= '&search_note='.urlencode($search_note);
+		if ($search_duration != '') $param .= '&amp;search_field2='.urlencode($search_duration);
+		if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+		/*
+		 // Add $param from extra fields
+		 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+		 */
+		if ($id) $param .= '&id='.urlencode($id);
+		if ($projectid) $param .= '&projectid='.urlencode($projectid);
+		if ($withproject) $param .= '&withproject='.urlencode($withproject);
 
-	    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
-	    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	    if ($action == 'editline') print '<input type="hidden" name="action" value="updateline">';
-	    elseif ($action == 'splitline') print '<input type="hidden" name="action" value="updatesplitline">';
-	    elseif ($action == 'createtime' && $user->rights->projet->lire) print '<input type="hidden" name="action" value="addtimespent">';
-	    elseif ($massaction == 'generateinvoice' && $user->rights->facture->lire) print '<input type="hidden" name="action" value="confirm_generateinvoice">';
-	    else print '<input type="hidden" name="action" value="list">';
-	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	    print '<input type="hidden" name="page" value="'.$page.'">';
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+		if ($action == 'editline') print '<input type="hidden" name="action" value="updateline">';
+		elseif ($action == 'splitline') print '<input type="hidden" name="action" value="updatesplitline">';
+		elseif ($action == 'createtime' && $user->rights->projet->lire) print '<input type="hidden" name="action" value="addtimespent">';
+		elseif ($massaction == 'generateinvoice' && $user->rights->facture->lire) print '<input type="hidden" name="action" value="confirm_generateinvoice">';
+		else print '<input type="hidden" name="action" value="list">';
+		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+		print '<input type="hidden" name="page" value="'.$page.'">';
 
-	    print '<input type="hidden" name="id" value="'.$id.'">';
-	    print '<input type="hidden" name="projectid" value="'.$projectidforalltimes.'">';
-	    print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		print '<input type="hidden" name="id" value="'.$id.'">';
+		print '<input type="hidden" name="projectid" value="'.$projectidforalltimes.'">';
+		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
-	    if ($massaction == 'generateinvoice')
-	    {
-	        //var_dump($_REQUEST);
-	        print '<input type="hidden" name="massaction" value="confirm_createbills">';
+		if ($massaction == 'generateinvoice')
+		{
+			//var_dump($_REQUEST);
+			print '<input type="hidden" name="massaction" value="confirm_createbills">';
 
-	        print '<table class="noborder" width="100%" >';
-	        print '<tr>';
-	        print '<td class="titlefield">';
-	        print $langs->trans('DateInvoice');
-	        print '</td>';
-	        print '<td>';
-	        print $form->selectDate('', '', '', '', '', '', 1, 1);
-	        print '</td>';
-	        print '</tr>';
-	        print '<tr>';
-	        print '<td>';
-	        print $langs->trans('Mode');
-	        print '</td>';
-	        print '<td>';
-	        $tmparray = array(
-	            'onelineperuser'=>'OneLinePerUser',
-	            //'onelinepertask'=>'OneLinePerTask',
-	        );
-	        print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
-	        print '</td>';
-	        print '</tr>';
-	        if ($conf->service->enabled)
-	        {
-    	        print '<tr>';
-    	        print '<td>';
-    	        print $langs->trans('ServiceToUseOnLines');
-    	        print '</td>';
-    	        print '<td>';
-    	        $form->select_produits('', 'productid', '1', 0, 0, 1, 2, '', 0, array(), 0, 'None', 0, 'maxwidth500');
-    	        print '</td>';
-    	        print '</tr>';
-	        }
-	        /*print '<tr>';
-	        print '<td>';
-	        print $langs->trans('ValidateInvoices');
-	        print '</td>';
-	        print '<td>';
-            print $form->selectyesno('validate_invoices', 0, 1);
-	        print '</td>';
-	        print '</tr>';*/
-	        print '</table>';
+			print '<table class="noborder" width="100%" >';
+			print '<tr>';
+			print '<td class="titlefield">';
+			print $langs->trans('DateInvoice');
+			print '</td>';
+			print '<td>';
+			print $form->selectDate('', '', '', '', '', '', 1, 1);
+			print '</td>';
+			print '</tr>';
+			print '<tr>';
+			print '<td>';
+			print $langs->trans('Mode');
+			print '</td>';
+			print '<td>';
+			$tmparray = array(
+				'onelineperuser'=>'OneLinePerUser',
+				'onelinepertask'=>'OneLinePerTask',
+				'onelineperperiod'=>'OneLinePerPeriod',
+			);
+			print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
+			print '</td>';
+			print '</tr>';
+			if ($conf->service->enabled)
+			{
+				print '<tr>';
+				print '<td>';
+				print $langs->trans('ServiceToUseOnLines');
+				print '</td>';
+				print '<td>';
+				$form->select_produits('', 'productid', '1', 0, 0, 1, 2, '', 0, array(), 0, 'None', 0, 'maxwidth500');
+				print '</td>';
+				print '</tr>';
+			}
+			print '<tr>';
+			print '<td class="titlefield">';
+			print $langs->trans('InvoiceToUse');
+			print '</td>';
+			print '<td>';
+            $form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'),
+			1, 0, 0, 'maxwidth500', '', 'all');
+			print '</td>';
+			print '</tr>';
+			/*print '<tr>';
+			print '<td>';
+			print $langs->trans('ValidateInvoices');
+			print '</td>';
+			print '<td>';
+			print $form->selectyesno('validate_invoices', 0, 1);
+			print '</td>';
+			print '</tr>';*/
+			print '</table>';
 
-	        print '<br>';
-	        print '<div class="center">';
-	        print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('GenerateBill').'">  ';
-	        print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
-	        print '</div>';
-	        print '<br>';
-	    }
+			print '<br>';
+			print '<div class="center">';
+			print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('GenerateBill').'">  ';
+			print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+			print '</div>';
+			print '<br>';
+		}
 
 		/*
-		 *  List of time spent
+		 *	List of time spent
 		 */
 		$tasks = array();
 
@@ -905,31 +1024,31 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$nbtotalofrecords = '';
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 		{
-		    $resql = $db->query($sql);
-		    $nbtotalofrecords = $db->num_rows($resql);
-		    if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
-		    {
-		        $page = 0;
-		        $offset = 0;
-		    }
+			$resql = $db->query($sql);
+			$nbtotalofrecords = $db->num_rows($resql);
+			if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
+			{
+				$page = 0;
+				$offset = 0;
+			}
 		}
 		// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
 		if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 		{
-		    $num = $nbtotalofrecords;
+			$num = $nbtotalofrecords;
 		}
 		else
 		{
-		    $sql .= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 
-		    $resql = $db->query($sql);
-		    if (!$resql)
-		    {
-		        dol_print_error($db);
-		        exit;
-		    }
+			$resql = $db->query($sql);
+			if (!$resql)
+			{
+				dol_print_error($db);
+				exit;
+			}
 
-		    $num = $db->num_rows($resql);
+			$num = $db->num_rows($resql);
 		}
 
 		if ($num >= 0)
@@ -944,11 +1063,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			}
 			else
 			{
-			    print '<!-- List of time spent for project -->'."\n";
+				print '<!-- List of time spent for project -->'."\n";
 
-			    $title = $langs->trans("ListTaskTimeForTask");
+				$title = $langs->trans("ListTaskTimeForTask");
 
-			    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit);
+				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit);
 			}
 
 			$i = 0;
@@ -971,9 +1090,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		if ($action == 'createtime' && $user->rights->projet->lire)
 		{
 			print '<!-- table to add time spent -->'."\n";
-            if (!empty($id)) print '<input type="hidden" name="taskid" value="'.$id.'">';
+			if (!empty($id)) print '<input type="hidden" name="taskid" value="'.$id.'">';
 
-            print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 			print '<table class="noborder nohover centpercent">';
 
 			print '<tr class="liste_titre">';
@@ -985,7 +1104,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			print '<td>'.$langs->trans("ProgressDeclared").'</td>';
 			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
 			{
-			    print '<td></td>';
+				print '<td></td>';
 			}
 			print '<td></td>';
 			print "</tr>\n";
@@ -1002,9 +1121,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			// Task
 			if (empty($id))
 			{
-    			print '<td class="maxwidthonsmartphone">';
-    			$formproject->selectTasks(-1, GETPOST('taskid', 'int'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
-    			print '</td>';
+				print '<td class="maxwidthonsmartphone">';
+				$formproject->selectTasks(-1, GETPOST('taskid', 'int'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
+				print '</td>';
 			}
 
 			// Contributor
@@ -1048,8 +1167,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			// Invoiced
 			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
 			{
-			    print '<td>';
-			    print '</td>';
+				print '<td>';
+				print '</td>';
 			}
 
 			print '<td class="center">';
@@ -1073,16 +1192,16 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 		if (!empty($moreforfilter))
 		{
-		    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-		    print $moreforfilter;
-		    print '</div>';
+			print '<div class="liste_titre liste_titre_bydiv centpercent">';
+			print $moreforfilter;
+			print '</div>';
 		}
 
 		$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 		$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 		$selectedfields .= (is_array($arrayofmassactions) && count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-        print '<div class="div-table-responsive">';
+		print '<div class="div-table-responsive">';
 		print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 		// Fields title search
@@ -1096,23 +1215,23 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			$formother->select_year($search_year, 'search_year', 1, 20, 5);
 			print '</td>';
 		}
-		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-        {
-            if (!empty($arrayfields['t.task_ref']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
-            if (!empty($arrayfields['t.task_label']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
-        }
-        // Author
-        if (!empty($arrayfields['author']['checked'])) print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200').'</td>';
+		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
+		{
+			if (!empty($arrayfields['t.task_ref']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
+			if (!empty($arrayfields['t.task_label']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
+		}
+		// Author
+		if (!empty($arrayfields['author']['checked'])) print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200').'</td>';
 		// Note
-        if (!empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_note" value="'.dol_escape_htmltag($search_note).'"></td>';
+		if (!empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_note" value="'.dol_escape_htmltag($search_note).'"></td>';
 		// Duration
-        if (!empty($arrayfields['t.task_duration']['checked'])) print '<td class="liste_titre right"></td>';
+		if (!empty($arrayfields['t.task_duration']['checked'])) print '<td class="liste_titre right"></td>';
 		// Value in main currency
-        if (!empty($arrayfields['value']['checked'])) print '<td class="liste_titre"></td>';
-        // Value billed
-        if (!empty($arrayfields['valuebilled']['checked'])) print '<td class="liste_titre center">'.$form->selectyesno('search_valuebilled', $search_valuebilled, 1, false, 1).'</td>';
+		if (!empty($arrayfields['value']['checked'])) print '<td class="liste_titre"></td>';
+		// Value billed
+		if (!empty($arrayfields['valuebilled']['checked'])) print '<td class="liste_titre center">'.$form->selectyesno('search_valuebilled', $search_valuebilled, 1, false, 1).'</td>';
 
-        /*
+		/*
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 		*/
@@ -1128,26 +1247,26 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		print '</tr>'."\n";
 
 		print '<tr class="liste_titre">';
-		if (!empty($arrayfields['t.task_date']['checked']))      print_liste_field_titre($arrayfields['t.task_date']['label'], $_SERVER['PHP_SELF'], 't.task_date,t.task_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
-		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-        {
-            if (!empty($arrayfields['t.task_ref']['checked']))   print_liste_field_titre($arrayfields['t.task_ref']['label'], $_SERVER['PHP_SELF'], 'pt.ref', '', $param, '', $sortfield, $sortorder);
-            if (!empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'], $_SERVER['PHP_SELF'], 'pt.label', '', $param, '', $sortfield, $sortorder);
-        }
-        if (!empty($arrayfields['author']['checked']))           print_liste_field_titre($arrayfields['author']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-		if (!empty($arrayfields['t.note']['checked']))           print_liste_field_titre($arrayfields['t.note']['label'], $_SERVER['PHP_SELF'], 't.note', '', $param, '', $sortfield, $sortorder);
+		if (!empty($arrayfields['t.task_date']['checked']))		 print_liste_field_titre($arrayfields['t.task_date']['label'], $_SERVER['PHP_SELF'], 't.task_date,t.task_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
+		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
+		{
+			if (!empty($arrayfields['t.task_ref']['checked']))	 print_liste_field_titre($arrayfields['t.task_ref']['label'], $_SERVER['PHP_SELF'], 'pt.ref', '', $param, '', $sortfield, $sortorder);
+			if (!empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'], $_SERVER['PHP_SELF'], 'pt.label', '', $param, '', $sortfield, $sortorder);
+		}
+		if (!empty($arrayfields['author']['checked']))			 print_liste_field_titre($arrayfields['author']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+		if (!empty($arrayfields['t.note']['checked']))			 print_liste_field_titre($arrayfields['t.note']['label'], $_SERVER['PHP_SELF'], 't.note', '', $param, '', $sortfield, $sortorder);
 		if (!empty($arrayfields['t.task_duration']['checked']))  print_liste_field_titre($arrayfields['t.task_duration']['label'], $_SERVER['PHP_SELF'], 't.task_duration', '', $param, '', $sortfield, $sortorder, 'right ');
-		if (!empty($arrayfields['value']['checked']))            print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		if (!empty($arrayfields['valuebilled']['checked']))      print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, '', $sortfield, $sortorder, 'center ');
+		if (!empty($arrayfields['value']['checked']))			 print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+		if (!empty($arrayfields['valuebilled']['checked']))		 print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, '', $sortfield, $sortorder, 'center ');
 		/*
-    	// Extra fields
+		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 		*/
-	    // Hook fields
+		// Hook fields
 		$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-        $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-    	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'width="80"', $sortfield, $sortorder, 'center maxwidthsearch ');
+		$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'width="80"', $sortfield, $sortorder, 'center maxwidthsearch ');
 		print "</tr>\n";
 
 		$tasktmp = new Task($db);
@@ -1162,7 +1281,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$totalarray = array();
 		foreach ($tasks as $task_time)
 		{
-		    if ($i >= $limit) break;
+			if ($i >= $limit) break;
 
 			print '<tr class="oddeven">';
 
@@ -1172,125 +1291,125 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			// Date
 			if (!empty($arrayfields['t.task_date']['checked']))
 			{
-    			print '<td class="nowrap">';
-    			if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-    			{
-    				if (empty($task_time->task_date_withhour))
-    				{
-    					print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-    				}
-    				else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
-    			}
-    			else
-    			{
-    				print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
-    			}
-    			print '</td>';
-    			if (!$i) $totalarray['nbfield']++;
+				print '<td class="nowrap">';
+				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
+				{
+					if (empty($task_time->task_date_withhour))
+					{
+						print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
+					}
+					else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+				}
+				else
+				{
+					print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
+				}
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 
 			// Task ref
-            if (!empty($arrayfields['t.task_ref']['checked']))
-            {
-        		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-    			{
-        			print '<td class="nowrap">';
-        			$tasktmp->id = $task_time->fk_task;
-        			$tasktmp->ref = $task_time->ref;
-        			$tasktmp->label = $task_time->label;
-        			print $tasktmp->getNomUrl(1, 'withproject', 'time');
-        			print '</td>';
-        			if (!$i) $totalarray['nbfield']++;
-    			}
-            }
+			if (!empty($arrayfields['t.task_ref']['checked']))
+			{
+				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
+				{
+					print '<td class="nowrap">';
+					$tasktmp->id = $task_time->fk_task;
+					$tasktmp->ref = $task_time->ref;
+					$tasktmp->label = $task_time->label;
+					print $tasktmp->getNomUrl(1, 'withproject', 'time');
+					print '</td>';
+					if (!$i) $totalarray['nbfield']++;
+				}
+			}
 
 			// Task label
-            if (!empty($arrayfields['t.task_label']['checked']))
-            {
-        		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-    			{
-        			print '<td class="nowrap">';
-        			print $task_time->label;
-        			print '</td>';
-        			if (!$i) $totalarray['nbfield']++;
-    			}
-            }
+			if (!empty($arrayfields['t.task_label']['checked']))
+			{
+				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
+				{
+					print '<td class="nowrap">';
+					print $task_time->label;
+					print '</td>';
+					if (!$i) $totalarray['nbfield']++;
+				}
+			}
 
-            // User
-            if (!empty($arrayfields['author']['checked']))
-            {
-                print '<td>';
-    			if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-    			{
-			        if (empty($object->id)) $object->fetch($id);
-    			    $contactsoftask = $object->getListContactId('internal');
-    				if (!in_array($task_time->fk_user, $contactsoftask)) {
-    					$contactsoftask[] = $task_time->fk_user;
-    				}
-    				if (count($contactsoftask) > 0) {
-    					print img_object('', 'user', 'class="hideonsmartphone"');
-    					print $form->select_dolusers($task_time->fk_user, 'userid_line', 0, '', 0, '', $contactsoftask);
-    				} else {
-    					print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
-    				}
-    			}
-    			else
-    			{
-    				$userstatic->id         = $task_time->fk_user;
-    				$userstatic->lastname = $task_time->lastname;
-    				$userstatic->firstname 	= $task_time->firstname;
-    				$userstatic->photo      = $task_time->photo;
-    				$userstatic->statut     = $task_time->user_status;
-    				print $userstatic->getNomUrl(-1);
-    			}
-    			print '</td>';
-    			if (!$i) $totalarray['nbfield']++;
-            }
+			// User
+			if (!empty($arrayfields['author']['checked']))
+			{
+				print '<td>';
+				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
+				{
+					if (empty($object->id)) $object->fetch($id);
+					$contactsoftask = $object->getListContactId('internal');
+					if (!in_array($task_time->fk_user, $contactsoftask)) {
+						$contactsoftask[] = $task_time->fk_user;
+					}
+					if (count($contactsoftask) > 0) {
+						print img_object('', 'user', 'class="hideonsmartphone"');
+						print $form->select_dolusers($task_time->fk_user, 'userid_line', 0, '', 0, '', $contactsoftask);
+					} else {
+						print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
+					}
+				}
+				else
+				{
+					$userstatic->id			= $task_time->fk_user;
+					$userstatic->lastname = $task_time->lastname;
+					$userstatic->firstname	= $task_time->firstname;
+					$userstatic->photo		= $task_time->photo;
+					$userstatic->statut		= $task_time->user_status;
+					print $userstatic->getNomUrl(-1);
+				}
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
 
 			// Note
-            if (!empty($arrayfields['t.note']['checked']))
-            {
-                print '<td class="left">';
-    			if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-    			{
-    				print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-    			}
-    			else
-    			{
-    				print dol_nl2br($task_time->note);
-    			}
-    			print '</td>';
-    			if (!$i) $totalarray['nbfield']++;
-            }
-            elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-            {
-                print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
-            }
+			if (!empty($arrayfields['t.note']['checked']))
+			{
+				print '<td class="left">';
+				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
+				{
+					print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
+				}
+				else
+				{
+					print dol_nl2br($task_time->note);
+				}
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
+			{
+				print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
+			}
 
 			// Time spent
-            if (!empty($arrayfields['t.task_duration']['checked']))
-            {
-    			print '<td class="right">';
-    			if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-    			{
-    				print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
-    				print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
-    			}
-    			else
-    			{
-    				print convertSecondToTime($task_time->task_duration, 'allhourmin');
-    			}
-    			print '</td>';
-    			if (!$i) $totalarray['nbfield']++;
-    			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.task_duration';
-    			$totalarray['val']['t.task_duration'] += $task_time->task_duration;
-    			if (!$i) $totalarray['totaldurationfield'] = $totalarray['nbfield'];
-    			$totalarray['totalduration'] += $task_time->task_duration;
-            }
+			if (!empty($arrayfields['t.task_duration']['checked']))
+			{
+				print '<td class="right">';
+				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
+				{
+					print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
+					print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
+				}
+				else
+				{
+					print convertSecondToTime($task_time->task_duration, 'allhourmin');
+				}
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.task_duration';
+				$totalarray['val']['t.task_duration'] += $task_time->task_duration;
+				if (!$i) $totalarray['totaldurationfield'] = $totalarray['nbfield'];
+				$totalarray['totalduration'] += $task_time->task_duration;
+			}
 
 			// Value spent
-            if (!empty($arrayfields['value']['checked']))
-            {
+			if (!empty($arrayfields['value']['checked']))
+			{
 				print '<td class="right">';
 				$value = price2num($task_time->thm * $task_time->task_duration / 3600);
 				print price($value, 1, $langs, 1, -1, -1, $conf->currency);
@@ -1300,51 +1419,51 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				$totalarray['val']['value'] += $value;
 				if (!$i) $totalarray['totalvaluefield'] = $totalarray['nbfield'];
 				$totalarray['totalvalue'] += $value;
-            }
+			}
 
-            // Invoiced
-            if (!empty($arrayfields['valuebilled']['checked']))
-            {
-                print '<td class="center">'; // invoice_id and invoice_line_id
-                if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-                {
-                    if ($projectstatic->usage_bill_time)
-                    {
-                        if ($task_time->invoice_id)
-                        {
-                            $result = $tmpinvoice->fetch($task_time->invoice_id);
-                            if ($result > 0)
-                            {
-                                print $tmpinvoice->getNomUrl(1);
-                            }
-                        }
-                        else
-                        {
-                            print $langs->trans("No");
-                        }
-                    }
-                    else
-                    {
-                        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
-                    }
-                }
-                print '</td>';
-            	if (!$i) $totalarray['nbfield']++;
-            	if (!$i) $totalarray['totalvaluebilledfield'] = $totalarray['nbfield'];
-            	$totalarray['totalvaluebilled'] += $valuebilled;
-            }
+			// Invoiced
+			if (!empty($arrayfields['valuebilled']['checked']))
+			{
+				print '<td class="center">'; // invoice_id and invoice_line_id
+				if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
+				{
+					if ($projectstatic->usage_bill_time)
+					{
+						if ($task_time->invoice_id)
+						{
+							$result = $tmpinvoice->fetch($task_time->invoice_id);
+							if ($result > 0)
+							{
+								print $tmpinvoice->getNomUrl(1);
+							}
+						}
+						else
+						{
+							print $langs->trans("No");
+						}
+					}
+					else
+					{
+						print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
+					}
+				}
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['totalvaluebilledfield'] = $totalarray['nbfield'];
+				$totalarray['totalvaluebilled'] += $valuebilled;
+			}
 
-            /*
-            // Extra fields
-            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-            */
+			/*
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			*/
 
 			// Fields from hook
 			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
-            // Action column
+			// Action column
 			print '<td class="center nowraponall">';
 			if (($action == 'editline' || $action == 'splitline') && $_GET['lineid'] == $task_time->rowid)
 			{
@@ -1353,19 +1472,19 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				print '<br>';
 				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
 			}
-			elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)    // Read project and enter time consumed on assigned tasks
+			elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)	 // Read project and enter time consumed on assigned tasks
 			{
 				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer)
 				{
-				    if ($conf->MAIN_FEATURES_LEVEL >= 2)
-				    {
-    				    print '&nbsp;';
-    				    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=splitline&amp;lineid='.$task_time->rowid.$param.'">';
-    				    print img_split();
-    				    print '</a>';
-				    }
+					if ($conf->MAIN_FEATURES_LEVEL >= 2)
+					{
+						print '&nbsp;';
+						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=splitline&amp;lineid='.$task_time->rowid.$param.'">';
+						print img_split();
+						print '</a>';
+					}
 
-				    print '&nbsp;';
+					print '&nbsp;';
 					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=editline&amp;lineid='.$task_time->rowid.$param.'">';
 					print img_edit();
 					print '</a>';
@@ -1375,17 +1494,17 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					print img_delete();
 					print '</a>';
 
-					if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					if ($massactionbutton || $massaction)	// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 					{
-					    $selected = 0;
-					    if (in_array($task_time->rowid, $arrayofselected)) $selected = 1;
-					    print '&nbsp;';
-					    print '<input id="cb'.$task_time->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$task_time->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+						$selected = 0;
+						if (in_array($task_time->rowid, $arrayofselected)) $selected = 1;
+						print '&nbsp;';
+						print '<input id="cb'.$task_time->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$task_time->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 					}
-			    }
+				}
 			}
-        	print '</td>';
-        	if (!$i) $totalarray['nbfield']++;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 
 			print "</tr>\n";
 
@@ -1393,298 +1512,298 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 			if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 			{
-			    print '<tr class="oddeven">';
+				print '<tr class="oddeven">';
 
-			    // Date
-			    if (!empty($arrayfields['t.task_date']['checked']))
-			    {
-			        print '<td class="nowrap">';
-			        if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			        {
-			            if (empty($task_time->task_date_withhour))
-			            {
-			                print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-			            }
-			            else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
-			        }
-			        else
-			        {
-			            print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
-			        }
-			        print '</td>';
-			    }
+				// Date
+				if (!empty($arrayfields['t.task_date']['checked']))
+				{
+					print '<td class="nowrap">';
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+					{
+						if (empty($task_time->task_date_withhour))
+						{
+							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
+						}
+						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+					}
+					else
+					{
+						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
+					}
+					print '</td>';
+				}
 
-			    // Task ref
-			    if (!empty($arrayfields['t.task_ref']['checked']))
-			    {
-			        if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-			        {
-			            print '<td class="nowrap">';
-			            $tasktmp->id = $task_time->fk_task;
-			            $tasktmp->ref = $task_time->ref;
-			            $tasktmp->label = $task_time->label;
-			            print $tasktmp->getNomUrl(1, 'withproject', 'time');
-			            print '</td>';
-			        }
-			    }
+				// Task ref
+				if (!empty($arrayfields['t.task_ref']['checked']))
+				{
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
+					{
+						print '<td class="nowrap">';
+						$tasktmp->id = $task_time->fk_task;
+						$tasktmp->ref = $task_time->ref;
+						$tasktmp->label = $task_time->label;
+						print $tasktmp->getNomUrl(1, 'withproject', 'time');
+						print '</td>';
+					}
+				}
 
-			    // Task label
-			    if (!empty($arrayfields['t.task_label']['checked']))
-			    {
-			        if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-			        {
-			            print '<td class="nowrap">';
-			            print $task_time->label;
-			            print '</td>';
-			        }
-			    }
+				// Task label
+				if (!empty($arrayfields['t.task_label']['checked']))
+				{
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
+					{
+						print '<td class="nowrap">';
+						print $task_time->label;
+						print '</td>';
+					}
+				}
 
-			    // User
-			    if (!empty($arrayfields['author']['checked']))
-			    {
-			        print '<td>';
-			        if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			        {
-			            if (empty($object->id)) $object->fetch($id);
-			            $contactsoftask = $object->getListContactId('internal');
-			            if (!in_array($task_time->fk_user, $contactsoftask)) {
-			                $contactsoftask[] = $task_time->fk_user;
-			            }
-			            if (count($contactsoftask) > 0) {
-			                print img_object('', 'user', 'class="hideonsmartphone"');
-			                print $form->select_dolusers($task_time->fk_user, 'userid_line', 0, '', 0, '', $contactsoftask);
-			            } else {
-			                print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
-			            }
-			        }
-			        else
-			        {
-			            $userstatic->id         = $task_time->fk_user;
-			            $userstatic->lastname = $task_time->lastname;
-			            $userstatic->firstname 	= $task_time->firstname;
-			            $userstatic->photo      = $task_time->photo;
-			            $userstatic->statut     = $task_time->user_status;
-			            print $userstatic->getNomUrl(-1);
-			        }
-			        print '</td>';
-			    }
+				// User
+				if (!empty($arrayfields['author']['checked']))
+				{
+					print '<td>';
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+					{
+						if (empty($object->id)) $object->fetch($id);
+						$contactsoftask = $object->getListContactId('internal');
+						if (!in_array($task_time->fk_user, $contactsoftask)) {
+							$contactsoftask[] = $task_time->fk_user;
+						}
+						if (count($contactsoftask) > 0) {
+							print img_object('', 'user', 'class="hideonsmartphone"');
+							print $form->select_dolusers($task_time->fk_user, 'userid_line', 0, '', 0, '', $contactsoftask);
+						} else {
+							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
+						}
+					}
+					else
+					{
+						$userstatic->id			= $task_time->fk_user;
+						$userstatic->lastname = $task_time->lastname;
+						$userstatic->firstname	= $task_time->firstname;
+						$userstatic->photo		= $task_time->photo;
+						$userstatic->statut		= $task_time->user_status;
+						print $userstatic->getNomUrl(-1);
+					}
+					print '</td>';
+				}
 
-			    // Note
-			    if (!empty($arrayfields['t.note']['checked']))
-			    {
-			        print '<td class="left">';
-			        if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			        {
-			            print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-			        }
-			        else
-			        {
-			            print dol_nl2br($task_time->note);
-			        }
-			        print '</td>';
-			    }
-			    elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			    {
-			        print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
-			    }
+				// Note
+				if (!empty($arrayfields['t.note']['checked']))
+				{
+					print '<td class="left">';
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+					{
+						print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
+					}
+					else
+					{
+						print dol_nl2br($task_time->note);
+					}
+					print '</td>';
+				}
+				elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+				{
+					print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
+				}
 
-			    // Time spent
-			    if (!empty($arrayfields['t.task_duration']['checked']))
-			    {
-			        print '<td class="right">';
-			        if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			        {
-			            print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
-			            print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
-			        }
-			        else
-			        {
-			            print convertSecondToTime($task_time->task_duration, 'allhourmin');
-			        }
-			        print '</td>';
-			    }
+				// Time spent
+				if (!empty($arrayfields['t.task_duration']['checked']))
+				{
+					print '<td class="right">';
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+					{
+						print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
+						print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
+					}
+					else
+					{
+						print convertSecondToTime($task_time->task_duration, 'allhourmin');
+					}
+					print '</td>';
+				}
 
-			    // Value spent
-			    if (!empty($arrayfields['value']['checked']))
-			    {
-			        print '<td class="right">';
-			        $value = price2num($task_time->thm * $task_time->task_duration / 3600);
-			        print price($value, 1, $langs, 1, -1, -1, $conf->currency);
-			        print '</td>';
-			    }
+				// Value spent
+				if (!empty($arrayfields['value']['checked']))
+				{
+					print '<td class="right">';
+					$value = price2num($task_time->thm * $task_time->task_duration / 3600);
+					print price($value, 1, $langs, 1, -1, -1, $conf->currency);
+					print '</td>';
+				}
 
-			    // Value billed
-			    if (!empty($arrayfields['valuebilled']['checked']))
-			    {
-			        print '<td class="right">';
-			        $valuebilled = price2num($task_time->total_ht);
-			        if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
-			        print '</td>';
-			    }
+				// Value billed
+				if (!empty($arrayfields['valuebilled']['checked']))
+				{
+					print '<td class="right">';
+					$valuebilled = price2num($task_time->total_ht);
+					if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+					print '</td>';
+				}
 
-			    /*
-			     // Extra fields
-			     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-			     */
+				/*
+				 // Extra fields
+				 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+				 */
 
-			    // Fields from hook
-			    $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time);
-			    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-			    print $hookmanager->resPrint;
+				// Fields from hook
+				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time);
+				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+				print $hookmanager->resPrint;
 
-			    // Action column
-			    print '<td class="center nowraponall">';
-			    print '</td>';
+				// Action column
+				print '<td class="center nowraponall">';
+				print '</td>';
 
-			    print "</tr>\n";
+				print "</tr>\n";
 
 
-			    // Line for second dispatching
+				// Line for second dispatching
 
-			    print '<tr class="oddeven">';
+				print '<tr class="oddeven">';
 
-			    // Date
-			    if (!empty($arrayfields['t.task_date']['checked']))
-			    {
-			        print '<td class="nowrap">';
-			        if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			        {
-			            if (empty($task_time->task_date_withhour))
-			            {
-			                print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 3, 3, 2, "timespent_date", 1, 0);
-			            }
-			            else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
-			        }
-			        else
-			        {
-			            print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
-			        }
-			        print '</td>';
-			    }
+				// Date
+				if (!empty($arrayfields['t.task_date']['checked']))
+				{
+					print '<td class="nowrap">';
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+					{
+						if (empty($task_time->task_date_withhour))
+						{
+							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 3, 3, 2, "timespent_date", 1, 0);
+						}
+						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
+					}
+					else
+					{
+						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
+					}
+					print '</td>';
+				}
 
-			    // Task ref
-			    if (!empty($arrayfields['t.task_ref']['checked']))
-			    {
-			        if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-			        {
-			            print '<td class="nowrap">';
-			            $tasktmp->id = $task_time->fk_task;
-			            $tasktmp->ref = $task_time->ref;
-			            $tasktmp->label = $task_time->label;
-			            print $tasktmp->getNomUrl(1, 'withproject', 'time');
-			            print '</td>';
-			        }
-			    }
+				// Task ref
+				if (!empty($arrayfields['t.task_ref']['checked']))
+				{
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
+					{
+						print '<td class="nowrap">';
+						$tasktmp->id = $task_time->fk_task;
+						$tasktmp->ref = $task_time->ref;
+						$tasktmp->label = $task_time->label;
+						print $tasktmp->getNomUrl(1, 'withproject', 'time');
+						print '</td>';
+					}
+				}
 
-			    // Task label
-			    if (!empty($arrayfields['t.task_label']['checked']))
-			    {
-			        if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-			        {
-			            print '<td class="nowrap">';
-			            print $task_time->label;
-			            print '</td>';
-			        }
-			    }
+				// Task label
+				if (!empty($arrayfields['t.task_label']['checked']))
+				{
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
+					{
+						print '<td class="nowrap">';
+						print $task_time->label;
+						print '</td>';
+					}
+				}
 
-			    // User
-			    if (!empty($arrayfields['author']['checked']))
-			    {
-			        print '<td>';
-			        if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			        {
-			            if (empty($object->id)) $object->fetch($id);
-			            $contactsoftask = $object->getListContactId('internal');
-			            if (!in_array($task_time->fk_user, $contactsoftask)) {
-			                $contactsoftask[] = $task_time->fk_user;
-			            }
-			            if (count($contactsoftask) > 0) {
-			                print img_object('', 'user', 'class="hideonsmartphone"');
-			                print $form->select_dolusers($task_time->fk_user, 'userid_line_2', 0, '', 0, '', $contactsoftask);
-			            } else {
-			                print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
-			            }
-			        }
-			        else
-			        {
-			            $userstatic->id         = $task_time->fk_user;
-			            $userstatic->lastname = $task_time->lastname;
-			            $userstatic->firstname 	= $task_time->firstname;
-			            $userstatic->photo      = $task_time->photo;
-			            $userstatic->statut     = $task_time->user_status;
-			            print $userstatic->getNomUrl(-1);
-			        }
-			        print '</td>';
-			    }
+				// User
+				if (!empty($arrayfields['author']['checked']))
+				{
+					print '<td>';
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+					{
+						if (empty($object->id)) $object->fetch($id);
+						$contactsoftask = $object->getListContactId('internal');
+						if (!in_array($task_time->fk_user, $contactsoftask)) {
+							$contactsoftask[] = $task_time->fk_user;
+						}
+						if (count($contactsoftask) > 0) {
+							print img_object('', 'user', 'class="hideonsmartphone"');
+							print $form->select_dolusers($task_time->fk_user, 'userid_line_2', 0, '', 0, '', $contactsoftask);
+						} else {
+							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
+						}
+					}
+					else
+					{
+						$userstatic->id			= $task_time->fk_user;
+						$userstatic->lastname = $task_time->lastname;
+						$userstatic->firstname	= $task_time->firstname;
+						$userstatic->photo		= $task_time->photo;
+						$userstatic->statut		= $task_time->user_status;
+						print $userstatic->getNomUrl(-1);
+					}
+					print '</td>';
+				}
 
-			    // Note
-			    if (!empty($arrayfields['t.note']['checked']))
-			    {
-			        print '<td class="left">';
-			        if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			        {
-			            print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-			        }
-			        else
-			        {
-			            print dol_nl2br($task_time->note);
-			        }
-			        print '</td>';
-			    }
-			    elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			    {
-			        print '<input type="hidden" name="timespent_note_line_2" value="'.$task_time->note.'">';
-			    }
+				// Note
+				if (!empty($arrayfields['t.note']['checked']))
+				{
+					print '<td class="left">';
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+					{
+						print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
+					}
+					else
+					{
+						print dol_nl2br($task_time->note);
+					}
+					print '</td>';
+				}
+				elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+				{
+					print '<input type="hidden" name="timespent_note_line_2" value="'.$task_time->note.'">';
+				}
 
-			    // Time spent
-			    if (!empty($arrayfields['t.task_duration']['checked']))
-			    {
-			        print '<td class="right">';
-			        if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			        {
-			            print '<input type="hidden" name="old_duration_2" value="0">';
-			            print $form->select_duration('new_duration_2', 0, 0, 'text');
-			        }
-			        else
-			        {
-			            print convertSecondToTime($task_time->task_duration, 'allhourmin');
-			        }
-			        print '</td>';
-			    }
+				// Time spent
+				if (!empty($arrayfields['t.task_duration']['checked']))
+				{
+					print '<td class="right">';
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+					{
+						print '<input type="hidden" name="old_duration_2" value="0">';
+						print $form->select_duration('new_duration_2', 0, 0, 'text');
+					}
+					else
+					{
+						print convertSecondToTime($task_time->task_duration, 'allhourmin');
+					}
+					print '</td>';
+				}
 
-			    // Value spent
-			    if (!empty($arrayfields['value']['checked']))
-			    {
-			        print '<td class="right">';
-			        $value = 0;
-			        print price($value, 1, $langs, 1, -1, -1, $conf->currency);
-			        print '</td>';
-			    }
+				// Value spent
+				if (!empty($arrayfields['value']['checked']))
+				{
+					print '<td class="right">';
+					$value = 0;
+					print price($value, 1, $langs, 1, -1, -1, $conf->currency);
+					print '</td>';
+				}
 
-			    // Value billed
-			    if (!empty($arrayfields['valuebilled']['checked']))
-			    {
-			        print '<td class="right">';
-			        $valuebilled = price2num($task_time->total_ht);
-			        if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
-			        print '</td>';
-			    }
+				// Value billed
+				if (!empty($arrayfields['valuebilled']['checked']))
+				{
+					print '<td class="right">';
+					$valuebilled = price2num($task_time->total_ht);
+					if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+					print '</td>';
+				}
 
-			    /*
-			     // Extra fields
-			     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-			     */
+				/*
+				 // Extra fields
+				 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+				 */
 
-			    // Fields from hook
-			    $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time);
-			    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-			    print $hookmanager->resPrint;
+				// Fields from hook
+				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time);
+				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+				print $hookmanager->resPrint;
 
-			    // Action column
-			    print '<td class="center nowraponall">';
-			    print '</td>';
+				// Action column
+				print '<td class="center nowraponall">';
+				print '</td>';
 
-			    print "</tr>\n";
+				print "</tr>\n";
 			}
 
 			$i++;