Dolibarr / dolibarr

htdocs/core/lib/project.lib.php

Spacing +343 added lines, -343 removed lines

@@ -44,16 +44,16 @@ 
 	$head[$h][2] = 'project';
 	$h++;
 
-	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 	$head[$h][2] = 'contact';
 	$h++;
 
-	if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
-	|| ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
-	|| ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
+	if (!empty($conf->fournisseur->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)
+	|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)
+	|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ProjectOverview");
@@ -65,29 +65,29 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'project');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project');
 
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'notes';
 		$h++;
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -98,9 +98,9 @@ 
 		$head[$h][1] = $langs->trans("Tasks");
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-		$taskstatic=new Task($db);
-		$nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		$taskstatic = new Task($db);
+		$nbTasks = count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+		if ($nbTasks > 0) $head[$h][1] .= ' <span class="badge">'.($nbTasks).'</span>';
 		$head[$h][2] = 'tasks';
 		$h++;
 
@@ -117,22 +117,22 @@ 
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) $head[$h][1] .= ' <span class="badge">'.$nbComments.'</span>';
 		$head[$h][2] = 'project_comment';
 		$h++;
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;
-	$head[$h][1].= $langs->trans("Events");
-	if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+	$head[$h][1] .= $langs->trans("Events");
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
-		$head[$h][1].= '/';
-		$head[$h][1].= $langs->trans("Agenda");
+		$head[$h][1] .= '/';
+		$head[$h][1] .= $langs->trans("Agenda");
 	}
 	$head[$h][2] = 'agenda';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project', 'remove');
 
 	return $head;
 }
@@ -150,20 +150,20 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'task_task';
 	$h++;
 
-	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TaskRessourceLinks");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 	$head[$h][2] = 'task_contact';
 	$h++;
 
 	// Is there timespent ?
-	$nbTimeSpent=0;
+	$nbTimeSpent = 0;
 	$sql = "SELECT t.rowid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
 	$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
@@ -172,13 +172,13 @@ 
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $nbTimeSpent=1;
+		if ($obj) $nbTimeSpent = 1;
 	}
 	else dol_print_error($db);
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TimeSpent");
-	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+	if ($nbTimeSpent > 0) $head[$h][1] .= ' <span class="badge">...</span>';
 	$head[$h][2] = 'task_time';
 	$h++;
 
@@ -186,28 +186,28 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'task');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task');
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'task_notes';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
+	$filesdir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->project->ref).'/'.dol_sanitizeFileName($object->ref);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$nbLinks=Link::count($db, $object->element, $object->id);
+	$nbFiles = count(dol_dir_list($filesdir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'task_document';
 	$h++;
 
@@ -215,14 +215,14 @@ 
 	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK))
 	{
 		$nbComments = $object->getNbComments();
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) $head[$h][1] .= ' <span class="badge">'.$nbComments.'</span>';
 		$head[$h][2] = 'task_comment';
 		$h++;
 	}
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'task','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task', 'remove');
 
 	return $head;
 }
@@ -234,7 +234,7 @@ 
  * @param   string  $fuser      Filter on user
  * @return  array				Array of tabs to show
  */
-function project_timesheet_prepare_head($mode, $fuser=null)
+function project_timesheet_prepare_head($mode, $fuser = null)
 {
 	global $langs, $conf, $user;
 	$h = 0;
@@ -242,13 +242,13 @@ 
 
 	$h = 0;
 
-	$param='';
-	$param.=($mode?'&mode='.$mode:'');
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+	$param = '';
+	$param .= ($mode ? '&mode='.$mode : '');
+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param .= '&search_usertoprocessid='.$fuser->id;
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param?'?'.$param:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerWeek");
 		$head[$h][2] = 'inputperweek';
 		$h++;
@@ -256,7 +256,7 @@ 
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param?'?'.$param:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerDay");
 		$head[$h][2] = 'inputperday';
 		$h++;
@@ -270,9 +270,9 @@ 
 		$h++;
 	}*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet', 'remove');
 
 	return $head;
 }
@@ -296,7 +296,7 @@ 
 	$head[$h][2] = 'project';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_admin');
 
 	$head[$h][0] = DOL_URL_ROOT."/projet/admin/project_extrafields.php";
 	$head[$h][1] = $langs->trans("ExtraFieldsProject");
@@ -308,7 +308,7 @@ 
 	$head[$h][2] = 'attributes_task';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_admin', 'remove');
 
 	return $head;
 }
@@ -329,29 +329,29 @@ 
  * @param   int         $projectidfortotallink     0 or Id of project to use on total line (link to see all time consumed for project)
  * @return	void
  */
-function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0, $projectidfortotallink=0)
+function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0)
 {
 	global $user, $bc, $langs, $conf;
 	global $projectstatic, $taskstatic;
 
-	$lastprojectid=0;
+	$lastprojectid = 0;
 
-	$projectsArrayId=explode(',',$projectsListId);
+	$projectsArrayId = explode(',', $projectsListId);
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
 	// We declare counter as global because we want to edit them into recursive call
-	global $total_projectlinesa_spent,$total_projectlinesa_planned,$total_projectlinesa_spent_if_planned;
+	global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned;
 	if ($level == 0)
 	{
-		$total_projectlinesa_spent=0;
-		$total_projectlinesa_planned=0;
-		$total_projectlinesa_spent_if_planned=0;
+		$total_projectlinesa_spent = 0;
+		$total_projectlinesa_planned = 0;
+		$total_projectlinesa_spent_if_planned = 0;
 	}
 
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
-		if ($parent == 0 && $level >= 0) $level = 0;              // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($parent == 0 && $level >= 0) $level = 0; // if $level = -1, we dont' use sublevel recursion, we show all lines
 
 		// Process line
 		// print "i:".$i."-".$lines[$i]->fk_project.'<br>';
@@ -359,26 +359,26 @@ 
 		if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines
 		{
 			// Show task line.
-			$showline=1;
-			$showlineingray=0;
+			$showline = 1;
+			$showlineingray = 0;
 
 			// If there is filters to use
 			if (is_array($taskrole))
 			{
 				// If task not legitimate to show, search if a legitimate task exists later in tree
-				if (! isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
+				if (!isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
 				{
 					// So search if task has a subtask legitimate to show
-					$foundtaskforuserdeeper=0;
-					searchTaskInChild($foundtaskforuserdeeper,$lines[$i]->id,$lines,$taskrole);
+					$foundtaskforuserdeeper = 0;
+					searchTaskInChild($foundtaskforuserdeeper, $lines[$i]->id, $lines, $taskrole);
 					//print '$foundtaskforuserpeeper='.$foundtaskforuserdeeper.'<br>';
 					if ($foundtaskforuserdeeper > 0)
 					{
-						$showlineingray=1;		// We will show line but in gray
+						$showlineingray = 1; // We will show line but in gray
 					}
 					else
 					{
-						$showline=0;			// No reason to show line
+						$showline = 0; // No reason to show line
 					}
 				}
 			}
@@ -389,12 +389,12 @@ 
 				if (empty($user->rights->projet->all->lire))
 				{
 					// User is not allowed on this project and project is not public, so we hide line
-					if (! in_array($lines[$i]->fk_project, $projectsArrayId))
+					if (!in_array($lines[$i]->fk_project, $projectsArrayId))
 					{
 						// Note that having a user assigned to a task into a project user has no permission on, should not be possible
 						// because assignement on task can be done only on contact of project.
 						// If assignement was done and after, was removed from contact of project, then we can hide the line.
-						$showline=0;
+						$showline = 0;
 					}
 				}
 			}
@@ -405,7 +405,7 @@ 
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
 				{
 					$var = !$var;
-					$lastprojectid=$lines[$i]->fk_project;
+					$lastprojectid = $lines[$i]->fk_project;
 				}
 
 				print '<tr '.$bc[$var].' id="row-'.$lines[$i]->id.'">'."\n";
@@ -415,18 +415,18 @@ 
 					// Project ref
 					print "<td>";
 					//if ($showlineingray) print '<i>';
-					$projectstatic->id=$lines[$i]->fk_project;
-					$projectstatic->ref=$lines[$i]->projectref;
-					$projectstatic->public=$lines[$i]->public;
-					$projectstatic->title=$lines[$i]->projectlabel;
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
-					else print $projectstatic->getNomUrl(1,'nolink');
+					$projectstatic->id = $lines[$i]->fk_project;
+					$projectstatic->ref = $lines[$i]->projectref;
+					$projectstatic->public = $lines[$i]->public;
+					$projectstatic->title = $lines[$i]->projectlabel;
+					if ($lines[$i]->public || in_array($lines[$i]->fk_project, $projectsArrayId) || !empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
+					else print $projectstatic->getNomUrl(1, 'nolink');
 					//if ($showlineingray) print '</i>';
 					print "</td>";
 
 					// Project status
 					print '<td>';
-					$projectstatic->statut=$lines[$i]->projectstatus;
+					$projectstatic->statut = $lines[$i]->projectstatus;
 					print $projectstatic->getLibStatut(2);
 					print "</td>";
 				}
@@ -435,14 +435,14 @@ 
 				print '<td>';
 				if ($showlineingray)
 				{
-					print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
+					print '<i>'.img_object('', 'projecttask').' '.$lines[$i]->ref.'</i>';
 				}
 				else
 				{
-					$taskstatic->id=$lines[$i]->id;
-					$taskstatic->ref=$lines[$i]->ref;
-					$taskstatic->label=($taskrole[$lines[$i]->id]?$langs->trans("YourRole").': '.$taskrole[$lines[$i]->id]:'');
-					print $taskstatic->getNomUrl(1,'withproject');
+					$taskstatic->id = $lines[$i]->id;
+					$taskstatic->ref = $lines[$i]->ref;
+					$taskstatic->label = ($taskrole[$lines[$i]->id] ? $langs->trans("YourRole").': '.$taskrole[$lines[$i]->id] : '');
+					print $taskstatic->getNomUrl(1, 'withproject');
 				}
 				print '</td>';
 
@@ -450,7 +450,7 @@ 
 				print "<td>";
 				if ($showlineingray) print '<i>';
 				//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
-				for ($k = 0 ; $k < $level ; $k++)
+				for ($k = 0; $k < $level; $k++)
 				{
 					print "&nbsp; &nbsp; &nbsp;";
 				}
@@ -461,7 +461,7 @@ 
 
 				// Date start
 				print '<td align="center">';
-				print dol_print_date($lines[$i]->date_start,'dayhour');
+				print dol_print_date($lines[$i]->date_start, 'dayhour');
 				print '</td>';
 
 				// Date end
@@ -470,19 +470,19 @@ 
 				$taskstatic->progress = $lines[$i]->progress;
 				$taskstatic->fk_statut = $lines[$i]->status;
 				$taskstatic->datee = $lines[$i]->date_end;
-				print dol_print_date($lines[$i]->date_end,'dayhour');
+				print dol_print_date($lines[$i]->date_end, 'dayhour');
 				if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
 				print '</td>';
 
-				$plannedworkloadoutputformat='allhourmin';
-				$timespentoutputformat='allhourmin';
-				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+				$plannedworkloadoutputformat = 'allhourmin';
+				$timespentoutputformat = 'allhourmin';
+				if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+				if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
 
 				// Planned Workload (in working hours)
 				print '<td align="right">';
-				$fullhour=convertSecondToTime($lines[$i]->planned_workload,$plannedworkloadoutputformat);
-				$workingdelay=convertSecondToTime($lines[$i]->planned_workload,'all',86400,7);	// TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
+				$fullhour = convertSecondToTime($lines[$i]->planned_workload, $plannedworkloadoutputformat);
+				$workingdelay = convertSecondToTime($lines[$i]->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
 				if ($lines[$i]->planned_workload != '')
 				{
 					print $fullhour;
@@ -495,8 +495,8 @@ 
 				// Time spent
 				print '<td align="right">';
 				if ($showlineingray) print '<i>';
-				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
-				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
+				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject ? '' : '&withproject=1').'">';
+				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration, $timespentoutputformat);
 				else print '--:--';
 				if ($showlineingray) print '</i>';
 				else print '</a>';
@@ -506,7 +506,7 @@ 
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload || $lines[$i]->duration)
 				{
-					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
+					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %';
 					else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
 				}
 				print '</td>';
@@ -527,7 +527,7 @@ 
 
 				print "</tr>\n";
 
-				if (! $showlineingray) $inc++;
+				if (!$showlineingray) $inc++;
 
 				if ($level >= 0)    // Call sublevels
 				{
@@ -559,12 +559,12 @@ 
 		print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject ? '' : '&withproject=1').'">';
 		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
 		if ($projectidfortotallink > 0) print '</a>';
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2).' %';
 		print '</td>';
 		print '<td></td>';
 		if ($addordertick) print '<td class="hideonsmartphone"></td>';
@@ -592,48 +592,48 @@ 
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
  */
-function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak=0)
+function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0)
 {
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
-	$lastprojectid=0;
-	$totalforeachline=array();
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
+	$lastprojectid = 0;
+	$totalforeachline = array();
+	$workloadforid = array();
+	$lineswithoutlevel0 = array();
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0; $i < $numlines; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 		}
 	}
 
 	if (empty($oldprojectforbreak))
 	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break
 	}
 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
 
 		//if ($lines[$i]->fk_task_parent == $parent)
 		//{
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
 			{
 				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 				// Break on a new project
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
 				{
-					$lastprojectid=$lines[$i]->fk_project;
+					$lastprojectid = $lines[$i]->fk_project;
 					if ($preselectedday)
 					{
 						$projectstatic->id = $lines[$i]->fk_project;
@@ -644,31 +644,31 @@ 
 				{
 					if ($preselectedday)
 					{
-						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-						$workloadforid[$projectstatic->id]=1;
+						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+						$workloadforid[$projectstatic->id] = 1;
 					}
 				}
 
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->project_ref;
-				$projectstatic->title=$lines[$i]->project_label;
-				$projectstatic->public=$lines[$i]->public;
+				$projectstatic->id = $lines[$i]->fk_project;
+				$projectstatic->ref = $lines[$i]->project_ref;
+				$projectstatic->title = $lines[$i]->project_label;
+				$projectstatic->public = $lines[$i]->public;
 
-				$taskstatic->id=$lines[$i]->task_id;
-				$taskstatic->ref=($lines[$i]->task_ref?$lines[$i]->task_ref:$lines[$i]->task_id);
-				$taskstatic->label=$lines[$i]->task_label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
+				$taskstatic->id = $lines[$i]->task_id;
+				$taskstatic->ref = ($lines[$i]->task_ref ? $lines[$i]->task_ref : $lines[$i]->task_id);
+				$taskstatic->label = $lines[$i]->task_label;
+				$taskstatic->date_start = $lines[$i]->date_start;
+				$taskstatic->date_end = $lines[$i]->date_end;
 
-				$thirdpartystatic->id=$lines[$i]->socid;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
+				$thirdpartystatic->id = $lines[$i]->socid;
+				$thirdpartystatic->name = $lines[$i]->thirdparty_name;
+				$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="11">';
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -693,7 +693,7 @@ 
 				print "<td>";
 				if ($oldprojectforbreak == -1)
 				{
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 					print '<br>'.$projectstatic->title;
 				}
 				print "</td>";
@@ -706,11 +706,11 @@ 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -719,47 +719,47 @@ 
 
 				// Date
 				print '<td align="center">';
-				print dol_print_date($lines[$i]->timespent_datehour,'day');
+				print dol_print_date($lines[$i]->timespent_datehour, 'day');
 				print '</td>';
 
-				$disabledproject=1;$disabledtask=1;
+				$disabledproject = 1; $disabledtask = 1;
 				//print "x".$lines[$i]->fk_project;
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
 				{
-					$disabledproject=0;
-					$disabledtask=0;
+					$disabledproject = 0;
+					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
 				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
 				{
-					$disabledtask=1;
+					$disabledtask = 1;
 				}
 
 				// Hour
 				print '<td class="nowrap" align="center">';
-				print dol_print_date($lines[$i]->timespent_datehour,'hour');
+				print dol_print_date($lines[$i]->timespent_datehour, 'hour');
 				print '</td>';
 
-				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				$cssonholiday = '';
+				if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
+				elseif (!$isavailable[$preselectedday]['morning'])   $cssonholiday .= 'onholidaymorning ';
+				elseif (!$isavailable[$preselectedday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
 
 				// Duration
-				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
+				print '<td align="center" class="duration'.($cssonholiday ? ' '.$cssonholiday : '').'">';
 
 				$dayWorkLoad = $lines[$i]->timespent_duration;
-				$totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
+				$totalforeachline[$preselectedday] += $lines[$i]->timespent_duration;
 
-				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				$alreadyspent = '';
+				if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
 
-				print convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				print convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
 
-				$modeinput='hours';
+				$modeinput = 'hours';
 
 				print '<script type="text/javascript">';
 				print "jQuery(document).ready(function () {\n";
@@ -771,7 +771,7 @@ 
 
 				// Note
 				print '<td align="center">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
+				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask ? ' disabled="disabled"' : '').'>';
 				print $lines[$i]->timespent_note;
 				print '</textarea>';
 				print '</td>';
@@ -818,48 +818,48 @@ 
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
  */
-function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak=0)
+function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0)
 {
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
-	$lastprojectid=0;
-	$totalforeachday=array();
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
+	$lastprojectid = 0;
+	$totalforeachday = array();
+	$workloadforid = array();
+	$lineswithoutlevel0 = array();
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0; $i < $numlines; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 		}
 	}
 
 	if (empty($oldprojectforbreak))
 	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break
 	}
 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
 			{
 				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 				// Break on a new project
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
 				{
-					$lastprojectid=$lines[$i]->fk_project;
+					$lastprojectid = $lines[$i]->fk_project;
 					if ($preselectedday)
 					{
 						$projectstatic->id = $lines[$i]->fk_project;
@@ -870,31 +870,31 @@ 
 				{
 					if ($preselectedday)
 					{
-						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-		   				$workloadforid[$projectstatic->id]=1;
+						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+		   				$workloadforid[$projectstatic->id] = 1;
 					}
 				}
 
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
+				$projectstatic->id = $lines[$i]->fk_project;
+				$projectstatic->ref = $lines[$i]->projectref;
+				$projectstatic->title = $lines[$i]->projectlabel;
+				$projectstatic->public = $lines[$i]->public;
 
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
-				$taskstatic->label=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
+				$taskstatic->id = $lines[$i]->id;
+				$taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
+				$taskstatic->label = $lines[$i]->label;
+				$taskstatic->date_start = $lines[$i]->date_start;
+				$taskstatic->date_end = $lines[$i]->date_end;
 
-				$thirdpartystatic->id=$lines[$i]->socid;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
+				$thirdpartystatic->id = $lines[$i]->socid;
+				$thirdpartystatic->name = $lines[$i]->thirdparty_name;
+				$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="9">';
-					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
+					print $projectstatic->getNomUrl(1, '', 0, '<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
 					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
 					if ($projectstatic->title)
 					{
@@ -929,11 +929,11 @@ 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -942,13 +942,13 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
 				else print '--:--';
 				print '</td>';
 
 				// Progress declared %
 				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
 				print '</td>';
 
 				// Time spent by everybody
@@ -957,7 +957,7 @@ 
 				if ($lines[$i]->duration)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
+					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
 				}
 				else print '--:--';
@@ -965,68 +965,68 @@ 
 
 				// Time spent by user
 				print '<td align="right">';
-				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
+				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
 				else print '--:--';
 				print "</td>\n";
 
-				$disabledproject=1;$disabledtask=1;
+				$disabledproject = 1; $disabledtask = 1;
 				//print "x".$lines[$i]->fk_project;
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
 				{
-					$disabledproject=0;
-					$disabledtask=0;
+					$disabledproject = 0;
+					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
 				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
 				{
-					$disabledtask=1;
+					$disabledtask = 1;
 				}
 
 				// Form to add new time
 				print '<td class="nowrap leftborder" align="center">';
-				$tableCell=$form->select_date($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask);
+				$tableCell = $form->select_date($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, 1, $disabledtask);
 				print $tableCell;
 				print '</td>';
 
-				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				$cssonholiday = '';
+				if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
+				elseif (!$isavailable[$preselectedday]['morning'])   $cssonholiday .= 'onholidaymorning ';
+				elseif (!$isavailable[$preselectedday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
 
 				global $daytoparse;
-				$tmparray = dol_getdate($daytoparse,true);	// detail of current day
+				$tmparray = dol_getdate($daytoparse, true); // detail of current day
 				$idw = $tmparray['wday'];
 
 				global $numstartworkingday, $numendworkingday;
-				$cssweekend='';
+				$cssweekend = '';
 				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
 				{
-					$cssweekend='weekend';
+					$cssweekend = 'weekend';
 				}
 
 				// Duration
-				print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
+				print '<td class="center duration'.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
 				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
-				$totalforeachday[$preselectedday]+=$dayWorkLoad;
+				$totalforeachday[$preselectedday] += $dayWorkLoad;
 
-				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+				$alreadyspent = '';
+				if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
 
 				$idw = 0;
 
-				$tableCell='';
-				$tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
-				$tableCell.='<span class="hideonsmartphone"> + </span>';
+				$tableCell = '';
+				$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+				$tableCell .= '<span class="hideonsmartphone"> + </span>';
 				//$tableCell.='&nbsp;&nbsp;&nbsp;';
-				$tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
+				$tableCell .= $form->select_duration($lines[$i]->id.'duration', '', $disabledtask, 'text', 0, 1);
 				//$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';
 				print $tableCell;
 
-				$modeinput='hours';
+				$modeinput = 'hours';
 
 				print '<script type="text/javascript">';
 				print "jQuery(document).ready(function () {\n";
@@ -1038,19 +1038,19 @@ 
 
 				// Note
 				print '<td align="center">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
+				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask ? ' disabled="disabled"' : '').'>';
 				print '</textarea>';
 				print '</td>';
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
    				else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
    					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
 
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
 				print '</td>';
 
@@ -1066,9 +1066,9 @@ 
 				$ret = projectLinesPerDay($inc, $lines[$i]->id, $fuser, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak);
 				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
 				//var_dump($ret);
-				foreach($ret as $key => $val)
+				foreach ($ret as $key => $val)
 				{
-					$totalforeachday[$key]+=$val;
+					$totalforeachday[$key] += $val;
 				}
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
 				//var_dump($totalforeachday);
@@ -1102,24 +1102,24 @@ 
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @return  array								Array with time spent for $fuser for each day of week on tasks in $lines and substasks
  */
-function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak=0)
+function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0)
 {
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
-	$lastprojectid=0;
-	$workloadforid=array();
-	$totalforeachday=array();
-	$lineswithoutlevel0=array();
+	$lastprojectid = 0;
+	$workloadforid = array();
+	$totalforeachday = array();
+	$lineswithoutlevel0 = array();
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0; $i < $numlines; $i++)
 		{
-		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 		}
 	}
 
@@ -1127,24 +1127,24 @@ 
 
 	if (empty($oldprojectforbreak))
 	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 = start break, -1 = never break
+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
 			{
 				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 				// Break on a new project
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
 				{
-					$lastprojectid=$lines[$i]->fk_project;
+					$lastprojectid = $lines[$i]->fk_project;
 					$projectstatic->id = $lines[$i]->fk_project;
 				}
 
@@ -1152,33 +1152,33 @@ 
 				//var_dump($projectstatic->weekWorkLoadPerTask);
 				if (empty($workloadforid[$projectstatic->id]))
 				{
-					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-					$workloadforid[$projectstatic->id]=1;
+					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+					$workloadforid[$projectstatic->id] = 1;
 				}
 				//var_dump($projectstatic->weekWorkLoadPerTask);
 				//var_dump('--- '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
 
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
-				$projectstatic->thirdparty_name=$lines[$i]->thirdparty_name;
+				$projectstatic->id = $lines[$i]->fk_project;
+				$projectstatic->ref = $lines[$i]->projectref;
+				$projectstatic->title = $lines[$i]->projectlabel;
+				$projectstatic->public = $lines[$i]->public;
+				$projectstatic->thirdparty_name = $lines[$i]->thirdparty_name;
 
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
-				$taskstatic->label=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
+				$taskstatic->id = $lines[$i]->id;
+				$taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
+				$taskstatic->label = $lines[$i]->label;
+				$taskstatic->date_start = $lines[$i]->date_start;
+				$taskstatic->date_end = $lines[$i]->date_end;
 
-				$thirdpartystatic->id=$lines[$i]->thirdparty_id;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
+				$thirdpartystatic->id = $lines[$i]->thirdparty_id;
+				$thirdpartystatic->name = $lines[$i]->thirdparty_name;
+				$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="13">';
-					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
+					print $projectstatic->getNomUrl(1, '', 0, '<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
 					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
 					if ($projectstatic->title)
 					{
@@ -1213,11 +1213,11 @@ 
 				// Ref
 				print '<td class="nowrap">';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
 				//print $taskstatic->getNomUrl(0, 'withproject', 'time');
 				print $taskstatic->label;
 				//print "<br>";
@@ -1227,13 +1227,13 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
 				else print '--:--';
 				print '</td>';
 
 				// Progress declared %
 				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
 				print '</td>';
 
 				// Time spent by everybody
@@ -1242,7 +1242,7 @@ 
 				if ($lines[$i]->duration)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
+					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
 				}
 				else print '--:--';
@@ -1250,80 +1250,80 @@ 
 
 				// Time spent by user
 				print '<td align="right">';
-				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
+				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
 				else print '--:--';
 				print "</td>\n";
 
-				$disabledproject=1;$disabledtask=1;
+				$disabledproject = 1; $disabledtask = 1;
 				//print "x".$lines[$i]->fk_project;
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
 				{
-					$disabledproject=0;
-					$disabledtask=0;
+					$disabledproject = 0;
+					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
 				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
 				{
-					$disabledtask=1;
+					$disabledtask = 1;
 				}
 
 				//var_dump($projectstatic->weekWorkLoadPerTask);
 
 				// Fields to show current time
-				$tableCell=''; $modeinput='hours';
+				$tableCell = ''; $modeinput = 'hours';
 				for ($idw = 0; $idw < 7; $idw++)
 				{
-					$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
+					$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
-					$cssonholiday='';
-					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon'])   $cssonholiday.='onholidayallday ';
-					elseif (! $isavailable[$tmpday]['morning'])   $cssonholiday.='onholidaymorning ';
-					elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+					$cssonholiday = '';
+					if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
+					elseif (!$isavailable[$tmpday]['morning'])   $cssonholiday .= 'onholidaymorning ';
+					elseif (!$isavailable[$tmpday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
 
-					$tmparray=dol_getdate($tmpday);
+					$tmparray = dol_getdate($tmpday);
 					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
-					$totalforeachday[$tmpday]+=$dayWorkLoad;
+					$totalforeachday[$tmpday] += $dayWorkLoad;
 
-					$alreadyspent='';
-					if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
-					$alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
+					$alreadyspent = '';
+					if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+					$alttitle = $langs->trans("AddHereTimeSpentForDay", $tmparray['day'], $tmparray['mon']);
 
 					global $numstartworkingday, $numendworkingday;
-					$cssweekend='';
+					$cssweekend = '';
 					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
 					{
-						$cssweekend='weekend';
+						$cssweekend = 'weekend';
 					}
 
-					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
-					$placeholder='';
+					$tableCell = '<td align="center" class="hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
+					$placeholder = '';
 					if ($alreadyspent)
 					{
-						$tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
 						//$placeholder=' placeholder="00:00"';
 					 	//$tableCell.='+';
 					}
-				  	$tableCell.='<input type="text" alt="'.($disabledtask?'':$alttitle).'" title="'.($disabledtask?'':$alttitle).'" '.($disabledtask?'disabled':$placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
-					$tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"';
-				   	$tableCell.=' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
-				   	$tableCell.=' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
-				   	$tableCell.='</td>';
+				  	$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
+				   	$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
+				   	$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
+				   	$tableCell .= '</td>';
 					print $tableCell;
 				}
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
    				else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
    					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
 
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
 				print '</td>';
 
@@ -1340,9 +1340,9 @@ 
 				$ret = projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak);
 				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
 				//var_dump($ret);
-				foreach($ret as $key => $val)
+				foreach ($ret as $key => $val)
 				{
-					$totalforeachday[$key]+=$val;
+					$totalforeachday[$key] += $val;
 				}
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
 				//var_dump($totalforeachday);
@@ -1371,8 +1371,8 @@ 
 function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
 {
 	//print 'Search in line with parent id = '.$parent.'<br>';
-	$numlines=count($lines);
-	for ($i = 0 ; $i < $numlines ; $i++)
+	$numlines = count($lines);
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		// Process line $lines[$i]
 		if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent)
@@ -1408,52 +1408,52 @@ 
  * @param   array   $hiddenfields       List of info to not show ('projectlabel', 'declaredprogress', '...', )
  * @return	void
  */
-function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=0, $statut=-1, $listofoppstatus=array(),$hiddenfields=array())
+function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks = 0, $statut = -1, $listofoppstatus = array(), $hiddenfields = array())
 {
-	global $langs,$conf,$user,$bc;
+	global $langs, $conf, $user, $bc;
 
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-	$projectstatic=new Project($db);
-	$thirdpartystatic=new Societe($db);
+	$projectstatic = new Project($db);
+	$thirdpartystatic = new Societe($db);
 
-	$sortfield='';
-	$sortorder='';
-	$project_year_filter=0;
+	$sortfield = '';
+	$sortorder = '';
+	$project_year_filter = 0;
 
-	$title=$langs->trans("Projects");
-	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+	$title = $langs->trans("Projects");
+	if (strcmp($statut, '') && $statut >= 0) $title = $langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
 
-	$arrayidtypeofcontact=array();
+	$arrayidtypeofcontact = array();
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
 
-	$sql= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql = " FROM ".MAIN_DB_PREFIX."projet as p";
 	if ($mytasks)
 	{
-		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-		$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-		$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+		$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
 	}
 	else
 	{
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
-	$sql.= " WHERE p.entity IN (".getEntity('project').")";
-	$sql.= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	$sql .= " WHERE p.entity IN (".getEntity('project').")";
+	$sql .= " AND p.rowid IN (".$projectsListId.")";
+	if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 	if ($mytasks)
 	{
-		$sql.= " AND p.rowid = t.fk_projet";
-		$sql.= " AND ec.element_id = t.rowid";
-		$sql.= " AND ec.fk_socpeople = ".$user->id;
-		$sql.= " AND ec.fk_c_type_contact = ctc.rowid";   // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
-		$sql.= " AND ctc.element = 'project_task'";
+		$sql .= " AND p.rowid = t.fk_projet";
+		$sql .= " AND ec.element_id = t.rowid";
+		$sql .= " AND ec.fk_socpeople = ".$user->id;
+		$sql .= " AND ec.fk_c_type_contact = ctc.rowid"; // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
+		$sql .= " AND ctc.element = 'project_task'";
 	}
 	if ($statut >= 0)
 	{
-		$sql.= " AND p.fk_statut = ".$statut;
+		$sql .= " AND p.fk_statut = ".$statut;
 	}
 	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
 	{
@@ -1465,40 +1465,40 @@ 
 			{
 				$project_year_filter = date("Y");
 			}
-			$sql.= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter,12,false)).")";
-			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
+			$sql .= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter, 12, false)).")";
+			$sql .= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter, 1, false)).")";
 		}
 	}
 
 	// Get id of project we must show tasks
-	$arrayidofprojects=array();
+	$arrayidofprojects = array();
 	$sql1 = "SELECT p.rowid as projectid";
-	$sql1.= $sql;
+	$sql1 .= $sql;
 	$resql = $db->query($sql1);
 	if ($resql)
 	{
-		$i=0;
+		$i = 0;
 		$num = $db->num_rows($resql);
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			$arrayidofprojects[$objp->projectid]=$objp->projectid;
+			$arrayidofprojects[$objp->projectid] = $objp->projectid;
 			$i++;
 		}
 	}
 	else dol_print_error($db);
-	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
+	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
 
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
-	$sql2.= " p.dateo, p.datee,";
-	$sql2.= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
-	$sql2.= " FROM ".MAIN_DB_PREFIX."projet as p";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
-	$sql2.= " WHERE p.rowid IN (".join(',',$arrayidofprojects).")";
-	$sql2.= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
-	$sql2.= " ORDER BY p.title, p.ref";
+	$sql2 .= " p.dateo, p.datee,";
+	$sql2 .= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
+	$sql2 .= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
+	$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
+	$sql2 .= " WHERE p.rowid IN (".join(',', $arrayidofprojects).")";
+	$sql2 .= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
+	$sql2 .= " ORDER BY p.title, p.ref";
 
 	$resql = $db->query($sql2);
 	if ($resql)
@@ -1511,24 +1511,24 @@ 
 		$i = 0;
 
 		print '<tr class="liste_titre">';
-		print_liste_field_titre($title.' <span class="badge">'.$num.'</span>',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-		print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		print_liste_field_titre($title.' <span class="badge">'.$num.'</span>', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
-			print_liste_field_titre("OpportunityAmount","","","","",'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre("OpportunityStatus","","","","",'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre("OpportunityAmount", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+			print_liste_field_titre("OpportunityStatus", "", "", "", "", 'align="right"', $sortfield, $sortorder);
 		}
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
-			print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre("Tasks", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+			if (!in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+			if (!in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared", "", "", "", "", 'align="right"', $sortfield, $sortorder);
 		}
-		print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre("Status", "", "", "", "", 'align="right"', $sortfield, $sortorder);
 		print "</tr>\n";
 
-		$total_plannedworkload=0;
-		$total_declaredprogressworkload=0;
+		$total_plannedworkload = 0;
+		$total_declaredprogressworkload = 0;
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
@@ -1541,7 +1541,7 @@ 
 			$userAccess = $projectstatic->restrictedProjectArea($user);
 			if ($userAccess >= 0)
 			{
-				$projectstatic->ref=$objp->ref;
+				$projectstatic->ref = $objp->ref;
 				$projectstatic->statut = $objp->status;
 				$projectstatic->title = $objp->title;
 				$projectstatic->datee = $db->jdate($objp->datee);
@@ -1551,18 +1551,18 @@ 
 				print '<tr class="oddeven">';
 				print '<td>';
 				print $projectstatic->getNomUrl(1);
-				if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
+				if (!in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title, 24);
 				print '</td>';
 				print '<td>';
 				if ($objp->fk_soc > 0)
 				{
-					$thirdpartystatic->id=$objp->fk_soc;
-					$thirdpartystatic->ref=$objp->socname;
-					$thirdpartystatic->name=$objp->socname;
+					$thirdpartystatic->id = $objp->fk_soc;
+					$thirdpartystatic->ref = $objp->socname;
+					$thirdpartystatic->name = $objp->socname;
 					print $thirdpartystatic->getNomUrl(1);
 				}
 				print '</td>';
-				if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 				{
 					print '<td align="right">';
 					if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
@@ -1576,19 +1576,19 @@ 
 				{
 					print '<td align="right">'.$objp->nb.'</td>';
 
-					$plannedworkload=$objp->planned_workload;
-					$total_plannedworkload+=$plannedworkload;
-					if (! in_array('plannedworkload', $hiddenfields))
+					$plannedworkload = $objp->planned_workload;
+					$total_plannedworkload += $plannedworkload;
+					if (!in_array('plannedworkload', $hiddenfields))
 					{
-						print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
+						print '<td align="right">'.($plannedworkload ?convertSecondToTime($plannedworkload) : '').'</td>';
 					}
-					if (! in_array('declaredprogress', $hiddenfields))
+					if (!in_array('declaredprogress', $hiddenfields))
 					{
-						$declaredprogressworkload=$objp->declared_progess_workload;
-						$total_declaredprogressworkload+=$declaredprogressworkload;
+						$declaredprogressworkload = $objp->declared_progess_workload;
+						$total_declaredprogressworkload += $declaredprogressworkload;
 						print '<td align="right">';
 						//print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
-						print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload,0).'%':'');
+						print ($plannedworkload ?round(100 * $declaredprogressworkload / $plannedworkload, 0).'%' : '');
 						print '</td>';
 					}
 				}
@@ -1606,7 +1606,7 @@ 
 
 		print '<tr class="liste_total">';
 		print '<td colspan="2">'.$langs->trans("Total")."</td>";
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
 			print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
 			print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
@@ -1614,8 +1614,8 @@ 
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
 			print '<td class="liste_total" align="right">'.$total_task.'</td>';
-			if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
-			if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+			if (!in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload ?convertSecondToTime($total_plannedworkload) : '').'</td>';
+			if (!in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload ?round(100 * $total_declaredprogressworkload / $total_plannedworkload, 0).'%' : '').'</td>';
 		}
 		print '<td class="liste_total"></td>';
 		print '</tr>';

Braces +308 added lines, -125 removed lines

@@ -47,7 +47,9 @@ 
 	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) {
+		$head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	}
 	$head[$h][2] = 'contact';
 	$h++;
 
@@ -71,11 +73,17 @@ 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+		if(!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if(!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'notes';
 		$h++;
 	}
@@ -87,7 +95,9 @@ 
 	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+		$head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -100,7 +110,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic=new Task($db);
 		$nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		if ($nbTasks > 0) {
+			$head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		}
 		$head[$h][2] = 'tasks';
 		$h++;
 
@@ -117,7 +129,9 @@ 
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) {
+			$head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		}
 		$head[$h][2] = 'project_comment';
 		$h++;
 	}
@@ -158,7 +172,9 @@ 
 	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$head[$h][1] = $langs->trans("TaskRessourceLinks");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) {
+		$head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	}
 	$head[$h][2] = 'task_contact';
 	$h++;
 
@@ -172,13 +188,18 @@ 
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $nbTimeSpent=1;
+		if ($obj) {
+			$nbTimeSpent=1;
+		}
+	} else {
+		dol_print_error($db);
 	}
-	else dol_print_error($db);
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$head[$h][1] = $langs->trans("TimeSpent");
-	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+	if ($nbTimeSpent > 0) {
+		$head[$h][1].= ' <span class="badge">...</span>';
+	}
 	$head[$h][2] = 'task_time';
 	$h++;
 
@@ -191,11 +212,17 @@ 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+		if(!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if(!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'task_notes';
 		$h++;
 	}
@@ -207,7 +234,9 @@ 
 	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
 	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+		$head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'task_document';
 	$h++;
 
@@ -217,7 +246,9 @@ 
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) {
+			$head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		}
 		$head[$h][2] = 'task_comment';
 		$h++;
 	}
@@ -244,7 +275,9 @@ 
 
 	$param='';
 	$param.=($mode?'&mode='.$mode:'');
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) {
+		$param.='&search_usertoprocessid='.$fuser->id;
+	}
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
 	{
@@ -351,15 +384,20 @@ 
 
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0 && $level >= 0) $level = 0;              // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($parent == 0 && $level >= 0) {
+			$level = 0;
+		}
+		// if $level = -1, we dont' use sublevel recursion, we show all lines
 
 		// Process line
 		// print "i:".$i."-".$lines[$i]->fk_project.'<br>';
 
-		if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($lines[$i]->fk_parent == $parent || $level < 0) {
+			// if $level = -1, we dont' use sublevel recursion, we show all lines
 		{
 			// Show task line.
 			$showline=1;
+		}
 			$showlineingray=0;
 
 			// If there is filters to use
@@ -375,14 +413,12 @@ 
 					if ($foundtaskforuserdeeper > 0)
 					{
 						$showlineingray=1;		// We will show line but in gray
-					}
-					else
+					} else
 					{
 						$showline=0;			// No reason to show line
 					}
 				}
-			}
-			else
+			} else
 			{
 				// Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
 				// or into all other projects if user has permission to).
@@ -419,8 +455,11 @@ 
 					$projectstatic->ref=$lines[$i]->projectref;
 					$projectstatic->public=$lines[$i]->public;
 					$projectstatic->title=$lines[$i]->projectlabel;
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
-					else print $projectstatic->getNomUrl(1,'nolink');
+					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) {
+						print $projectstatic->getNomUrl(1);
+					} else {
+						print $projectstatic->getNomUrl(1,'nolink');
+					}
 					//if ($showlineingray) print '</i>';
 					print "</td>";
 
@@ -436,8 +475,7 @@ 
 				if ($showlineingray)
 				{
 					print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
-				}
-				else
+				} else
 				{
 					$taskstatic->id=$lines[$i]->id;
 					$taskstatic->ref=$lines[$i]->ref;
@@ -448,14 +486,18 @@ 
 
 				// Title of task
 				print "<td>";
-				if ($showlineingray) print '<i>';
+				if ($showlineingray) {
+					print '<i>';
+				}
 				//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
 				for ($k = 0 ; $k < $level ; $k++)
 				{
 					print "&nbsp; &nbsp; &nbsp;";
 				}
 				print $lines[$i]->label;
-				if ($showlineingray) print '</i>';
+				if ($showlineingray) {
+					print '</i>';
+				}
 				//else print '</a>';
 				print "</td>\n";
 
@@ -471,13 +513,19 @@ 
 				$taskstatic->fk_statut = $lines[$i]->status;
 				$taskstatic->datee = $lines[$i]->date_end;
 				print dol_print_date($lines[$i]->date_end,'dayhour');
-				if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
+				if ($taskstatic->hasDelay()) {
+					print img_warning($langs->trans("Late"));
+				}
 				print '</td>';
 
 				$plannedworkloadoutputformat='allhourmin';
 				$timespentoutputformat='allhourmin';
-				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) {
+					$plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+				}
+				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
+					$timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+				}
 
 				// Planned Workload (in working hours)
 				print '<td align="right">';
@@ -494,20 +542,32 @@ 
 
 				// Time spent
 				print '<td align="right">';
-				if ($showlineingray) print '<i>';
-				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
-				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
-				else print '--:--';
-				if ($showlineingray) print '</i>';
-				else print '</a>';
+				if ($showlineingray) {
+					print '<i>';
+				} else {
+					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
+				}
+				if ($lines[$i]->duration) {
+					print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
+				} else {
+					print '--:--';
+				}
+				if ($showlineingray) {
+					print '</i>';
+				} else {
+					print '</a>';
+				}
 				print '</td>';
 
 				// Progress calculated (Note: ->duration is time spent)
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload || $lines[$i]->duration)
 				{
-					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
-					else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
+					if ($lines[$i]->planned_workload) {
+						print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
+					} else {
+						print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
+					}
 				}
 				print '</td>';
 
@@ -527,21 +587,28 @@ 
 
 				print "</tr>\n";
 
-				if (! $showlineingray) $inc++;
+				if (! $showlineingray) {
+					$inc++;
+				}
 
-				if ($level >= 0)    // Call sublevels
+				if ($level >= 0) {
+					// Call sublevels
 				{
 					$level++;
-					if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
+				}
+					if ($lines[$i]->id) {
+						projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
+					}
 					$level--;
 				}
 
 				$total_projectlinesa_spent += $lines[$i]->duration;
 				$total_projectlinesa_planned += $lines[$i]->planned_workload;
-				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
+				if ($lines[$i]->planned_workload) {
+					$total_projectlinesa_spent_if_planned += $lines[$i]->duration;
+				}
 			}
-		}
-		else
+		} else
 		{
 			//$level--;
 		}
@@ -551,7 +618,9 @@ 
 	{
 		print '<tr class="liste_total nodrag nodrop">';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
-		if ($showproject) print '<td></td><td></td>';
+		if ($showproject) {
+			print '<td></td><td></td>';
+		}
 		print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';
@@ -559,15 +628,23 @@ 
 		print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+		if ($projectidfortotallink > 0) {
+			print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+		}
 		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
-		if ($projectidfortotallink > 0) print '</a>';
+		if ($projectidfortotallink > 0) {
+			print '</a>';
+		}
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+		if ($total_projectlinesa_planned) {
+			print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+		}
 		print '</td>';
 		print '<td></td>';
-		if ($addordertick) print '<td class="hideonsmartphone"></td>';
+		if ($addordertick) {
+			print '<td class="hideonsmartphone"></td>';
+		}
 		print '</tr>';
 	}
 
@@ -605,11 +682,16 @@ 
 	$numlines=count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
+	if ($parent == 0) {
+		// Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0 ;
+	}
+	$i < $numlines ; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) {
+				$lineswithoutlevel0[]=$lines[$i];
+			}
 		}
 	}
 
@@ -621,7 +703,9 @@ 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0) $level = 0;
+		if ($parent == 0) {
+			$level = 0;
+		}
 
 		//if ($lines[$i]->fk_task_parent == $parent)
 		//{
@@ -678,7 +762,9 @@ 
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+					$oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven">'."\n";
 
@@ -700,17 +786,23 @@ 
 
 				// Thirdparty
 				print '<td class="tdoverflowmax100">';
-				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+				if ($thirdpartystatic->id > 0) {
+					print $thirdpartystatic->getNomUrl(1, 'project', 10);
+				}
 				print '</td>';
 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -744,9 +836,13 @@ 
 				print '</td>';
 
 				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday.='onholidayallday ';
+				} elseif (! $isavailable[$preselectedday]['morning']) {
+					$cssonholiday.='onholidaymorning ';
+				} elseif (! $isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday.='onholidayafternoon ';
+				}
 
 				// Duration
 				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
@@ -755,7 +851,9 @@ 
 				$totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
 
 				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				if ($dayWorkLoad > 0) {
+					$alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				}
 
 				print convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
 
@@ -831,11 +929,16 @@ 
 	$numlines=count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
+	if ($parent == 0) {
+		// Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0 ;
+	}
+	$i < $numlines ; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) {
+				$lineswithoutlevel0[]=$lines[$i];
+			}
 		}
 	}
 
@@ -847,7 +950,9 @@ 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0) $level = 0;
+		if ($parent == 0) {
+			$level = 0;
+		}
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
@@ -895,7 +1000,9 @@ 
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="9">';
 					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
+					if ($thirdpartystatic->id > 0) {
+						print ' - '.$thirdpartystatic->getNomUrl(1);
+					}
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -905,7 +1012,9 @@ 
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+					$oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven">'."\n";
 
@@ -929,11 +1038,15 @@ 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -942,8 +1055,11 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
+				if ($lines[$i]->planned_workload) {
+					print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print '</td>';
 
 				// Progress declared %
@@ -959,15 +1075,19 @@ 
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration,'allhourmin');
 					print '</a>';
+				} else {
+					print '--:--';
 				}
-				else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
 				print '<td align="right">';
 				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
-				else print '--:--';
+				if ($tmptimespent['total_duration']) {
+					print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				$disabledproject=1;$disabledtask=1;
@@ -993,9 +1113,13 @@ 
 				print '</td>';
 
 				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday.='onholidayallday ';
+				} elseif (! $isavailable[$preselectedday]['morning']) {
+					$cssonholiday.='onholidaymorning ';
+				} elseif (! $isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday.='onholidayafternoon ';
+				}
 
 				global $daytoparse;
 				$tmparray = dol_getdate($daytoparse,true);	// detail of current day
@@ -1003,10 +1127,12 @@ 
 
 				global $numstartworkingday, $numendworkingday;
 				$cssweekend='';
-				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday) {
+					// This is a day is not inside the setup of working days, so we use a week-end css.
 				{
 					$cssweekend='weekend';
 				}
+				}
 
 				// Duration
 				print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
@@ -1014,7 +1140,9 @@ 
 				$totalforeachday[$preselectedday]+=$dayWorkLoad;
 
 				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+				if ($dayWorkLoad > 0) {
+					$alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+				}
 
 				$idw = 0;
 
@@ -1044,11 +1172,14 @@ 
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
+   				if ((! $lines[$i]->public) && $disabledproject) {
+   					print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				} else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					if ($fuser->id != $user->id) {
+   						$titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					}
 
    					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
@@ -1074,8 +1205,7 @@ 
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
+		} else
 		{
 			//$level--;
 		}
@@ -1115,11 +1245,16 @@ 
 	$lineswithoutlevel0=array();
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
+	if ($parent == 0) {
+		// Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0 ;
+	}
+	$i < $numlines ; $i++)
 		{
-		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+		   if ($lines[$i]->fk_task_parent) {
+		   	$lineswithoutlevel0[]=$lines[$i];
+		   }
 		}
 	}
 
@@ -1132,7 +1267,9 @@ 
 
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0) $level = 0;
+		if ($parent == 0) {
+			$level = 0;
+		}
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
@@ -1179,7 +1316,9 @@ 
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="13">';
 					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
+					if ($thirdpartystatic->id > 0) {
+						print ' - '.$thirdpartystatic->getNomUrl(1);
+					}
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -1189,7 +1328,9 @@ 
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+					$oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven">'."\n";
 
@@ -1213,11 +1354,15 @@ 
 				// Ref
 				print '<td class="nowrap">';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+					print "&nbsp;&nbsp;&nbsp;";
+				}
 				//print $taskstatic->getNomUrl(0, 'withproject', 'time');
 				print $taskstatic->label;
 				//print "<br>";
@@ -1227,8 +1372,11 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
+				if ($lines[$i]->planned_workload) {
+					print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print '</td>';
 
 				// Progress declared %
@@ -1244,15 +1392,19 @@ 
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration,'allhourmin');
 					print '</a>';
+				} else {
+					print '--:--';
 				}
-				else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
 				print '<td align="right">';
 				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
-				else print '--:--';
+				if ($tmptimespent['total_duration']) {
+					print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				$disabledproject=1;$disabledtask=1;
@@ -1280,24 +1432,32 @@ 
 					$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
 					$cssonholiday='';
-					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon'])   $cssonholiday.='onholidayallday ';
-					elseif (! $isavailable[$tmpday]['morning'])   $cssonholiday.='onholidaymorning ';
-					elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon']) {
+						$cssonholiday.='onholidayallday ';
+					} elseif (! $isavailable[$tmpday]['morning']) {
+						$cssonholiday.='onholidaymorning ';
+					} elseif (! $isavailable[$tmpday]['afternoon']) {
+						$cssonholiday.='onholidayafternoon ';
+					}
 
 					$tmparray=dol_getdate($tmpday);
 					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
 					$totalforeachday[$tmpday]+=$dayWorkLoad;
 
 					$alreadyspent='';
-					if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+					if ($dayWorkLoad > 0) {
+						$alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+					}
 					$alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
 
 					global $numstartworkingday, $numendworkingday;
 					$cssweekend='';
-					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday) {
+						// This is a day is not inside the setup of working days, so we use a week-end css.
 					{
 						$cssweekend='weekend';
 					}
+					}
 
 					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
 					$placeholder='';
@@ -1317,11 +1477,14 @@ 
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
+   				if ((! $lines[$i]->public) && $disabledproject) {
+   					print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				} else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					if ($fuser->id != $user->id) {
+   						$titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					}
 
    					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
@@ -1348,8 +1511,7 @@ 
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
+		} else
 		{
 			//$level--;
 		}
@@ -1388,7 +1550,9 @@ 
 			searchTaskInChild($inc, $lines[$i]->id, $lines, $taskrole);
 			//print 'Found inc='.$inc.'<br>';
 
-			if ($inc > 0) return $inc;
+			if ($inc > 0) {
+				return $inc;
+			}
 		}
 	}
 
@@ -1422,7 +1586,9 @@ 
 	$project_year_filter=0;
 
 	$title=$langs->trans("Projects");
-	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+	if (strcmp($statut, '') && $statut >= 0) {
+		$title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+	}
 
 	$arrayidtypeofcontact=array();
 
@@ -1435,14 +1601,15 @@ 
 		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
 		$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-	}
-	else
+	} else
 	{
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
 	$sql.= " WHERE p.entity IN (".getEntity('project').")";
 	$sql.= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	if ($socid) {
+		$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	}
 	if ($mytasks)
 	{
 		$sql.= " AND p.rowid = t.fk_projet";
@@ -1485,9 +1652,12 @@ 
 			$arrayidofprojects[$objp->projectid]=$objp->projectid;
 			$i++;
 		}
+	} else {
+		dol_print_error($db);
+	}
+	if (empty($arrayidofprojects)) {
+		$arrayidofprojects[0]=-1;
 	}
-	else dol_print_error($db);
-	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
 
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
@@ -1521,8 +1691,12 @@ 
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
 			print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+			if (! in_array('plannedworkload', $hiddenfields)) {
+				print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
+			}
+			if (! in_array('declaredprogress', $hiddenfields)) {
+				print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+			}
 		}
 		print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
 		print "</tr>\n";
@@ -1551,7 +1725,9 @@ 
 				print '<tr class="oddeven">';
 				print '<td>';
 				print $projectstatic->getNomUrl(1);
-				if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
+				if (! in_array('projectlabel', $hiddenfields)) {
+					print '<br>'.dol_trunc($objp->title,24);
+				}
 				print '</td>';
 				print '<td>';
 				if ($objp->fk_soc > 0)
@@ -1565,11 +1741,15 @@ 
 				if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 				{
 					print '<td align="right">';
-					if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
+					if ($objp->opp_amount) {
+						print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
+					}
 					print '</td>';
 					print '<td align="right">';
 					$code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
-					if ($code) print $langs->trans("OppStatus".$code);
+					if ($code) {
+						print $langs->trans("OppStatus".$code);
+					}
 					print '</td>';
 				}
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
@@ -1614,15 +1794,18 @@ 
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
 			print '<td class="liste_total" align="right">'.$total_task.'</td>';
-			if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
-			if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+			if (! in_array('plannedworkload', $hiddenfields)) {
+				print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
+			}
+			if (! in_array('declaredprogress', $hiddenfields)) {
+				print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+			}
 		}
 		print '<td class="liste_total"></td>';
 		print '</tr>';
 
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}

htdocs/product/class/product.class.php

Indentation +640 added lines, -640 removed lines

@@ -68,9 +68,9 @@ 
 	public $label;
 
 	/**
-     	* Product descripion
-     	* @var string
-     	*/
+	 * Product descripion
+	 * @var string
+	 */
 	public $description;
 
 	/**
@@ -131,7 +131,7 @@ 
 	public $tva_tx;
 
 	//! French VAT NPR (0 or 1)
-    public $tva_npr=0;
+	public $tva_npr=0;
 
 	//! Other local taxes
 	public $localtax1_tx;
@@ -249,7 +249,7 @@ 
 	public $stats_commande=array();
 	public $stats_contrat=array();
 	public $stats_facture=array();
-    public $stats_commande_fournisseur=array();
+	public $stats_commande_fournisseur=array();
 
 	public $multilangs=array();
 
@@ -273,7 +273,7 @@ 
 
 	public $oldcopy;
 
-    public $fk_price_expression;
+	public $fk_price_expression;
 
 	/**
 	 * @deprecated
@@ -372,7 +372,7 @@ 
 	{
 		global $conf, $langs;
 
-        	$error=0;
+			$error=0;
 
 		// Clean parameters
 		$this->ref = dol_string_nospecial(trim($this->ref));
@@ -619,94 +619,94 @@ 
 				$this->db->rollback();
 				return -$error;
 			}
-        }
-        else
-       {
-            $this->db->rollback();
-            dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
-            return -3;
-        }
+		}
+		else
+	   {
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
+			return -3;
+		}
 
 	}
 
 
-    /**
-     *    Check properties of product are ok (like name, barcode, ...).
-     *    All properties must be already loaded on object (this->barcode, this->barcode_type_code, ...).
-     *
-     *    @return     int		0 if OK, <0 if KO
-     */
-    function verify()
-    {
-        $this->errors=array();
-
-        $result = 0;
-        $this->ref = trim($this->ref);
-
-        if (! $this->ref)
-        {
-            $this->errors[] = 'ErrorBadRef';
-            $result = -2;
-        }
-
-        $rescode = $this->check_barcode($this->barcode, $this->barcode_type_code);
-        if ($rescode)
-        {
-        	if ($rescode == -1)
-        	{
-        		$this->errors[] = 'ErrorBadBarCodeSyntax';
-        	}
-        	elseif ($rescode == -2)
-        	{
-        		$this->errors[] = 'ErrorBarCodeRequired';
-        	}
-        	elseif ($rescode == -3)
-        	{
-        		// Note: Common usage is to have barcode unique. For variants, we should have a different barcode.
-        		$this->errors[] = 'ErrorBarCodeAlreadyUsed';
-        	}
-
-        	$result = -3;
-        }
-
-        return $result;
-    }
-
-    /**
-     *  Check barcode
-     *
-     *	@param	string	$valuetotest	Value to test
-     *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
-     *  @return int						0 if OK
-     * 									-1 ErrorBadBarCodeSyntax
-     * 									-2 ErrorBarCodeRequired
-     * 									-3 ErrorBarCodeAlreadyUsed
-     */
-    function check_barcode($valuetotest,$typefortest)
-    {
-        global $conf;
-        if (! empty($conf->barcode->enabled) && ! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
-        {
-        	$module=strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
-
-            $dirsociete=array_merge(array('/core/modules/barcode/'),$conf->modules_parts['barcode']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-
-            $mod = new $module();
-
-            dol_syslog(get_class($this)."::check_barcode value=".$valuetotest." type=".$typefortest." module=".$module);
-            $result = $mod->verif($this->db, $valuetotest, $this, 0, $typefortest);
-            return $result;
-        }
-        else
-		{
-            return 0;
-        }
-    }
+	/**
+	 *    Check properties of product are ok (like name, barcode, ...).
+	 *    All properties must be already loaded on object (this->barcode, this->barcode_type_code, ...).
+	 *
+	 *    @return     int		0 if OK, <0 if KO
+	 */
+	function verify()
+	{
+		$this->errors=array();
+
+		$result = 0;
+		$this->ref = trim($this->ref);
+
+		if (! $this->ref)
+		{
+			$this->errors[] = 'ErrorBadRef';
+			$result = -2;
+		}
+
+		$rescode = $this->check_barcode($this->barcode, $this->barcode_type_code);
+		if ($rescode)
+		{
+			if ($rescode == -1)
+			{
+				$this->errors[] = 'ErrorBadBarCodeSyntax';
+			}
+			elseif ($rescode == -2)
+			{
+				$this->errors[] = 'ErrorBarCodeRequired';
+			}
+			elseif ($rescode == -3)
+			{
+				// Note: Common usage is to have barcode unique. For variants, we should have a different barcode.
+				$this->errors[] = 'ErrorBarCodeAlreadyUsed';
+			}
+
+			$result = -3;
+		}
+
+		return $result;
+	}
+
+	/**
+	 *  Check barcode
+	 *
+	 *	@param	string	$valuetotest	Value to test
+	 *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
+	 *  @return int						0 if OK
+	 * 									-1 ErrorBadBarCodeSyntax
+	 * 									-2 ErrorBarCodeRequired
+	 * 									-3 ErrorBarCodeAlreadyUsed
+	 */
+	function check_barcode($valuetotest,$typefortest)
+	{
+		global $conf;
+		if (! empty($conf->barcode->enabled) && ! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
+		{
+			$module=strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
+
+			$dirsociete=array_merge(array('/core/modules/barcode/'),$conf->modules_parts['barcode']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+
+			$mod = new $module();
+
+			dol_syslog(get_class($this)."::check_barcode value=".$valuetotest." type=".$typefortest." module=".$module);
+			$result = $mod->verif($this->db, $valuetotest, $this, 0, $typefortest);
+			return $result;
+		}
+		else
+		{
+			return 0;
+		}
+	}
 
 	/**
 	 *	Update a record into database.
@@ -768,10 +768,10 @@ 
 		if (empty($this->status))				$this->status = 0;
 		if (empty($this->status_buy))			$this->status_buy = 0;
 
-        if (empty($this->country_id))           $this->country_id = 0;
+		if (empty($this->country_id))           $this->country_id = 0;
 
-        // Barcode value
-        $this->barcode=trim($this->barcode);
+		// Barcode value
+		$this->barcode=trim($this->barcode);
 
 		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
 		$this->accountancy_code_sell= trim($this->accountancy_code_sell);
@@ -779,74 +779,74 @@ 
 		$this->accountancy_code_sell_export= trim($this->accountancy_code_sell_export);
 
 
-        $this->db->begin();
-
-        // Check name is required and codes are ok or unique.
-        // If error, this->errors[] is filled
-        if ($action != 'add')
-        {
-        	$result = $this->verify();	// We don't check when update called during a create because verify was already done
-        }
-
-        if ($result >= 0)
-        {
-            if (empty($this->oldcopy))
-            {
-                $org=new self($this->db);
-                $org->fetch($this->id);
-                $this->oldcopy=$org;
-            }
-
-            // Test if batch management is activated on existing product
-            // If yes, we create missing entries into product_batch
-            if ($this->hasbatch() && !$this->oldcopy->hasbatch())
-            {
-                //$valueforundefinedlot = 'Undefined';  // In previous version, 39 and lower
-                $valueforundefinedlot = '000000';
-
-                dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");
-
-                $this->load_stock();
-                foreach ($this->stock_warehouse as $idW => $ObjW)   // For each warehouse where we have stocks defined for this product (for each lines in product_stock)
-                {
-                    $qty_batch = 0;
-                    foreach ($ObjW->detail_batch as $detail)    // Each lines of detail in product_batch of the current $ObjW = product_stock
-                    {
-                        if ($detail->batch == $valueforundefinedlot || $detail->batch == 'Undefined')
-                        {
-                            // We discard this line, we will create it later
-                            $sqlclean="DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE batch in('Undefined', '".$valueforundefinedlot."') AND fk_product_stock = ".$ObjW->id;
-                            $result = $this->db->query($sqlclean);
-                            if (! $result)
-                            {
-                                dol_print_error($this->db);
-                                exit;
-                            }
-                            continue;
-                        }
-
-                        $qty_batch += $detail->qty;
-                    }
-                    // Quantities in batch details are not same as stock quantity,
-                    // so we add a default batch record to complete and get same qty in parent and child table
-                    if ($ObjW->real <> $qty_batch)
-                    {
-                        $ObjBatch = new Productbatch($this->db);
-                        $ObjBatch->batch = $valueforundefinedlot;
-                        $ObjBatch->qty = ($ObjW->real - $qty_batch);
-                        $ObjBatch->fk_product_stock = $ObjW->id;
-
-                        if ($ObjBatch->create($user,1) < 0)
-                        {
-                            $error++;
-                            $this->errors=$ObjBatch->errors;
-                        }
-                    }
-                }
-            }
-
-	        // For automatic creation
-	        if ($this->barcode == -1) $this->barcode = $this->get_barcode($this,$this->barcode_type_code);
+		$this->db->begin();
+
+		// Check name is required and codes are ok or unique.
+		// If error, this->errors[] is filled
+		if ($action != 'add')
+		{
+			$result = $this->verify();	// We don't check when update called during a create because verify was already done
+		}
+
+		if ($result >= 0)
+		{
+			if (empty($this->oldcopy))
+			{
+				$org=new self($this->db);
+				$org->fetch($this->id);
+				$this->oldcopy=$org;
+			}
+
+			// Test if batch management is activated on existing product
+			// If yes, we create missing entries into product_batch
+			if ($this->hasbatch() && !$this->oldcopy->hasbatch())
+			{
+				//$valueforundefinedlot = 'Undefined';  // In previous version, 39 and lower
+				$valueforundefinedlot = '000000';
+
+				dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");
+
+				$this->load_stock();
+				foreach ($this->stock_warehouse as $idW => $ObjW)   // For each warehouse where we have stocks defined for this product (for each lines in product_stock)
+				{
+					$qty_batch = 0;
+					foreach ($ObjW->detail_batch as $detail)    // Each lines of detail in product_batch of the current $ObjW = product_stock
+					{
+						if ($detail->batch == $valueforundefinedlot || $detail->batch == 'Undefined')
+						{
+							// We discard this line, we will create it later
+							$sqlclean="DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE batch in('Undefined', '".$valueforundefinedlot."') AND fk_product_stock = ".$ObjW->id;
+							$result = $this->db->query($sqlclean);
+							if (! $result)
+							{
+								dol_print_error($this->db);
+								exit;
+							}
+							continue;
+						}
+
+						$qty_batch += $detail->qty;
+					}
+					// Quantities in batch details are not same as stock quantity,
+					// so we add a default batch record to complete and get same qty in parent and child table
+					if ($ObjW->real <> $qty_batch)
+					{
+						$ObjBatch = new Productbatch($this->db);
+						$ObjBatch->batch = $valueforundefinedlot;
+						$ObjBatch->qty = ($ObjW->real - $qty_batch);
+						$ObjBatch->fk_product_stock = $ObjW->id;
+
+						if ($ObjBatch->create($user,1) < 0)
+						{
+							$error++;
+							$this->errors=$ObjBatch->errors;
+						}
+					}
+				}
+			}
+
+			// For automatic creation
+			if ($this->barcode == -1) $this->barcode = $this->get_barcode($this,$this->barcode_type_code);
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product";
 			$sql.= " SET label = '" . $this->db->escape($this->label) ."'";
@@ -884,8 +884,8 @@ 
 			$sql.= ", description = '" . $this->db->escape($this->description) ."'";
 			$sql.= ", url = " . ($this->url?"'".$this->db->escape($this->url)."'":'null');
 			$sql.= ", customcode = '" .        $this->db->escape($this->customcode) ."'";
-	        $sql.= ", fk_country = " . ($this->country_id > 0 ? $this->country_id : 'null');
-	        $sql.= ", note = ".(isset($this->note) ? "'" .$this->db->escape($this->note)."'" : 'null');
+			$sql.= ", fk_country = " . ($this->country_id > 0 ? $this->country_id : 'null');
+			$sql.= ", note = ".(isset($this->note) ? "'" .$this->db->escape($this->note)."'" : 'null');
 			$sql.= ", duration = '" . $this->db->escape($this->duration_value . $this->duration_unit) ."'";
 			$sql.= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy)."'";
 			$sql.= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell)."'";
@@ -893,8 +893,8 @@ 
 			$sql.= ", accountancy_code_sell_export= '" . $this->db->escape($this->accountancy_code_sell_export)."'";
 			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");
 			$sql.= ", cost_price = " . ($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
-	        $sql.= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
-	        $sql.= ", price_autogen = " . (!$this->price_autogen ? 0 : 1);
+			$sql.= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
+			$sql.= ", price_autogen = " . (!$this->price_autogen ? 0 : 1);
 			$sql.= ", fk_price_expression = ".($this->fk_price_expression != 0 ? $this->fk_price_expression : 'NULL');
 			$sql.= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
 			// stock field is not here because it is a denormalized value from product_stock.
@@ -931,10 +931,10 @@ 
 
 				if (! $error && ! $notrigger)
 				{
-                    // Call trigger
-                    $result=$this->call_trigger('PRODUCT_MODIFY',$user);
-                    if ($result < 0) { $error++; }
-                    // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('PRODUCT_MODIFY',$user);
+					if ($result < 0) { $error++; }
+					// End call triggers
 				}
 
 				if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
@@ -952,7 +952,7 @@ 
 							$res = @rename($olddir, $newdir);
 							if (! $res)
 							{
-							    $langs->load("errors");
+								$langs->load("errors");
 								$this->error=$langs->trans('ErrorFailToRenameDir',$olddir,$newdir);
 								$error++;
 							}
@@ -1001,13 +1001,13 @@ 
 					return -2;
 				}
 			}
-        }
-        else
-       {
-            $this->db->rollback();
-            dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
-            return -3;
-        }
+		}
+		else
+	   {
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
+			return -3;
+		}
 	}
 
 	/**
@@ -1052,10 +1052,10 @@ 
 
 			if (! $error && empty($notrigger))
 			{
-                // Call trigger
-                $result=$this->call_trigger('PRODUCT_DELETE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('PRODUCT_DELETE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 
 			// Delete from product_batch on product delete
@@ -1078,21 +1078,21 @@ 
 			if (! $error)
 			{
 				$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot');  // product_batch is done before
-    			foreach($elements as $table)
-    			{
-    				if (! $error)
-    				{
-    					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
-    					$sql.= " WHERE fk_product = ".$id;
-    					dol_syslog(get_class($this).'::delete', LOG_DEBUG);
-    					$result = $this->db->query($sql);
-    					if (! $result)
-    					{
-    						$error++;
-    						$this->errors[] = $this->db->lasterror();
-    					}
-    				}
-    			}
+				foreach($elements as $table)
+				{
+					if (! $error)
+					{
+						$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
+						$sql.= " WHERE fk_product = ".$id;
+						dol_syslog(get_class($this).'::delete', LOG_DEBUG);
+						$result = $this->db->query($sql);
+						if (! $result)
+						{
+							$error++;
+							$this->errors[] = $this->db->lasterror();
+						}
+					}
+				}
 			}
 
 			if (!$error) {
@@ -1264,11 +1264,11 @@ 
 				// We do not save if main fields are empty
 				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"])
 				{
-    				if (! $this->db->query($sql2))
-    				{
-    					$this->error=$this->db->lasterror();
-    					return -1;
-    				}
+					if (! $this->db->query($sql2))
+					{
+						$this->error=$this->db->lasterror();
+						return -1;
+					}
 				}
 			}
 			else
@@ -1512,7 +1512,7 @@ 
 		$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.remise_percent,";
 		$sql.= " pfp.fk_product, pfp.ref_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression";
 		$sql.= " ,pfp.default_vat_code";
-        $sql.= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
+		$sql.= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 		$sql.= " WHERE pfp.rowid = ".$prodfournprice;
 		if ($qty > 0) $sql.= " AND pfp.quantity <= ".$qty;
@@ -1525,22 +1525,22 @@ 
 			$obj = $this->db->fetch_object($resql);
 			if ($obj && $obj->quantity > 0)		// If we found a supplier prices from the id of supplier price
 			{
-                if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression))
-                {
+				if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression))
+				{
 					require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-                    $prod_supplier = new ProductFournisseur($this->db);
-                    $prod_supplier->product_fourn_price_id = $obj->rowid;
-                    $prod_supplier->id = $obj->fk_product;
-                    $prod_supplier->fourn_qty = $obj->quantity;
-                    $prod_supplier->fourn_tva_tx = $obj->tva_tx;
-                    $prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
-                    $priceparser = new PriceParser($this->db);
-                    $price_result = $priceparser->parseProductSupplier($prod_supplier);
-                    if ($price_result >= 0) {
-                    	$obj->price = $price_result;
-                    }
-                }
-                $this->product_fourn_price_id = $obj->rowid;
+					$prod_supplier = new ProductFournisseur($this->db);
+					$prod_supplier->product_fourn_price_id = $obj->rowid;
+					$prod_supplier->id = $obj->fk_product;
+					$prod_supplier->fourn_qty = $obj->quantity;
+					$prod_supplier->fourn_tva_tx = $obj->tva_tx;
+					$prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
+					$priceparser = new PriceParser($this->db);
+					$price_result = $priceparser->parseProductSupplier($prod_supplier);
+					if ($price_result >= 0) {
+						$obj->price = $price_result;
+					}
+				}
+				$this->product_fourn_price_id = $obj->rowid;
 				$this->buyprice = $obj->price;                      // deprecated
 				$this->fourn_pu = $obj->price / $obj->quantity;     // Unit price of product of supplier
 				$this->fourn_price_base_type = 'HT';                // Price base type
@@ -1549,11 +1549,11 @@ 
 				$this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed
 				$this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier
 				$this->default_vat_code = $obj->default_vat_code;   // Vat code supplier
-                $this->fourn_multicurrency_price       = $obj->multicurrency_price;
-                $this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
-                $this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
-                $this->fourn_multicurrency_id          = $obj->fk_multicurrency;
-                $this->fourn_multicurrency_code        = $obj->multicurrency_code;
+				$this->fourn_multicurrency_price       = $obj->multicurrency_price;
+				$this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
+				$this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
+				$this->fourn_multicurrency_id          = $obj->fk_multicurrency;
+				$this->fourn_multicurrency_code        = $obj->multicurrency_code;
 				$result=$obj->fk_product;
 				return $result;
 			}
@@ -1563,7 +1563,7 @@ 
 				$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,";
 				$sql.= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.tva_tx, pfp.fk_supplier_price_expression";
 				$sql.= " ,pfp.default_vat_code";
-                $sql.= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
+				$sql.= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
 				$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 				$sql.= " WHERE pfp.fk_product = ".$product_id;
 				if ($fourn_ref != 'none') $sql.= " AND pfp.ref_fourn = '".$fourn_ref."'";
@@ -1579,22 +1579,22 @@ 
 					$obj = $this->db->fetch_object($resql);
 					if ($obj && $obj->quantity > 0)		// If found
 					{
-		                if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression))
-		                {
+						if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression))
+						{
 							require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-		                    $prod_supplier = new ProductFournisseur($this->db);
-		                    $prod_supplier->product_fourn_price_id = $obj->rowid;
-		                    $prod_supplier->id = $obj->fk_product;
-		                    $prod_supplier->fourn_qty = $obj->quantity;
-		                    $prod_supplier->fourn_tva_tx = $obj->tva_tx;
-		                    $prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
-		                    $priceparser = new PriceParser($this->db);
-		                    $price_result = $priceparser->parseProductSupplier($prod_supplier);
-		                    if ($result >= 0) {
-		                    	$obj->price = $price_result;
-		                    }
-		                }
-		                $this->product_fourn_price_id = $obj->rowid;
+							$prod_supplier = new ProductFournisseur($this->db);
+							$prod_supplier->product_fourn_price_id = $obj->rowid;
+							$prod_supplier->id = $obj->fk_product;
+							$prod_supplier->fourn_qty = $obj->quantity;
+							$prod_supplier->fourn_tva_tx = $obj->tva_tx;
+							$prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
+							$priceparser = new PriceParser($this->db);
+							$price_result = $priceparser->parseProductSupplier($prod_supplier);
+							if ($result >= 0) {
+								$obj->price = $price_result;
+							}
+						}
+						$this->product_fourn_price_id = $obj->rowid;
 						$this->buyprice = $obj->price;                      // deprecated
 						$this->fourn_qty = $obj->quantity;					// min quantity for price for a virtual supplier
 						$this->fourn_pu = $obj->price / $obj->quantity;     // Unit price of product for a virtual supplier
@@ -1604,11 +1604,11 @@ 
 						$this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed
 						$this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier
 						$this->default_vat_code = $obj->default_vat_code;   // Vat code supplier
-                        $this->fourn_multicurrency_price       = $obj->multicurrency_price;
-                        $this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
-                        $this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
-                        $this->fourn_multicurrency_id          = $obj->fk_multicurrency;
-                        $this->fourn_multicurrency_code        = $obj->multicurrency_code;
+						$this->fourn_multicurrency_price       = $obj->multicurrency_price;
+						$this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
+						$this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
+						$this->fourn_multicurrency_id          = $obj->fk_multicurrency;
+						$this->fourn_multicurrency_code        = $obj->multicurrency_code;
 						$result=$obj->fk_product;
 						return $result;
 					}
@@ -1644,8 +1644,8 @@ 
 	 *  @param     	int		$newnpr             0=Standard vat rate, 1=Special vat rate for French NPR VAT
 	 *  @param     	int		$newpbq             1 if it has price by quantity
 	 *  @param 		int 	$ignore_autogen     Used to avoid infinite loops
-     *	@param      array	$localtaxes_array	Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
-     *  @param      string  $newdefaultvatcode  Default vat code
+	 *	@param      array	$localtaxes_array	Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
+	 *  @param      string  $newdefaultvatcode  Default vat code
 	 * 	@return		int						    <0 if KO, >0 if OK
 	 */
 	function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice=0, $level=0, $newnpr=0, $newpbq=0, $ignore_autogen=0, $localtaxes_array=array(), $newdefaultvatcode='')
@@ -1658,7 +1658,7 @@ 
 
 		// Clean parameters
 		if (empty($this->tva_tx))  $this->tva_tx=0;
-        if (empty($newnpr)) $newnpr=0;
+		if (empty($newnpr)) $newnpr=0;
 
 		// Check parameters
 		if ($newvat == '') $newvat=$this->tva_tx;
@@ -1719,17 +1719,17 @@ 
 
 			if (count($localtaxes_array) > 0)
 			{
-			    $localtaxtype1=$localtaxes_array['0'];
-			    $localtax1=$localtaxes_array['1'];
-			    $localtaxtype2=$localtaxes_array['2'];
-			    $localtax2=$localtaxes_array['3'];
+				$localtaxtype1=$localtaxes_array['0'];
+				$localtax1=$localtaxes_array['1'];
+				$localtaxtype2=$localtaxes_array['2'];
+				$localtax2=$localtaxes_array['3'];
 			}
 			else     // old method. deprecated because ot can't retreive type
 			{
-	       		$localtaxtype1='0';
-			    $localtax1=get_localtax($newvat,1);
-	       		$localtaxtype2='0';
-			    $localtax2=get_localtax($newvat,2);
+		   		$localtaxtype1='0';
+				$localtax1=get_localtax($newvat,1);
+		   		$localtaxtype2='0';
+				$localtax2=get_localtax($newvat,2);
 			}
 			if (empty($localtax1)) $localtax1=0;	// If = '' then = 0
 			if (empty($localtax2)) $localtax2=0;	// If = '' then = 0
@@ -1748,9 +1748,9 @@ 
 			$sql.= " localtax2_tx=".($localtax2>=0?$localtax2:'NULL').",";
 			$sql.= " localtax1_type=".($localtaxtype1!=''?"'".$localtaxtype1."'":"'0'").",";
 			$sql.= " localtax2_type=".($localtaxtype2!=''?"'".$localtaxtype2."'":"'0'").",";
-            $sql.= " default_vat_code=".($newdefaultvatcode?"'".$this->db->escape($newdefaultvatcode)."'":"null").",";
+			$sql.= " default_vat_code=".($newdefaultvatcode?"'".$this->db->escape($newdefaultvatcode)."'":"null").",";
 			$sql.= " tva_tx='".price2num($newvat)."',";
-            $sql.= " recuperableonly='".$newnpr."'";
+			$sql.= " recuperableonly='".$newnpr."'";
 			$sql.= " WHERE rowid = ".$id;
 
 			dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
@@ -1787,42 +1787,42 @@ 
 
 				$this->level = $level;				// Store level of price edited for trigger
 
-                // Call trigger
-                $result=$this->call_trigger('PRODUCT_PRICE_MODIFY',$user);
-                if ($result < 0)
-                {
-                	$this->db->rollback();
-                	return -1;
-                }
-                // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('PRODUCT_PRICE_MODIFY',$user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
 
-                $this->db->commit();
+				$this->db->commit();
 			}
 			else
 			{
 				$this->db->rollback();
-			    dol_print_error($this->db);
+				dol_print_error($this->db);
 			}
 		}
 
 		return 1;
 	}
 
-    /**
-     *  Sets the supplier price expression
-     *
-     *  @param  int     $expression_id	Expression
-     *  @return int                 	<0 if KO, >0 if OK
+	/**
+	 *  Sets the supplier price expression
+	 *
+	 *  @param  int     $expression_id	Expression
+	 *  @return int                 	<0 if KO, >0 if OK
 	 * @deprecated Use Product::update instead
-     */
-    function setPriceExpression($expression_id)
-    {
+	 */
+	function setPriceExpression($expression_id)
+	{
 		global $user;
 
 		$this->fk_price_expression = $expression_id;
 
 		return $this->update($this->id, $user);
-    }
+	}
 
 	/**
 	 *  Load a product in memory from database
@@ -1830,12 +1830,12 @@ 
 	 *  @param	int		$id      			Id of product/service to load
 	 *  @param  string	$ref     			Ref of product/service to load
 	 *  @param	string	$ref_ext			Ref ext of product/service to load
-     *  @param	int		$ignore_expression  Ignores the math expression for calculating price and uses the db value instead
+	 *  @param	int		$ignore_expression  Ignores the math expression for calculating price and uses the db value instead
 	 *  @return int     					<0 if KO, 0 if not found, >0 if OK
 	 */
 	function fetch($id='', $ref='', $ref_ext='', $ignore_expression=0)
 	{
-	    include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 		global $langs, $conf;
 
@@ -2091,19 +2091,19 @@ 
 					// Not yet implemented
 				}
 
-                if (!empty($conf->dynamicprices->enabled) && !empty($this->fk_price_expression) && empty($ignore_expression))
-                {
+				if (!empty($conf->dynamicprices->enabled) && !empty($this->fk_price_expression) && empty($ignore_expression))
+				{
 					require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-                	$priceparser = new PriceParser($this->db);
-                    $price_result = $priceparser->parseProduct($this);
-                    if ($price_result >= 0)
-                    {
-                        $this->price = $price_result;
-                        // Calculate the VAT
+					$priceparser = new PriceParser($this->db);
+					$price_result = $priceparser->parseProduct($this);
+					if ($price_result >= 0)
+					{
+						$this->price = $price_result;
+						// Calculate the VAT
 						$this->price_ttc = price2num($this->price) * (1 + ($this->tva_tx / 100));
 						$this->price_ttc = price2num($this->price_ttc,'MU');
-                    }
-                }
+					}
+				}
 
 				// We should not load stock during the fetch. If someone need stock of product, he must call load_stock after fetching product.
 				// Instead we just init the stock_warehouse array
@@ -2596,12 +2596,12 @@ 
 
 		if (empty($year))
 		{
-		    $year = strftime('%Y',time());
-		    $month = strftime('%m',time());
+			$year = strftime('%Y',time());
+			$month = strftime('%m',time());
 		}
 		else
 		{
-		    $month=12;    // We imagine we are at end of year, so we get last 12 month before, so all correct year.
+			$month=12;    // We imagine we are at end of year, so we get last 12 month before, so all correct year.
 		}
 		$result = array();
 
@@ -2683,8 +2683,8 @@ 
 		$sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
-        if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
+		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE f.rowid = d.fk_facture_fourn";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
 		else $sql.=" AND d.fk_product > 0";
@@ -2718,7 +2718,7 @@ 
 		$sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";
+		if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE p.rowid = d.fk_propal";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
@@ -2753,7 +2753,7 @@ 
 		$sql = "SELECT sum(d.qty), date_format(p.date_valid, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";
+		if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE p.rowid = d.fk_supplier_proposal";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
@@ -2787,8 +2787,8 @@ 
 		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = d.fk_commande";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
 		else $sql.=" AND d.fk_product > 0";
@@ -2821,7 +2821,7 @@ 
 		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
+		if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = d.fk_commande";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
@@ -3010,29 +3010,29 @@ 
 
 		$now=dol_now();
 
-    	dol_syslog(get_class($this)."::add_fournisseur id_fourn = ".$id_fourn." ref_fourn=".$ref_fourn." quantity=".$quantity, LOG_DEBUG);
+		dol_syslog(get_class($this)."::add_fournisseur id_fourn = ".$id_fourn." ref_fourn=".$ref_fourn." quantity=".$quantity, LOG_DEBUG);
 
 		if ($ref_fourn)
 		{
-    		$sql = "SELECT rowid, fk_product";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-    		$sql.= " WHERE fk_soc = ".$id_fourn;
-    		$sql.= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
-    		$sql.= " AND fk_product != ".$this->id;
-    		$sql.= " AND entity IN (".getEntity('productprice').")";
-
-    		$resql=$this->db->query($sql);
-    		if ($resql)
-    		{
-    			$obj = $this->db->fetch_object($resql);
-                if ($obj)
-                {
-        			// If the supplier ref already exists but for another product (duplicate ref is accepted for different quantity only or different companies)
-                    $this->product_id_already_linked = $obj->fk_product;
-    				return -3;
-    			}
-                $this->db->free($resql);
-    		}
+			$sql = "SELECT rowid, fk_product";
+			$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+			$sql.= " WHERE fk_soc = ".$id_fourn;
+			$sql.= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
+			$sql.= " AND fk_product != ".$this->id;
+			$sql.= " AND entity IN (".getEntity('productprice').")";
+
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$obj = $this->db->fetch_object($resql);
+				if ($obj)
+				{
+					// If the supplier ref already exists but for another product (duplicate ref is accepted for different quantity only or different companies)
+					$this->product_id_already_linked = $obj->fk_product;
+					return -3;
+				}
+				$this->db->free($resql);
+			}
 		}
 
 		$sql = "SELECT rowid";
@@ -3047,9 +3047,9 @@ 
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-    		$obj = $this->db->fetch_object($resql);
+			$obj = $this->db->fetch_object($resql);
 
-		    // The reference supplier does not exist, we create it for this product.
+			// The reference supplier does not exist, we create it for this product.
 			if (! $obj)
 			{
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
@@ -3226,8 +3226,8 @@ 
 		}
 		else
 		{
-		    $this->db->commit();
-		    return 1;
+			$this->db->commit();
+			return 1;
 		}
 	}
 
@@ -3448,7 +3448,7 @@ 
 	 */
 	function get_sousproduits_arbo()
 	{
-	    $parent=array();
+		$parent=array();
 
 		foreach($this->getChildsArbo($this->id) as $keyChild => $valueChild)	// Warning. getChildsArbo can call getChildsArbo recursively. Starting point is $value[0]=id of product
 		{
@@ -3466,7 +3466,7 @@ 
 	 *	@param		int		$withpicto					Add picto into link
 	 *	@param		string	$option						Where point the link ('stock', 'composition', 'category', 'supplier', '')
 	 *	@param		int		$maxlength					Maxlength of ref
-     *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return		string								String with URL
 	 */
 	function getNomUrl($withpicto=0, $option='', $maxlength=0, $save_lastsearch_value=-1)
@@ -3475,67 +3475,67 @@ 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
 		$result='';
-        $newref=$this->ref;
-        if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle');
-
-        if ($this->type == Product::TYPE_PRODUCT) $label = '<u>' . $langs->trans("ShowProduct") . '</u>';
-        if ($this->type == Product::TYPE_SERVICE) $label = '<u>' . $langs->trans("ShowService") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('ProductRef') . ':</b> ' . $this->ref;
-        if (! empty($this->label))
-            $label .= '<br><b>' . $langs->trans('ProductLabel') . ':</b> ' . $this->label;
-
-        if ($this->type == Product::TYPE_PRODUCT)
-        {
-            if ($this->weight)  $label.="<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuring_units_string($this->weight_units,"weight");
-    		if ($this->length)  $label.="<br><b>".$langs->trans("Length").'</b>: '.$this->length.' '.measuring_units_string($this->length_units,'length');
-    		if ($this->surface) $label.="<br><b>".$langs->trans("Surface").'</b>: '.$this->surface.' '.measuring_units_string($this->surface_units,'surface');
-    		if ($this->volume)  $label.="<br><b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuring_units_string($this->volume_units,'volume');
-        }
-
-        if ($this->type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-        {
-    		if (! empty($conf->productbatch->enabled))
-            {
-            	$langs->load("productbatch");
-                $label.="<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0,2);
-            }
-        }
-        if ($this->type == Product::TYPE_SERVICE)
-        {
-            //
-        }
-        if (! empty($conf->accounting->enabled) && $this->status)
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellCode') . ':</b> '. length_accountg($this->accountancy_code_sell);
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellIntraCode') . ':</b> '. length_accountg($this->accountancy_code_sell_export);
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellExportCode') . ':</b> '. length_accountg($this->accountancy_code_sell_intra);
-        }
-        if (! empty($conf->accounting->enabled) && $this->status_buy)
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancyBuyCode') . ':</b> '. length_accountg($this->accountancy_code_buy);
-        }
-        if (! empty($this->entity))
-        {
-            $tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
-            if ($this->nbphoto > 0) $label .= '<br>' . $tmpphoto;
-        }
+		$newref=$this->ref;
+		if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle');
+
+		if ($this->type == Product::TYPE_PRODUCT) $label = '<u>' . $langs->trans("ShowProduct") . '</u>';
+		if ($this->type == Product::TYPE_SERVICE) $label = '<u>' . $langs->trans("ShowService") . '</u>';
+		if (! empty($this->ref))
+			$label .= '<br><b>' . $langs->trans('ProductRef') . ':</b> ' . $this->ref;
+		if (! empty($this->label))
+			$label .= '<br><b>' . $langs->trans('ProductLabel') . ':</b> ' . $this->label;
+
+		if ($this->type == Product::TYPE_PRODUCT)
+		{
+			if ($this->weight)  $label.="<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuring_units_string($this->weight_units,"weight");
+			if ($this->length)  $label.="<br><b>".$langs->trans("Length").'</b>: '.$this->length.' '.measuring_units_string($this->length_units,'length');
+			if ($this->surface) $label.="<br><b>".$langs->trans("Surface").'</b>: '.$this->surface.' '.measuring_units_string($this->surface_units,'surface');
+			if ($this->volume)  $label.="<br><b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuring_units_string($this->volume_units,'volume');
+		}
+
+		if ($this->type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+		{
+			if (! empty($conf->productbatch->enabled))
+			{
+				$langs->load("productbatch");
+				$label.="<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0,2);
+			}
+		}
+		if ($this->type == Product::TYPE_SERVICE)
+		{
+			//
+		}
+		if (! empty($conf->accounting->enabled) && $this->status)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			$label.= '<br><b>' . $langs->trans('ProductAccountancySellCode') . ':</b> '. length_accountg($this->accountancy_code_sell);
+			$label.= '<br><b>' . $langs->trans('ProductAccountancySellIntraCode') . ':</b> '. length_accountg($this->accountancy_code_sell_export);
+			$label.= '<br><b>' . $langs->trans('ProductAccountancySellExportCode') . ':</b> '. length_accountg($this->accountancy_code_sell_intra);
+		}
+		if (! empty($conf->accounting->enabled) && $this->status_buy)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			$label.= '<br><b>' . $langs->trans('ProductAccountancyBuyCode') . ':</b> '. length_accountg($this->accountancy_code_buy);
+		}
+		if (! empty($this->entity))
+		{
+			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
+			if ($this->nbphoto > 0) $label .= '<br>' . $tmpphoto;
+		}
 
 		$linkclose='';
 		if (empty($notooltip))
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label=$langs->trans("ShowOrder");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowOrder");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
 
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
-		    $linkclose.= ' class="classfortooltip"';
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
+			$linkclose.= ' class="classfortooltip"';
 
-		    /*if (! is_object($hookmanager))
+			/*if (! is_object($hookmanager))
 	        {
 	            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 	            $hookmanager=new HookManager($this->db);
@@ -3547,29 +3547,29 @@ 
 	        */
 		}
 
-        if ($option == 'supplier' || $option == 'category') {
-            $url = DOL_URL_ROOT.'/product/fournisseurs.php?id='.$this->id;
-        } else if ($option == 'stock') {
-            $url = DOL_URL_ROOT.'/product/stock/product.php?id='.$this->id;
-        } else if ($option == 'composition') {
-            $url = DOL_URL_ROOT.'/product/composition/card.php?id='.$this->id;
-        } else {
-            $url = DOL_URL_ROOT.'/product/card.php?id='.$this->id;
-        }
-
-        if ($option !== 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-        }
-
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
-
-        $result.=$linkstart;
+		if ($option == 'supplier' || $option == 'category') {
+			$url = DOL_URL_ROOT.'/product/fournisseurs.php?id='.$this->id;
+		} else if ($option == 'stock') {
+			$url = DOL_URL_ROOT.'/product/stock/product.php?id='.$this->id;
+		} else if ($option == 'composition') {
+			$url = DOL_URL_ROOT.'/product/composition/card.php?id='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/product/card.php?id='.$this->id;
+		}
+
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		}
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		$result.=$linkstart;
 		if ($withpicto) {
 			if ($this->type == Product::TYPE_PRODUCT) $result.=(img_object(($notooltip?'':$label), 'product', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
 			if ($this->type == Product::TYPE_SERVICE) $result.=(img_object(($notooltip?'':$label), 'service',  ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
@@ -3780,8 +3780,8 @@ 
 			}
 			else
 			{
-			    $this->error=$movementstock->error;
-			    $this->errors=$movementstock->errors;
+				$this->error=$movementstock->error;
+				$this->errors=$movementstock->errors;
 
 				$this->db->rollback();
 				return -1;
@@ -3828,8 +3828,8 @@ 
 			}
 			else
 			{
-			    $this->error=$movementstock->error;
-			    $this->errors=$movementstock->errors;
+				$this->error=$movementstock->error;
+				$this->errors=$movementstock->errors;
 
 				$this->db->rollback();
 				return -1;
@@ -3905,7 +3905,7 @@ 
 
 			if (! preg_match('/novirtual/', $option))
 			{
-			    $this->load_virtual_stock();		// This also load stats_commande_fournisseur, ...
+				$this->load_virtual_stock();		// This also load stats_commande_fournisseur, ...
 			}
 
 			return 1;
@@ -3924,59 +3924,59 @@ 
 	 *    @return   int             < 0 if KO, > 0 if OK
 	 *    @see		load_stock, getBatchInfo
 	 */
-    function load_virtual_stock()
-    {
-        global $conf;
-
-        $stock_commande_client=0;
-        $stock_commande_fournisseur=0;
-        $stock_sending_client=0;
-        $stock_reception_fournisseur=0;
-
-        if (! empty($conf->commande->enabled))
-        {
-            $result=$this->load_stats_commande(0,'1,2', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_commande_client=$this->stats_commande['qty'];
-        }
-        if (! empty($conf->expedition->enabled))
-        {
-            $result=$this->load_stats_sending(0,'1,2', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_sending_client=$this->stats_expedition['qty'];
-        }
-        if (! empty($conf->fournisseur->enabled))
-        {
-            $result=$this->load_stats_commande_fournisseur(0,'1,2,3,4', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_commande_fournisseur=$this->stats_commande_fournisseur['qty'];
-
-            $result=$this->load_stats_reception(0,'4', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_reception_fournisseur=$this->stats_reception['qty'];
-        }
-
-        // Stock decrease mode
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
-            $this->stock_theorique=$this->stock_reel-$stock_commande_client+$stock_sending_client;
-        }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
-            $this->stock_theorique=$this->stock_reel;
-        }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
-            $this->stock_theorique=$this->stock_reel-$stock_commande_client;
-        }
-        // Stock Increase mode
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
-            $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
-        }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
-            $this->stock_theorique-=$stock_reception_fournisseur;
-        }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
-            $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
-        }
-    }
+	function load_virtual_stock()
+	{
+		global $conf;
+
+		$stock_commande_client=0;
+		$stock_commande_fournisseur=0;
+		$stock_sending_client=0;
+		$stock_reception_fournisseur=0;
+
+		if (! empty($conf->commande->enabled))
+		{
+			$result=$this->load_stats_commande(0,'1,2', 1);
+			if ($result < 0) dol_print_error($this->db,$this->error);
+			$stock_commande_client=$this->stats_commande['qty'];
+		}
+		if (! empty($conf->expedition->enabled))
+		{
+			$result=$this->load_stats_sending(0,'1,2', 1);
+			if ($result < 0) dol_print_error($this->db,$this->error);
+			$stock_sending_client=$this->stats_expedition['qty'];
+		}
+		if (! empty($conf->fournisseur->enabled))
+		{
+			$result=$this->load_stats_commande_fournisseur(0,'1,2,3,4', 1);
+			if ($result < 0) dol_print_error($this->db,$this->error);
+			$stock_commande_fournisseur=$this->stats_commande_fournisseur['qty'];
+
+			$result=$this->load_stats_reception(0,'4', 1);
+			if ($result < 0) dol_print_error($this->db,$this->error);
+			$stock_reception_fournisseur=$this->stats_reception['qty'];
+		}
+
+		// Stock decrease mode
+		if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+			$this->stock_theorique=$this->stock_reel-$stock_commande_client+$stock_sending_client;
+		}
+		if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
+			$this->stock_theorique=$this->stock_reel;
+		}
+		if (! empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+			$this->stock_theorique=$this->stock_reel-$stock_commande_client;
+		}
+		// Stock Increase mode
+		if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+			$this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
+		}
+		if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
+			$this->stock_theorique-=$stock_reception_fournisseur;
+		}
+		if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+			$this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
+		}
+	}
 
 
 	/**
@@ -3986,34 +3986,34 @@ 
 	 *  @return     array					Array with record into product_batch
 	 *  @see		load_stock, load_virtual_stock
 	 */
-    function loadBatchInfo($batch)
-    {
-    	$result=array();
-
-    	$sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) FROM ".MAIN_DB_PREFIX."product_batch as pb, ".MAIN_DB_PREFIX."product_stock as ps";
-    	$sql.= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".$this->id." AND pb.batch = '".$this->db->escape($batch)."'";
-    	$sql.= " GROUP BY pb.batch, pb.eatby, pb.sellby";
-    	dol_syslog(get_class($this)."::loadBatchInfo load first entry found for lot/serial = ".$batch, LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		$i=0;
-    		while ($i < $num)
-    		{
-    			$obj = $this->db->fetch_object($resql);
+	function loadBatchInfo($batch)
+	{
+		$result=array();
+
+		$sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) FROM ".MAIN_DB_PREFIX."product_batch as pb, ".MAIN_DB_PREFIX."product_stock as ps";
+		$sql.= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".$this->id." AND pb.batch = '".$this->db->escape($batch)."'";
+		$sql.= " GROUP BY pb.batch, pb.eatby, pb.sellby";
+		dol_syslog(get_class($this)."::loadBatchInfo load first entry found for lot/serial = ".$batch, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i=0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
 				$result[]=array('batch'=>$batch, 'eatby'=>$this->db->jdate($obj->eatby), 'sellby'=>$this->db->jdate($obj->sellby), 'qty'=>$obj->qty);
 				$i++;
-    		}
-    		return $result;
-    	}
-    	else
-    	{
-    		dol_print_error($this->db);
-    		$this->db->rollback();
-    		return array();
-    	}
-    }
+			}
+			return $result;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->db->rollback();
+			return array();
+		}
+	}
 
 
 	/**
@@ -4065,8 +4065,8 @@ 
 	 */
 	function is_photo_available($sdir)
 	{
-	    include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-	    include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
 
 		global $conf;
 
@@ -4082,11 +4082,11 @@ 
 			$handle=opendir($dir_osencoded);
 			if (is_resource($handle))
 			{
-			    while (($file = readdir($handle)) !== false)
-    			{
-    				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in UTF8 in memory
-    				if (dol_is_file($dir.$file) && image_format_supported($file) > 0) return true;
-    			}
+				while (($file = readdir($handle)) !== false)
+				{
+					if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in UTF8 in memory
+					if (dol_is_file($dir.$file) && image_format_supported($file) > 0) return true;
+				}
 			}
 		}
 		return false;
@@ -4102,8 +4102,8 @@ 
 	 */
 	function liste_photos($dir,$nbmax=0)
 	{
-	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 		$nbphoto=0;
 		$tabobj=array();
@@ -4156,10 +4156,10 @@ 
 	 */
 	function delete_photo($file)
 	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-        $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
+		$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
 		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
 		$filename = preg_replace('/'.preg_quote($dir,'/').'/i','',$file); // Nom du fichier
 
@@ -4214,11 +4214,11 @@ 
 		// Add where from hooks
 		if (is_object($hookmanager))
 		{
-		    $parameters=array();
-		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-		    $sql.=$hookmanager->resPrint;
+			$parameters=array();
+			$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+			$sql.=$hookmanager->resPrint;
 		}
-        $sql.= ' GROUP BY fk_product_type';
+		$sql.= ' GROUP BY fk_product_type';
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -4228,7 +4228,7 @@ 
 				if ($obj->fk_product_type == 1) $this->nb["services"]=$obj->nb;
 				else $this->nb["products"]=$obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
 		}
 		else
@@ -4239,102 +4239,102 @@ 
 		}
 	}
 
-    /**
-     * Return if object is a product
-     *
-     * @return  boolean     True if it's a product
-     */
+	/**
+	 * Return if object is a product
+	 *
+	 * @return  boolean     True if it's a product
+	 */
 	function isProduct()
 	{
 		return ($this->type == Product::TYPE_PRODUCT ? true : false);
 	}
 
-    /**
-     * Return if object is a product
-     *
-     * @return  boolean     True if it's a service
-     */
+	/**
+	 * Return if object is a product
+	 *
+	 * @return  boolean     True if it's a service
+	 */
 	function isService()
 	{
 		return ($this->type == Product::TYPE_SERVICE ? true : false);
 	}
 
-    /**
-     *  Get a barcode from the module to generate barcode values.
-     *  Return value is stored into this->barcode
-     *
-     *	@param	Product		$object		Object product or service
-     *	@param	string		$type		Barcode type (ean, isbn, ...)
-     *  @return void
-     */
-    function get_barcode($object,$type='')
-    {
-        global $conf;
-
-        $result='';
-        if (! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
-        {
-            $dirsociete=array_merge(array('/core/modules/barcode/'),$conf->modules_parts['barcode']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$conf->global->BARCODE_PRODUCT_ADDON_NUM.'.php');
-                if ($res) break;
-            }
-            $var = $conf->global->BARCODE_PRODUCT_ADDON_NUM;
-            $mod = new $var;
-
-            $result=$mod->getNextValue($object,$type);
-
-            dol_syslog(get_class($this)."::get_barcode barcode=".$result." module=".$var);
-        }
-        return $result;
-    }
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    function initAsSpecimen()
-    {
-        global $user,$langs,$conf,$mysoc;
-
-        $now=dol_now();
-
-        // Initialize parameters
-        $this->specimen=1;
-        $this->id=0;
-        $this->ref = 'PRODUCT_SPEC';
-        $this->label = 'PRODUCT SPECIMEN';
-        $this->description = 'This is description of this product specimen that was created the '.dol_print_date($now,'dayhourlog').'.';
-        $this->specimen=1;
-        $this->country_id=1;
-        $this->tosell=1;
-        $this->tobuy=1;
-		$this->tobatch=0;
-        $this->note='This is a comment (private)';
-        $this->date_creation = $now;
-        $this->date_modification = $now;
+	/**
+	 *  Get a barcode from the module to generate barcode values.
+	 *  Return value is stored into this->barcode
+	 *
+	 *	@param	Product		$object		Object product or service
+	 *	@param	string		$type		Barcode type (ean, isbn, ...)
+	 *  @return void
+	 */
+	function get_barcode($object,$type='')
+	{
+		global $conf;
+
+		$result='';
+		if (! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
+		{
+			$dirsociete=array_merge(array('/core/modules/barcode/'),$conf->modules_parts['barcode']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$conf->global->BARCODE_PRODUCT_ADDON_NUM.'.php');
+				if ($res) break;
+			}
+			$var = $conf->global->BARCODE_PRODUCT_ADDON_NUM;
+			$mod = new $var;
 
-        $this->weight = 4;
-        $this->weight_unit = 1;
+			$result=$mod->getNextValue($object,$type);
+
+			dol_syslog(get_class($this)."::get_barcode barcode=".$result." module=".$var);
+		}
+		return $result;
+	}
 
-        $this->length = 5;
-        $this->length_unit = 1;
-        $this->width = 6;
-        $this->width_unit = 0;
-        $this->height = null;
-        $this->height_unit = null;
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	function initAsSpecimen()
+	{
+		global $user,$langs,$conf,$mysoc;
 
-        $this->surface = 30;
-        $this->surface_unit = 0;
-        $this->volume = 300;
-        $this->volume_unit = 0;
+		$now=dol_now();
 
-        $this->barcode=-1;	// Create barcode automatically
-    }
+		// Initialize parameters
+		$this->specimen=1;
+		$this->id=0;
+		$this->ref = 'PRODUCT_SPEC';
+		$this->label = 'PRODUCT SPECIMEN';
+		$this->description = 'This is description of this product specimen that was created the '.dol_print_date($now,'dayhourlog').'.';
+		$this->specimen=1;
+		$this->country_id=1;
+		$this->tosell=1;
+		$this->tobuy=1;
+		$this->tobatch=0;
+		$this->note='This is a comment (private)';
+		$this->date_creation = $now;
+		$this->date_modification = $now;
+
+		$this->weight = 4;
+		$this->weight_unit = 1;
+
+		$this->length = 5;
+		$this->length_unit = 1;
+		$this->width = 6;
+		$this->width_unit = 0;
+		$this->height = null;
+		$this->height_unit = null;
+
+		$this->surface = 30;
+		$this->surface_unit = 0;
+		$this->volume = 300;
+		$this->volume_unit = 0;
+
+		$this->barcode=-1;	// Create barcode automatically
+	}
 
 	/**
 	 *	Returns the text label from units dictionary
@@ -4378,11 +4378,11 @@ 
 		}
 	}
 
-    /**
-     * Return if object has a sell-by date or eat-by date
-     *
-     * @return  boolean     True if it's has
-     */
+	/**
+	 * Return if object has a sell-by date or eat-by date
+	 *
+	 * @return  boolean     True if it's has
+	 */
 	function hasbatch()
 	{
 		return ($this->status_batch == 1 ? true : false);
@@ -4390,10 +4390,10 @@ 
 
 
 	/**
-     * Return minimum product recommended price
-     *
+	 * Return minimum product recommended price
+	 *
 	 * @return	int			Minimum recommanded price that is higher price among all suppliers * PRODUCT_MINIMUM_RECOMMENDED_PRICE
-     */
+	 */
 	function min_recommended_price()
 	{
 		global $conf;
@@ -4564,52 +4564,52 @@ 
 		}
 	}
 
-    /**
-     *  Load information for tab info
-     *
-     *  @param  int		$id     Id of thirdparty to load
-     *  @return	void
-     */
-    function info($id)
-    {
-        $sql = "SELECT p.rowid, p.ref, p.datec as date_creation, p.tms as date_modification,";
-        $sql.= " p.fk_user_author, p.fk_user_modif";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
-        $sql.= " WHERE p.rowid = ".$id;
-
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-
-                $this->id = $obj->rowid;
-
-                if ($obj->fk_user_author) {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation     = $cuser;
-                }
-
-                if ($obj->fk_user_modif) {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
-
-                $this->ref			     = $obj->ref;
-                $this->date_creation     = $this->db->jdate($obj->date_creation);
-                $this->date_modification = $this->db->jdate($obj->date_modification);
-            }
-
-            $this->db->free($result);
-
-        }
-        else
-		{
-            dol_print_error($this->db);
-        }
-    }
+	/**
+	 *  Load information for tab info
+	 *
+	 *  @param  int		$id     Id of thirdparty to load
+	 *  @return	void
+	 */
+	function info($id)
+	{
+		$sql = "SELECT p.rowid, p.ref, p.datec as date_creation, p.tms as date_modification,";
+		$sql.= " p.fk_user_author, p.fk_user_modif";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
+		$sql.= " WHERE p.rowid = ".$id;
+
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+
+				$this->id = $obj->rowid;
+
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation     = $cuser;
+				}
+
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+
+				$this->ref			     = $obj->ref;
+				$this->date_creation     = $this->db->jdate($obj->date_creation);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
+			}
+
+			$this->db->free($result);
+
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
 
 }

Spacing +1155 added lines, -1155 removed lines

@@ -43,18 +43,18 @@ 
  */
 class Product extends CommonObject
 {
-	public $element='product';
-	public $table_element='product';
-	public $fk_element='fk_product';
-	protected $childtables=array('supplier_proposaldet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet');    // To test if we can delete object
-	public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $element = 'product';
+	public $table_element = 'product';
+	public $fk_element = 'fk_product';
+	protected $childtables = array('supplier_proposaldet', 'propaldet', 'commandedet', 'facturedet', 'contratdet', 'facture_fourn_det', 'commande_fournisseurdet'); // To test if we can delete object
+	public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
 	/**
 	 * {@inheritdoc}
 	 */
 	protected $table_ref_field = 'ref';
 
-	public $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm'; // See also into images.lib.php
+	public $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm'; // See also into images.lib.php
 
 	/*
 	 * @deprecated
@@ -83,7 +83,7 @@ 
 	 * Selling price
 	 * @var float
 	 */
-	public $price;			// Price net
+	public $price; // Price net
 
 	/**
 	 * Price with tax
@@ -110,19 +110,19 @@ 
 	public $price_base_type;
 
 	//! Arrays for multiprices
-	public $multiprices=array();
-	public $multiprices_ttc=array();
-	public $multiprices_base_type=array();
-	public $multiprices_min=array();
-	public $multiprices_min_ttc=array();
-	public $multiprices_tva_tx=array();
-	public $multiprices_recuperableonly=array();
+	public $multiprices = array();
+	public $multiprices_ttc = array();
+	public $multiprices_base_type = array();
+	public $multiprices_min = array();
+	public $multiprices_min_ttc = array();
+	public $multiprices_tva_tx = array();
+	public $multiprices_recuperableonly = array();
 
 	//! Price by quantity arrays
 	public $price_by_qty;
-	public $prices_by_qty=array();
-	public $prices_by_qty_id=array();
-	public $prices_by_qty_list=array();
+	public $prices_by_qty = array();
+	public $prices_by_qty_id = array();
+	public $prices_by_qty_list = array();
 
 	//! Default VAT code for product (link to code into llx_c_tva but without foreign keys)
 	public $default_vat_code;
@@ -131,7 +131,7 @@ 
 	public $tva_tx;
 
 	//! French VAT NPR (0 or 1)
-    public $tva_npr=0;
+    public $tva_npr = 0;
 
 	//! Other local taxes
 	public $localtax1_tx;
@@ -164,12 +164,12 @@ 
 	 * Stock alert
 	 * @var int
 	 */
-	public $seuil_stock_alerte=0;
+	public $seuil_stock_alerte = 0;
 
 	/**
 	 * Ask for replenishment when $desiredstock < $stock_reel
 	 */
-	public $desiredstock=0;
+	public $desiredstock = 0;
 
 	/*
 	 * Service expiration
@@ -185,13 +185,13 @@ 
 	 * Status indicates whether the product is on sale '1' or not '0'
 	 * @var int
 	 */
-	public $status=0;
+	public $status = 0;
 
 	/**
 	 * Status indicate whether the product is available for purchase '1' or not '0'
 	 * @var int
 	 */
-	public $status_buy=0;
+	public $status_buy = 0;
 
 	/**
 	 * Status indicates whether the product is a finished product '1' or a raw material '0'
@@ -203,7 +203,7 @@ 
 	 * We must manage lot/batch number, sell-by date and so on : '1':yes '0':no
 	 * @var int
 	 */
-	public $status_batch=0;
+	public $status_batch = 0;
 
 	/**
 	 * Customs code
@@ -243,15 +243,15 @@ 
 	 * Additional barcodes (Some products have different barcodes according to the country of origin of manufacture)
 	 * @var array
 	 */
-	public $barcodes_extra=array();
+	public $barcodes_extra = array();
 
-	public $stats_propale=array();
-	public $stats_commande=array();
-	public $stats_contrat=array();
-	public $stats_facture=array();
-    public $stats_commande_fournisseur=array();
+	public $stats_propale = array();
+	public $stats_commande = array();
+	public $stats_contrat = array();
+	public $stats_facture = array();
+    public $stats_commande_fournisseur = array();
 
-	public $multilangs=array();
+	public $multilangs = array();
 
 	//! Taille de l'image
 	public $imgWidth;
@@ -266,10 +266,10 @@ 
 	//! Product ID already linked to a reference supplier
 	public $product_id_already_linked;
 
-	public $nbphoto=0;
+	public $nbphoto = 0;
 
 	//! Contains detail of stock of product into each warehouse
-	public $stock_warehouse=array();
+	public $stock_warehouse = array();
 
 	public $oldcopy;
 
@@ -368,19 +368,19 @@ 
 	 *  @param	int		$notrigger		Disable triggers
 	 *	@return int			     		Id of product/service if OK, < 0 if KO
 	 */
-	function create($user,$notrigger=0)
+	function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
-        	$error=0;
+        	$error = 0;
 
 		// Clean parameters
 		$this->ref = dol_string_nospecial(trim($this->ref));
 		$this->label = trim($this->label);
-		$this->price_ttc=price2num($this->price_ttc);
-		$this->price=price2num($this->price);
-		$this->price_min_ttc=price2num($this->price_min_ttc);
-		$this->price_min=price2num($this->price_min);
+		$this->price_ttc = price2num($this->price_ttc);
+		$this->price = price2num($this->price);
+		$this->price_min_ttc = price2num($this->price_min_ttc);
+		$this->price_min = price2num($this->price_min);
 		if (empty($this->tva_tx))    	$this->tva_tx = 0;
 		if (empty($this->tva_npr))    	$this->tva_npr = 0;
 		//Local taxes
@@ -398,88 +398,88 @@ 
 		if (empty($this->status))    	$this->status = 0;
 		if (empty($this->status_buy))   $this->status_buy = 0;
 
-		$price_ht=0;
-		$price_ttc=0;
-		$price_min_ht=0;
-		$price_min_ttc=0;
+		$price_ht = 0;
+		$price_ttc = 0;
+		$price_min_ht = 0;
+		$price_min_ttc = 0;
 
 		//
 		if ($this->price_base_type == 'TTC' && $this->price_ttc > 0)
 		{
-			$price_ttc = price2num($this->price_ttc,'MU');
-			$price_ht = price2num($this->price_ttc / (1 + ($this->tva_tx / 100)),'MU');
+			$price_ttc = price2num($this->price_ttc, 'MU');
+			$price_ht = price2num($this->price_ttc / (1 + ($this->tva_tx / 100)), 'MU');
 		}
 
 		//
 		if ($this->price_base_type != 'TTC' && $this->price > 0)
 		{
-			$price_ht = price2num($this->price,'MU');
-			$price_ttc = price2num($this->price * (1 + ($this->tva_tx / 100)),'MU');
+			$price_ht = price2num($this->price, 'MU');
+			$price_ttc = price2num($this->price * (1 + ($this->tva_tx / 100)), 'MU');
 		}
 
 		//
 		if (($this->price_min_ttc > 0) && ($this->price_base_type == 'TTC'))
 		{
-			$price_min_ttc = price2num($this->price_min_ttc,'MU');
-			$price_min_ht = price2num($this->price_min_ttc / (1 + ($this->tva_tx / 100)),'MU');
+			$price_min_ttc = price2num($this->price_min_ttc, 'MU');
+			$price_min_ht = price2num($this->price_min_ttc / (1 + ($this->tva_tx / 100)), 'MU');
 		}
 
 		//
 		if (($this->price_min > 0) && ($this->price_base_type != 'TTC'))
 		{
-			$price_min_ht = price2num($this->price_min,'MU');
-			$price_min_ttc = price2num($this->price_min * (1 + ($this->tva_tx / 100)),'MU');
+			$price_min_ht = price2num($this->price_min, 'MU');
+			$price_min_ttc = price2num($this->price_min * (1 + ($this->tva_tx / 100)), 'MU');
 		}
 
 		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
-		$this->accountancy_code_sell= trim($this->accountancy_code_sell);
-		$this->accountancy_code_sell_intra= trim($this->accountancy_code_sell_intra);
-		$this->accountancy_code_sell_export= trim($this->accountancy_code_sell_export);
+		$this->accountancy_code_sell = trim($this->accountancy_code_sell);
+		$this->accountancy_code_sell_intra = trim($this->accountancy_code_sell_intra);
+		$this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
 
 		// Barcode value
-		$this->barcode=trim($this->barcode);
+		$this->barcode = trim($this->barcode);
 
 		// Check parameters
 		if (empty($this->label))
 		{
-			$this->error='ErrorMandatoryParametersNotProvided';
+			$this->error = 'ErrorMandatoryParametersNotProvided';
 			return -1;
 		}
 
 		if (empty($this->ref))
 		{
 			// Load object modCodeProduct
-			$module=(! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON)?$conf->global->PRODUCT_CODEPRODUCT_ADDON:'mod_codeproduct_leopard');
+			$module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
 			if ($module != 'mod_codeproduct_leopard')	// Do not load module file for leopard
 			{
 				if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
 				{
-					$module = substr($module, 0, dol_strlen($module)-4);
+					$module = substr($module, 0, dol_strlen($module) - 4);
 				}
 				dol_include_once('/core/modules/product/'.$module.'.php');
 				$modCodeProduct = new $module;
-				if (! empty($modCodeProduct->code_auto))
+				if (!empty($modCodeProduct->code_auto))
 				{
-					$this->ref = $modCodeProduct->getNextValue($this,$this->type);
+					$this->ref = $modCodeProduct->getNextValue($this, $this->type);
 				}
 				unset($modCodeProduct);
 			}
 
 			if (empty($this->ref))
 			{
-				$this->error='ProductModuleNotSetupForAutoRef';
+				$this->error = 'ProductModuleNotSetupForAutoRef';
 				return -2;
 			}
 		}
 
 		dol_syslog(get_class($this)."::create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type, LOG_DEBUG);
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->barcode == -1) $this->barcode = $this->get_barcode($this,$this->barcode_type_code);
+		if ($this->barcode == -1) $this->barcode = $this->get_barcode($this, $this->barcode_type_code);
 
 		// Check more parameters
 		// If error, this->errors[] is filled
@@ -488,9 +488,9 @@ 
 		if ($result >= 0)
 		{
 			$sql = "SELECT count(*) as nb";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product";
-			$sql.= " WHERE entity IN (".getEntity('product').")";
-			$sql.= " AND ref = '" .$this->db->escape($this->ref)."'";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product";
+			$sql .= " WHERE entity IN (".getEntity('product').")";
+			$sql .= " AND ref = '".$this->db->escape($this->ref)."'";
 
 			$result = $this->db->query($sql);
 			if ($result)
@@ -500,66 +500,66 @@ 
 				{
 					// Produit non deja existant
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
-					$sql.= "datec";
-					$sql.= ", entity";
-					$sql.= ", ref";
-					$sql.= ", ref_ext";
-					$sql.= ", price_min";
-					$sql.= ", price_min_ttc";
-					$sql.= ", label";
-					$sql.= ", fk_user_author";
-					$sql.= ", fk_product_type";
-					$sql.= ", price";
-					$sql.= ", price_ttc";
-					$sql.= ", price_base_type";
-					$sql.= ", tobuy";
-					$sql.= ", tosell";
-					$sql.= ", accountancy_code_buy";
-					$sql.= ", accountancy_code_sell";
-					$sql.= ", accountancy_code_sell_intra";
-					$sql.= ", accountancy_code_sell_export";
-					$sql.= ", canvas";
-					$sql.= ", finished";
-					$sql.= ", tobatch";
-					$sql.= ", fk_unit";
-					$sql.= ") VALUES (";
-					$sql.= "'".$this->db->idate($now)."'";
-					$sql.= ", ".$conf->entity;
-					$sql.= ", '".$this->db->escape($this->ref)."'";
-					$sql.= ", ".(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null");
-					$sql.= ", ".price2num($price_min_ht);
-					$sql.= ", ".price2num($price_min_ttc);
-					$sql.= ", ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
-					$sql.= ", ".$user->id;
-					$sql.= ", ".$this->type;
-					$sql.= ", ".price2num($price_ht);
-					$sql.= ", ".price2num($price_ttc);
-					$sql.= ", '".$this->db->escape($this->price_base_type)."'";
-					$sql.= ", ".$this->status;
-					$sql.= ", ".$this->status_buy;
-					$sql.= ", '".$this->db->escape($this->accountancy_code_buy)."'";
-					$sql.= ", '".$this->db->escape($this->accountancy_code_sell)."'";
-					$sql.= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
-					$sql.= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
-					$sql.= ", '".$this->db->escape($this->canvas)."'";
-					$sql.= ", ".((! isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'null' : (int) $this->finished);
-					$sql.= ", ".((empty($this->status_batch) || $this->status_batch < 0)? '0':$this->status_batch);
-					$sql.= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-					$sql.= ")";
+					$sql .= "datec";
+					$sql .= ", entity";
+					$sql .= ", ref";
+					$sql .= ", ref_ext";
+					$sql .= ", price_min";
+					$sql .= ", price_min_ttc";
+					$sql .= ", label";
+					$sql .= ", fk_user_author";
+					$sql .= ", fk_product_type";
+					$sql .= ", price";
+					$sql .= ", price_ttc";
+					$sql .= ", price_base_type";
+					$sql .= ", tobuy";
+					$sql .= ", tosell";
+					$sql .= ", accountancy_code_buy";
+					$sql .= ", accountancy_code_sell";
+					$sql .= ", accountancy_code_sell_intra";
+					$sql .= ", accountancy_code_sell_export";
+					$sql .= ", canvas";
+					$sql .= ", finished";
+					$sql .= ", tobatch";
+					$sql .= ", fk_unit";
+					$sql .= ") VALUES (";
+					$sql .= "'".$this->db->idate($now)."'";
+					$sql .= ", ".$conf->entity;
+					$sql .= ", '".$this->db->escape($this->ref)."'";
+					$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+					$sql .= ", ".price2num($price_min_ht);
+					$sql .= ", ".price2num($price_min_ttc);
+					$sql .= ", ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+					$sql .= ", ".$user->id;
+					$sql .= ", ".$this->type;
+					$sql .= ", ".price2num($price_ht);
+					$sql .= ", ".price2num($price_ttc);
+					$sql .= ", '".$this->db->escape($this->price_base_type)."'";
+					$sql .= ", ".$this->status;
+					$sql .= ", ".$this->status_buy;
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
+					$sql .= ", '".$this->db->escape($this->canvas)."'";
+					$sql .= ", ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'null' : (int) $this->finished);
+					$sql .= ", ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);
+					$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+					$sql .= ")";
 
 					dol_syslog(get_class($this)."::Create", LOG_DEBUG);
 					$result = $this->db->query($sql);
-					if ( $result )
+					if ($result)
 					{
 						$id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
 
 						if ($id > 0)
 						{
-							$this->id				= $id;
-							$this->price			= $price_ht;
+							$this->id = $id;
+							$this->price = $price_ht;
 							$this->price_ttc		= $price_ttc;
 							$this->price_min		= $price_min_ht;
-							$this->price_min_ttc	= $price_min_ttc;
+							$this->price_min_ttc = $price_min_ttc;
 
 							$result = $this->_log_price($user);
 							if ($result > 0)
@@ -572,19 +572,19 @@ 
 							else
 							{
 								$error++;
-								$this->error=$this->db->lasterror();
+								$this->error = $this->db->lasterror();
 							}
 						}
 						else
 						{
 							$error++;
-							$this->error='ErrorFailedToGetInsertedId';
+							$this->error = 'ErrorFailedToGetInsertedId';
 						}
 					}
 					else
 					{
 						$error++;
-						$this->error=$this->db->lasterror();
+						$this->error = $this->db->lasterror();
 					}
 				}
 				else
@@ -598,18 +598,18 @@ 
 			else
 			{
 				$error++;
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 			}
 
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('PRODUCT_CREATE',$user);
+				$result = $this->call_trigger('PRODUCT_CREATE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return $this->id;
@@ -623,7 +623,7 @@ 
         else
        {
             $this->db->rollback();
-            dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
+            dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
         }
 
@@ -638,12 +638,12 @@ 
      */
     function verify()
     {
-        $this->errors=array();
+        $this->errors = array();
 
         $result = 0;
         $this->ref = trim($this->ref);
 
-        if (! $this->ref)
+        if (!$this->ref)
         {
             $this->errors[] = 'ErrorBadRef';
             $result = -2;
@@ -682,17 +682,17 @@ 
      * 									-2 ErrorBarCodeRequired
      * 									-3 ErrorBarCodeAlreadyUsed
      */
-    function check_barcode($valuetotest,$typefortest)
+    function check_barcode($valuetotest, $typefortest)
     {
         global $conf;
-        if (! empty($conf->barcode->enabled) && ! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
+        if (!empty($conf->barcode->enabled) && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
         {
-        	$module=strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
+        	$module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
 
-            $dirsociete=array_merge(array('/core/modules/barcode/'),$conf->modules_parts['barcode']);
+            $dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
 
@@ -718,14 +718,14 @@ 
 	 *	@param	string	$action		Current action for hookmanager ('add' or 'update')
 	 *	@return int         		1 if OK, -1 if ref already exists, -2 if other error
 	 */
-	function update($id, $user, $notrigger=false, $action='update')
+	function update($id, $user, $notrigger = false, $action = 'update')
 	{
 		global $langs, $conf, $hookmanager;
 
-		$error=0;
+		$error = 0;
 
 		// Check parameters
-		if (! $this->label) $this->label = 'MISSING LABEL';
+		if (!$this->label) $this->label = 'MISSING LABEL';
 
 		// Clean parameters
 		$this->ref = dol_string_nospecial(trim($this->ref));
@@ -741,8 +741,8 @@ 
 		$this->height = price2num($this->height);
 		$this->height_units = trim($this->height_units);
 		// set unit not defined
-		if ($this->length_units) $this->width_units = $this->length_units;    // Not used yet
-		if ($this->length_units) $this->height_units = $this->length_units;    // Not used yet
+		if ($this->length_units) $this->width_units = $this->length_units; // Not used yet
+		if ($this->length_units) $this->height_units = $this->length_units; // Not used yet
 		// Automated compute surface and volume if not filled
 		if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units)
 		{
@@ -751,7 +751,7 @@ 
 		}
 		if (empty($this->volume) && !empty($this->surface_units) && !empty($this->height) && $this->length_units == $this->height_units)
 		{
-			$this->volume =  $this->surface * $this->height;
+			$this->volume = $this->surface * $this->height;
 			$this->volume_units = measuring_units_cubed($this->height_units);
 		}
 
@@ -771,12 +771,12 @@ 
         if (empty($this->country_id))           $this->country_id = 0;
 
         // Barcode value
-        $this->barcode=trim($this->barcode);
+        $this->barcode = trim($this->barcode);
 
 		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
-		$this->accountancy_code_sell= trim($this->accountancy_code_sell);
-		$this->accountancy_code_sell_intra= trim($this->accountancy_code_sell_intra);
-		$this->accountancy_code_sell_export= trim($this->accountancy_code_sell_export);
+		$this->accountancy_code_sell = trim($this->accountancy_code_sell);
+		$this->accountancy_code_sell_intra = trim($this->accountancy_code_sell_intra);
+		$this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
 
 
         $this->db->begin();
@@ -785,16 +785,16 @@ 
         // If error, this->errors[] is filled
         if ($action != 'add')
         {
-        	$result = $this->verify();	// We don't check when update called during a create because verify was already done
+        	$result = $this->verify(); // We don't check when update called during a create because verify was already done
         }
 
         if ($result >= 0)
         {
             if (empty($this->oldcopy))
             {
-                $org=new self($this->db);
+                $org = new self($this->db);
                 $org->fetch($this->id);
-                $this->oldcopy=$org;
+                $this->oldcopy = $org;
             }
 
             // Test if batch management is activated on existing product
@@ -815,9 +815,9 @@ 
                         if ($detail->batch == $valueforundefinedlot || $detail->batch == 'Undefined')
                         {
                             // We discard this line, we will create it later
-                            $sqlclean="DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE batch in('Undefined', '".$valueforundefinedlot."') AND fk_product_stock = ".$ObjW->id;
+                            $sqlclean = "DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE batch in('Undefined', '".$valueforundefinedlot."') AND fk_product_stock = ".$ObjW->id;
                             $result = $this->db->query($sqlclean);
-                            if (! $result)
+                            if (!$result)
                             {
                                 dol_print_error($this->db);
                                 exit;
@@ -836,131 +836,131 @@ 
                         $ObjBatch->qty = ($ObjW->real - $qty_batch);
                         $ObjBatch->fk_product_stock = $ObjW->id;
 
-                        if ($ObjBatch->create($user,1) < 0)
+                        if ($ObjBatch->create($user, 1) < 0)
                         {
                             $error++;
-                            $this->errors=$ObjBatch->errors;
+                            $this->errors = $ObjBatch->errors;
                         }
                     }
                 }
             }
 
 	        // For automatic creation
-	        if ($this->barcode == -1) $this->barcode = $this->get_barcode($this,$this->barcode_type_code);
+	        if ($this->barcode == -1) $this->barcode = $this->get_barcode($this, $this->barcode_type_code);
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product";
-			$sql.= " SET label = '" . $this->db->escape($this->label) ."'";
-			$sql.= ", ref = '" . $this->db->escape($this->ref) ."'";
-			$sql.= ", ref_ext = ".(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null");
-			$sql.= ", default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null");
-			$sql.= ", tva_tx = " . $this->tva_tx;
-			$sql.= ", recuperableonly = " . $this->tva_npr;
-			$sql.= ", localtax1_tx = " . $this->localtax1_tx;
-			$sql.= ", localtax2_tx = " . $this->localtax2_tx;
-			$sql.= ", localtax1_type = " . ($this->localtax1_type!=''?"'".$this->db->escape($this->localtax1_type)."'":"'0'");
-			$sql.= ", localtax2_type = " . ($this->localtax2_type!=''?"'".$this->db->escape($this->localtax2_type)."'":"'0'");
-
-			$sql.= ", barcode = ". (empty($this->barcode)?"null":"'".$this->db->escape($this->barcode)."'");
-			$sql.= ", fk_barcode_type = ". (empty($this->barcode_type)?"null":$this->db->escape($this->barcode_type));
-
-			$sql.= ", tosell = " . $this->status;
-			$sql.= ", tobuy = " . $this->status_buy;
-			$sql.= ", tobatch = " . ((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);
-			$sql.= ", finished = " . ((! isset($this->finished) || $this->finished < 0) ? "null" : (int) $this->finished);
-			$sql.= ", weight = " . ($this->weight!='' ? "'".$this->db->escape($this->weight)."'" : 'null');
-			$sql.= ", weight_units = " . ($this->weight_units!='' ? "'".$this->db->escape($this->weight_units)."'": 'null');
-			$sql.= ", length = " . ($this->length!='' ? "'".$this->db->escape($this->length)."'" : 'null');
-			$sql.= ", length_units = " . ($this->length_units!='' ? "'".$this->db->escape($this->length_units)."'" : 'null');
-			$sql.= ", width= " . ($this->width!='' ? "'".$this->db->escape($this->width)."'" : 'null');
-			$sql.= ", width_units = " . ($this->width_units!='' ? "'".$this->db->escape($this->width_units)."'" : 'null');
-			$sql.= ", height = " . ($this->height!='' ? "'".$this->db->escape($this->height)."'" : 'null');
-			$sql.= ", height_units = " . ($this->height_units!='' ? "'".$this->db->escape($this->height_units)."'" : 'null');
-			$sql.= ", surface = " . ($this->surface!='' ? "'".$this->db->escape($this->surface)."'" : 'null');
-			$sql.= ", surface_units = " . ($this->surface_units!='' ? "'".$this->db->escape($this->surface_units)."'" : 'null');
-			$sql.= ", volume = " . ($this->volume!='' ? "'".$this->db->escape($this->volume)."'" : 'null');
-			$sql.= ", volume_units = " . ($this->volume_units!='' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
-			$sql.= ", fk_default_warehouse = " . ($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
-			$sql.= ", seuil_stock_alerte = " . ((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'".$this->db->escape($this->seuil_stock_alerte)."'" : "null");
-			$sql.= ", description = '" . $this->db->escape($this->description) ."'";
-			$sql.= ", url = " . ($this->url?"'".$this->db->escape($this->url)."'":'null');
-			$sql.= ", customcode = '" .        $this->db->escape($this->customcode) ."'";
-	        $sql.= ", fk_country = " . ($this->country_id > 0 ? $this->country_id : 'null');
-	        $sql.= ", note = ".(isset($this->note) ? "'" .$this->db->escape($this->note)."'" : 'null');
-			$sql.= ", duration = '" . $this->db->escape($this->duration_value . $this->duration_unit) ."'";
-			$sql.= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy)."'";
-			$sql.= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell)."'";
-			$sql.= ", accountancy_code_sell_intra= '" . $this->db->escape($this->accountancy_code_sell_intra)."'";
-			$sql.= ", accountancy_code_sell_export= '" . $this->db->escape($this->accountancy_code_sell_export)."'";
-			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");
-			$sql.= ", cost_price = " . ($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
-	        $sql.= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
-	        $sql.= ", price_autogen = " . (!$this->price_autogen ? 0 : 1);
-			$sql.= ", fk_price_expression = ".($this->fk_price_expression != 0 ? $this->fk_price_expression : 'NULL');
-			$sql.= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
+			$sql .= " SET label = '".$this->db->escape($this->label)."'";
+			$sql .= ", ref = '".$this->db->escape($this->ref)."'";
+			$sql .= ", ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+			$sql .= ", default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null");
+			$sql .= ", tva_tx = ".$this->tva_tx;
+			$sql .= ", recuperableonly = ".$this->tva_npr;
+			$sql .= ", localtax1_tx = ".$this->localtax1_tx;
+			$sql .= ", localtax2_tx = ".$this->localtax2_tx;
+			$sql .= ", localtax1_type = ".($this->localtax1_type != '' ? "'".$this->db->escape($this->localtax1_type)."'" : "'0'");
+			$sql .= ", localtax2_type = ".($this->localtax2_type != '' ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'");
+
+			$sql .= ", barcode = ".(empty($this->barcode) ? "null" : "'".$this->db->escape($this->barcode)."'");
+			$sql .= ", fk_barcode_type = ".(empty($this->barcode_type) ? "null" : $this->db->escape($this->barcode_type));
+
+			$sql .= ", tosell = ".$this->status;
+			$sql .= ", tobuy = ".$this->status_buy;
+			$sql .= ", tobatch = ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);
+			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0) ? "null" : (int) $this->finished);
+			$sql .= ", weight = ".($this->weight != '' ? "'".$this->db->escape($this->weight)."'" : 'null');
+			$sql .= ", weight_units = ".($this->weight_units != '' ? "'".$this->db->escape($this->weight_units)."'" : 'null');
+			$sql .= ", length = ".($this->length != '' ? "'".$this->db->escape($this->length)."'" : 'null');
+			$sql .= ", length_units = ".($this->length_units != '' ? "'".$this->db->escape($this->length_units)."'" : 'null');
+			$sql .= ", width= ".($this->width != '' ? "'".$this->db->escape($this->width)."'" : 'null');
+			$sql .= ", width_units = ".($this->width_units != '' ? "'".$this->db->escape($this->width_units)."'" : 'null');
+			$sql .= ", height = ".($this->height != '' ? "'".$this->db->escape($this->height)."'" : 'null');
+			$sql .= ", height_units = ".($this->height_units != '' ? "'".$this->db->escape($this->height_units)."'" : 'null');
+			$sql .= ", surface = ".($this->surface != '' ? "'".$this->db->escape($this->surface)."'" : 'null');
+			$sql .= ", surface_units = ".($this->surface_units != '' ? "'".$this->db->escape($this->surface_units)."'" : 'null');
+			$sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');
+			$sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
+			$sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
+			$sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'".$this->db->escape($this->seuil_stock_alerte)."'" : "null");
+			$sql .= ", description = '".$this->db->escape($this->description)."'";
+			$sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');
+			$sql .= ", customcode = '".$this->db->escape($this->customcode)."'";
+	        $sql .= ", fk_country = ".($this->country_id > 0 ? $this->country_id : 'null');
+	        $sql .= ", note = ".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : 'null');
+			$sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
+			$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
+			$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
+			$sql .= ", accountancy_code_sell_intra= '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+			$sql .= ", accountancy_code_sell_export= '".$this->db->escape($this->accountancy_code_sell_export)."'";
+			$sql .= ", desiredstock = ".((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");
+			$sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
+	        $sql .= ", fk_unit= ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+	        $sql .= ", price_autogen = ".(!$this->price_autogen ? 0 : 1);
+			$sql .= ", fk_price_expression = ".($this->fk_price_expression != 0 ? $this->fk_price_expression : 'NULL');
+			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
 			// stock field is not here because it is a denormalized value from product_stock.
-			$sql.= " WHERE rowid = " . $id;
+			$sql .= " WHERE rowid = ".$id;
 
 			dol_syslog(get_class($this)."::update", LOG_DEBUG);
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->id = $id;
 
 				// Multilangs
-				if (! empty($conf->global->MAIN_MULTILANGS))
+				if (!empty($conf->global->MAIN_MULTILANGS))
 				{
-					if ( $this->setMultiLangs($user) < 0)
+					if ($this->setMultiLangs($user) < 0)
 					{
-						$this->error=$langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+						$this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
 						return -2;
 					}
 				}
 
-				$action='update';
+				$action = 'update';
 
 				// Actions on extra fields
 				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					$result=$this->insertExtraFields();
+					$result = $this->insertExtraFields();
 					if ($result < 0)
 					{
 						$error++;
 					}
 				}
 
-				if (! $error && ! $notrigger)
+				if (!$error && !$notrigger)
 				{
                     // Call trigger
-                    $result=$this->call_trigger('PRODUCT_MODIFY',$user);
+                    $result = $this->call_trigger('PRODUCT_MODIFY', $user);
                     if ($result < 0) { $error++; }
                     // End call triggers
 				}
 
-				if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
+				if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
 				{
 					// We remove directory
 					if ($conf->product->dir_output)
 					{
-						$olddir = $conf->product->dir_output . "/" . dol_sanitizeFileName($this->oldcopy->ref);
-						$newdir = $conf->product->dir_output . "/" . dol_sanitizeFileName($this->ref);
+						$olddir = $conf->product->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);
+						$newdir = $conf->product->dir_output."/".dol_sanitizeFileName($this->ref);
 						if (file_exists($olddir))
 						{
 							//include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 							//$res = dol_move($olddir, $newdir);
 							// do not use dol_move with directory
 							$res = @rename($olddir, $newdir);
-							if (! $res)
+							if (!$res)
 							{
 							    $langs->load("errors");
-								$this->error=$langs->trans('ErrorFailToRenameDir',$olddir,$newdir);
+								$this->error = $langs->trans('ErrorFailToRenameDir', $olddir, $newdir);
 								$error++;
 							}
 						}
 					}
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					if ($conf->variants->enabled) {
 
@@ -987,16 +987,16 @@ 
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
-					if (empty($conf->barcode->enabled)) $this->error=$langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists",$this->ref);
-					else $this->error=$langs->trans("Error")." : ".$langs->trans("ErrorProductBarCodeAlreadyExists",$this->barcode);
-					$this->errors[]=$this->error;
+					if (empty($conf->barcode->enabled)) $this->error = $langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists", $this->ref);
+					else $this->error = $langs->trans("Error")." : ".$langs->trans("ErrorProductBarCodeAlreadyExists", $this->barcode);
+					$this->errors[] = $this->error;
 					$this->db->rollback();
 					return -1;
 				}
 				else
 				{
-					$this->error=$langs->trans("Error")." : ".$this->db->error()." - ".$sql;
-					$this->errors[]=$this->error;
+					$this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+					$this->errors[] = $this->error;
 					$this->db->rollback();
 					return -2;
 				}
@@ -1005,7 +1005,7 @@ 
         else
        {
             $this->db->rollback();
-            dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
+            dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
         }
 	}
@@ -1017,20 +1017,20 @@ 
 	 *  @param      int     $notrigger  Do not execute trigger
 	 * 	@return		int					< 0 if KO, 0 = Not possible, > 0 if OK
 	 */
-	function delete(User $user, $notrigger=0)
+	function delete(User $user, $notrigger = 0)
 	{
 		// Deprecation warning
 		if ($id > 0) {
-			dol_syslog(__METHOD__ . " with parameter is deprecated", LOG_WARNING);
+			dol_syslog(__METHOD__." with parameter is deprecated", LOG_WARNING);
 		}
 
 		global $conf, $langs;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (empty($id)) $id=$this->id;
+		if (empty($id)) $id = $this->id;
 		else $this->fetch($id);
 
 		// Check parameters
@@ -1050,24 +1050,24 @@ 
 		{
 			$this->db->begin();
 
-			if (! $error && empty($notrigger))
+			if (!$error && empty($notrigger))
 			{
                 // Call trigger
-                $result=$this->call_trigger('PRODUCT_DELETE',$user);
+                $result = $this->call_trigger('PRODUCT_DELETE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 			}
 
 			// Delete from product_batch on product delete
-			if (! $error)
+			if (!$error)
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX.'product_batch';
-				$sql.= " WHERE fk_product_stock IN (";
-				$sql.= "SELECT rowid FROM ".MAIN_DB_PREFIX.'product_stock';
-				$sql.= " WHERE fk_product = ".$id.")";
+				$sql .= " WHERE fk_product_stock IN (";
+				$sql .= "SELECT rowid FROM ".MAIN_DB_PREFIX.'product_stock';
+				$sql .= " WHERE fk_product = ".$id.")";
 				dol_syslog(get_class($this).'::delete', LOG_DEBUG);
 				$result = $this->db->query($sql);
-				if (! $result)
+				if (!$result)
 				{
 					$error++;
 					$this->errors[] = $this->db->lasterror();
@@ -1075,18 +1075,18 @@ 
 			}
 
    			// Delete all child tables
-			if (! $error)
+			if (!$error)
 			{
-				$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot');  // product_batch is done before
-    			foreach($elements as $table)
+				$elements = array('product_fournisseur_price', 'product_price', 'product_lang', 'categorie_product', 'product_stock', 'product_customer_price', 'product_lot'); // product_batch is done before
+    			foreach ($elements as $table)
     			{
-    				if (! $error)
+    				if (!$error)
     				{
     					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
-    					$sql.= " WHERE fk_product = ".$id;
+    					$sql .= " WHERE fk_product = ".$id;
     					dol_syslog(get_class($this).'::delete', LOG_DEBUG);
     					$result = $this->db->query($sql);
-    					if (! $result)
+    					if (!$result)
     					{
     						$error++;
     						$this->errors[] = $this->db->lasterror();
@@ -1116,30 +1116,30 @@ 
 			}
 
 			// Delete product
-			if (! $error)
+			if (!$error)
 			{
 				$sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
-				$sqlz.= " WHERE rowid = ".$id;
+				$sqlz .= " WHERE rowid = ".$id;
 				dol_syslog(get_class($this).'::delete', LOG_DEBUG);
 				$resultz = $this->db->query($sqlz);
-				if ( ! $resultz )
+				if (!$resultz)
 				{
 					$error++;
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				// We remove directory
 				$ref = dol_sanitizeFileName($this->ref);
 				if ($conf->product->dir_output)
 				{
-					$dir = $conf->product->dir_output . "/" . $ref;
+					$dir = $conf->product->dir_output."/".$ref;
 					if (file_exists($dir))
 					{
-						$res=@dol_delete_dir_recursive($dir);
-						if (! $res)
+						$res = @dol_delete_dir_recursive($dir);
+						if (!$res)
 						{
 							$this->errors[] = 'ErrorFailToDeleteDir';
 							$error++;
@@ -1149,9 +1149,9 @@ 
 			}
 
 			// Remove extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
 			{
-				$result=$this->deleteExtraFields();
+				$result = $this->deleteExtraFields();
 				if ($result < 0)
 				{
 					$error++;
@@ -1159,17 +1159,17 @@ 
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return 1;
 			}
 			else
 			{
-				foreach($this->errors as $errmsg)
+				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-					$this->error.=($this->error?', '.$errmsg:$errmsg);
+					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
 				$this->db->rollback();
 				return -$error;
@@ -1200,73 +1200,73 @@ 
 			if ($key == $current_lang)
 			{
 				$sql = "SELECT rowid";
-				$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
-				$sql.= " WHERE fk_product=".$this->id;
-				$sql.= " AND lang='".$key."'";
+				$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+				$sql .= " WHERE fk_product=".$this->id;
+				$sql .= " AND lang='".$key."'";
 
 				$result = $this->db->query($sql);
 
 				if ($this->db->num_rows($result)) // if there is already a description line for this language
 				{
 					$sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";
-					$sql2.= " SET ";
-					$sql2.= " label='".$this->db->escape($this->label)."',";
-					$sql2.= " description='".$this->db->escape($this->description)."'";
-					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", note='".$this->db->escape($this->other)."'";
-					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
+					$sql2 .= " SET ";
+					$sql2 .= " label='".$this->db->escape($this->label)."',";
+					$sql2 .= " description='".$this->db->escape($this->description)."'";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2 .= ", note='".$this->db->escape($this->other)."'";
+					$sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
 				}
 				else
 				{
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
-					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.=", note";
-					$sql2.= ")";
-					$sql2.= " VALUES(".$this->id.",'".$this->db->escape($key)."','". $this->db->escape($this->label)."',";
-					$sql2.= " '".$this->db->escape($this->description)."'";
-					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", '".$this->db->escape($this->other)."'";
-					$sql2.= ")";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2 .= ", note";
+					$sql2 .= ")";
+					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
+					$sql2 .= " '".$this->db->escape($this->description)."'";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2 .= ", '".$this->db->escape($this->other)."'";
+					$sql2 .= ")";
 				}
 				dol_syslog(get_class($this).'::setMultiLangs key = current_lang = '.$key);
-				if (! $this->db->query($sql2))
+				if (!$this->db->query($sql2))
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					return -1;
 				}
 			}
 			else if (isset($this->multilangs[$key]))
 			{
 				$sql = "SELECT rowid";
-				$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
-				$sql.= " WHERE fk_product=".$this->id;
-				$sql.= " AND lang='".$key."'";
+				$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+				$sql .= " WHERE fk_product=".$this->id;
+				$sql .= " AND lang='".$key."'";
 
 				$result = $this->db->query($sql);
 
 				if ($this->db->num_rows($result)) // if there is already a description line for this language
 				{
 					$sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";
-					$sql2.= " SET ";
-					$sql2.= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
-					$sql2.= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
-					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", note='".$this->db->escape($this->multilangs["$key"]["other"])."'";
-					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
+					$sql2 .= " SET ";
+					$sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2 .= ", note='".$this->db->escape($this->multilangs["$key"]["other"])."'";
+					$sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
 				}
 				else
 				{
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
-					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.=", note";
-					$sql2.= ")";
-					$sql2.= " VALUES(".$this->id.",'".$this->db->escape($key)."','". $this->db->escape($this->multilangs["$key"]["label"])."',";
-					$sql2.= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
-					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";
-					$sql2.= ")";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2 .= ", note";
+					$sql2 .= ")";
+					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2 .= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";
+					$sql2 .= ")";
 				}
 
 				// We do not save if main fields are empty
 				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"])
 				{
-    				if (! $this->db->query($sql2))
+    				if (!$this->db->query($sql2))
     				{
-    					$this->error=$this->db->lasterror();
+    					$this->error = $this->db->lasterror();
     					return -1;
     				}
 				}
@@ -1278,7 +1278,7 @@ 
 		}
 
 		// Call trigger
-		$result = $this->call_trigger('PRODUCT_SET_MULTILANGS',$user);
+		$result = $this->call_trigger('PRODUCT_SET_MULTILANGS', $user);
 		if ($result < 0) {
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -1299,14 +1299,14 @@ 
 	function delMultiLangs($langtodelete, $user)
 	{
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_lang";
-		$sql.= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
+		$sql .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
 
 		dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			// Call trigger
-			$result = $this->call_trigger('PRODUCT_DEL_MULTILANGS',$user);
+			$result = $this->call_trigger('PRODUCT_DEL_MULTILANGS', $user);
 			if ($result < 0) {
 				$this->error = $this->db->lasterror();
 				dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
@@ -1317,7 +1317,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
 			return -1;
 		}
@@ -1350,8 +1350,8 @@ 
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ";
-		$sql.= "$field = '".$this->db->escape($value)."'";
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= "$field = '".$this->db->escape($value)."'";
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::".__FUNCTION__." sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1359,12 +1359,12 @@ 
 		if ($resql)
 		{
 			// Call triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('PRODUCT_MODIFY',$this,$user,$langs,$conf);
+			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+			$interface = new Interfaces($this->db);
+			$result = $interface->run_triggers('PRODUCT_MODIFY', $this, $user, $langs, $conf);
 			if ($result < 0)
 			{
-				$this->errors=$interface->errors;
+				$this->errors = $interface->errors;
 				$this->db->rollback();
 				return -1;
 			}
@@ -1377,7 +1377,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1395,8 +1395,8 @@ 
 		$current_lang = $langs->getDefaultLang();
 
 		$sql = "SELECT lang, label, description, note as other";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
-		$sql.= " WHERE fk_product=".$this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+		$sql .= " WHERE fk_product=".$this->id;
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -1406,19 +1406,19 @@ 
 				//print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
 				if ($obj->lang == $current_lang)  // si on a les traduct. dans la langue courante on les charge en infos principales.
 				{
-					$this->label		= $obj->label;
-					$this->description	= $obj->description;
-					$this->other	    = $obj->other;
+					$this->label = $obj->label;
+					$this->description = $obj->description;
+					$this->other = $obj->other;
 				}
 				$this->multilangs["$obj->lang"]["label"]		= $obj->label;
-				$this->multilangs["$obj->lang"]["description"]	= $obj->description;
+				$this->multilangs["$obj->lang"]["description"] = $obj->description;
 				$this->multilangs["$obj->lang"]["other"]		= $obj->other;
 			}
 			return 1;
 		}
 		else
 		{
-			$this->error="Error: ".$this->db->lasterror()." - ".$sql;
+			$this->error = "Error: ".$this->db->lasterror()." - ".$sql;
 			return -1;
 		}
 	}
@@ -1432,27 +1432,27 @@ 
 	 *	@param		int		$level		price level to change
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-	function _log_price($user,$level=0)
+	function _log_price($user, $level = 0)
 	{
 		global $conf;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Clean parameters
-		if (empty($this->price_by_qty)) $this->price_by_qty=0;
+		if (empty($this->price_by_qty)) $this->price_by_qty = 0;
 
 		// Add new price
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
-		$sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
-		$sql.= " VALUES(".($level?$level:1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->db->escape($this->price_base_type)."',".$this->status.",".$this->tva_tx.", ".($this->default_vat_code?("'".$this->db->escape($this->default_vat_code)."'"):"null").",".$this->tva_npr.",";
-		$sql.= " ".$this->localtax1_tx.", ".$this->localtax2_tx.", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0?$this->fk_price_expression:'null');
-		$sql.= ")";
+		$sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
+		$sql .= " VALUES(".($level ? $level : 1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->db->escape($this->price_base_type)."',".$this->status.",".$this->tva_tx.", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").",".$this->tva_npr.",";
+		$sql .= " ".$this->localtax1_tx.", ".$this->localtax2_tx.", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0 ? $this->fk_price_expression : 'null');
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::_log_price", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if(! $resql)
+		$resql = $this->db->query($sql);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1473,19 +1473,19 @@ 
 	function log_price_delete($user, $rowid)
 	{
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-		$sql.= " WHERE fk_product_price=".$rowid;
-		$resql=$this->db->query($sql);
+		$sql .= " WHERE fk_product_price=".$rowid;
+		$resql = $this->db->query($sql);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price";
-		$sql.= " WHERE rowid=".$rowid;
-		$resql=$this->db->query($sql);
+		$sql .= " WHERE rowid=".$rowid;
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1503,20 +1503,20 @@ 
 	 *  @param      int     $fk_soc             If of supplier
 	 *  @return    	int 						<-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...)
 	 */
-	function get_buyprice($prodfournprice, $qty, $product_id=0, $fourn_ref='', $fk_soc=0)
+	function get_buyprice($prodfournprice, $qty, $product_id = 0, $fourn_ref = '', $fk_soc = 0)
 	{
 		global $conf;
 		$result = 0;
 
 		// We do a first seach with a select by searching with couple prodfournprice and qty only (later we will search on triplet qty/product_id/fourn_ref)
 		$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.remise_percent,";
-		$sql.= " pfp.fk_product, pfp.ref_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression";
-		$sql.= " ,pfp.default_vat_code";
-        $sql.= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-		$sql.= " WHERE pfp.rowid = ".$prodfournprice;
-		if ($qty > 0) $sql.= " AND pfp.quantity <= ".$qty;
-		$sql.= " ORDER BY pfp.quantity DESC";
+		$sql .= " pfp.fk_product, pfp.ref_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression";
+		$sql .= " ,pfp.default_vat_code";
+        $sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+		$sql .= " WHERE pfp.rowid = ".$prodfournprice;
+		if ($qty > 0) $sql .= " AND pfp.quantity <= ".$qty;
+		$sql .= " ORDER BY pfp.quantity DESC";
 
 		dol_syslog(get_class($this)."::get_buyprice first search by prodfournprice/qty", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1541,36 +1541,36 @@ 
                     }
                 }
                 $this->product_fourn_price_id = $obj->rowid;
-				$this->buyprice = $obj->price;                      // deprecated
-				$this->fourn_pu = $obj->price / $obj->quantity;     // Unit price of product of supplier
-				$this->fourn_price_base_type = 'HT';                // Price base type
-				$this->ref_fourn = $obj->ref_fourn;                 // deprecated
-				$this->ref_supplier = $obj->ref_fourn;              // Ref supplier
-				$this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed
-				$this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier
-				$this->default_vat_code = $obj->default_vat_code;   // Vat code supplier
+				$this->buyprice = $obj->price; // deprecated
+				$this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product of supplier
+				$this->fourn_price_base_type = 'HT'; // Price base type
+				$this->ref_fourn = $obj->ref_fourn; // deprecated
+				$this->ref_supplier = $obj->ref_fourn; // Ref supplier
+				$this->remise_percent = $obj->remise_percent; // remise percent if present and not typed
+				$this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier
+				$this->default_vat_code = $obj->default_vat_code; // Vat code supplier
                 $this->fourn_multicurrency_price       = $obj->multicurrency_price;
                 $this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
                 $this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
                 $this->fourn_multicurrency_id          = $obj->fk_multicurrency;
                 $this->fourn_multicurrency_code        = $obj->multicurrency_code;
-				$result=$obj->fk_product;
+				$result = $obj->fk_product;
 				return $result;
 			}
 			else // If not found
 			{
 				// We do a second search by doing a select again but searching with less reliable criteria: couple qty/id product, and if set fourn_ref or fk_soc.
 				$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,";
-				$sql.= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.tva_tx, pfp.fk_supplier_price_expression";
-				$sql.= " ,pfp.default_vat_code";
-                $sql.= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
-				$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-				$sql.= " WHERE pfp.fk_product = ".$product_id;
-				if ($fourn_ref != 'none') $sql.= " AND pfp.ref_fourn = '".$fourn_ref."'";
-				if ($fk_soc > 0) $sql.= " AND pfp.fk_soc = ".$fk_soc;
-				if ($qty > 0) $sql.= " AND pfp.quantity <= ".$qty;
-				$sql.= " ORDER BY pfp.quantity DESC";
-				$sql.= " LIMIT 1";
+				$sql .= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.tva_tx, pfp.fk_supplier_price_expression";
+				$sql .= " ,pfp.default_vat_code";
+                $sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
+				$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+				$sql .= " WHERE pfp.fk_product = ".$product_id;
+				if ($fourn_ref != 'none') $sql .= " AND pfp.ref_fourn = '".$fourn_ref."'";
+				if ($fk_soc > 0) $sql .= " AND pfp.fk_soc = ".$fk_soc;
+				if ($qty > 0) $sql .= " AND pfp.quantity <= ".$qty;
+				$sql .= " ORDER BY pfp.quantity DESC";
+				$sql .= " LIMIT 1";
 
 				dol_syslog(get_class($this)."::get_buyprice second search from qty/ref/product_id", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1595,38 +1595,38 @@ 
 		                    }
 		                }
 		                $this->product_fourn_price_id = $obj->rowid;
-						$this->buyprice = $obj->price;                      // deprecated
-						$this->fourn_qty = $obj->quantity;					// min quantity for price for a virtual supplier
-						$this->fourn_pu = $obj->price / $obj->quantity;     // Unit price of product for a virtual supplier
-						$this->fourn_price_base_type = 'HT';                // Price base type for a virtual supplier
-						$this->ref_fourn = $obj->ref_supplier;              // deprecated
-						$this->ref_supplier = $obj->ref_supplier;           // Ref supplier
-						$this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed
-						$this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier
-						$this->default_vat_code = $obj->default_vat_code;   // Vat code supplier
+						$this->buyprice = $obj->price; // deprecated
+						$this->fourn_qty = $obj->quantity; // min quantity for price for a virtual supplier
+						$this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product for a virtual supplier
+						$this->fourn_price_base_type = 'HT'; // Price base type for a virtual supplier
+						$this->ref_fourn = $obj->ref_supplier; // deprecated
+						$this->ref_supplier = $obj->ref_supplier; // Ref supplier
+						$this->remise_percent = $obj->remise_percent; // remise percent if present and not typed
+						$this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier
+						$this->default_vat_code = $obj->default_vat_code; // Vat code supplier
                         $this->fourn_multicurrency_price       = $obj->multicurrency_price;
                         $this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
                         $this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
                         $this->fourn_multicurrency_id          = $obj->fk_multicurrency;
                         $this->fourn_multicurrency_code        = $obj->multicurrency_code;
-						$result=$obj->fk_product;
+						$result = $obj->fk_product;
 						return $result;
 					}
 					else
 					{
-						return -1;	// Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.
+						return -1; // Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.
 					}
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					return -3;
 				}
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -2;
 		}
 	}
@@ -1648,20 +1648,20 @@ 
      *  @param      string  $newdefaultvatcode  Default vat code
 	 * 	@return		int						    <0 if KO, >0 if OK
 	 */
-	function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice=0, $level=0, $newnpr=0, $newpbq=0, $ignore_autogen=0, $localtaxes_array=array(), $newdefaultvatcode='')
+	function updatePrice($newprice, $newpricebase, $user, $newvat = '', $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$id=$this->id;
+		$id = $this->id;
 
 		dol_syslog(get_class($this)."::update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase." newminprice=".$newminprice." level=".$level." npr=".$newnpr." newdefaultvatcode=".$newdefaultvatcode);
 
 		// Clean parameters
-		if (empty($this->tva_tx))  $this->tva_tx=0;
-        if (empty($newnpr)) $newnpr=0;
+		if (empty($this->tva_tx))  $this->tva_tx = 0;
+        if (empty($newnpr)) $newnpr = 0;
 
 		// Check parameters
-		if ($newvat == '') $newvat=$this->tva_tx;
+		if ($newvat == '') $newvat = $this->tva_tx;
 
 		// If multiprices are enabled, then we check if the current product is subject to price autogeneration
 		// Price will be modified ONLY when the first one is the one that is being modified
@@ -1670,9 +1670,9 @@ 
 			return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpbq);
 		}
 
-		if (! empty($newminprice) && ($newminprice > $newprice))
+		if (!empty($newminprice) && ($newminprice > $newprice))
 		{
-			$this->error='ErrorPriceCantBeLowerThanMinPrice';
+			$this->error = 'ErrorPriceCantBeLowerThanMinPrice';
 			return -1;
 		}
 
@@ -1680,91 +1680,91 @@ 
 		{
 			if ($newpricebase == 'TTC')
 			{
-				$price_ttc = price2num($newprice,'MU');
+				$price_ttc = price2num($newprice, 'MU');
 				$price = price2num($newprice) / (1 + ($newvat / 100));
-				$price = price2num($price,'MU');
+				$price = price2num($price, 'MU');
 
 				if ($newminprice != '' || $newminprice == 0)
 				{
-					$price_min_ttc = price2num($newminprice,'MU');
+					$price_min_ttc = price2num($newminprice, 'MU');
 					$price_min = price2num($newminprice) / (1 + ($newvat / 100));
-					$price_min = price2num($price_min,'MU');
+					$price_min = price2num($price_min, 'MU');
 				}
 				else
 				{
-					$price_min=0;
-					$price_min_ttc=0;
+					$price_min = 0;
+					$price_min_ttc = 0;
 				}
 			}
 			else
 			{
-				$price = price2num($newprice,'MU');
-				$price_ttc = ( $newnpr != 1 ) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;
-				$price_ttc = price2num($price_ttc,'MU');
+				$price = price2num($newprice, 'MU');
+				$price_ttc = ($newnpr != 1) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;
+				$price_ttc = price2num($price_ttc, 'MU');
 
-				if ( $newminprice !== '' || $newminprice === 0)
+				if ($newminprice !== '' || $newminprice === 0)
 				{
-					$price_min = price2num($newminprice,'MU');
+					$price_min = price2num($newminprice, 'MU');
 					$price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100));
-					$price_min_ttc = price2num($price_min_ttc,'MU');
+					$price_min_ttc = price2num($price_min_ttc, 'MU');
 					//print 'X'.$newminprice.'-'.$price_min;
 				}
 				else
 				{
-					$price_min=0;
-					$price_min_ttc=0;
+					$price_min = 0;
+					$price_min_ttc = 0;
 				}
 			}
 			//print 'x'.$id.'-'.$newprice.'-'.$newpricebase.'-'.$price.'-'.$price_ttc.'-'.$price_min.'-'.$price_min_ttc;
 
 			if (count($localtaxes_array) > 0)
 			{
-			    $localtaxtype1=$localtaxes_array['0'];
-			    $localtax1=$localtaxes_array['1'];
-			    $localtaxtype2=$localtaxes_array['2'];
-			    $localtax2=$localtaxes_array['3'];
+			    $localtaxtype1 = $localtaxes_array['0'];
+			    $localtax1 = $localtaxes_array['1'];
+			    $localtaxtype2 = $localtaxes_array['2'];
+			    $localtax2 = $localtaxes_array['3'];
 			}
 			else     // old method. deprecated because ot can't retreive type
 			{
-	       		$localtaxtype1='0';
-			    $localtax1=get_localtax($newvat,1);
-	       		$localtaxtype2='0';
-			    $localtax2=get_localtax($newvat,2);
+	       		$localtaxtype1 = '0';
+			    $localtax1 = get_localtax($newvat, 1);
+	       		$localtaxtype2 = '0';
+			    $localtax2 = get_localtax($newvat, 2);
 			}
-			if (empty($localtax1)) $localtax1=0;	// If = '' then = 0
-			if (empty($localtax2)) $localtax2=0;	// If = '' then = 0
+			if (empty($localtax1)) $localtax1 = 0; // If = '' then = 0
+			if (empty($localtax2)) $localtax2 = 0; // If = '' then = 0
 
 			$this->db->begin();
 
 			// Ne pas mettre de quote sur les numeriques decimaux.
 			// Ceci provoque des stockages avec arrondis en base au lieu des valeurs exactes.
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
-			$sql.= " price_base_type='".$newpricebase."',";
-			$sql.= " price=".$price.",";
-			$sql.= " price_ttc=".$price_ttc.",";
-			$sql.= " price_min=".$price_min.",";
-			$sql.= " price_min_ttc=".$price_min_ttc.",";
-			$sql.= " localtax1_tx=".($localtax1>=0?$localtax1:'NULL').",";
-			$sql.= " localtax2_tx=".($localtax2>=0?$localtax2:'NULL').",";
-			$sql.= " localtax1_type=".($localtaxtype1!=''?"'".$localtaxtype1."'":"'0'").",";
-			$sql.= " localtax2_type=".($localtaxtype2!=''?"'".$localtaxtype2."'":"'0'").",";
-            $sql.= " default_vat_code=".($newdefaultvatcode?"'".$this->db->escape($newdefaultvatcode)."'":"null").",";
-			$sql.= " tva_tx='".price2num($newvat)."',";
-            $sql.= " recuperableonly='".$newnpr."'";
-			$sql.= " WHERE rowid = ".$id;
+			$sql .= " price_base_type='".$newpricebase."',";
+			$sql .= " price=".$price.",";
+			$sql .= " price_ttc=".$price_ttc.",";
+			$sql .= " price_min=".$price_min.",";
+			$sql .= " price_min_ttc=".$price_min_ttc.",";
+			$sql .= " localtax1_tx=".($localtax1 >= 0 ? $localtax1 : 'NULL').",";
+			$sql .= " localtax2_tx=".($localtax2 >= 0 ? $localtax2 : 'NULL').",";
+			$sql .= " localtax1_type=".($localtaxtype1 != '' ? "'".$localtaxtype1."'" : "'0'").",";
+			$sql .= " localtax2_type=".($localtaxtype2 != '' ? "'".$localtaxtype2."'" : "'0'").",";
+            $sql .= " default_vat_code=".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
+			$sql .= " tva_tx='".price2num($newvat)."',";
+            $sql .= " recuperableonly='".$newnpr."'";
+			$sql .= " WHERE rowid = ".$id;
 
 			dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->multiprices[$level] = $price;
 				$this->multiprices_ttc[$level] = $price_ttc;
-				$this->multiprices_min[$level]= $price_min;
-				$this->multiprices_min_ttc[$level]= $price_min_ttc;
-				$this->multiprices_base_type[$level]= $newpricebase;
-				$this->multiprices_default_vat_code[$level]= $newdefaultvatcode;
-				$this->multiprices_tva_tx[$level]= $newvat;
-				$this->multiprices_recuperableonly[$level]= $newnpr;
+				$this->multiprices_min[$level] = $price_min;
+				$this->multiprices_min_ttc[$level] = $price_min_ttc;
+				$this->multiprices_base_type[$level] = $newpricebase;
+				$this->multiprices_default_vat_code[$level] = $newdefaultvatcode;
+				$this->multiprices_tva_tx[$level] = $newvat;
+				$this->multiprices_recuperableonly[$level] = $newnpr;
 
 				$this->price = $price;
 				$this->price_ttc = $price_ttc;
@@ -1783,12 +1783,12 @@ 
 				// Price by quantity
 				$this->price_by_qty = $newpbq;
 
-				$this->_log_price($user,$level);	// Save price for level into table product_price
+				$this->_log_price($user, $level); // Save price for level into table product_price
 
-				$this->level = $level;				// Store level of price edited for trigger
+				$this->level = $level; // Store level of price edited for trigger
 
                 // Call trigger
-                $result=$this->call_trigger('PRODUCT_PRICE_MODIFY',$user);
+                $result = $this->call_trigger('PRODUCT_PRICE_MODIFY', $user);
                 if ($result < 0)
                 {
                 	$this->db->rollback();
@@ -1833,7 +1833,7 @@ 
      *  @param	int		$ignore_expression  Ignores the math expression for calculating price and uses the db value instead
 	 *  @return int     					<0 if KO, 0 if not found, >0 if OK
 	 */
-	function fetch($id='', $ref='', $ref_ext='', $ignore_expression=0)
+	function fetch($id = '', $ref = '', $ref_ext = '', $ignore_expression = 0)
 	{
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
@@ -1842,65 +1842,65 @@ 
 		dol_syslog(get_class($this)."::fetch id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
 		// Check parameters
-		if (! $id && ! $ref && ! $ref_ext)
+		if (!$id && !$ref && !$ref_ext)
 		{
-			$this->error='ErrorWrongParameters';
+			$this->error = 'ErrorWrongParameters';
 			dol_print_error(get_class($this)."::fetch ".$this->error);
 			return -1;
 		}
 
 		$sql = "SELECT rowid, ref, ref_ext, label, description, url, note as note_private, customcode, fk_country, price, price_ttc,";
-		$sql.= " price_min, price_min_ttc, price_base_type, cost_price, default_vat_code, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, tosell,";
-		$sql.= " tobuy, fk_product_type, duration, fk_default_warehouse, seuil_stock_alerte, canvas, weight, weight_units,";
-		$sql.= " length, length_units, width, width_units, height, height_units,";
-		$sql.= " surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
-		$sql.= " accountancy_code_buy, accountancy_code_sell, accountancy_code_sell_intra, accountancy_code_sell_export, stock, pmp,";
-		$sql.= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit,";
-		$sql.= " fk_price_expression, price_autogen";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id);
+		$sql .= " price_min, price_min_ttc, price_base_type, cost_price, default_vat_code, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, tosell,";
+		$sql .= " tobuy, fk_product_type, duration, fk_default_warehouse, seuil_stock_alerte, canvas, weight, weight_units,";
+		$sql .= " length, length_units, width, width_units, height, height_units,";
+		$sql .= " surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
+		$sql .= " accountancy_code_buy, accountancy_code_sell, accountancy_code_sell_intra, accountancy_code_sell_export, stock, pmp,";
+		$sql .= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit,";
+		$sql .= " fk_price_expression, price_autogen";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		if ($id) $sql .= " WHERE rowid = ".$this->db->escape($id);
 		else
 		{
-			$sql.= " WHERE entity IN (".getEntity($this->element).")";
-			if ($ref) $sql.= " AND ref = '".$this->db->escape($ref)."'";
-			else if ($ref_ext) $sql.= " AND ref_ext = '".$this->db->escape($ref_ext)."'";
+			$sql .= " WHERE entity IN (".getEntity($this->element).")";
+			if ($ref) $sql .= " AND ref = '".$this->db->escape($ref)."'";
+			else if ($ref_ext) $sql .= " AND ref_ext = '".$this->db->escape($ref_ext)."'";
 		}
 
 		$resql = $this->db->query($sql);
-		if ( $resql )
+		if ($resql)
 		{
 			if ($this->db->num_rows($resql) > 0)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id							= $obj->rowid;
-				$this->ref							= $obj->ref;
-				$this->ref_ext						= $obj->ref_ext;
-				$this->label						= $obj->label;
-				$this->description					= $obj->description;
-				$this->url							= $obj->url;
-				$this->note_private					= $obj->note_private;
-				$this->note							= $obj->note_private;  // deprecated
+				$this->id = $obj->rowid;
+				$this->ref = $obj->ref;
+				$this->ref_ext = $obj->ref_ext;
+				$this->label = $obj->label;
+				$this->description = $obj->description;
+				$this->url = $obj->url;
+				$this->note_private = $obj->note_private;
+				$this->note							= $obj->note_private; // deprecated
 
 				$this->type							= $obj->fk_product_type;
-				$this->status						= $obj->tosell;
+				$this->status = $obj->tosell;
 				$this->status_buy					= $obj->tobuy;
-				$this->status_batch					= $obj->tobatch;
+				$this->status_batch = $obj->tobatch;
 
 				$this->customcode					= $obj->customcode;
 				$this->country_id					= $obj->fk_country;
-				$this->country_code					= getCountry($this->country_id,2,$this->db);
-				$this->price						= $obj->price;
+				$this->country_code = getCountry($this->country_id, 2, $this->db);
+				$this->price = $obj->price;
 				$this->price_ttc					= $obj->price_ttc;
 				$this->price_min					= $obj->price_min;
-				$this->price_min_ttc				= $obj->price_min_ttc;
-				$this->price_base_type				= $obj->price_base_type;
-				$this->cost_price					= $obj->cost_price;
-				$this->default_vat_code				= $obj->default_vat_code;
-				$this->tva_tx						= $obj->tva_tx;
+				$this->price_min_ttc = $obj->price_min_ttc;
+				$this->price_base_type = $obj->price_base_type;
+				$this->cost_price = $obj->cost_price;
+				$this->default_vat_code = $obj->default_vat_code;
+				$this->tva_tx = $obj->tva_tx;
 				//! French VAT NPR
-				$this->tva_npr						= $obj->tva_npr;
-				$this->recuperableonly				= $obj->tva_npr;       // For backward compatibility
+				$this->tva_npr = $obj->tva_npr;
+				$this->recuperableonly = $obj->tva_npr; // For backward compatibility
 				//! Local taxes
 				$this->localtax1_tx					= $obj->localtax1_tx;
 				$this->localtax2_tx					= $obj->localtax2_tx;
@@ -1909,45 +1909,45 @@ 
 
 				$this->finished						= $obj->finished;
 				$this->duration						= $obj->duration;
-				$this->duration_value				= substr($obj->duration,0,dol_strlen($obj->duration)-1);
-				$this->duration_unit				= substr($obj->duration,-1);
+				$this->duration_value = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
+				$this->duration_unit				= substr($obj->duration, -1);
 				$this->canvas						= $obj->canvas;
 				$this->weight						= $obj->weight;
 				$this->weight_units					= $obj->weight_units;
 				$this->length						= $obj->length;
 				$this->length_units					= $obj->length_units;
-				$this->width						= $obj->width;
-				$this->width_units					= $obj->width_units;
-				$this->height						= $obj->height;
+				$this->width = $obj->width;
+				$this->width_units = $obj->width_units;
+				$this->height = $obj->height;
 				$this->height_units					= $obj->height_units;
 
-				$this->surface						= $obj->surface;
+				$this->surface = $obj->surface;
 				$this->surface_units				= $obj->surface_units;
-				$this->volume						= $obj->volume;
+				$this->volume = $obj->volume;
 				$this->volume_units					= $obj->volume_units;
-				$this->barcode						= $obj->barcode;
+				$this->barcode = $obj->barcode;
 				$this->barcode_type					= $obj->fk_barcode_type;
 
 				$this->accountancy_code_buy			= $obj->accountancy_code_buy;
 				$this->accountancy_code_sell		= $obj->accountancy_code_sell;
-				$this->accountancy_code_sell_intra	= $obj->accountancy_code_sell_intra;
-				$this->accountancy_code_sell_export	= $obj->accountancy_code_sell_export;
+				$this->accountancy_code_sell_intra = $obj->accountancy_code_sell_intra;
+				$this->accountancy_code_sell_export = $obj->accountancy_code_sell_export;
 
-				$this->fk_default_warehouse			= $obj->fk_default_warehouse;
-				$this->seuil_stock_alerte			= $obj->seuil_stock_alerte;
-				$this->desiredstock					= $obj->desiredstock;
-				$this->stock_reel					= $obj->stock;
-				$this->pmp							= $obj->pmp;
+				$this->fk_default_warehouse = $obj->fk_default_warehouse;
+				$this->seuil_stock_alerte = $obj->seuil_stock_alerte;
+				$this->desiredstock = $obj->desiredstock;
+				$this->stock_reel = $obj->stock;
+				$this->pmp = $obj->pmp;
 
-				$this->date_creation				= $obj->datec;
-				$this->date_modification			= $obj->tms;
-				$this->import_key					= $obj->import_key;
-				$this->entity						= $obj->entity;
+				$this->date_creation = $obj->datec;
+				$this->date_modification = $obj->tms;
+				$this->import_key = $obj->import_key;
+				$this->entity = $obj->entity;
 
 				$this->ref_ext						= $obj->ref_ext;
-				$this->fk_price_expression			= $obj->fk_price_expression;
+				$this->fk_price_expression = $obj->fk_price_expression;
 				$this->fk_unit						= $obj->fk_unit;
-				$this->price_autogen				= $obj->price_autogen;
+				$this->price_autogen = $obj->price_autogen;
 
 				$this->db->free($resql);
 
@@ -1956,34 +1956,34 @@ 
 				$this->fetch_optionals();
 
 				// multilangs
-				if (! empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
+				if (!empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
 
 				// Load multiprices array
-				if (! empty($conf->global->PRODUIT_MULTIPRICES))				// prices per segment
+				if (!empty($conf->global->PRODUIT_MULTIPRICES))				// prices per segment
 				{
-					for ($i=1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+					for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
 					{
 						$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
-						$sql.= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
-						$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
-						$sql.= " WHERE entity IN (".getEntity('productprice').")";
-						$sql.= " AND price_level=".$i;
-						$sql.= " AND fk_product = ".$this->id;
-						$sql.= " ORDER BY date_price DESC, rowid DESC";
-						$sql.= " LIMIT 1";
+						$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
+						$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+						$sql .= " WHERE entity IN (".getEntity('productprice').")";
+						$sql .= " AND price_level=".$i;
+						$sql .= " AND fk_product = ".$this->id;
+						$sql .= " ORDER BY date_price DESC, rowid DESC";
+						$sql .= " LIMIT 1";
 						$resql = $this->db->query($sql);
 						if ($resql)
 						{
 							$result = $this->db->fetch_array($resql);
 
-							$this->multiprices[$i]=$result["price"];
-							$this->multiprices_ttc[$i]=$result["price_ttc"];
-							$this->multiprices_min[$i]=$result["price_min"];
-							$this->multiprices_min_ttc[$i]=$result["price_min_ttc"];
-							$this->multiprices_base_type[$i]=$result["price_base_type"];
+							$this->multiprices[$i] = $result["price"];
+							$this->multiprices_ttc[$i] = $result["price_ttc"];
+							$this->multiprices_min[$i] = $result["price_min"];
+							$this->multiprices_min_ttc[$i] = $result["price_min_ttc"];
+							$this->multiprices_base_type[$i] = $result["price_base_type"];
 							// Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
-							$this->multiprices_tva_tx[$i]=$result["tva_tx"];     // TODO Add ' ('.$result['default_vat_code'].')'
-							$this->multiprices_recuperableonly[$i]=$result["recuperableonly"];
+							$this->multiprices_tva_tx[$i] = $result["tva_tx"]; // TODO Add ' ('.$result['default_vat_code'].')'
+							$this->multiprices_recuperableonly[$i] = $result["recuperableonly"];
 
 							// Price by quantity
 							/*
@@ -2028,50 +2028,50 @@ 
 						}
 					}
 				}
-				elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))			// prices per customers
+				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))			// prices per customers
 				{
 					// Nothing loaded by default. List may be very long.
 				}
-				else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))	// prices per quantity
+				else if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))	// prices per quantity
 				{
 					$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
-					$sql.= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";
-					$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
-					$sql.= " WHERE fk_product = ".$this->id;
-					$sql.= " ORDER BY date_price DESC, rowid DESC";
-					$sql.= " LIMIT 1";
+					$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";
+					$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+					$sql .= " WHERE fk_product = ".$this->id;
+					$sql .= " ORDER BY date_price DESC, rowid DESC";
+					$sql .= " LIMIT 1";
 					$resql = $this->db->query($sql);
 					if ($resql)
 					{
 						$result = $this->db->fetch_array($resql);
 
 						// Price by quantity
-						$this->prices_by_qty[0]=$result["price_by_qty"];
-						$this->prices_by_qty_id[0]=$result["rowid"];
+						$this->prices_by_qty[0] = $result["price_by_qty"];
+						$this->prices_by_qty_id[0] = $result["rowid"];
 						// Récuperation de la liste des prix selon qty si flag positionné
 						if ($this->prices_by_qty[0] == 1)
 						{
 							$sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise, remise, price_base_type";
-							$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-							$sql.= " WHERE fk_product_price = ".$this->prices_by_qty_id[0];
-							$sql.= " ORDER BY quantity ASC";
-							$resultat=array();
+							$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+							$sql .= " WHERE fk_product_price = ".$this->prices_by_qty_id[0];
+							$sql .= " ORDER BY quantity ASC";
+							$resultat = array();
 							$resql = $this->db->query($sql);
 							if ($resql)
 							{
-								$ii=0;
-								while ($result= $this->db->fetch_array($resql)) {
-									$resultat[$ii]=array();
-									$resultat[$ii]["rowid"]=$result["rowid"];
-									$resultat[$ii]["price"]= $result["price"];
-									$resultat[$ii]["unitprice"]= $result["unitprice"];
-									$resultat[$ii]["quantity"]= $result["quantity"];
-									$resultat[$ii]["remise_percent"]= $result["remise_percent"];
+								$ii = 0;
+								while ($result = $this->db->fetch_array($resql)) {
+									$resultat[$ii] = array();
+									$resultat[$ii]["rowid"] = $result["rowid"];
+									$resultat[$ii]["price"] = $result["price"];
+									$resultat[$ii]["unitprice"] = $result["unitprice"];
+									$resultat[$ii]["quantity"] = $result["quantity"];
+									$resultat[$ii]["remise_percent"] = $result["remise_percent"];
 									//$resultat[$ii]["remise"]= $result["remise"];					// deprecated
-									$resultat[$ii]["price_base_type"]= $result["price_base_type"];
+									$resultat[$ii]["price_base_type"] = $result["price_base_type"];
 									$ii++;
 								}
-								$this->prices_by_qty_list[0]=$resultat;
+								$this->prices_by_qty_list[0] = $resultat;
 							}
 							else
 							{
@@ -2086,7 +2086,7 @@ 
 						return -1;
 					}
 				}
-				else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))	// prices per customer and quantity
+				else if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))	// prices per customer and quantity
 				{
 					// Not yet implemented
 				}
@@ -2101,7 +2101,7 @@ 
                         $this->price = $price_result;
                         // Calculate the VAT
 						$this->price_ttc = price2num($this->price) * (1 + ($this->tva_tx / 100));
-						$this->price_ttc = price2num($this->price_ttc,'MU');
+						$this->price_ttc = price2num($this->price_ttc, 'MU');
                     }
                 }
 
@@ -2130,38 +2130,38 @@ 
 	 *  @param    int	$socid      Id societe
 	 *  @return   array       		Tableau des stats
 	 */
-	function load_stats_propale($socid=0)
+	function load_stats_propale($socid = 0)
 	{
 		global $conf;
 		global $user;
 
 		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_customers, COUNT(DISTINCT p.rowid) as nb,";
-		$sql.= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
-		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
+		$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE p.rowid = pd.fk_propal";
-		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('propal').")";
-		$sql.= " AND pd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql .= " WHERE p.rowid = pd.fk_propal";
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND p.entity IN (".getEntity('propal').")";
+		$sql .= " AND pd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		//$sql.= " AND pr.fk_statut != 0";
-		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
+		if ($socid > 0)	$sql .= " AND p.fk_soc = ".$socid;
 
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
-			$obj=$this->db->fetch_object($result);
-			$this->stats_propale['customers']=$obj->nb_customers;
-			$this->stats_propale['nb']=$obj->nb;
-			$this->stats_propale['rows']=$obj->nb_rows;
-			$this->stats_propale['qty']=$obj->qty?$obj->qty:0;
+			$obj = $this->db->fetch_object($result);
+			$this->stats_propale['customers'] = $obj->nb_customers;
+			$this->stats_propale['nb'] = $obj->nb;
+			$this->stats_propale['rows'] = $obj->nb_rows;
+			$this->stats_propale['qty'] = $obj->qty ? $obj->qty : 0;
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2173,38 +2173,38 @@ 
 	 *  @param    int	$socid      Id thirdparty
 	 *  @return   array       		Tableau des stats
 	 */
-	function load_stats_proposal_supplier($socid=0)
+	function load_stats_proposal_supplier($socid = 0)
 	{
 		global $conf;
 		global $user;
 
 		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_suppliers, COUNT(DISTINCT p.rowid) as nb,";
-		$sql.= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as pd";
-		$sql.= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
-		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as pd";
+		$sql .= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE p.rowid = pd.fk_supplier_proposal";
-		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
-		$sql.= " AND pd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql .= " WHERE p.rowid = pd.fk_supplier_proposal";
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
+		$sql .= " AND pd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		//$sql.= " AND pr.fk_statut != 0";
-		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
+		if ($socid > 0)	$sql .= " AND p.fk_soc = ".$socid;
 
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
-			$obj=$this->db->fetch_object($result);
-			$this->stats_proposal_supplier['suppliers']=$obj->nb_suppliers;
-			$this->stats_proposal_supplier['nb']=$obj->nb;
-			$this->stats_proposal_supplier['rows']=$obj->nb_rows;
-			$this->stats_proposal_supplier['qty']=$obj->qty?$obj->qty:0;
+			$obj = $this->db->fetch_object($result);
+			$this->stats_proposal_supplier['suppliers'] = $obj->nb_suppliers;
+			$this->stats_proposal_supplier['nb'] = $obj->nb;
+			$this->stats_proposal_supplier['rows'] = $obj->nb_rows;
+			$this->stats_proposal_supplier['qty'] = $obj->qty ? $obj->qty : 0;
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2218,39 +2218,39 @@ 
 	 *  @param    int    $forVirtualStock Ignore rights filter for virtual stock calculation.
 	 *  @return   array                  Array of stats (nb=nb of order, qty=qty ordered)
 	 */
-	function load_stats_commande($socid=0,$filtrestatut='', $forVirtualStock = 0)
+	function load_stats_commande($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
-		global $conf,$user;
+		global $conf, $user;
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
-		$sql.= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
-		$sql.= ", ".MAIN_DB_PREFIX."commande as c";
-		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.rowid = cd.fk_commande";
-		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('commande').")";
-		$sql.= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
-		if ($filtrestatut <> '') $sql.= " AND c.fk_statut in (".$filtrestatut.")";
+		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
+		$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE c.rowid = cd.fk_commande";
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('commande').")";
+		$sql .= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0)	$sql .= " AND c.fk_soc = ".$socid;
+		if ($filtrestatut <> '') $sql .= " AND c.fk_statut in (".$filtrestatut.")";
 
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
-			$obj=$this->db->fetch_object($result);
-			$this->stats_commande['customers']=$obj->nb_customers;
-			$this->stats_commande['nb']=$obj->nb;
-			$this->stats_commande['rows']=$obj->nb_rows;
-			$this->stats_commande['qty']=$obj->qty?$obj->qty:0;
+			$obj = $this->db->fetch_object($result);
+			$this->stats_commande['customers'] = $obj->nb_customers;
+			$this->stats_commande['nb'] = $obj->nb;
+			$this->stats_commande['rows'] = $obj->nb_rows;
+			$this->stats_commande['qty'] = $obj->qty ? $obj->qty : 0;
 
 			// if it's a virtual product, maybe it is in order by extension
-			if (! empty($conf->global->ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC))
+			if (!empty($conf->global->ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC))
 			{
 				$TFather = $this->getFather();
 				if (is_array($TFather) && !empty($TFather)) {
-					foreach($TFather as &$fatherData) {
+					foreach ($TFather as &$fatherData) {
 						$pFather = new Product($this->db);
 						$pFather->id = $fatherData['id'];
 						$qtyCoef = $fatherData['qty'];
@@ -2258,10 +2258,10 @@ 
 						if ($fatherData['incdec']) {
 							$pFather->load_stats_commande($socid, $filtrestatut);
 
-							$this->stats_commande['customers']+=$pFather->stats_commande['customers'];
-							$this->stats_commande['nb']+=$pFather->stats_commande['nb'];
-							$this->stats_commande['rows']+=$pFather->stats_commande['rows'];
-							$this->stats_commande['qty']+=$pFather->stats_commande['qty'] * $qtyCoef;
+							$this->stats_commande['customers'] += $pFather->stats_commande['customers'];
+							$this->stats_commande['nb'] += $pFather->stats_commande['nb'];
+							$this->stats_commande['rows'] += $pFather->stats_commande['rows'];
+							$this->stats_commande['qty'] += $pFather->stats_commande['qty'] * $qtyCoef;
 
 						}
 					}
@@ -2271,9 +2271,9 @@ 
 			// If stock decrease is on invoice validation, the theorical stock continue to
 			// count the orders to ship in theorical stock when some are already removed b invoice validation.
 			// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation.
-			if (! empty($conf->global->STOCK_CALCULATE_ON_BILL))
+			if (!empty($conf->global->STOCK_CALCULATE_ON_BILL))
 			{
-				if (! empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS))
+				if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS))
 				{
 					$adeduire = 0;
 					$sql = "SELECT sum(fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
@@ -2284,7 +2284,7 @@ 
 					dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
 
 					$resql = $this->db->query($sql);
-					if ( $resql )
+					if ($resql)
 					{
 						if ($this->db->num_rows($resql) > 0)
 						{
@@ -2301,7 +2301,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2314,37 +2314,37 @@ 
 	 *  @param    int      $forVirtualStock Ignore rights filter for virtual stock calculation.
 	 *  @return   array                     Tableau des stats
 	 */
-	function load_stats_commande_fournisseur($socid=0,$filtrestatut='', $forVirtualStock = 0)
+	function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
-		global $conf,$user;
+		global $conf, $user;
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_suppliers, COUNT(DISTINCT c.rowid) as nb,";
-		$sql.= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
-		$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.rowid = cd.fk_commande";
-		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('supplier_order').")";
-		$sql.= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid;
-		if ($filtrestatut != '') $sql.= " AND c.fk_statut in (".$filtrestatut.")"; // Peut valoir 0
+		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
+		$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE c.rowid = cd.fk_commande";
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
+		$sql .= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0) $sql .= " AND c.fk_soc = ".$socid;
+		if ($filtrestatut != '') $sql .= " AND c.fk_statut in (".$filtrestatut.")"; // Peut valoir 0
 
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
-			$obj=$this->db->fetch_object($result);
-			$this->stats_commande_fournisseur['suppliers']=$obj->nb_suppliers;
-			$this->stats_commande_fournisseur['nb']=$obj->nb;
-			$this->stats_commande_fournisseur['rows']=$obj->nb_rows;
-			$this->stats_commande_fournisseur['qty']=$obj->qty?$obj->qty:0;
+			$obj = $this->db->fetch_object($result);
+			$this->stats_commande_fournisseur['suppliers'] = $obj->nb_suppliers;
+			$this->stats_commande_fournisseur['nb'] = $obj->nb;
+			$this->stats_commande_fournisseur['rows'] = $obj->nb_rows;
+			$this->stats_commande_fournisseur['qty'] = $obj->qty ? $obj->qty : 0;
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->error().' sql='.$sql;
+			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
 	}
@@ -2357,41 +2357,41 @@ 
 	 *  @param    int    $forVirtualStock Ignore rights filter for virtual stock calculation.
 	 *  @return   array                   Tableau des stats
 	 */
-	function load_stats_sending($socid=0,$filtrestatut='', $forVirtualStock = 0)
+	function load_stats_sending($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
-		global $conf,$user;
+		global $conf, $user;
 
 		$sql = "SELECT COUNT(DISTINCT e.fk_soc) as nb_customers, COUNT(DISTINCT e.rowid) as nb,";
-		$sql.= " COUNT(ed.rowid) as nb_rows, SUM(ed.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
-		$sql.= ", ".MAIN_DB_PREFIX."commandedet as cd";
-		$sql.= ", ".MAIN_DB_PREFIX."commande as c";
-		$sql.= ", ".MAIN_DB_PREFIX."expedition as e";
-		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE e.rowid = ed.fk_expedition";
-		$sql.= " AND c.rowid = cd.fk_commande";
-		$sql.= " AND e.fk_soc = s.rowid";
-		$sql.= " AND e.entity IN (".getEntity('expedition').")";
-		$sql.= " AND ed.fk_origin_line = cd.rowid";
-		$sql.= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)	$sql.= " AND e.fk_soc = ".$socid;
-		if ($filtrestatut <> '') $sql.= " AND c.fk_statut in (".$filtrestatut.")";
+		$sql .= " COUNT(ed.rowid) as nb_rows, SUM(ed.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+		$sql .= ", ".MAIN_DB_PREFIX."commandedet as cd";
+		$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+		$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE e.rowid = ed.fk_expedition";
+		$sql .= " AND c.rowid = cd.fk_commande";
+		$sql .= " AND e.fk_soc = s.rowid";
+		$sql .= " AND e.entity IN (".getEntity('expedition').")";
+		$sql .= " AND ed.fk_origin_line = cd.rowid";
+		$sql .= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql .= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0)	$sql .= " AND e.fk_soc = ".$socid;
+		if ($filtrestatut <> '') $sql .= " AND c.fk_statut in (".$filtrestatut.")";
 
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
-			$obj=$this->db->fetch_object($result);
-			$this->stats_expedition['customers']=$obj->nb_customers;
-			$this->stats_expedition['nb']=$obj->nb;
-			$this->stats_expedition['rows']=$obj->nb_rows;
-			$this->stats_expedition['qty']=$obj->qty?$obj->qty:0;
+			$obj = $this->db->fetch_object($result);
+			$this->stats_expedition['customers'] = $obj->nb_customers;
+			$this->stats_expedition['nb'] = $obj->nb;
+			$this->stats_expedition['rows'] = $obj->nb_rows;
+			$this->stats_expedition['qty'] = $obj->qty ? $obj->qty : 0;
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2404,37 +2404,37 @@ 
 	 *  @param    int    $forVirtualStock Ignore rights filter for virtual stock calculation.
 	 *  @return   array                   Tableau des stats
 	 */
-	function load_stats_reception($socid=0,$filtrestatut='', $forVirtualStock = 0)
+	function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
-		global $conf,$user;
+		global $conf, $user;
 
 		$sql = "SELECT COUNT(DISTINCT cf.fk_soc) as nb_customers, COUNT(DISTINCT cf.rowid) as nb,";
-		$sql.= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd";
-		$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE cf.rowid = fd.fk_commande";
-		$sql.= " AND cf.fk_soc = s.rowid";
-		$sql.= " AND cf.entity IN (".getEntity('supplier_order').")";
-		$sql.= " AND fd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)	$sql.= " AND cf.fk_soc = ".$socid;
-		if ($filtrestatut <> '') $sql.= " AND cf.fk_statut in (".$filtrestatut.")";
+		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd";
+		$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE cf.rowid = fd.fk_commande";
+		$sql .= " AND cf.fk_soc = s.rowid";
+		$sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
+		$sql .= " AND fd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0)	$sql .= " AND cf.fk_soc = ".$socid;
+		if ($filtrestatut <> '') $sql .= " AND cf.fk_statut in (".$filtrestatut.")";
 
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
-			$obj=$this->db->fetch_object($result);
-			$this->stats_reception['suppliers']=$obj->nb_customers;
-			$this->stats_reception['nb']=$obj->nb;
-			$this->stats_reception['rows']=$obj->nb_rows;
-			$this->stats_reception['qty']=$obj->qty?$obj->qty:0;
+			$obj = $this->db->fetch_object($result);
+			$this->stats_reception['suppliers'] = $obj->nb_customers;
+			$this->stats_reception['nb'] = $obj->nb;
+			$this->stats_reception['rows'] = $obj->nb_rows;
+			$this->stats_reception['qty'] = $obj->qty ? $obj->qty : 0;
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2445,38 +2445,38 @@ 
 	 *  @param    int	$socid      Id societe
 	 *  @return   array       		Tableau des stats
 	 */
-	function load_stats_contrat($socid=0)
+	function load_stats_contrat($socid = 0)
 	{
 		global $conf;
 		global $user;
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
-		$sql.= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-		$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
-		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.rowid = cd.fk_contrat";
-		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('contract').")";
-		$sql.= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+		$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE c.rowid = cd.fk_contrat";
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('contract').")";
+		$sql .= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		//$sql.= " AND c.statut != 0";
-		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
+		if ($socid > 0)	$sql .= " AND c.fk_soc = ".$socid;
 
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
-			$obj=$this->db->fetch_object($result);
-			$this->stats_contrat['customers']=$obj->nb_customers;
-			$this->stats_contrat['nb']=$obj->nb;
-			$this->stats_contrat['rows']=$obj->nb_rows;
-			$this->stats_contrat['qty']=$obj->qty?$obj->qty:0;
+			$obj = $this->db->fetch_object($result);
+			$this->stats_contrat['customers'] = $obj->nb_customers;
+			$this->stats_contrat['nb'] = $obj->nb;
+			$this->stats_contrat['rows'] = $obj->nb_rows;
+			$this->stats_contrat['qty'] = $obj->qty ? $obj->qty : 0;
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->error().' sql='.$sql;
+			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
 	}
@@ -2487,38 +2487,38 @@ 
 	 *  @param    int		$socid      Id societe
 	 *  @return   array       			Tableau des stats
 	 */
-	function load_stats_facture($socid=0)
+	function load_stats_facture($socid = 0)
 	{
 		global $conf;
 		global $user;
 
 		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
-		$sql.= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
-		$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.rowid = fd.fk_facture";
-		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture').")";
-		$sql.= " AND fd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE f.rowid = fd.fk_facture";
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('facture').")";
+		$sql .= " AND fd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		//$sql.= " AND f.fk_statut != 0";
 		if ($socid > 0)	$sql .= " AND f.fk_soc = ".$socid;
 
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
-			$obj=$this->db->fetch_object($result);
-			$this->stats_facture['customers']=$obj->nb_customers;
-			$this->stats_facture['nb']=$obj->nb;
-			$this->stats_facture['rows']=$obj->nb_rows;
-			$this->stats_facture['qty']=$obj->qty?$obj->qty:0;
+			$obj = $this->db->fetch_object($result);
+			$this->stats_facture['customers'] = $obj->nb_customers;
+			$this->stats_facture['nb'] = $obj->nb;
+			$this->stats_facture['rows'] = $obj->nb_rows;
+			$this->stats_facture['qty'] = $obj->qty ? $obj->qty : 0;
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2529,38 +2529,38 @@ 
 	 *  @param    int		$socid      Id societe
 	 *  @return   array       			Tableau des stats
 	 */
-	function load_stats_facture_fournisseur($socid=0)
+	function load_stats_facture_fournisseur($socid = 0)
 	{
 		global $conf;
 		global $user;
 
 		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_suppliers, COUNT(DISTINCT f.rowid) as nb,";
-		$sql.= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
-		$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.rowid = fd.fk_facture_fourn";
-		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture_fourn').")";
-		$sql.= " AND fd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
+		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE f.rowid = fd.fk_facture_fourn";
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
+		$sql .= " AND fd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		//$sql.= " AND f.fk_statut != 0";
 		if ($socid > 0)	$sql .= " AND f.fk_soc = ".$socid;
 
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
-			$obj=$this->db->fetch_object($result);
-			$this->stats_facture_fournisseur['suppliers']=$obj->nb_suppliers;
-			$this->stats_facture_fournisseur['nb']=$obj->nb;
-			$this->stats_facture_fournisseur['rows']=$obj->nb_rows;
-			$this->stats_facture_fournisseur['qty']=$obj->qty?$obj->qty:0;
+			$obj = $this->db->fetch_object($result);
+			$this->stats_facture_fournisseur['suppliers'] = $obj->nb_suppliers;
+			$this->stats_facture_fournisseur['nb'] = $obj->nb;
+			$this->stats_facture_fournisseur['rows'] = $obj->nb_rows;
+			$this->stats_facture_fournisseur['qty'] = $obj->qty ? $obj->qty : 0;
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2573,7 +2573,7 @@ 
 	 *  @param      int     $year       Year (0=current year)
 	 *  @return   	array       		<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function _get_stats($sql, $mode, $year=0)
+	function _get_stats($sql, $mode, $year = 0)
 	{
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2583,40 +2583,40 @@ 
 			while ($i < $num)
 			{
 				$arr = $this->db->fetch_array($resql);
-				if ($mode == 'byunit')   $tab[$arr[1]] = $arr[0];	// 1st field
-				if ($mode == 'bynumber') $tab[$arr[1]] = $arr[2];	// 3rd field
+				if ($mode == 'byunit')   $tab[$arr[1]] = $arr[0]; // 1st field
+				if ($mode == 'bynumber') $tab[$arr[1]] = $arr[2]; // 3rd field
 				$i++;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error().' sql='.$sql;
+			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
 
 		if (empty($year))
 		{
-		    $year = strftime('%Y',time());
-		    $month = strftime('%m',time());
+		    $year = strftime('%Y', time());
+		    $month = strftime('%m', time());
 		}
 		else
 		{
-		    $month=12;    // We imagine we are at end of year, so we get last 12 month before, so all correct year.
+		    $month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.
 		}
 		$result = array();
 
-		for ($j = 0 ; $j < 12 ; $j++)
+		for ($j = 0; $j < 12; $j++)
 		{
-			$idx=ucfirst(dol_trunc(dol_print_date(dol_mktime(12,0,0,$month,1,$year),"%b"),3,'right','UTF-8',1));
-			$monthnum=sprintf("%02s",$month);
+			$idx = ucfirst(dol_trunc(dol_print_date(dol_mktime(12, 0, 0, $month, 1, $year), "%b"), 3, 'right', 'UTF-8', 1));
+			$monthnum = sprintf("%02s", $month);
 
-			$result[$j] = array($idx,isset($tab[$year.$month])?$tab[$year.$month]:0);
+			$result[$j] = array($idx, isset($tab[$year.$month]) ? $tab[$year.$month] : 0);
 			//            $result[$j] = array($monthnum,isset($tab[$year.$month])?$tab[$year.$month]:0);
 
 			$month = "0".($month - 1);
 			if (dol_strlen($month) == 3)
 			{
-				$month = substr($month,1);
+				$month = substr($month, 1);
 			}
 			if ($month == 0)
 			{
@@ -2639,29 +2639,29 @@ 
 	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_vente($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
+	function get_nb_vente($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
 		global $conf;
 		global $user;
 
 		$sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
-		if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-		if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.rowid = d.fk_facture";
-		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
-		else $sql.=" AND d.fk_product > 0";
-		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture').")";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
-		$sql.=$morefilter;
-		$sql.= " GROUP BY date_format(f.datef,'%Y%m')";
-		$sql.= " ORDER BY date_format(f.datef,'%Y%m') DESC";
-
-		return $this->_get_stats($sql,$mode, $year);
+		if ($mode == 'bynumber') $sql .= ", count(DISTINCT f.rowid)";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
+		if ($filteronproducttype >= 0) $sql .= ", ".MAIN_DB_PREFIX."product as p";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE f.rowid = d.fk_facture";
+		if ($this->id > 0) $sql .= " AND d.fk_product =".$this->id;
+		else $sql .= " AND d.fk_product > 0";
+		if ($filteronproducttype >= 0) $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('facture').")";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0)	$sql .= " AND f.fk_soc = $socid";
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(f.datef,'%Y%m')";
+		$sql .= " ORDER BY date_format(f.datef,'%Y%m') DESC";
+
+		return $this->_get_stats($sql, $mode, $year);
 	}
 
 
@@ -2675,29 +2675,29 @@ 
 	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_achat($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
+	function get_nb_achat($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
 		global $conf;
 		global $user;
 
 		$sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
-		if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
-        if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.rowid = d.fk_facture_fourn";
-		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
-		else $sql.=" AND d.fk_product > 0";
-		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture_fourn').")";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
-		$sql.=$morefilter;
-		$sql.= " GROUP BY date_format(f.datef,'%Y%m')";
-		$sql.= " ORDER BY date_format(f.datef,'%Y%m') DESC";
-
-		return $this->_get_stats($sql,$mode, $year);
+		if ($mode == 'bynumber') $sql .= ", count(DISTINCT f.rowid)";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
+        if ($filteronproducttype >= 0) $sql .= ", ".MAIN_DB_PREFIX."product as p";
+        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE f.rowid = d.fk_facture_fourn";
+		if ($this->id > 0) $sql .= " AND d.fk_product =".$this->id;
+		else $sql .= " AND d.fk_product > 0";
+		if ($filteronproducttype >= 0) $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0)	$sql .= " AND f.fk_soc = $socid";
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(f.datef,'%Y%m')";
+		$sql .= " ORDER BY date_format(f.datef,'%Y%m') DESC";
+
+		return $this->_get_stats($sql, $mode, $year);
 	}
 
 	/**
@@ -2710,29 +2710,29 @@ 
 	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_propal($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
+	function get_nb_propal($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
 		global $conf;
 		global $user;
 
 		$sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')";
-		if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";
+		if ($mode == 'bynumber') $sql .= ", count(DISTINCT p.rowid)";
+		$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
+        if ($filteronproducttype >= 0) $sql .= ", ".MAIN_DB_PREFIX."product as prod";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE p.rowid = d.fk_propal";
-		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
-		else $sql.=" AND d.fk_product > 0";
-		if ($filteronproducttype >= 0) $sql.= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
-		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('propal').")";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
-		$sql.=$morefilter;
-		$sql.= " GROUP BY date_format(p.datep,'%Y%m')";
-		$sql.= " ORDER BY date_format(p.datep,'%Y%m') DESC";
-
-		return $this->_get_stats($sql,$mode, $year);
+		$sql .= " WHERE p.rowid = d.fk_propal";
+		if ($this->id > 0) $sql .= " AND d.fk_product =".$this->id;
+		else $sql .= " AND d.fk_product > 0";
+		if ($filteronproducttype >= 0) $sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND p.entity IN (".getEntity('propal').")";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0)	$sql .= " AND p.fk_soc = ".$socid;
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(p.datep,'%Y%m')";
+		$sql .= " ORDER BY date_format(p.datep,'%Y%m') DESC";
+
+		return $this->_get_stats($sql, $mode, $year);
 	}
 
 	/**
@@ -2745,29 +2745,29 @@ 
 	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_propalsupplier($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
+	function get_nb_propalsupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
 		global $conf;
 		global $user;
 
 		$sql = "SELECT sum(d.qty), date_format(p.date_valid, '%Y%m')";
-		if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";
+		if ($mode == 'bynumber') $sql .= ", count(DISTINCT p.rowid)";
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."societe as s";
+        if ($filteronproducttype >= 0) $sql .= ", ".MAIN_DB_PREFIX."product as prod";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE p.rowid = d.fk_supplier_proposal";
-		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
-		else $sql.=" AND d.fk_product > 0";
-		if ($filteronproducttype >= 0) $sql.= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
-		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
-		$sql.=$morefilter;
-		$sql.= " GROUP BY date_format(p.date_valid,'%Y%m')";
-		$sql.= " ORDER BY date_format(p.date_valid,'%Y%m') DESC";
-
-		return $this->_get_stats($sql,$mode, $year);
+		$sql .= " WHERE p.rowid = d.fk_supplier_proposal";
+		if ($this->id > 0) $sql .= " AND d.fk_product =".$this->id;
+		else $sql .= " AND d.fk_product > 0";
+		if ($filteronproducttype >= 0) $sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0)	$sql .= " AND p.fk_soc = ".$socid;
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(p.date_valid,'%Y%m')";
+		$sql .= " ORDER BY date_format(p.date_valid,'%Y%m') DESC";
+
+		return $this->_get_stats($sql, $mode, $year);
 	}
 
 	/**
@@ -2780,28 +2780,28 @@ 
 	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_order($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
+	function get_nb_order($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
 		global $conf, $user;
 
 		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
-		if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
+		if ($mode == 'bynumber') $sql .= ", count(DISTINCT c.rowid)";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
+        if ($filteronproducttype >= 0) $sql .= ", ".MAIN_DB_PREFIX."product as p";
         if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.rowid = d.fk_commande";
-		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
-		else $sql.=" AND d.fk_product > 0";
-		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('commande').")";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
-		$sql.=$morefilter;
-		$sql.= " GROUP BY date_format(c.date_commande,'%Y%m')";
-		$sql.= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
-
-		return $this->_get_stats($sql,$mode, $year);
+		$sql .= " WHERE c.rowid = d.fk_commande";
+		if ($this->id > 0) $sql .= " AND d.fk_product =".$this->id;
+		else $sql .= " AND d.fk_product > 0";
+		if ($filteronproducttype >= 0) $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('commande').")";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0)	$sql .= " AND c.fk_soc = ".$socid;
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";
+		$sql .= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
+
+		return $this->_get_stats($sql, $mode, $year);
 	}
 
 	/**
@@ -2814,28 +2814,28 @@ 
 	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_ordersupplier($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
+	function get_nb_ordersupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
 		global $conf, $user;
 
 		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
-		if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
+		if ($mode == 'bynumber') $sql .= ", count(DISTINCT c.rowid)";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
+        if ($filteronproducttype >= 0) $sql .= ", ".MAIN_DB_PREFIX."product as p";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.rowid = d.fk_commande";
-		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
-		else $sql.=" AND d.fk_product > 0";
-		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('supplier_order').")";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
-		$sql.=$morefilter;
-		$sql.= " GROUP BY date_format(c.date_commande,'%Y%m')";
-		$sql.= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
-
-		return $this->_get_stats($sql,$mode, $year);
+		$sql .= " WHERE c.rowid = d.fk_commande";
+		if ($this->id > 0) $sql .= " AND d.fk_product =".$this->id;
+		else $sql .= " AND d.fk_product > 0";
+		if ($filteronproducttype >= 0) $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($socid > 0)	$sql .= " AND c.fk_soc = ".$socid;
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";
+		$sql .= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
+
+		return $this->_get_stats($sql, $mode, $year);
 	}
 
 	/**
@@ -2847,20 +2847,20 @@ 
 	 *  @param		int	$incdec		1=Increase/decrease stock of child when parent stock increase/decrease
 	 *  @return     int        		< 0 if KO, > 0 if OK
 	 */
-	function add_sousproduit($id_pere, $id_fils, $qty, $incdec=1)
+	function add_sousproduit($id_pere, $id_fils, $qty, $incdec = 1)
 	{
 		// Clean parameters
-		if (! is_numeric($id_pere)) $id_pere=0;
-		if (! is_numeric($id_fils)) $id_fils=0;
-		if (! is_numeric($incdec)) $incdec=0;
+		if (!is_numeric($id_pere)) $id_pere = 0;
+		if (!is_numeric($id_fils)) $id_fils = 0;
+		if (!is_numeric($incdec)) $incdec = 0;
 
-		$result=$this->del_sousproduit($id_pere, $id_fils);
+		$result = $this->del_sousproduit($id_pere, $id_fils);
 		if ($result < 0) return $result;
 
 		// Check not already father of id_pere (to avoid father -> child -> father links)
 		$sql = 'SELECT fk_product_pere from '.MAIN_DB_PREFIX.'product_association';
 		$sql .= ' WHERE fk_product_pere  = '.$id_fils.' AND fk_product_fils = '.$id_pere;
-		if (! $this->db->query($sql))
+		if (!$this->db->query($sql))
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -2871,16 +2871,16 @@ 
 			if ($result)
 			{
 				$num = $this->db->num_rows($result);
-				if($num > 0)
+				if ($num > 0)
 				{
-					$this->error="isFatherOfThis";
+					$this->error = "isFatherOfThis";
 					return -1;
 				}
 				else
 				{
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty,incdec)';
 					$sql .= ' VALUES ('.$id_pere.', '.$id_fils.', '.$qty.', '.$incdec.')';
-					if (! $this->db->query($sql))
+					if (!$this->db->query($sql))
 					{
 						dol_print_error($this->db);
 						return -1;
@@ -2903,17 +2903,17 @@ 
 	 *  @param		int	$incdec		1=Increase/decrease stock of child when parent stock increase/decrease
 	 * 	@return     int        		< 0 if KO, > 0 if OK
 	 */
-	function update_sousproduit($id_pere, $id_fils, $qty, $incdec=1)
+	function update_sousproduit($id_pere, $id_fils, $qty, $incdec = 1)
 	{
 		// Clean parameters
-		if (! is_numeric($id_pere)) $id_pere=0;
-		if (! is_numeric($id_fils)) $id_fils=0;
-		if (! is_numeric($incdec)) $incdec=1;
-		if (! is_numeric($qty)) $qty=1;
+		if (!is_numeric($id_pere)) $id_pere = 0;
+		if (!is_numeric($id_fils)) $id_fils = 0;
+		if (!is_numeric($incdec)) $incdec = 1;
+		if (!is_numeric($qty)) $qty = 1;
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'product_association SET ';
-		$sql.= 'qty='.$qty;
-		$sql.= ',incdec='.$incdec;
+		$sql .= 'qty='.$qty;
+		$sql .= ',incdec='.$incdec;
 		$sql .= ' WHERE fk_product_pere='.$id_pere.' AND fk_product_fils='.$id_fils;
 
 		if (!$this->db->query($sql))
@@ -2937,15 +2937,15 @@ 
 	 */
 	function del_sousproduit($fk_parent, $fk_child)
 	{
-		if (! is_numeric($fk_parent)) $fk_parent=0;
-		if (! is_numeric($fk_child)) $fk_child=0;
+		if (!is_numeric($fk_parent)) $fk_parent = 0;
+		if (!is_numeric($fk_child)) $fk_child = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
-		$sql.= " WHERE fk_product_pere  = ".$fk_parent;
-		$sql.= " AND fk_product_fils = ".$fk_child;
+		$sql .= " WHERE fk_product_pere  = ".$fk_parent;
+		$sql .= " AND fk_product_fils = ".$fk_child;
 
 		dol_syslog(get_class($this).'::del_sousproduit', LOG_DEBUG);
-		if (! $this->db->query($sql))
+		if (!$this->db->query($sql))
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -2964,16 +2964,16 @@ 
 	function is_sousproduit($fk_parent, $fk_child)
 	{
 		$sql = "SELECT fk_product_pere, qty, incdec";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_association";
-		$sql.= " WHERE fk_product_pere  = '".$fk_parent."'";
-		$sql.= " AND fk_product_fils = '".$fk_child."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_association";
+		$sql .= " WHERE fk_product_pere  = '".$fk_parent."'";
+		$sql .= " AND fk_product_fils = '".$fk_child."'";
 
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$num = $this->db->num_rows($result);
 
-			if($num > 0)
+			if ($num > 0)
 			{
 				$obj = $this->db->fetch_object($result);
 				$this->is_sousproduit_qty = $obj->qty;
@@ -3008,20 +3008,20 @@ 
 	{
 		global $conf;
 
-		$now=dol_now();
+		$now = dol_now();
 
     	dol_syslog(get_class($this)."::add_fournisseur id_fourn = ".$id_fourn." ref_fourn=".$ref_fourn." quantity=".$quantity, LOG_DEBUG);
 
 		if ($ref_fourn)
 		{
     		$sql = "SELECT rowid, fk_product";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-    		$sql.= " WHERE fk_soc = ".$id_fourn;
-    		$sql.= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
-    		$sql.= " AND fk_product != ".$this->id;
-    		$sql.= " AND entity IN (".getEntity('productprice').")";
+    		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+    		$sql .= " WHERE fk_soc = ".$id_fourn;
+    		$sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
+    		$sql .= " AND fk_product != ".$this->id;
+    		$sql .= " AND entity IN (".getEntity('productprice').")";
 
-    		$resql=$this->db->query($sql);
+    		$resql = $this->db->query($sql);
     		if ($resql)
     		{
     			$obj = $this->db->fetch_object($resql);
@@ -3036,41 +3036,41 @@ 
 		}
 
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-		$sql.= " WHERE fk_soc = ".$id_fourn;
-		if ($ref_fourn) $sql.= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
-		else $sql.= " AND (ref_fourn = '' OR ref_fourn IS NULL)";
-		$sql.= " AND quantity = '".$quantity."'";
-		$sql.= " AND fk_product = ".$this->id;
-		$sql.= " AND entity IN (".getEntity('productprice').")";
-
-		$resql=$this->db->query($sql);
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " WHERE fk_soc = ".$id_fourn;
+		if ($ref_fourn) $sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
+		else $sql .= " AND (ref_fourn = '' OR ref_fourn IS NULL)";
+		$sql .= " AND quantity = '".$quantity."'";
+		$sql .= " AND fk_product = ".$this->id;
+		$sql .= " AND entity IN (".getEntity('productprice').")";
+
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
     		$obj = $this->db->fetch_object($resql);
 
 		    // The reference supplier does not exist, we create it for this product.
-			if (! $obj)
+			if (!$obj)
 			{
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
-				$sql.= "datec";
-				$sql.= ", entity";
-				$sql.= ", fk_product";
-				$sql.= ", fk_soc";
-				$sql.= ", ref_fourn";
-				$sql.= ", quantity";
-				$sql.= ", fk_user";
-				$sql.= ", tva_tx";
-				$sql.= ") VALUES (";
-				$sql.= "'".$this->db->idate($now)."'";
-				$sql.= ", ".$conf->entity;
-				$sql.= ", ".$this->id;
-				$sql.= ", ".$id_fourn;
-				$sql.= ", '".$this->db->escape($ref_fourn)."'";
-				$sql.= ", ".$quantity;
-				$sql.= ", ".$user->id;
-				$sql.= ", 0";
-				$sql.= ")";
+				$sql .= "datec";
+				$sql .= ", entity";
+				$sql .= ", fk_product";
+				$sql .= ", fk_soc";
+				$sql .= ", ref_fourn";
+				$sql .= ", quantity";
+				$sql .= ", fk_user";
+				$sql .= ", tva_tx";
+				$sql .= ") VALUES (";
+				$sql .= "'".$this->db->idate($now)."'";
+				$sql .= ", ".$conf->entity;
+				$sql .= ", ".$this->id;
+				$sql .= ", ".$id_fourn;
+				$sql .= ", '".$this->db->escape($ref_fourn)."'";
+				$sql .= ", ".$quantity;
+				$sql .= ", ".$user->id;
+				$sql .= ", 0";
+				$sql .= ")";
 
 				if ($this->db->query($sql))
 				{
@@ -3079,7 +3079,7 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					return -1;
 				}
 			}
@@ -3092,7 +3092,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -2;
 		}
 	}
@@ -3110,15 +3110,15 @@ 
 		$list = array();
 
 		$sql = "SELECT DISTINCT p.fk_soc";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as p";
-		$sql.= " WHERE p.fk_product = ".$this->id;
-		$sql.= " AND p.entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as p";
+		$sql .= " WHERE p.fk_product = ".$this->id;
+		$sql .= " AND p.entity = ".$conf->entity;
 
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$num = $this->db->num_rows($result);
-			$i=0;
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($result);
@@ -3143,13 +3143,13 @@ 
 
 		// les prix
 		$sql = "INSERT ".MAIN_DB_PREFIX."product_price (";
-		$sql.= " fk_product, date_price, price, tva_tx, localtax1_tx, localtax2_tx, fk_user_author, tosell)";
-		$sql.= " SELECT ".$toId . ", date_price, price, tva_tx, localtax1_tx, localtax2_tx, fk_user_author, tosell";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_price ";
-		$sql.= " WHERE fk_product = ". $fromId;
+		$sql .= " fk_product, date_price, price, tva_tx, localtax1_tx, localtax2_tx, fk_user_author, tosell)";
+		$sql .= " SELECT ".$toId.", date_price, price, tva_tx, localtax1_tx, localtax2_tx, fk_user_author, tosell";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_price ";
+		$sql .= " WHERE fk_product = ".$fromId;
 
 		dol_syslog(get_class($this).'::clone_price', LOG_DEBUG);
-		if (! $this->db->query($sql))
+		if (!$this->db->query($sql))
 		{
 			$this->db->rollback();
 			return -1;
@@ -3170,11 +3170,11 @@ 
 		$this->db->begin();
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association (fk_product_pere, fk_product_fils, qty)';
-		$sql.= " SELECT ".$toId.", fk_product_fils, qty FROM ".MAIN_DB_PREFIX."product_association";
-		$sql.= " WHERE fk_product_pere = ".$fromId;
+		$sql .= " SELECT ".$toId.", fk_product_fils, qty FROM ".MAIN_DB_PREFIX."product_association";
+		$sql .= " WHERE fk_product_pere = ".$fromId;
 
 		dol_syslog(get_class($this).'::clone_association', LOG_DEBUG);
-		if (! $this->db->query($sql))
+		if (!$this->db->query($sql))
 		{
 			$this->db->rollback();
 			return -1;
@@ -3195,7 +3195,7 @@ 
 	{
 		$this->db->begin();
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// les fournisseurs
 		/*$sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur ("
@@ -3212,14 +3212,14 @@ 
 
 		// les prix de fournisseurs.
 		$sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur_price (";
-		$sql.= " datec, fk_product, fk_soc, price, quantity, fk_user)";
-		$sql.= " SELECT '".$this->db->idate($now)."', ".$toId. ", fk_soc, price, quantity, fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-		$sql.= " WHERE fk_product = ".$fromId;
+		$sql .= " datec, fk_product, fk_soc, price, quantity, fk_user)";
+		$sql .= " SELECT '".$this->db->idate($now)."', ".$toId.", fk_soc, price, quantity, fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " WHERE fk_product = ".$fromId;
 
 		dol_syslog(get_class($this).'::clone_fournisseurs', LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql)
+		$resql = $this->db->query($sql);
+		if (!$resql)
 		{
 			$this->db->rollback();
 			return -1;
@@ -3242,38 +3242,38 @@ 
 	 *  @param		int			$id_parent		Id parent
 	 *  @return 	void
 	 */
-	function fetch_prod_arbo($prod, $compl_path="", $multiply=1, $level=1, $id_parent=0)
+	function fetch_prod_arbo($prod, $compl_path = "", $multiply = 1, $level = 1, $id_parent = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$product = new Product($this->db);
 		//var_dump($prod);
-		foreach($prod as $id_product => $desc_pere)	// $id_product is 0 (first call starting with root top) or an id of a sub_product
+		foreach ($prod as $id_product => $desc_pere)	// $id_product is 0 (first call starting with root top) or an id of a sub_product
 		{
 			if (is_array($desc_pere))	// If desc_pere is an array, this means it's a child
 			{
-				$id=(! empty($desc_pere[0]) ? $desc_pere[0] :'');
-				$nb=(! empty($desc_pere[1]) ? $desc_pere[1] :'');
-				$type=(! empty($desc_pere[2]) ? $desc_pere[2] :'');
-				$label=(! empty($desc_pere[3]) ? $desc_pere[3] :'');
-				$incdec=!empty($desc_pere[4]) ? $desc_pere[4] : 0;
+				$id = (!empty($desc_pere[0]) ? $desc_pere[0] : '');
+				$nb = (!empty($desc_pere[1]) ? $desc_pere[1] : '');
+				$type = (!empty($desc_pere[2]) ? $desc_pere[2] : '');
+				$label = (!empty($desc_pere[3]) ? $desc_pere[3] : '');
+				$incdec = !empty($desc_pere[4]) ? $desc_pere[4] : 0;
 
-				if ($multiply < 1) $multiply=1;
+				if ($multiply < 1) $multiply = 1;
 
 				//print "XXX We add id=".$id." - label=".$label." - nb=".$nb." - multiply=".$multiply." fullpath=".$compl_path.$label."\n";
-				$this->fetch($id);		// Load product
-				$this->load_stock('nobatch,novirtual');	// Load stock to get true this->stock_reel
-				$this->res[]= array(
-					'id'=>$id,					// Id product
+				$this->fetch($id); // Load product
+				$this->load_stock('nobatch,novirtual'); // Load stock to get true this->stock_reel
+				$this->res[] = array(
+					'id'=>$id, // Id product
 					'id_parent'=>$id_parent,
-					'ref'=>$this->ref,			// Ref product
-					'nb'=>$nb,					// Nb of units that compose parent product
-					'nb_total'=>$nb*$multiply,	// Nb of units for all nb of product
-					'stock'=>$this->stock_reel,	// Stock
-					'stock_alert'=>$this->seuil_stock_alerte,	// Stock alert
+					'ref'=>$this->ref, // Ref product
+					'nb'=>$nb, // Nb of units that compose parent product
+					'nb_total'=>$nb * $multiply, // Nb of units for all nb of product
+					'stock'=>$this->stock_reel, // Stock
+					'stock_alert'=>$this->seuil_stock_alerte, // Stock alert
 					'label'=>$label,
-					'fullpath'=>$compl_path.$label,			// Label
-					'type'=>$type,				// Nb of units that compose parent product
+					'fullpath'=>$compl_path.$label, // Label
+					'type'=>$type, // Nb of units that compose parent product
 					'desiredstock'=>$this->desiredstock,
 					'level'=>$level,
 					'incdec'=>$incdec,
@@ -3284,7 +3284,7 @@ 
 				if (is_array($desc_pere['childs']))
 				{
 					//print 'YYY We go down for '.$desc_pere[3]." -> \n";
-					$this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1]*$multiply, $level+1, $id);
+					$this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1] * $multiply, $level + 1, $id);
 				}
 			}
 		}
@@ -3297,14 +3297,14 @@ 
 	 *	@param		int		$multiply		Because each sublevel must be multiplicated by parent nb
 	 *  @return 	array 					$this->res
 	 */
-	function get_arbo_each_prod($multiply=1)
+	function get_arbo_each_prod($multiply = 1)
 	{
 		$this->res = array();
 		if (isset($this->sousprods) && is_array($this->sousprods))
 		{
-			foreach($this->sousprods as $prod_name => $desc_product)
+			foreach ($this->sousprods as $prod_name => $desc_product)
 			{
-				if (is_array($desc_product)) $this->fetch_prod_arbo($desc_product,"",$multiply,1,$this->id);
+				if (is_array($desc_product)) $this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id);
 			}
 		}
 		//var_dump($this->res);
@@ -3321,8 +3321,8 @@ 
 		$nb = 0;
 
 		$sql = "SELECT COUNT(pa.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa";
-		$sql.= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa";
+		$sql .= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3345,15 +3345,15 @@ 
 	function getFather()
 	{
 		$sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec, p.entity";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa,";
-		$sql.= " ".MAIN_DB_PREFIX."product as p";
-		$sql.= " WHERE p.rowid = pa.fk_product_pere";
-		$sql.= " AND pa.fk_product_fils = ".$this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."product as p";
+		$sql .= " WHERE p.rowid = pa.fk_product_pere";
+		$sql .= " AND pa.fk_product_fils = ".$this->id;
 
 		$res = $this->db->query($sql);
 		if ($res)
 		{
-			$prods = array ();
+			$prods = array();
 			while ($record = $this->db->fetch_array($res))
 			{
 				// $record['id'] = $record['rowid'] = id of father
@@ -3362,8 +3362,8 @@ 
 				$prods[$record['id']]['label'] = $record['label'];
 				$prods[$record['id']]['qty'] = $record['qty'];
 				$prods[$record['id']]['incdec'] = $record['incdec'];
-				$prods[$record['id']]['fk_product_type'] =  $record['fk_product_type'];
-				$prods[$record['id']]['entity'] =  $record['entity'];
+				$prods[$record['id']]['fk_product_type'] = $record['fk_product_type'];
+				$prods[$record['id']]['entity'] = $record['entity'];
 			}
 			return $prods;
 		}
@@ -3383,36 +3383,36 @@ 
 	 *  @param		int		$level				Level of recursing call (start to 1)
 	 *  @return     array       				Return array(prodid=>array(0=prodid, 1=>qty, 2=> ...)
 	 */
-	function getChildsArbo($id, $firstlevelonly=0, $level=1)
+	function getChildsArbo($id, $firstlevelonly = 0, $level = 1)
 	{
 		global $alreadyfound;
 
 		$sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type, pa.incdec";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql.= ", ".MAIN_DB_PREFIX."product_association as pa";
-		$sql.= " WHERE p.rowid = pa.fk_product_fils";
-		$sql.= " AND pa.fk_product_pere = ".$id;
-		$sql.= " AND pa.fk_product_fils != ".$id;	// This should not happens, it is to avoid infinite loop if it happens
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+		$sql .= ", ".MAIN_DB_PREFIX."product_association as pa";
+		$sql .= " WHERE p.rowid = pa.fk_product_fils";
+		$sql .= " AND pa.fk_product_pere = ".$id;
+		$sql .= " AND pa.fk_product_fils != ".$id; // This should not happens, it is to avoid infinite loop if it happens
 
 		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level, LOG_DEBUG);
 
-		if ($level == 1) $alreadyfound=array($id=>1);	// We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly
+		if ($level == 1) $alreadyfound = array($id=>1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly
 		// Protection against infinite loop
 		if ($level > 30) return array();
 
-		$res  = $this->db->query($sql);
+		$res = $this->db->query($sql);
 		if ($res)
 		{
 			$prods = array();
 			while ($rec = $this->db->fetch_array($res))
 			{
-				if (! empty($alreadyfound[$rec['rowid']]))
+				if (!empty($alreadyfound[$rec['rowid']]))
 				{
 					dol_syslog(get_class($this).'::getChildsArbo the product id='.$rec['rowid'].' was already found at a higher level in tree. We discard to avoid infinite loop', LOG_WARNING);
 					continue;
 				}
-				$alreadyfound[$rec['rowid']]=1;
-				$prods[$rec['rowid']]= array(
+				$alreadyfound[$rec['rowid']] = 1;
+				$prods[$rec['rowid']] = array(
 					0=>$rec['rowid'],
 					1=>$rec['qty'],
 					2=>$rec['fk_product_type'],
@@ -3423,8 +3423,8 @@ 
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
 				if (empty($firstlevelonly))
 				{
-					$listofchilds=$this->getChildsArbo($rec['rowid'], 0, $level + 1);
-					foreach($listofchilds as $keyChild => $valueChild)
+					$listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1);
+					foreach ($listofchilds as $keyChild => $valueChild)
 					{
 						$prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
 					}
@@ -3448,13 +3448,13 @@ 
 	 */
 	function get_sousproduits_arbo()
 	{
-	    $parent=array();
+	    $parent = array();
 
-		foreach($this->getChildsArbo($this->id) as $keyChild => $valueChild)	// Warning. getChildsArbo can call getChildsArbo recursively. Starting point is $value[0]=id of product
+		foreach ($this->getChildsArbo($this->id) as $keyChild => $valueChild)	// Warning. getChildsArbo can call getChildsArbo recursively. Starting point is $value[0]=id of product
 		{
 			$parent[$this->label][$keyChild] = $valueChild;
 		}
-		foreach($parent as $key => $value)		// key=label, value is array of childs
+		foreach ($parent as $key => $value)		// key=label, value is array of childs
 		{
 			$this->sousprods[$key] = $value;
 		}
@@ -3469,71 +3469,71 @@ 
      *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return		string								String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $maxlength=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $hookmanager;
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
-		$result='';
-        $newref=$this->ref;
-        if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle');
+		$result = '';
+        $newref = $this->ref;
+        if ($maxlength) $newref = dol_trunc($newref, $maxlength, 'middle');
 
-        if ($this->type == Product::TYPE_PRODUCT) $label = '<u>' . $langs->trans("ShowProduct") . '</u>';
-        if ($this->type == Product::TYPE_SERVICE) $label = '<u>' . $langs->trans("ShowService") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('ProductRef') . ':</b> ' . $this->ref;
-        if (! empty($this->label))
-            $label .= '<br><b>' . $langs->trans('ProductLabel') . ':</b> ' . $this->label;
+        if ($this->type == Product::TYPE_PRODUCT) $label = '<u>'.$langs->trans("ShowProduct").'</u>';
+        if ($this->type == Product::TYPE_SERVICE) $label = '<u>'.$langs->trans("ShowService").'</u>';
+        if (!empty($this->ref))
+            $label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
+        if (!empty($this->label))
+            $label .= '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
 
         if ($this->type == Product::TYPE_PRODUCT)
         {
-            if ($this->weight)  $label.="<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuring_units_string($this->weight_units,"weight");
-    		if ($this->length)  $label.="<br><b>".$langs->trans("Length").'</b>: '.$this->length.' '.measuring_units_string($this->length_units,'length');
-    		if ($this->surface) $label.="<br><b>".$langs->trans("Surface").'</b>: '.$this->surface.' '.measuring_units_string($this->surface_units,'surface');
-    		if ($this->volume)  $label.="<br><b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuring_units_string($this->volume_units,'volume');
+            if ($this->weight)  $label .= "<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuring_units_string($this->weight_units, "weight");
+    		if ($this->length)  $label .= "<br><b>".$langs->trans("Length").'</b>: '.$this->length.' '.measuring_units_string($this->length_units, 'length');
+    		if ($this->surface) $label .= "<br><b>".$langs->trans("Surface").'</b>: '.$this->surface.' '.measuring_units_string($this->surface_units, 'surface');
+    		if ($this->volume)  $label .= "<br><b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuring_units_string($this->volume_units, 'volume');
         }
 
-        if ($this->type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+        if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
         {
-    		if (! empty($conf->productbatch->enabled))
+    		if (!empty($conf->productbatch->enabled))
             {
             	$langs->load("productbatch");
-                $label.="<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0,2);
+                $label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
             }
         }
         if ($this->type == Product::TYPE_SERVICE)
         {
             //
         }
-        if (! empty($conf->accounting->enabled) && $this->status)
+        if (!empty($conf->accounting->enabled) && $this->status)
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellCode') . ':</b> '. length_accountg($this->accountancy_code_sell);
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellIntraCode') . ':</b> '. length_accountg($this->accountancy_code_sell_export);
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancySellExportCode') . ':</b> '. length_accountg($this->accountancy_code_sell_intra);
+        	$label .= '<br><b>'.$langs->trans('ProductAccountancySellCode').':</b> '.length_accountg($this->accountancy_code_sell);
+        	$label .= '<br><b>'.$langs->trans('ProductAccountancySellIntraCode').':</b> '.length_accountg($this->accountancy_code_sell_export);
+        	$label .= '<br><b>'.$langs->trans('ProductAccountancySellExportCode').':</b> '.length_accountg($this->accountancy_code_sell_intra);
         }
-        if (! empty($conf->accounting->enabled) && $this->status_buy)
+        if (!empty($conf->accounting->enabled) && $this->status_buy)
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-        	$label.= '<br><b>' . $langs->trans('ProductAccountancyBuyCode') . ':</b> '. length_accountg($this->accountancy_code_buy);
+        	$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyCode').':</b> '.length_accountg($this->accountancy_code_buy);
         }
-        if (! empty($this->entity))
+        if (!empty($this->entity))
         {
             $tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
-            if ($this->nbphoto > 0) $label .= '<br>' . $tmpphoto;
+            if ($this->nbphoto > 0) $label .= '<br>'.$tmpphoto;
         }
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		    {
-		        $label=$langs->trans("ShowOrder");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		        $label = $langs->trans("ShowOrder");
+		        $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 		    }
 
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
-		    $linkclose.= ' class="classfortooltip"';
+		    $linkclose .= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
+		    $linkclose .= ' class="classfortooltip"';
 
 		    /*if (! is_object($hookmanager))
 	        {
@@ -3560,32 +3560,32 @@ 
         if ($option !== 'nolink')
         {
         	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
         $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
-        $result.=$linkstart;
+        $result .= $linkstart;
 		if ($withpicto) {
-			if ($this->type == Product::TYPE_PRODUCT) $result.=(img_object(($notooltip?'':$label), 'product', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
-			if ($this->type == Product::TYPE_SERVICE) $result.=(img_object(($notooltip?'':$label), 'service',  ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
+			if ($this->type == Product::TYPE_PRODUCT) $result .= (img_object(($notooltip ? '' : $label), 'product', ($notooltip ? 'class="paddingright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1));
+			if ($this->type == Product::TYPE_SERVICE) $result .= (img_object(($notooltip ? '' : $label), 'service', ($notooltip ? 'class="paddinright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1));
 		}
-		$result.= $newref;
-		$result.= $linkend;
+		$result .= $newref;
+		$result .= $linkend;
 
 		global $action;
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('productdao'));
-		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) $result = $hookmanager->resPrint;
 		else $result .= $hookmanager->resPrint;
 
@@ -3603,16 +3603,16 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
 		$langs->load("products");
 
 		// Positionne le modele sur le nom du modele a utiliser
-		if (! dol_strlen($modele))
+		if (!dol_strlen($modele))
 		{
-			if (! empty($conf->global->PRODUCT_ADDON_PDF))
+			if (!empty($conf->global->PRODUCT_ADDON_PDF))
 			{
 				$modele = $conf->global->PRODUCT_ADDON_PDF;
 			}
@@ -3634,19 +3634,19 @@ 
 	 *	@param      int	$type       0=Sell, 1=Buy, 2=Batch Number management
 	 *	@return     string      	Label of status
 	 */
-	function getLibStatut($mode=0, $type=0)
+	function getLibStatut($mode = 0, $type = 0)
 	{
 		switch ($type)
 		{
 			case 0:
-				return $this->LibStatut($this->status,$mode,$type);
+				return $this->LibStatut($this->status, $mode, $type);
 			case 1:
-				return $this->LibStatut($this->status_buy,$mode,$type);
+				return $this->LibStatut($this->status_buy, $mode, $type);
 			case 2:
-				return $this->LibStatut($this->status_batch,$mode,$type);
+				return $this->LibStatut($this->status_batch, $mode, $type);
 			default:
 				//Simulate previous behavior but should return an error string
-				return $this->LibStatut($this->status_buy,$mode,$type);
+				return $this->LibStatut($this->status_buy, $mode, $type);
 		}
 	}
 
@@ -3658,12 +3658,12 @@ 
 	 *	@param      int		$type       0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
 	 *	@return     string      		Label of status
 	 */
-	function LibStatut($status,$mode=0,$type=0)
+	function LibStatut($status, $mode = 0, $type = 0)
 	{
 		global $conf, $langs;
 
 		$langs->load('products');
-		if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
+		if (!empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
 		if ($type == 2)
 		{
@@ -3674,55 +3674,55 @@ 
 				case 1:
 					return ($status == 0 ? $langs->trans('ProductStatusNotOnBatchShort') : $langs->trans('ProductStatusOnBatchShort'));
 				case 2:
-					return $this->LibStatut($status,3,2).' '.$this->LibStatut($status,1,2);
+					return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2);
 				case 3:
 					if ($status == 0)
 					{
-						return img_picto($langs->trans('ProductStatusNotOnBatch'),'statut5');
+						return img_picto($langs->trans('ProductStatusNotOnBatch'), 'statut5');
 					}
-					return img_picto($langs->trans('ProductStatusOnBatch'),'statut4');
+					return img_picto($langs->trans('ProductStatusOnBatch'), 'statut4');
 				case 4:
-					return $this->LibStatut($status,3,2).' '.$this->LibStatut($status,0,2);
+					return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2);
 				case 5:
-					return $this->LibStatut($status,1,2).' '.$this->LibStatut($status,3,2);
+					return $this->LibStatut($status, 1, 2).' '.$this->LibStatut($status, 3, 2);
 				default:
 					return $langs->trans('Unknown');
 			}
 		}
 		if ($mode == 0)
 		{
-			if ($status == 0) return ($type==0 ? $langs->trans('ProductStatusNotOnSellShort'):$langs->trans('ProductStatusNotOnBuyShort'));
-			if ($status == 1) return ($type==0 ? $langs->trans('ProductStatusOnSellShort'):$langs->trans('ProductStatusOnBuyShort'));
+			if ($status == 0) return ($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort'));
+			if ($status == 1) return ($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort'));
 		}
 		if ($mode == 1)
 		{
-			if ($status == 0) return ($type==0 ? $langs->trans('ProductStatusNotOnSell'):$langs->trans('ProductStatusNotOnBuy'));
-			if ($status == 1) return ($type==0 ? $langs->trans('ProductStatusOnSell'):$langs->trans('ProductStatusOnBuy'));
+			if ($status == 0) return ($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy'));
+			if ($status == 1) return ($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy'));
 		}
 		if ($mode == 2)
 		{
-			if ($status == 0) return img_picto($langs->trans('ProductStatusNotOnSell'),'statut5', 'class="pictostatus"').' '.($type==0 ? $langs->trans('ProductStatusNotOnSellShort'):$langs->trans('ProductStatusNotOnBuyShort'));
-			if ($status == 1) return img_picto($langs->trans('ProductStatusOnSell'),'statut4', 'class="pictostatus"').' '.($type==0 ? $langs->trans('ProductStatusOnSellShort'):$langs->trans('ProductStatusOnBuyShort'));
+			if ($status == 0) return img_picto($langs->trans('ProductStatusNotOnSell'), 'statut5', 'class="pictostatus"').' '.($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort'));
+			if ($status == 1) return img_picto($langs->trans('ProductStatusOnSell'), 'statut4', 'class="pictostatus"').' '.($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort'));
 		}
 		if ($mode == 3)
 		{
-			if ($status == 0) return img_picto(($type==0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy')),'statut5', 'class="pictostatus"');
-			if ($status == 1) return img_picto(($type==0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy')),'statut4', 'class="pictostatus"');
+			if ($status == 0) return img_picto(($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');
+			if ($status == 1) return img_picto(($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy')), 'statut4', 'class="pictostatus"');
 		}
 		if ($mode == 4)
 		{
-			if ($status == 0) return img_picto($langs->trans('ProductStatusNotOnSell'),'statut5', 'class="pictostatus"').' '.($type==0 ? $langs->trans('ProductStatusNotOnSell'):$langs->trans('ProductStatusNotOnBuy'));
-			if ($status == 1) return img_picto($langs->trans('ProductStatusOnSell'),'statut4', 'class="pictostatus"').' '.($type==0 ? $langs->trans('ProductStatusOnSell'):$langs->trans('ProductStatusOnBuy'));
+			if ($status == 0) return img_picto($langs->trans('ProductStatusNotOnSell'), 'statut5', 'class="pictostatus"').' '.($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy'));
+			if ($status == 1) return img_picto($langs->trans('ProductStatusOnSell'), 'statut4', 'class="pictostatus"').' '.($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy'));
 		}
 		if ($mode == 5)
 		{
-			if ($status == 0) return ($type==0 ? $langs->trans('ProductStatusNotOnSellShort'):$langs->trans('ProductStatusNotOnBuyShort')).' '.img_picto(($type==0 ? $langs->trans('ProductStatusNotOnSell'):$langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');
-			if ($status == 1) return ($type==0 ? $langs->trans('ProductStatusOnSellShort'):$langs->trans('ProductStatusOnBuyShort')).' '.img_picto(($type==0 ? $langs->trans('ProductStatusOnSell'):$langs->trans('ProductStatusOnBuy')),'statut4', 'class="pictostatus"');
+			if ($status == 0) return ($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort')).' '.img_picto(($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');
+			if ($status == 1) return ($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort')).' '.img_picto(($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy')), 'statut4', 'class="pictostatus"');
 		}
 		if ($mode == 6)
 		{
-			if ($status == 0) return ($type==0 ? $langs->trans('ProductStatusNotOnSellShort'):$langs->trans('ProductStatusNotOnBuyShort')).' '.img_picto(($type==0 ? $langs->trans('ProductStatusNotOnSell'):$langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');
-			if ($status == 1) return ($type==0 ? $langs->trans('ProductStatusOnSellShort'):$langs->trans('ProductStatusOnBuyShort')).' '.img_picto(($type==0 ? $langs->trans('ProductStatusOnSell'):$langs->trans('ProductStatusOnBuy')),'statut4', 'class="pictostatus"');
+			if ($status == 0) return ($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort')).' '.img_picto(($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');
+			if ($status == 1) return ($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort')).' '.img_picto(($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy')), 'statut4', 'class="pictostatus"');
 		}
 		return $langs->trans('Unknown');
 	}
@@ -3758,20 +3758,20 @@ 
 	 *  @param  	int		$origin_id      Origin id of element
 	 * 	@return     int     				<0 if KO, >0 if OK
 	 */
-	function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $inventorycode='', $origin_element='', $origin_id=null)
+	function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null)
 	{
 		if ($id_entrepot)
 		{
 			$this->db->begin();
 
-			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 
-			$movementstock=new MouvementStock($this->db);
+			$movementstock = new MouvementStock($this->db);
 			$movementstock->setOrigin($origin_element, $origin_id);
-			$result=$movementstock->_create($user,$this->id,$id_entrepot,$op[$movement],$movement,$price,$label,$inventorycode);
+			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode);
 
 			if ($result >= 0)
 			{
@@ -3780,8 +3780,8 @@ 
 			}
 			else
 			{
-			    $this->error=$movementstock->error;
-			    $this->errors=$movementstock->errors;
+			    $this->error = $movementstock->error;
+			    $this->errors = $movementstock->errors;
 
 				$this->db->rollback();
 				return -1;
@@ -3806,20 +3806,20 @@ 
 	 *  @param  	int		$origin_id      Origin id of element
 	 * 	@return     int     				<0 if KO, >0 if OK
 	 */
-	function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $dlc='', $dluo='',$lot='', $inventorycode='', $origin_element='', $origin_id=null)
+	function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null)
 	{
 		if ($id_entrepot)
 		{
 			$this->db->begin();
 
-			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 
-			$movementstock=new MouvementStock($this->db);
+			$movementstock = new MouvementStock($this->db);
 			$movementstock->setOrigin($origin_element, $origin_id);
-			$result=$movementstock->_create($user,$this->id,$id_entrepot,$op[$movement],$movement,$price,$label,$inventorycode,'',$dlc,$dluo,$lot);
+			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', $dlc, $dluo, $lot);
 
 			if ($result >= 0)
 			{
@@ -3828,8 +3828,8 @@ 
 			}
 			else
 			{
-			    $this->error=$movementstock->error;
-			    $this->errors=$movementstock->errors;
+			    $this->error = $movementstock->error;
+			    $this->errors = $movementstock->errors;
 
 				$this->db->rollback();
 				return -1;
@@ -3851,7 +3851,7 @@ 
 	 *    @return     int                   < 0 if KO, > 0 if OK
 	 *    @see		  load_virtual_stock, getBatchInfo
 	 */
-	function load_stock($option='')
+	function load_stock($option = '')
 	{
 		global $conf;
 
@@ -3875,19 +3875,19 @@ 
 		}
 
 		$sql = "SELECT ps.rowid, ps.reel, ps.fk_entrepot";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-		$sql.= ", ".MAIN_DB_PREFIX."entrepot as w";
-		$sql.= " WHERE w.entity IN (".getEntity('stock').")";
-		$sql.= " AND w.rowid = ps.fk_entrepot";
-		$sql.= " AND ps.fk_product = ".$this->id;
-		if ($conf->global->ENTREPOT_EXTRA_STATUS && count($warehouseStatus)) $sql.= " AND w.statut IN (".$this->db->escape(implode(',',$warehouseStatus)).")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+		$sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
+		$sql .= " WHERE w.entity IN (".getEntity('stock').")";
+		$sql .= " AND w.rowid = ps.fk_entrepot";
+		$sql .= " AND ps.fk_product = ".$this->id;
+		if ($conf->global->ENTREPOT_EXTRA_STATUS && count($warehouseStatus)) $sql .= " AND w.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")";
 
 		dol_syslog(get_class($this)."::load_stock", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$num = $this->db->num_rows($result);
-			$i=0;
+			$i = 0;
 			if ($num > 0)
 			{
 				while ($i < $num)
@@ -3896,23 +3896,23 @@ 
 					$this->stock_warehouse[$row->fk_entrepot] = new stdClass();
 					$this->stock_warehouse[$row->fk_entrepot]->real = $row->reel;
 					$this->stock_warehouse[$row->fk_entrepot]->id = $row->rowid;
-					if ((! preg_match('/nobatch/', $option)) && $this->hasbatch()) $this->stock_warehouse[$row->fk_entrepot]->detail_batch=Productbatch::findAll($this->db, $row->rowid, 1, $this->id);
-					$this->stock_reel+=$row->reel;
+					if ((!preg_match('/nobatch/', $option)) && $this->hasbatch()) $this->stock_warehouse[$row->fk_entrepot]->detail_batch = Productbatch::findAll($this->db, $row->rowid, 1, $this->id);
+					$this->stock_reel += $row->reel;
 					$i++;
 				}
 			}
 			$this->db->free($result);
 
-			if (! preg_match('/novirtual/', $option))
+			if (!preg_match('/novirtual/', $option))
 			{
-			    $this->load_virtual_stock();		// This also load stats_commande_fournisseur, ...
+			    $this->load_virtual_stock(); // This also load stats_commande_fournisseur, ...
 			}
 
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -3928,53 +3928,53 @@ 
     {
         global $conf;
 
-        $stock_commande_client=0;
-        $stock_commande_fournisseur=0;
-        $stock_sending_client=0;
-        $stock_reception_fournisseur=0;
+        $stock_commande_client = 0;
+        $stock_commande_fournisseur = 0;
+        $stock_sending_client = 0;
+        $stock_reception_fournisseur = 0;
 
-        if (! empty($conf->commande->enabled))
+        if (!empty($conf->commande->enabled))
         {
-            $result=$this->load_stats_commande(0,'1,2', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_commande_client=$this->stats_commande['qty'];
+            $result = $this->load_stats_commande(0, '1,2', 1);
+            if ($result < 0) dol_print_error($this->db, $this->error);
+            $stock_commande_client = $this->stats_commande['qty'];
         }
-        if (! empty($conf->expedition->enabled))
+        if (!empty($conf->expedition->enabled))
         {
-            $result=$this->load_stats_sending(0,'1,2', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_sending_client=$this->stats_expedition['qty'];
+            $result = $this->load_stats_sending(0, '1,2', 1);
+            if ($result < 0) dol_print_error($this->db, $this->error);
+            $stock_sending_client = $this->stats_expedition['qty'];
         }
-        if (! empty($conf->fournisseur->enabled))
+        if (!empty($conf->fournisseur->enabled))
         {
-            $result=$this->load_stats_commande_fournisseur(0,'1,2,3,4', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_commande_fournisseur=$this->stats_commande_fournisseur['qty'];
+            $result = $this->load_stats_commande_fournisseur(0, '1,2,3,4', 1);
+            if ($result < 0) dol_print_error($this->db, $this->error);
+            $stock_commande_fournisseur = $this->stats_commande_fournisseur['qty'];
 
-            $result=$this->load_stats_reception(0,'4', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_reception_fournisseur=$this->stats_reception['qty'];
+            $result = $this->load_stats_reception(0, '4', 1);
+            if ($result < 0) dol_print_error($this->db, $this->error);
+            $stock_reception_fournisseur = $this->stats_reception['qty'];
         }
 
         // Stock decrease mode
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
-            $this->stock_theorique=$this->stock_reel-$stock_commande_client+$stock_sending_client;
+        if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+            $this->stock_theorique = $this->stock_reel - $stock_commande_client + $stock_sending_client;
         }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
-            $this->stock_theorique=$this->stock_reel;
+        if (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
+            $this->stock_theorique = $this->stock_reel;
         }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
-            $this->stock_theorique=$this->stock_reel-$stock_commande_client;
+        if (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+            $this->stock_theorique = $this->stock_reel - $stock_commande_client;
         }
         // Stock Increase mode
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
-            $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
+        if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+            $this->stock_theorique += $stock_commande_fournisseur - $stock_reception_fournisseur;
         }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
-            $this->stock_theorique-=$stock_reception_fournisseur;
+        if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
+            $this->stock_theorique -= $stock_reception_fournisseur;
         }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
-            $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
+        if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+            $this->stock_theorique += $stock_commande_fournisseur - $stock_reception_fournisseur;
         }
     }
 
@@ -3988,21 +3988,21 @@ 
 	 */
     function loadBatchInfo($batch)
     {
-    	$result=array();
+    	$result = array();
 
     	$sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) FROM ".MAIN_DB_PREFIX."product_batch as pb, ".MAIN_DB_PREFIX."product_stock as ps";
-    	$sql.= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".$this->id." AND pb.batch = '".$this->db->escape($batch)."'";
-    	$sql.= " GROUP BY pb.batch, pb.eatby, pb.sellby";
+    	$sql .= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".$this->id." AND pb.batch = '".$this->db->escape($batch)."'";
+    	$sql .= " GROUP BY pb.batch, pb.eatby, pb.sellby";
     	dol_syslog(get_class($this)."::loadBatchInfo load first entry found for lot/serial = ".$batch, LOG_DEBUG);
     	$resql = $this->db->query($sql);
     	if ($resql)
     	{
     		$num = $this->db->num_rows($resql);
-    		$i=0;
+    		$i = 0;
     		while ($i < $num)
     		{
     			$obj = $this->db->fetch_object($resql);
-				$result[]=array('batch'=>$batch, 'eatby'=>$this->db->jdate($obj->eatby), 'sellby'=>$this->db->jdate($obj->sellby), 'qty'=>$obj->qty);
+				$result[] = array('batch'=>$batch, 'eatby'=>$this->db->jdate($obj->eatby), 'sellby'=>$this->db->jdate($obj->sellby), 'qty'=>$obj->qty);
 				$i++;
     		}
     		return $result;
@@ -4032,19 +4032,19 @@ 
 		$result = 0;
 
 		$dir = $sdir;
-		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $dir .= '/'. get_exdir($this->id,2,0,0,$this,'product') . $this->id ."/photos";
-		else $dir .= '/'.get_exdir(0,0,0,0,$this,'product').dol_sanitizeFileName($this->ref);
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $dir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'product').$this->id."/photos";
+		else $dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product').dol_sanitizeFileName($this->ref);
 
 		dol_mkdir($dir);
 
-		$dir_osencoded=$dir;
+		$dir_osencoded = $dir;
 
 		if (is_dir($dir_osencoded))
 		{
-			$originImage = $dir . '/' . $file['name'];
+			$originImage = $dir.'/'.$file['name'];
 
 			// Cree fichier en taille origine
-			$result=dol_move_uploaded_file($file['tmp_name'], $originImage, 1);
+			$result = dol_move_uploaded_file($file['tmp_name'], $originImage, 1);
 
 			if (file_exists(dol_osencode($originImage)))
 			{
@@ -4065,26 +4065,26 @@ 
 	 */
 	function is_photo_available($sdir)
 	{
-	    include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-	    include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 		global $conf;
 
 		$dir = $sdir;
-		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $dir .= '/'. get_exdir($this->id,2,0,0,$this,'product') . $this->id ."/photos/";
-		else $dir .= '/'.get_exdir(0,0,0,0,$this,'product').dol_sanitizeFileName($this->ref).'/';
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $dir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'product').$this->id."/photos/";
+		else $dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product').dol_sanitizeFileName($this->ref).'/';
 
-		$nbphoto=0;
+		$nbphoto = 0;
 
-		$dir_osencoded=dol_osencode($dir);
+		$dir_osencoded = dol_osencode($dir);
 		if (file_exists($dir_osencoded))
 		{
-			$handle=opendir($dir_osencoded);
+			$handle = opendir($dir_osencoded);
 			if (is_resource($handle))
 			{
 			    while (($file = readdir($handle)) !== false)
     			{
-    				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in UTF8 in memory
+    				if (!utf8_check($file)) $file = utf8_encode($file); // To be sure data is stored in UTF8 in memory
     				if (dol_is_file($dir.$file) && image_format_supported($file) > 0) return true;
     			}
 			}
@@ -4100,42 +4100,42 @@ 
 	 *  @param      int			$nbmax      Nombre maximum de photos (0=pas de max)
 	 *  @return     array       			Tableau de photos
 	 */
-	function liste_photos($dir,$nbmax=0)
+	function liste_photos($dir, $nbmax = 0)
 	{
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-		$nbphoto=0;
-		$tabobj=array();
+		$nbphoto = 0;
+		$tabobj = array();
 
-		$dir_osencoded=dol_osencode($dir);
-		$handle=@opendir($dir_osencoded);
+		$dir_osencoded = dol_osencode($dir);
+		$handle = @opendir($dir_osencoded);
 		if (is_resource($handle))
 		{
 			while (($file = readdir($handle)) !== false)
 			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// readdir returns ISO
+				if (!utf8_check($file)) $file = utf8_encode($file); // readdir returns ISO
 				if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)
 				{
 					$nbphoto++;
 
 					// On determine nom du fichier vignette
-					$photo=$file;
-					$photo_vignette='';
+					$photo = $file;
+					$photo_vignette = '';
 					if (preg_match('/('.$this->regeximgext.')$/i', $photo, $regs))
 					{
-						$photo_vignette=preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
+						$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
 					}
 
 					$dirthumb = $dir.'thumbs/';
 
 					// Objet
-					$obj=array();
-					$obj['photo']=$photo;
-					if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']='thumbs/' . $photo_vignette;
-					else $obj['photo_vignette']="";
+					$obj = array();
+					$obj['photo'] = $photo;
+					if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
+					else $obj['photo_vignette'] = "";
 
-					$tabobj[$nbphoto-1]=$obj;
+					$tabobj[$nbphoto - 1] = $obj;
 
 					// On continue ou on arrete de boucler ?
 					if ($nbmax && $nbphoto >= $nbmax) break;
@@ -4161,21 +4161,21 @@ 
 
         $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
 		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
-		$filename = preg_replace('/'.preg_quote($dir,'/').'/i','',$file); // Nom du fichier
+		$filename = preg_replace('/'.preg_quote($dir, '/').'/i', '', $file); // Nom du fichier
 
 		// On efface l'image d'origine
 		dol_delete_file($file, 0, 0, 0, $this); // For triggers
 
 		// Si elle existe, on efface la vignette
-		if (preg_match('/('.$this->regeximgext.')$/i',$filename,$regs))
+		if (preg_match('/('.$this->regeximgext.')$/i', $filename, $regs))
 		{
-			$photo_vignette=preg_replace('/'.$regs[0].'/i','',$filename).'_small'.$regs[0];
+			$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_small'.$regs[0];
 			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
 			{
 				dol_delete_file($dirthumb.$photo_vignette);
 			}
 
-			$photo_vignette=preg_replace('/'.$regs[0].'/i','',$filename).'_mini'.$regs[0];
+			$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_mini'.$regs[0];
 			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
 			{
 				dol_delete_file($dirthumb.$photo_vignette);
@@ -4191,7 +4191,7 @@ 
 	 */
 	function get_image_size($file)
 	{
-		$file_osencoded=dol_osencode($file);
+		$file_osencoded = dol_osencode($file);
 		$infoImg = getimagesize($file_osencoded); // Get information on image
 		$this->imgWidth = $infoImg[0]; // Largeur de l'image
 		$this->imgHeight = $infoImg[1]; // Hauteur de l'image
@@ -4206,27 +4206,27 @@ 
 	{
 		global $conf, $user, $hookmanager;
 
-		$this->nb=array();
+		$this->nb = array();
 
 		$sql = "SELECT count(p.rowid) as nb, fk_product_type";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql.= ' WHERE p.entity IN ('.getEntity($this->element, 1).')';
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+		$sql .= ' WHERE p.entity IN ('.getEntity($this->element, 1).')';
 		// Add where from hooks
 		if (is_object($hookmanager))
 		{
-		    $parameters=array();
-		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-		    $sql.=$hookmanager->resPrint;
+		    $parameters = array();
+		    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+		    $sql .= $hookmanager->resPrint;
 		}
-        $sql.= ' GROUP BY fk_product_type';
+        $sql .= ' GROUP BY fk_product_type';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				if ($obj->fk_product_type == 1) $this->nb["services"]=$obj->nb;
-				else $this->nb["products"]=$obj->nb;
+				if ($obj->fk_product_type == 1) $this->nb["services"] = $obj->nb;
+				else $this->nb["products"] = $obj->nb;
 			}
             $this->db->free($resql);
 			return 1;
@@ -4234,7 +4234,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -4267,23 +4267,23 @@ 
      *	@param	string		$type		Barcode type (ean, isbn, ...)
      *  @return void
      */
-    function get_barcode($object,$type='')
+    function get_barcode($object, $type = '')
     {
         global $conf;
 
-        $result='';
-        if (! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
+        $result = '';
+        if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
         {
-            $dirsociete=array_merge(array('/core/modules/barcode/'),$conf->modules_parts['barcode']);
+            $dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$conf->global->BARCODE_PRODUCT_ADDON_NUM.'.php');
+                $res = dol_include_once($dirroot.$conf->global->BARCODE_PRODUCT_ADDON_NUM.'.php');
                 if ($res) break;
             }
             $var = $conf->global->BARCODE_PRODUCT_ADDON_NUM;
             $mod = new $var;
 
-            $result=$mod->getNextValue($object,$type);
+            $result = $mod->getNextValue($object, $type);
 
             dol_syslog(get_class($this)."::get_barcode barcode=".$result." module=".$var);
         }
@@ -4299,22 +4299,22 @@ 
      */
     function initAsSpecimen()
     {
-        global $user,$langs,$conf,$mysoc;
+        global $user, $langs, $conf, $mysoc;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Initialize parameters
-        $this->specimen=1;
-        $this->id=0;
+        $this->specimen = 1;
+        $this->id = 0;
         $this->ref = 'PRODUCT_SPEC';
         $this->label = 'PRODUCT SPECIMEN';
-        $this->description = 'This is description of this product specimen that was created the '.dol_print_date($now,'dayhourlog').'.';
-        $this->specimen=1;
-        $this->country_id=1;
-        $this->tosell=1;
-        $this->tobuy=1;
-		$this->tobatch=0;
-        $this->note='This is a comment (private)';
+        $this->description = 'This is description of this product specimen that was created the '.dol_print_date($now, 'dayhourlog').'.';
+        $this->specimen = 1;
+        $this->country_id = 1;
+        $this->tosell = 1;
+        $this->tobuy = 1;
+		$this->tobatch = 0;
+        $this->note = 'This is a comment (private)';
         $this->date_creation = $now;
         $this->date_modification = $now;
 
@@ -4333,7 +4333,7 @@ 
         $this->volume = 300;
         $this->volume_unit = 0;
 
-        $this->barcode=-1;	// Create barcode automatically
+        $this->barcode = -1; // Create barcode automatically
     }
 
 	/**
@@ -4342,7 +4342,7 @@ 
 	 * 	@param	string $type Label type (long or short)
 	 *	@return	string|int <0 if ko, label if ok
 	 */
-	function getLabelOfUnit($type='long')
+	function getLabelOfUnit($type = 'long')
 	{
 		global $langs;
 
@@ -4363,7 +4363,7 @@ 
 
 		$sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
 		$resql = $this->db->query($sql);
-		if($resql && $this->db->num_rows($resql) > 0)
+		if ($resql && $this->db->num_rows($resql) > 0)
 		{
 			$res = $this->db->fetch_array($resql);
 			$label = $res[$label_type];
@@ -4372,7 +4372,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error().' sql='.$sql;
+			$this->error = $this->db->error().' sql='.$sql;
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -4398,17 +4398,17 @@ 
 	{
 		global $conf;
 
-		$maxpricesupplier=0;
+		$maxpricesupplier = 0;
 
-		if (! empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
+		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 			$product_fourn = new ProductFournisseur($this->db);
 			$product_fourn_list = $product_fourn->list_product_fournisseur_price($this->id, '', '');
 
-			if (is_array($product_fourn_list) && count($product_fourn_list)>0)
+			if (is_array($product_fourn_list) && count($product_fourn_list) > 0)
 			{
-				foreach($product_fourn_list as $productfourn)
+				foreach ($product_fourn_list as $productfourn)
 				{
 					if ($productfourn->fourn_unitprice > $maxpricesupplier)
 					{
@@ -4435,12 +4435,12 @@ 
 	 */
 	public function setCategories($categories) {
 		// Handle single category
-		if (! is_array($categories)) {
+		if (!is_array($categories)) {
 			$categories = array($categories);
 		}
 
 		// Get current categories
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$c = new Categorie($this->db);
 		$existing = $c->containing($this->id, Categorie::TYPE_PRODUCT, 'id');
 
@@ -4454,7 +4454,7 @@ 
 		}
 
 		// Process
-		foreach($to_del as $del) {
+		foreach ($to_del as $del) {
 			if ($c->fetch($del) > 0) {
 				$c->del_type($this, 'product');
 			}
@@ -4523,14 +4523,14 @@ 
 			//We have to make sure it does exist and it is > 0
 			//First price level only allows changing min_price
 			if ($i > 1 && isset($rules[$i]->var_percent) && $rules[$i]->var_percent) {
-				$price = $prices[$rules[$i]->fk_level] * (1 + ($rules[$i]->var_percent/100));
+				$price = $prices[$rules[$i]->fk_level] * (1 + ($rules[$i]->var_percent / 100));
 			}
 
 			$prices[$i] = $price;
 
 			//We have to make sure it does exist and it is > 0
 			if (isset($rules[$i]->var_min_percent) && $rules[$i]->var_min_percent) {
-				$price_min = $price * (1 - ($rules[$i]->var_min_percent/100));
+				$price_min = $price * (1 - ($rules[$i]->var_min_percent / 100));
 			}
 
 			//Little check to make sure the price is modified before triggering generation
@@ -4573,11 +4573,11 @@ 
     function info($id)
     {
         $sql = "SELECT p.rowid, p.ref, p.datec as date_creation, p.tms as date_modification,";
-        $sql.= " p.fk_user_author, p.fk_user_modif";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
-        $sql.= " WHERE p.rowid = ".$id;
+        $sql .= " p.fk_user_author, p.fk_user_modif";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
+        $sql .= " WHERE p.rowid = ".$id;
 
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             if ($this->db->num_rows($result))
@@ -4589,7 +4589,7 @@ 
                 if ($obj->fk_user_author) {
                     $cuser = new User($this->db);
                     $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation     = $cuser;
+                    $this->user_creation = $cuser;
                 }
 
                 if ($obj->fk_user_modif) {
@@ -4598,7 +4598,7 @@ 
                     $this->user_modification = $muser;
                 }
 
-                $this->ref			     = $obj->ref;
+                $this->ref = $obj->ref;
                 $this->date_creation     = $this->db->jdate($obj->date_creation);
                 $this->date_modification = $this->db->jdate($obj->date_modification);
             }

htdocs/projet/tasks.php

Spacing +119 added lines, -119 removed lines

@@ -37,8 +37,8 @@ 
 $ref = GETPOST('ref', 'alpha');
 $taskref = GETPOST('taskref', 'alpha');
 $action = GETPOST('action', 'alpha');
-$backtopage=GETPOST('backtopage','alpha');
-$cancel=GETPOST('cancel','alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
 
 $search_user_id = GETPOST('search_user_id', 'int');
 
@@ -49,86 +49,86 @@ 
 $extrafields_project = new ExtraFields($db);
 $extrafields_task = new ExtraFields($db);
 
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	// fetch optionals attributes and labels
-	$extralabels_projet=$extrafields_project->fetch_name_optionals_label($object->table_element);
+	$extralabels_projet = $extrafields_project->fetch_name_optionals_label($object->table_element);
 }
-$extralabels_task=$extrafields_task->fetch_name_optionals_label($taskstatic->table_element);
+$extralabels_task = $extrafields_task->fetch_name_optionals_label($taskstatic->table_element);
 
 // Security check
-$socid=0;
+$socid = 0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('projecttaskcard','globalcard'));
+$hookmanager->initHooks(array('projecttaskcard', 'globalcard'));
 
-$progress=GETPOST('progress', 'int');
-$label=GETPOST('label', 'alpha');
-$description=GETPOST('description');
-$planned_workloadhour=(GETPOST('planned_workloadhour','int')?GETPOST('planned_workloadhour','int'):0);
-$planned_workloadmin=(GETPOST('planned_workloadmin','int')?GETPOST('planned_workloadmin','int'):0);
-$planned_workload=$planned_workloadhour*3600+$planned_workloadmin*60;
+$progress = GETPOST('progress', 'int');
+$label = GETPOST('label', 'alpha');
+$description = GETPOST('description');
+$planned_workloadhour = (GETPOST('planned_workloadhour', 'int') ?GETPOST('planned_workloadhour', 'int') : 0);
+$planned_workloadmin = (GETPOST('planned_workloadmin', 'int') ?GETPOST('planned_workloadmin', 'int') : 0);
+$planned_workload = $planned_workloadhour * 3600 + $planned_workloadmin * 60;
 
-$userAccess=0;
+$userAccess = 0;
 
 
-$parameters=array('id'=>$id);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 /*
  * Actions
  */
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_user_id="";
-    $toselect='';
-    $search_array_options=array();
+    $search_user_id = "";
+    $toselect = '';
+    $search_array_options = array();
 }
 
 if ($action == 'createtask' && $user->rights->projet->creer)
 {
-	$error=0;
+	$error = 0;
 
     // If we use user timezone, we must change also view/list to use user timezone everywhere
     //$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
 	//$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
-	$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
-	$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
+	$date_start = dol_mktime($_POST['dateohour'], $_POST['dateomin'], 0, $_POST['dateomonth'], $_POST['dateoday'], $_POST['dateoyear']);
+	$date_end = dol_mktime($_POST['dateehour'], $_POST['dateemin'], 0, $_POST['dateemonth'], $_POST['dateeday'], $_POST['dateeyear']);
 
-	if (! $cancel)
+	if (!$cancel)
 	{
 		if (empty($taskref))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
-			$action='create';
+			$action = 'create';
 			$error++;
 		}
 	    if (empty($label))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-			$action='create';
+			$action = 'create';
 			$error++;
 		}
 		else if (empty($_POST['task_parent']))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ChildOfProjectTask")), null, 'errors');
-			$action='create';
+			$action = 'create';
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$tmparray=explode('_',$_POST['task_parent']);
-			$projectid=$tmparray[0];
+			$tmparray = explode('_', $_POST['task_parent']);
+			$projectid = $tmparray[0];
 			if (empty($projectid)) $projectid = $id; // If projectid is ''
-			$task_parent=$tmparray[1];
-			if (empty($task_parent)) $task_parent = 0;	// If task_parent is ''
+			$task_parent = $tmparray[1];
+			if (empty($task_parent)) $task_parent = 0; // If task_parent is ''
 
 			$task = new Task($db);
 
@@ -144,7 +144,7 @@ 
 			$task->progress = $progress;
 
 			// Fill array 'array_options' with data from add form
-			$ret = $extrafields_task->setOptionalsFromPost($extralabels_task,$task);
+			$ret = $extrafields_task->setOptionalsFromPost($extralabels_task, $task);
 
 			$taskid = $task->create($user);
 
@@ -154,20 +154,20 @@ 
 			}
 			else
 			{
-			    setEventMessages($task->error,$task->errors,'errors');
+			    setEventMessages($task->error, $task->errors, 'errors');
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! empty($backtopage))
+			if (!empty($backtopage))
 			{
 				header("Location: ".$backtopage);
 				exit;
 			}
 			else if (empty($projectid))
 			{
-				header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode)?'':'?mode='.$mode));
+				header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
 				exit;
 			}
 			$id = $projectid;
@@ -175,7 +175,7 @@ 
 	}
 	else
 	{
-		if (! empty($backtopage))
+		if (!empty($backtopage))
 		{
 			header("Location: ".$backtopage);
 			exit;
@@ -183,7 +183,7 @@ 
 		else if (empty($id))
 		{
 			// We go back on task list
-			header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode)?'':'?mode='.$mode));
+			header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
 			exit;
 		}
 	}
@@ -194,57 +194,57 @@ 
  * View
  */
 
-$form=new Form($db);
-$formother=new FormOther($db);
+$form = new Form($db);
+$formother = new FormOther($db);
 $taskstatic = new Task($db);
-$userstatic=new User($db);
+$userstatic = new User($db);
 
-$title=$langs->trans("Project").' - '.$langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
-$help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
-llxHeader("",$title,$help_url);
+$title = $langs->trans("Project").' - '.$langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
+$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+llxHeader("", $title, $help_url);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
-	$res=$object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
 
 	// To verify role of users
 	//$userAccess = $object->restrictedProjectArea($user,'read');
-	$userWrite  = $object->restrictedProjectArea($user,'write');
+	$userWrite = $object->restrictedProjectArea($user, 'write');
 	//$userDelete = $object->restrictedProjectArea($user,'delete');
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 
-	$tab=GETPOST('tab')?GETPOST('tab'):'tasks';
+	$tab = GETPOST('tab') ?GETPOST('tab') : 'tasks';
 
-	$head=project_prepare_head($object);
-	dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
+	$head = project_prepare_head($object);
+	dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
-	$param='';
-    if ($search_user_id > 0) $param.='&search_user_id='.dol_escape_htmltag($search_user_id);
+	$param = '';
+    if ($search_user_id > 0) $param .= '&search_user_id='.dol_escape_htmltag($search_user_id);
 
     // Project card
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref='<div class="refidno">';
+    $morehtmlref = '<div class="refidno">';
     // Title
-    $morehtmlref.=$object->title;
+    $morehtmlref .= $object->title;
     // Thirdparty
     if ($object->thirdparty->id > 0)
     {
-        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
+        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
     }
-    $morehtmlref.='</div>';
+    $morehtmlref .= '</div>';
 
     // Define a complementary filter for search of next/prev ref.
-    if (! $user->rights->projet->all->lire)
+    if (!$user->rights->projet->all->lire)
     {
-        $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0);
-        $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
+        $objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
+        $object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
     }
 
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -282,22 +282,22 @@ 
 
     // Date start - end
     print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-    $start = dol_print_date($object->date_start,'day');
-    print ($start?$start:'?');
-    $end = dol_print_date($object->date_end,'day');
+    $start = dol_print_date($object->date_start, 'day');
+    print ($start ? $start : '?');
+    $end = dol_print_date($object->date_end, 'day');
     print ' - ';
-    print ($end?$end:'?');
+    print ($end ? $end : '?');
     if ($object->hasDelay()) print img_warning("Late");
     print '</td></tr>';
 
     // Budget
     print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-    if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,1,0,0,$conf->currency);
+    if (strcmp($object->budget_amount, '')) print price($object->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';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
     print '</table>';
 
@@ -314,9 +314,9 @@ 
     print '</td></tr>';
 
     // Categories
-    if($conf->categorie->enabled) {
+    if ($conf->categorie->enabled) {
         print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
-        print $form->showCategories($object->id,'project',1);
+        print $form->showCategories($object->id, 'project', 1);
         print "</td></tr>";
     }
 
@@ -335,7 +335,7 @@ 
 
 if ($action == 'create' && $user->rights->projet->creer && (empty($object->thirdparty->id) || $userWrite > 0))
 {
-	if ($id > 0 || ! empty($ref)) print '<br>';
+	if ($id > 0 || !empty($ref)) print '<br>';
 
 	print load_fiche_titre($langs->trans("NewTask"), '', 'title_project');
 
@@ -343,27 +343,27 @@ 
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="createtask">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if (! empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
+	if (!empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 	dol_fiche_head('');
 
 	print '<table class="border" width="100%">';
 
-	$defaultref='';
-	$obj = empty($conf->global->PROJECT_TASK_ADDON)?'mod_task_simple':$conf->global->PROJECT_TASK_ADDON;
-	if (! empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+	$defaultref = '';
+	$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+	if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
 	{
-		require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+		require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
 		$modTask = new $obj;
-		$defaultref = $modTask->getNextValue($object->thirdparty,null);
+		$defaultref = $modTask->getNextValue($object->thirdparty, null);
 	}
 
-	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
 
 	// Ref
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';
-	print ($_POST["ref"]?$_POST["ref"]:$defaultref);
-	print '<input type="hidden" name="taskref" value="'.($_POST["ref"]?$_POST["ref"]:$defaultref).'">';
+	print ($_POST["ref"] ? $_POST["ref"] : $defaultref);
+	print '<input type="hidden" name="taskref" value="'.($_POST["ref"] ? $_POST["ref"] : $defaultref).'">';
 	print '</td></tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
@@ -372,11 +372,11 @@ 
 
 	// List of projects
 	print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
-	print $formother->selectProjectTasks(GETPOST('task_parent'),$projectid?$projectid:$object->id, 'task_parent', 0, 0, 1, 1);
+	print $formother->selectProjectTasks(GETPOST('task_parent'), $projectid ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1);
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
-	$contactsofproject=(! empty($object->id)?$object->getListContactId('internal'):'');
+	$contactsofproject = (!empty($object->id) ? $object->getListContactId('internal') : '');
 	if (count($contactsofproject))
 	{
 		print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
@@ -389,22 +389,22 @@ 
 
 	// Date start
 	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-	print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1,1);
+	print $form->select_date(($date_start ? $date_start : ''), 'dateo', 1, 1, 0, '', 1, 1, 1);
 	print '</td></tr>';
 
 	// Date end
 	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-	print $form->select_date(($date_end?$date_end:-1),'datee',-1,1,0,'',1,1,1);
+	print $form->select_date(($date_end ? $date_end : -1), 'datee', -1, 1, 0, '', 1, 1, 1);
 	print '</td></tr>';
 
 	// Planned workload
 	print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
-	print $form->select_duration('planned_workload', $planned_workload?$planned_workload : $object->planned_workload,0,'text');
+	print $form->select_duration('planned_workload', $planned_workload ? $planned_workload : $object->planned_workload, 0, 'text');
 	print '</td></tr>';
 
 	// Progress
 	print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-	print $formother->select_percent($progress,'progress',0,5,0,100,1);
+	print $formother->select_percent($progress, 'progress', 0, 5, 0, 100, 1);
 	print '</td></tr>';
 
 	// Description
@@ -414,12 +414,12 @@ 
 	print '</td></tr>';
 
 	// Other options
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
-		print $object->showOptionals($extrafields_task,'edit');
+		print $object->showOptionals($extrafields_task, 'edit');
 	}
 
 	print '</table>';
@@ -435,24 +435,24 @@ 
 	print '</form>';
 
 }
-else if ($id > 0 || ! empty($ref))
+else if ($id > 0 || !empty($ref))
 {
 	/*
 	 * Projet card in view mode
 	 */
 
 	// Definition of fields for list
-	$arrayfields=array();
-	$arrayfields['t.task_ref']=array('label'=>$langs->trans("RefTask"), 'checked'=>1);
-	$arrayfields['t.task_label']=array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
-	$arrayfields['t.task_date_start']=array('label'=>$langs->trans("DateStart"), 'checked'=>1);
-	$arrayfields['t.task_date_end']=array('label'=>$langs->trans("DateEnd"), 'checked'=>1);
+	$arrayfields = array();
+	$arrayfields['t.task_ref'] = array('label'=>$langs->trans("RefTask"), 'checked'=>1);
+	$arrayfields['t.task_label'] = array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
+	$arrayfields['t.task_date_start'] = array('label'=>$langs->trans("DateStart"), 'checked'=>1);
+	$arrayfields['t.task_date_end'] = array('label'=>$langs->trans("DateEnd"), 'checked'=>1);
 	// Extra fields
 	if (is_array($extrafields_task->attribute_label) && count($extrafields_task->attribute_label))
 	{
-		foreach($extrafields_task->attribute_label as $key => $val)
+		foreach ($extrafields_task->attribute_label as $key => $val)
 		{
-			if (! empty($extrafields_task->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields_task->attribute_label[$key], 'checked'=>(($extrafields_task->attribute_list[$key]<0)?0:1), 'position'=>$extrafields_task->attribute_pos[$key], 'enabled'=>(abs($extrafields_task->attribute_list[$key])!=3 && $extrafields_task->attribute_perms[$key]));
+			if (!empty($extrafields_task->attribute_list[$key])) $arrayfields["ef.".$key] = array('label'=>$extrafields_task->attribute_label[$key], 'checked'=>(($extrafields_task->attribute_list[$key] < 0) ? 0 : 1), 'position'=>$extrafields_task->attribute_pos[$key], 'enabled'=>(abs($extrafields_task->attribute_list[$key]) != 3 && $extrafields_task->attribute_perms[$key]));
 		}
 	}
 
@@ -487,8 +487,8 @@ 
     print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-	$title=$langs->trans("ListOfTasks");
-	$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1">'.$langs->trans("GoToGanttView").'<span class="paddingleft fa fa-calendar-minus-o valignmiddle"></span></a>';
+	$title = $langs->trans("ListOfTasks");
+	$linktotasks = '<a href="'.DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1">'.$langs->trans("GoToGanttView").'<span class="paddingleft fa fa-calendar-minus-o valignmiddle"></span></a>';
 
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
 	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'title_generic.png');
@@ -496,22 +496,22 @@ 
 	// Get list of tasks in tasksarray and taskarrayfiltered
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
 	$filteronthirdpartyid = $socid;
-	$tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0);
+	$tasksarray = $taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0);
 	// We load also tasks limited to a particular user
-	$tmpuser=new User($db);
+	$tmpuser = new User($db);
 	if ($search_user_id > 0) $tmpuser->fetch($search_user_id);
 
-	$tasksrole=($tmpuser->id > 0 ? $taskstatic->getUserRolesForProjectsOrTasks(0, $tmpuser, $object->id, 0) : '');
+	$tasksrole = ($tmpuser->id > 0 ? $taskstatic->getUserRolesForProjectsOrTasks(0, $tmpuser, $object->id, 0) : '');
 	//var_dump($tasksarray);
 	//var_dump($tasksrole);
 
-	if (! empty($conf->use_javascript_ajax))
+	if (!empty($conf->use_javascript_ajax))
 	{
 		include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 	}
 
-	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 	print '<div class="div-table-responsive">';
 	print '<table id="tablelines" class="noborder" width="100%">';
@@ -526,30 +526,30 @@ 
 
         // Action column
         print '<td class="liste_titre" align="right">';
-        $searchpicto=$form->showFilterButtons();
+        $searchpicto = $form->showFilterButtons();
         print $searchpicto;
         print '</td>';
 	}
 
 	print '<tr class="liste_titre nodrag nodrop">';
 	// print '<td>'.$langs->trans("Project").'</td>';
-	print_liste_field_titre("RefTask", $_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'');
-	print_liste_field_titre("LabelTask", $_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'');
-	print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'');
-	print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'');
-	print_liste_field_titre("PlannedWorkload", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'');
-	print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'');
-	print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'');
-	print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'');
+	print_liste_field_titre("RefTask", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, '');
+	print_liste_field_titre("LabelTask", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, '');
+	print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, '');
+	print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, '');
+	print_liste_field_titre("PlannedWorkload", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, '');
+	print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, '');
+	print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, '');
+	print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, '');
 	//print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch ');
-	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'align="center" width="80"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
 	if (count($tasksarray) > 0)
 	{
 	    // Show all lines in taskarray (recursive function to go down on tree)
-		$j=0; $level=0;
-		$nboftaskshown=projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id);
+		$j = 0; $level = 0;
+		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id);
 	}
 	else
 	{
@@ -564,7 +564,7 @@ 
 
 	// Test if database is clean. If not we clean it.
 	//print 'mode='.$_REQUEST["mode"].' $nboftaskshown='.$nboftaskshown.' count($tasksarray)='.count($tasksarray).' count($tasksrole)='.count($tasksrole).'<br>';
-	if (! empty($user->rights->projet->all->lire))	// We make test to clean only if user has permission to see all (test may report false positive otherwise)
+	if (!empty($user->rights->projet->all->lire))	// We make test to clean only if user has permission to see all (test may report false positive otherwise)
 	{
 		if ($search_user_id == $user->id)
 		{
@@ -576,7 +576,7 @@ 
 		}
 		else
 		{
-			if ($nboftaskshown < count($tasksarray) && ! GETPOST('search_user_id','int'))
+			if ($nboftaskshown < count($tasksarray) && !GETPOST('search_user_id', 'int'))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');

htdocs/projet/ganttview.php

Indentation +88 added lines, -88 removed lines

@@ -94,102 +94,102 @@ 
 	//$userDelete = $object->restrictedProjectArea($user,'delete');
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
-    $tab='tasks';
+	$tab='tasks';
 
-    $head=project_prepare_head($object);
-    dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
+	$head=project_prepare_head($object);
+	dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
-    $param=($mode=='mine'?'&mode=mine':'');
+	$param=($mode=='mine'?'&mode=mine':'');
 
 
 
-    // Project card
+	// 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.=$object->title;
-    // Thirdparty
-    if ($object->thirdparty->id > 0)
-    {
-        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
-    }
-    $morehtmlref.='</div>';
+	$morehtmlref='<div class="refidno">';
+	// Title
+	$morehtmlref.=$object->title;
+	// Thirdparty
+	if ($object->thirdparty->id > 0)
+	{
+		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
+	}
+	$morehtmlref.='</div>';
 
-    // Define a complementary filter for search of next/prev ref.
-    if (! $user->rights->projet->all->lire)
-    {
-        $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0);
-        $object->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 = $object->getProjectsAuthorizedForUser($user,0,0);
+		$object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
+	}
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, '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" width="100%">';
+	print '<table class="border" width="100%">';
 
-    // Visibility
-    print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-    if ($object->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 ($object->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>';
+	// Date start - end
+	print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 	$start = dol_print_date($object->date_start,'day');
 	print ($start?$start:'?');
 	$end = dol_print_date($object->date_end,'day');
 	print ' - ';
 	print ($end?$end:'?');
 	if ($object->hasDelay()) print img_warning("Late");
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Budget
-    print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-    if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,1,0,0,$conf->currency);
-    print '</td></tr>';
+	// Budget
+	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+	if (strcmp($object->budget_amount, '')) print price($object->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" width="100%">';
+	print '<table class="border" width="100%">';
 
-    // Description
-    print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-    print nl2br($object->description);
-    print '</td></tr>';
+	// Description
+	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print nl2br($object->description);
+	print '</td></tr>';
 
-    // Categories
-    if($conf->categorie->enabled) {
-        print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
-        print $form->showCategories($object->id,'project',1);
-        print "</td></tr>";
-    }
+	// Categories
+	if($conf->categorie->enabled) {
+		print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
+		print $form->showCategories($object->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();
+	dol_fiche_end();
 
-    print '<br>';
+	print '<br>';
 }
 
 // Link to create task
@@ -248,21 +248,21 @@ 
 		$tasks[$taskcursor]['task_parent']=$idparent;
 
 		$tasks[$taskcursor]['task_is_group'] = 0;
-        $tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        $tasks[$taskcursor]['task_position'] = $val->rang;
-        $tasks[$taskcursor]['task_planned_workload'] = $val->planned_workload;
-
-        if ($val->fk_parent != 0 && $task->hasChildren()> 0){
-            $tasks[$taskcursor]['task_is_group']=1;
-        	$tasks[$taskcursor]['task_css']='ggroupblack';
-            //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        }
-        elseif ($task->hasChildren()> 0) {
-            $tasks[$taskcursor]['task_is_group'] = 1;
-        	//$tasks[$taskcursor]['task_is_group'] = 0;
-            $tasks[$taskcursor]['task_css'] = 'ggroupblack';
-            //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        }
+		$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		$tasks[$taskcursor]['task_position'] = $val->rang;
+		$tasks[$taskcursor]['task_planned_workload'] = $val->planned_workload;
+
+		if ($val->fk_parent != 0 && $task->hasChildren()> 0){
+			$tasks[$taskcursor]['task_is_group']=1;
+			$tasks[$taskcursor]['task_css']='ggroupblack';
+			//$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		}
+		elseif ($task->hasChildren()> 0) {
+			$tasks[$taskcursor]['task_is_group'] = 1;
+			//$tasks[$taskcursor]['task_is_group'] = 0;
+			$tasks[$taskcursor]['task_css'] = 'ggroupblack';
+			//$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		}
 		$tasks[$taskcursor]['task_milestone']='0';
 		$tasks[$taskcursor]['task_percent_complete']=$val->progress;
 		//$tasks[$taskcursor]['task_name']=$task->getNomUrl(1);
@@ -312,9 +312,9 @@ 
 		//if ($s) $tasks[$taskcursor]['task_resources']='<a href="'.DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$val->id.'&withproject=1" title="'.dol_escape_htmltag($s).'">'.$langs->trans("List").'</a>';
 		/* For JSGanttImproved */
 		//if ($s) $tasks[$taskcursor]['task_resources']=implode(',',$idofusers);
-        $tasks[$taskcursor]['task_resources'] = $s;
+		$tasks[$taskcursor]['task_resources'] = $s;
 		//print "xxx".$val->id.$tasks[$taskcursor]['task_resources'];
-        $tasks[$taskcursor]['note']=$task->note_public;
+		$tasks[$taskcursor]['note']=$task->note_public;
 		$taskcursor++;
 	}
 
@@ -336,18 +336,18 @@ 
 
  	if (! empty($conf->use_javascript_ajax))
 	{
-	    //var_dump($_SESSION);
+		//var_dump($_SESSION);
 
 		// How the date for data are formated (format used bu jsgantt)
-	    $dateformatinput='yyyy-mm-dd';
-	    // How the date for data are formated (format used by dol_print_date)
-	    $dateformatinput2='standard';
-	    //var_dump($dateformatinput);
+		$dateformatinput='yyyy-mm-dd';
+		// How the date for data are formated (format used by dol_print_date)
+		$dateformatinput2='standard';
+		//var_dump($dateformatinput);
   		//var_dump($dateformatinput2);
 
-	    print '<div class="div-table-responsive">';
+		print '<div class="div-table-responsive">';
 
-	    print '<div id="tabs" class="gantt" style="width: 80vw;">'."\n";
+		print '<div id="tabs" class="gantt" style="width: 80vw;">'."\n";
 		include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.inc.php';
 		print '</div>'."\n";
 

Spacing +88 added lines, -88 removed lines

@@ -32,8 +32,8 @@ 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
-$id=GETPOST('id','intcomma');
-$ref=GETPOST('ref','alpha');
+$id = GETPOST('id', 'intcomma');
+$ref = GETPOST('ref', 'alpha');
 
 $mode = GETPOST('mode', 'alpha');
 $mine = ($mode == 'mine' ? 1 : 0);
@@ -41,10 +41,10 @@ 
 
 $object = new Project($db);
 
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
 
 // Security check
-$socid=0;
+$socid = 0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
@@ -63,43 +63,43 @@ 
  * View
  */
 
-$form=new Form($db);
-$formother=new FormOther($db);
-$userstatic=new User($db);
-$companystatic=new Societe($db);
-$contactstatic=new Contact($db);
+$form = new Form($db);
+$formother = new FormOther($db);
+$userstatic = new User($db);
+$companystatic = new Societe($db);
+$contactstatic = new Contact($db);
 $task = new Task($db);
 
-$arrayofcss=array('/includes/jsgantt/jsgantt.css');
+$arrayofcss = array('/includes/jsgantt/jsgantt.css');
 
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
-	$arrayofjs=array(
+	$arrayofjs = array(
 	'/includes/jsgantt/jsgantt.js',
 	'/projet/jsgantt_language.js.php?lang='.$langs->defaultlang
 	);
 }
 
 //$title=$langs->trans("Gantt").($object->ref?' - '.$object->ref.' '.$object->name:'');
-$title=$langs->trans("Gantt");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=($object->ref?$object->ref.' '.$object->name.' - ':'').$langs->trans("Gantt");
-$help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos";
-llxHeader("",$title,$help_url,'',0,0,$arrayofjs,$arrayofcss);
+$title = $langs->trans("Gantt");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = ($object->ref ? $object->ref.' '.$object->name.' - ' : '').$langs->trans("Gantt");
+$help_url = "EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos";
+llxHeader("", $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss);
 
-if (($id > 0 && is_numeric($id)) || ! empty($ref))
+if (($id > 0 && is_numeric($id)) || !empty($ref))
 {
 	// To verify role of users
 	//$userAccess = $object->restrictedProjectArea($user,'read');
-	$userWrite  = $object->restrictedProjectArea($user,'write');
+	$userWrite = $object->restrictedProjectArea($user, 'write');
 	//$userDelete = $object->restrictedProjectArea($user,'delete');
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
-    $tab='tasks';
+    $tab = 'tasks';
 
-    $head=project_prepare_head($object);
-    dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
+    $head = project_prepare_head($object);
+    dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
-    $param=($mode=='mine'?'&mode=mine':'');
+    $param = ($mode == 'mine' ? '&mode=mine' : '');
 
 
 
@@ -107,21 +107,21 @@ 
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref='<div class="refidno">';
+    $morehtmlref = '<div class="refidno">';
     // Title
-    $morehtmlref.=$object->title;
+    $morehtmlref .= $object->title;
     // Thirdparty
     if ($object->thirdparty->id > 0)
     {
-        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
+        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
     }
-    $morehtmlref.='</div>';
+    $morehtmlref .= '</div>';
 
     // Define a complementary filter for search of next/prev ref.
-    if (! $user->rights->projet->all->lire)
+    if (!$user->rights->projet->all->lire)
     {
-        $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0);
-        $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
+        $objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
+        $object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
     }
 
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -141,22 +141,22 @@ 
 
     // Date start - end
     print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-	$start = dol_print_date($object->date_start,'day');
-	print ($start?$start:'?');
-	$end = dol_print_date($object->date_end,'day');
+	$start = dol_print_date($object->date_start, 'day');
+	print ($start ? $start : '?');
+	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
-	print ($end?$end:'?');
+	print ($end ? $end : '?');
 	if ($object->hasDelay()) print img_warning("Late");
     print '</td></tr>';
 
     // Budget
     print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-    if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,1,0,0,$conf->currency);
+    if (strcmp($object->budget_amount, '')) print price($object->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';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
     print '</table>';
 
@@ -173,9 +173,9 @@ 
     print '</td></tr>';
 
     // Categories
-    if($conf->categorie->enabled) {
+    if ($conf->categorie->enabled) {
         print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
-        print $form->showCategories($object->id,'project',1);
+        print $form->showCategories($object->id, 'project', 1);
         print "</td></tr>";
     }
 
@@ -209,7 +209,7 @@ 
 	$linktocreatetask = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 }
 
-$linktolist='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id.'">'.$langs->trans("GoToListOfTasks").'<span class="paddingleft fa fa-list-ul valignmiddle"></span></a>';
+$linktolist = '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id.'">'.$langs->trans("GoToListOfTasks").'<span class="paddingleft fa fa-list-ul valignmiddle"></span></a>';
 
 //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
 print load_fiche_titre($title, $linktolist.' &nbsp; '.$linktocreatetask, 'title_generic.png');
@@ -218,92 +218,92 @@ 
 // Get list of tasks in tasksarray and taskarrayfiltered
 // We need all tasks (even not limited to a user because a task to user
 // can have a parent that is not affected to him).
-$tasksarray=$task->getTasksArray(0, 0, ($object->id ? $object->id : $id), $socid, 0);
+$tasksarray = $task->getTasksArray(0, 0, ($object->id ? $object->id : $id), $socid, 0);
 // We load also tasks limited to a particular user
 //$tasksrole=($_REQUEST["mode"]=='mine' ? $task->getUserRolesForProjectsOrTasks(0,$user,$object->id,0) : '');
 //var_dump($tasksarray);
 //var_dump($tasksrole);
 
 
-if (count($tasksarray)>0)
+if (count($tasksarray) > 0)
 {
 
 	// Show Gant diagram from $taskarray using JSGantt
 
-	$dateformat=$langs->trans("FormatDateShortJQuery");			// Used by include ganttchart.inc.php later
-	$datehourformat=$langs->trans("FormatDateShortJQuery").' '.$langs->trans("FormatHourShortJQuery");	// Used by include ganttchart.inc.php later
-	$array_contacts=array();
-	$tasks=array();
-	$task_dependencies=array();
-	$taskcursor=0;
-	foreach($tasksarray as $key => $val)	// Task array are sorted by "project, position, dateo"
+	$dateformat = $langs->trans("FormatDateShortJQuery"); // Used by include ganttchart.inc.php later
+	$datehourformat = $langs->trans("FormatDateShortJQuery").' '.$langs->trans("FormatHourShortJQuery"); // Used by include ganttchart.inc.php later
+	$array_contacts = array();
+	$tasks = array();
+	$task_dependencies = array();
+	$taskcursor = 0;
+	foreach ($tasksarray as $key => $val)	// Task array are sorted by "project, position, dateo"
 	{
 		$task->fetch($val->id, '');
 
-		$idparent = ($val->fk_parent ? $val->fk_parent : '-'.$val->fk_project);	// If start with -, id is a project id
+		$idparent = ($val->fk_parent ? $val->fk_parent : '-'.$val->fk_project); // If start with -, id is a project id
 
-		$tasks[$taskcursor]['task_id']=$val->id;
-		$tasks[$taskcursor]['task_alternate_id']=($taskcursor+1);		// An id that has same order than position (requird by ganttchart)
-		$tasks[$taskcursor]['task_project_id']=$val->fk_project;
-		$tasks[$taskcursor]['task_parent']=$idparent;
+		$tasks[$taskcursor]['task_id'] = $val->id;
+		$tasks[$taskcursor]['task_alternate_id'] = ($taskcursor + 1); // An id that has same order than position (requird by ganttchart)
+		$tasks[$taskcursor]['task_project_id'] = $val->fk_project;
+		$tasks[$taskcursor]['task_parent'] = $idparent;
 
 		$tasks[$taskcursor]['task_is_group'] = 0;
         $tasks[$taskcursor]['task_css'] = 'gtaskblue';
         $tasks[$taskcursor]['task_position'] = $val->rang;
         $tasks[$taskcursor]['task_planned_workload'] = $val->planned_workload;
 
-        if ($val->fk_parent != 0 && $task->hasChildren()> 0){
-            $tasks[$taskcursor]['task_is_group']=1;
-        	$tasks[$taskcursor]['task_css']='ggroupblack';
+        if ($val->fk_parent != 0 && $task->hasChildren() > 0) {
+            $tasks[$taskcursor]['task_is_group'] = 1;
+        	$tasks[$taskcursor]['task_css'] = 'ggroupblack';
             //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
         }
-        elseif ($task->hasChildren()> 0) {
+        elseif ($task->hasChildren() > 0) {
             $tasks[$taskcursor]['task_is_group'] = 1;
         	//$tasks[$taskcursor]['task_is_group'] = 0;
             $tasks[$taskcursor]['task_css'] = 'ggroupblack';
             //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
         }
-		$tasks[$taskcursor]['task_milestone']='0';
-		$tasks[$taskcursor]['task_percent_complete']=$val->progress;
+		$tasks[$taskcursor]['task_milestone'] = '0';
+		$tasks[$taskcursor]['task_percent_complete'] = $val->progress;
 		//$tasks[$taskcursor]['task_name']=$task->getNomUrl(1);
 		//print dol_print_date($val->date_start).dol_print_date($val->date_end).'<br>'."\n";
-		$tasks[$taskcursor]['task_name']=$val->ref.' - '.$val->label;
-		$tasks[$taskcursor]['task_start_date']=$val->date_start;
-		$tasks[$taskcursor]['task_end_date']=$val->date_end;
-		$tasks[$taskcursor]['task_color']='b4d1ea';
-
-		$idofusers=$task->getListContactId('internal');
-		$idofcontacts=$task->getListContactId('external');
-  		$s='';
-		if (count($idofusers)>0)
+		$tasks[$taskcursor]['task_name'] = $val->ref.' - '.$val->label;
+		$tasks[$taskcursor]['task_start_date'] = $val->date_start;
+		$tasks[$taskcursor]['task_end_date'] = $val->date_end;
+		$tasks[$taskcursor]['task_color'] = 'b4d1ea';
+
+		$idofusers = $task->getListContactId('internal');
+		$idofcontacts = $task->getListContactId('external');
+  		$s = '';
+		if (count($idofusers) > 0)
 		{
-			$s.=$langs->trans("Internals").': ';
-			$i=0;
-			foreach($idofusers as $valid)
+			$s .= $langs->trans("Internals").': ';
+			$i = 0;
+			foreach ($idofusers as $valid)
 			{
 				$userstatic->fetch($valid);
-				if ($i) $s.=', ';
-				$s.=$userstatic->login;
+				if ($i) $s .= ', ';
+				$s .= $userstatic->login;
 				$i++;
 			}
 		}
 		//if (count($idofusers)>0 && (count($idofcontacts)>0)) $s.=' - ';
-		if (count($idofcontacts)>0)
+		if (count($idofcontacts) > 0)
 		{
-			if ($s) $s.=' - ';
-			$s.=$langs->trans("Externals").': ';
-			$i=0;
-			$contactidfound=array();
-			foreach($idofcontacts as $valid)
+			if ($s) $s .= ' - ';
+			$s .= $langs->trans("Externals").': ';
+			$i = 0;
+			$contactidfound = array();
+			foreach ($idofcontacts as $valid)
 			{
 				if (empty($contactidfound[$valid]))
 				{
 					$res = $contactstatic->fetch($valid);
 					if ($res > 0)
 					{
-						if ($i) $s.=', ';
-						$s.=$contactstatic->getFullName($langs);
-						$contactidfound[$valid]=1;
+						if ($i) $s .= ', ';
+						$s .= $contactstatic->getFullName($langs);
+						$contactidfound[$valid] = 1;
 						$i++;
 					}
 				}
@@ -314,18 +314,18 @@ 
 		//if ($s) $tasks[$taskcursor]['task_resources']=implode(',',$idofusers);
         $tasks[$taskcursor]['task_resources'] = $s;
 		//print "xxx".$val->id.$tasks[$taskcursor]['task_resources'];
-        $tasks[$taskcursor]['note']=$task->note_public;
+        $tasks[$taskcursor]['note'] = $task->note_public;
 		$taskcursor++;
 	}
 
 	// Search parent to set task_parent_alternate_id (requird by ganttchart)
-	foreach($tasks as $tmpkey => $tmptask)
+	foreach ($tasks as $tmpkey => $tmptask)
 	{
-		foreach($tasks as $tmptask2)
+		foreach ($tasks as $tmptask2)
 		{
 			if ($tmptask2['task_id'] == $tmptask['task_parent'])
 			{
-				$tasks[$tmpkey]['task_parent_alternate_id']=$tmptask2['task_alternate_id'];
+				$tasks[$tmpkey]['task_parent_alternate_id'] = $tmptask2['task_alternate_id'];
 				break;
 			}
 		}
@@ -334,14 +334,14 @@ 
 
 	print "\n";
 
- 	if (! empty($conf->use_javascript_ajax))
+ 	if (!empty($conf->use_javascript_ajax))
 	{
 	    //var_dump($_SESSION);
 
 		// How the date for data are formated (format used bu jsgantt)
-	    $dateformatinput='yyyy-mm-dd';
+	    $dateformatinput = 'yyyy-mm-dd';
 	    // How the date for data are formated (format used by dol_print_date)
-	    $dateformatinput2='standard';
+	    $dateformatinput2 = 'standard';
 	    //var_dump($dateformatinput);
   		//var_dump($dateformatinput2);
 

Braces +34 added lines, -20 removed lines

@@ -82,7 +82,9 @@ 
 
 //$title=$langs->trans("Gantt").($object->ref?' - '.$object->ref.' '.$object->name:'');
 $title=$langs->trans("Gantt");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=($object->ref?$object->ref.' '.$object->name.' - ':'').$langs->trans("Gantt");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title=($object->ref?$object->ref.' '.$object->name.' - ':'').$langs->trans("Gantt");
+}
 $help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos";
 llxHeader("",$title,$help_url,'',0,0,$arrayofjs,$arrayofcss);
 
@@ -135,8 +137,11 @@ 
 
     // Visibility
     print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-    if ($object->public) print $langs->trans('SharedProject');
-    else print $langs->trans('PrivateProject');
+    if ($object->public) {
+    	print $langs->trans('SharedProject');
+    } else {
+    	print $langs->trans('PrivateProject');
+    }
     print '</td></tr>';
 
     // Date start - end
@@ -146,12 +151,16 @@ 
 	$end = dol_print_date($object->date_end,'day');
 	print ' - ';
 	print ($end?$end:'?');
-	if ($object->hasDelay()) print img_warning("Late");
+	if ($object->hasDelay()) {
+		print img_warning("Late");
+	}
     print '</td></tr>';
 
     // Budget
     print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-    if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,1,0,0,$conf->currency);
+    if (strcmp($object->budget_amount, '')) {
+    	print price($object->budget_amount,'',$langs,1,0,0,$conf->currency);
+    }
     print '</td></tr>';
 
     // Other attributes
@@ -198,13 +207,11 @@ 
 	if ($object->public || $userWrite > 0)
 	{
 		$linktocreatetask = '<a class="butActionNew" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
-	}
-	else
+	} else
 	{
 		$linktocreatetask = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 	}
-}
-else
+} else
 {
 	$linktocreatetask = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 }
@@ -236,9 +243,11 @@ 
 	$tasks=array();
 	$task_dependencies=array();
 	$taskcursor=0;
-	foreach($tasksarray as $key => $val)	// Task array are sorted by "project, position, dateo"
+	foreach($tasksarray as $key => $val) {
+		// Task array are sorted by "project, position, dateo"
 	{
 		$task->fetch($val->id, '');
+	}
 
 		$idparent = ($val->fk_parent ? $val->fk_parent : '-'.$val->fk_project);	// If start with -, id is a project id
 
@@ -256,8 +265,7 @@ 
             $tasks[$taskcursor]['task_is_group']=1;
         	$tasks[$taskcursor]['task_css']='ggroupblack';
             //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        }
-        elseif ($task->hasChildren()> 0) {
+        } elseif ($task->hasChildren()> 0) {
             $tasks[$taskcursor]['task_is_group'] = 1;
         	//$tasks[$taskcursor]['task_is_group'] = 0;
             $tasks[$taskcursor]['task_css'] = 'ggroupblack';
@@ -282,7 +290,9 @@ 
 			foreach($idofusers as $valid)
 			{
 				$userstatic->fetch($valid);
-				if ($i) $s.=', ';
+				if ($i) {
+					$s.=', ';
+				}
 				$s.=$userstatic->login;
 				$i++;
 			}
@@ -290,7 +300,9 @@ 
 		//if (count($idofusers)>0 && (count($idofcontacts)>0)) $s.=' - ';
 		if (count($idofcontacts)>0)
 		{
-			if ($s) $s.=' - ';
+			if ($s) {
+				$s.=' - ';
+			}
 			$s.=$langs->trans("Externals").': ';
 			$i=0;
 			$contactidfound=array();
@@ -301,7 +313,9 @@ 
 					$res = $contactstatic->fetch($valid);
 					if ($res > 0)
 					{
-						if ($i) $s.=', ';
+						if ($i) {
+							$s.=', ';
+						}
 						$s.=$contactstatic->getFullName($langs);
 						$contactidfound[$valid]=1;
 						$i++;
@@ -329,7 +343,9 @@ 
 				break;
 			}
 		}
-		if (empty($tasks[$tmpkey]['task_parent_alternate_id'])) $tasks[$tmpkey]['task_parent_alternate_id'] = $tasks[$tmpkey]['task_parent'];
+		if (empty($tasks[$tmpkey]['task_parent_alternate_id'])) {
+			$tasks[$tmpkey]['task_parent_alternate_id'] = $tasks[$tmpkey]['task_parent'];
+		}
 	}
 
 	print "\n";
@@ -352,14 +368,12 @@ 
 		print '</div>'."\n";
 
 		print '</div>';
-	}
-	else
+	} else
 	{
 		$langs->load("admin");
 		print $langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled");
 	}
-}
-else
+} else
 {
 	print '<div class="opacitymedium">'.$langs->trans("NoTasks").'</div>';
 }

htdocs/projet/tasks/time.php

Indentation +331 added lines, -331 removed lines

@@ -104,19 +104,19 @@ 
 	$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;
-    $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;
+	$toselect='';
+	$search_array_options=array();
+	$action='';
 }
 
 if ($action == 'addtimespent' && $user->rights->projet->lire)
@@ -160,12 +160,12 @@ 
 			$object->progress = GETPOST('progress', 'int');
 			$object->timespent_duration = $_POST["timespent_durationhour"]*60*60;	// We store duration in seconds
 			$object->timespent_duration+= $_POST["timespent_durationmin"]*60;		// We store duration in seconds
-	        if (GETPOST("timehour") != '' && GETPOST("timehour") >= 0)	// If hour was entered
-	        {
+			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
+			}
+			else
 			{
 				$object->timespent_date = dol_mktime(12,0,0,GETPOST("timemonth"),GETPOST("timeday"),GETPOST("timeyear"));
 			}
@@ -209,12 +209,12 @@ 
 		$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"));
 		}
@@ -298,22 +298,22 @@ 
 	/*
 	 * Fiche projet en mode visu
  	 */
-    if ($projectidforalltimes)
-    {
-        $result=$projectstatic->fetch($projectidforalltimes);
-        if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
-        $res=$projectstatic->fetch_optionals();
-    }
-    elseif ($object->fetch($id, $ref) >= 0)
+	if ($projectidforalltimes)
+	{
+		$result=$projectstatic->fetch($projectidforalltimes);
+		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+		$res=$projectstatic->fetch_optionals();
+	}
+	elseif ($object->fetch($id, $ref) >= 0)
 	{
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 		$res=$projectstatic->fetch_optionals();
 
 		$object->project = clone $projectstatic;
-    }
+	}
 
-    $userWrite = $projectstatic->restrictedProjectArea($user,'write');
+	$userWrite = $projectstatic->restrictedProjectArea($user,'write');
 
 	if ($projectstatic->id > 0)
 	{
@@ -329,86 +329,86 @@ 
 
 			// Project card
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-            $morehtmlref='<div class="refidno">';
-            // Title
-            $morehtmlref.=$projectstatic->title;
-            // Thirdparty
-            if ($projectstatic->thirdparty->id > 0)
-            {
-                $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
-            }
-            $morehtmlref.='</div>';
-
-            // Define a complementary filter for search of next/prev ref.
-            if (! $user->rights->projet->all->lire)
-            {
-                $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);
-
-            print '<div class="fichecenter">';
-            print '<div class="fichehalfleft">';
-            print '<div class="underbanner clearboth"></div>';
-
-            print '<table class="border" width="100%">';
-
-            // Visibility
-            print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-            if ($projectstatic->public) print $langs->trans('SharedProject');
-            else print $langs->trans('PrivateProject');
-            print '</td></tr>';
-
-            // Date start - end
-            print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-            $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>';
-
-            // Other attributes
-            $cols = 2;
-            //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
-            print '</table>';
-
-            print '</div>';
-            print '<div class="fichehalfright">';
-            print '<div class="ficheaddleft">';
-            print '<div class="underbanner clearboth"></div>';
-
-            print '<table class="border" width="100%">';
-
-            // Description
-            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-            print nl2br($projectstatic->description);
-            print '</td></tr>';
-
-            // Categories
-            if($conf->categorie->enabled) {
-                print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id,'project',1);
-                print "</td></tr>";
-            }
-
-            print '</table>';
-
-            print '</div>';
-            print '</div>';
-            print '</div>';
-
-            print '<div class="clearboth"></div>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+			$morehtmlref='<div class="refidno">';
+			// Title
+			$morehtmlref.=$projectstatic->title;
+			// Thirdparty
+			if ($projectstatic->thirdparty->id > 0)
+			{
+				$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
+			}
+			$morehtmlref.='</div>';
+
+			// Define a complementary filter for search of next/prev ref.
+			if (! $user->rights->projet->all->lire)
+			{
+				$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);
+
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
+
+			print '<table class="border" width="100%">';
+
+			// Visibility
+			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+			if ($projectstatic->public) print $langs->trans('SharedProject');
+			else print $langs->trans('PrivateProject');
+			print '</td></tr>';
+
+			// Date start - end
+			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+			$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>';
+
+			// Other attributes
+			$cols = 2;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+			print '</table>';
+
+			print '</div>';
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print '<div class="underbanner clearboth"></div>';
+
+			print '<table class="border" width="100%">';
+
+			// Description
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+			print nl2br($projectstatic->description);
+			print '</td></tr>';
+
+			// Categories
+			if($conf->categorie->enabled) {
+				print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
+				print $form->showCategories($projectstatic->id,'project',1);
+				print "</td></tr>";
+			}
+
+			print '</table>';
+
+			print '</div>';
+			print '</div>';
+			print '</div>';
+
+			print '<div class="clearboth"></div>';
 
 			dol_fiche_end();
 
@@ -417,21 +417,21 @@ 
 			// Link to create time
 			//if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))
 			//{
-    			if ($user->rights->projet->all->creer || $user->rights->projet->creer)
-    			{
-    				if ($projectstatic->public || $userWrite > 0)
-    			    {
-    			    	$linktocreatetime = '<a class="butActionNew" href="'.$_SERVER['PHP_SELF'].'?withproject=1'.($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTimeSpent').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
-    			    }
-    			    else
-    			    {
-    			    	$linktocreatetime = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTime').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
-    			    }
-    			}
-    			else
-    			{
-    				$linktocreatetime = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTime').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
-    			}
+				if ($user->rights->projet->all->creer || $user->rights->projet->creer)
+				{
+					if ($projectstatic->public || $userWrite > 0)
+					{
+						$linktocreatetime = '<a class="butActionNew" href="'.$_SERVER['PHP_SELF'].'?withproject=1'.($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTimeSpent').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
+					}
+					else
+					{
+						$linktocreatetime = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTime').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
+					}
+				}
+				else
+				{
+					$linktocreatetime = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTime').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
+				}
 			//}
 		}
 	}
@@ -461,17 +461,17 @@ 
 		// Project
 		if (empty($withproject))
 		{
-		    $morehtmlref.='<div class="refidno">';
-		    $morehtmlref.=$langs->trans("Project").': ';
-		    $morehtmlref.=$projectstatic->getNomUrl(1);
-		    $morehtmlref.='<br>';
-
-		    // Third party
-	    	$morehtmlref.=$langs->trans("ThirdParty").': ';
-	    	if (is_object($projectstatic->thirdparty)) {
-	    		$morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
-	    	}
-		    $morehtmlref.='</div>';
+			$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>';
 		}
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -479,7 +479,7 @@ 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
 
 		// Date start - Date end
@@ -623,31 +623,31 @@ 
 			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'));
-	    $extrafields = new ExtraFields($db);
+		// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+		$hookmanager->initHooks(array('tasktimelist'));
+		$extrafields = new ExtraFields($db);
 
-	    // Definition of fields for list
-	    $arrayfields=array();
-	    $arrayfields['t.task_date']=array('label'=>$langs->trans("Date"), 'checked'=>1);
+		// 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("AmountInvoiced"), 'checked'=>1, 'enabled'=>(empty($conf->global->PROJECT_BILL_TIME_SPENT)?0:1));
-	    // Extra fields
-	    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	    {
-	        foreach($extrafields->attribute_label as $key => $val)
-	        {
+		{
+			$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("AmountInvoiced"), 'checked'=>1, 'enabled'=>(empty($conf->global->PROJECT_BILL_TIME_SPENT)?0:1));
+		// Extra fields
+		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+		{
+			foreach($extrafields->attribute_label as $key => $val)
+			{
 				if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-	        }
-	    }
+			}
+		}
 
 		/*
 		 *  List of time spent
@@ -696,9 +696,9 @@ 
 				print '<!-- List of time spent for project -->'."\n";
 
 				$title=$langs->trans("ListTaskTimeUserProject");
-			    //$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("GoToListOfTasks").'</a>';
-			    //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
-			    print load_fiche_titre($title, $linktocreatetime, 'title_generic.png');
+				//$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("GoToListOfTasks").'</a>';
+				//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
+				print load_fiche_titre($title, $linktocreatetime, 'title_generic.png');
 			}
 
 			$i = 0;
@@ -821,8 +821,8 @@ 
 
 
 		$arrayofmassactions =  array(
-		    //'presend'=>$langs->trans("SendByMail"),
-		    //'builddoc'=>$langs->trans("PDFMerge"),
+			//'presend'=>$langs->trans("SendByMail"),
+			//'builddoc'=>$langs->trans("PDFMerge"),
 		);
 		//if ($user->rights->projet->creer) $arrayofmassactions['predelete']=$langs->trans("Delete");
 		if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
@@ -830,14 +830,14 @@ 
 
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'">';
-        if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 		if ($action == 'editline') print '<input type="hidden" name="action" value="updateline">';
 		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="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.'">';
@@ -852,15 +852,15 @@ 
 
 		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
 
-        print '<div class="div-table-responsive">';
+		print '<div class="div-table-responsive">';
 		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 		// Fields title search
@@ -875,21 +875,21 @@ 
 			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($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"></td>';
-        /*
+		if (! empty($arrayfields['value']['checked'])) print '<td class="liste_titre"></td>';
+		// Value billed
+		if (! empty($arrayfields['valuebilled']['checked'])) print '<td class="liste_titre"></td>';
+		/*
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 		*/
@@ -907,11 +907,11 @@ 
 		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.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,'align="right"',$sortfield,$sortorder);
 		if (! empty($arrayfields['value']['checked']))            print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
@@ -920,11 +920,11 @@ 
     	// 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"],"",'','','align="center" width="80"',$sortfield,$sortorder,'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"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch ');
 		print "</tr>\n";
 
 		$tasktmp = new Task($db);
@@ -947,140 +947,140 @@ 
 			// Date
 			if (! empty($arrayfields['t.task_date']['checked']))
 			{
-    			print '<td class="nowrap">';
-    			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
-    			{
-    				if (empty($task_time->task_date_withhour))
-    				{
-    					print $form->select_date(($date2?$date2:$date1),'timeline',3,3,2,"timespent_date",1,0,1);
-    				}
-    				else print $form->select_date(($date2?$date2:$date1),'timeline',1,1,2,"timespent_date",1,0,1);
-    			}
-    			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 ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
+				{
+					if (empty($task_time->task_date_withhour))
+					{
+						print $form->select_date(($date2?$date2:$date1),'timeline',3,3,2,"timespent_date",1,0,1);
+					}
+					else print $form->select_date(($date2?$date2:$date1),'timeline',1,1,2,"timespent_date",1,0,1);
+				}
+				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']++;
-    			}
-            }
-
-            // User
-            if (! empty($arrayfields['author']['checked']))
-            {
-                print '<td>';
-    			if ($_GET['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;
-    				print $userstatic->getNomUrl(-1);
-    			}
-    			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 ($_GET['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;
+					print $userstatic->getNomUrl(-1);
+				}
+				print '</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
 
 			// Note
-            if (! empty($arrayfields['t.note']['checked']))
-            {
-                print '<td align="left">';
-    			if ($_GET['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']++;
-            }
+			if (! empty($arrayfields['t.note']['checked']))
+			{
+				print '<td align="left">';
+				if ($_GET['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']++;
+			}
 
 			// Time spent
-            if (! empty($arrayfields['t.task_duration']['checked']))
-            {
-    			print '<td align="right">';
-    			if ($_GET['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['totaldurationfield']=$totalarray['nbfield'];
-    			$totalarray['totalduration'] += $task_time->task_duration;
-            }
+			if (! empty($arrayfields['t.task_duration']['checked']))
+			{
+				print '<td align="right">';
+				if ($_GET['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['totaldurationfield']=$totalarray['nbfield'];
+				$totalarray['totalduration'] += $task_time->task_duration;
+			}
 
 			// Value spent
-            if (! empty($arrayfields['value']['checked']))
-            {
+			if (! empty($arrayfields['value']['checked']))
+			{
 				print '<td align="right">';
 				$value = price2num($task_time->thm * $task_time->task_duration / 3600);
 				print price($value, 1, $langs, 1, -1, -1, $conf->currency);
 				print '</td>';
 				if (! $i) $totalarray['nbfield']++;
-    			if (! $i) $totalarray['totalvaluefield']=$totalarray['nbfield'];
-    			$totalarray['totalvalue'] += $value;
-            }
-
-            // Value billed
-            if (! empty($arrayfields['valuebilled']['checked']))
-            {
-            	print '<td align="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>';
-            	if (! $i) $totalarray['nbfield']++;
-            	if (! $i) $totalarray['totalvaluefield']=$totalarray['nbfield'];
-            	$totalarray['totalvaluebilled'] += $valuebilled;
-            }
-
-            /*
+				if (! $i) $totalarray['totalvaluefield']=$totalarray['nbfield'];
+				$totalarray['totalvalue'] += $value;
+			}
+
+			// Value billed
+			if (! empty($arrayfields['valuebilled']['checked']))
+			{
+				print '<td align="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>';
+				if (! $i) $totalarray['nbfield']++;
+				if (! $i) $totalarray['totalvaluefield']=$totalarray['nbfield'];
+				$totalarray['totalvaluebilled'] += $valuebilled;
+			}
+
+			/*
             // Extra fields
             include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
             */
@@ -1090,7 +1090,7 @@ 
 			$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' && $_GET['lineid'] == $task_time->rowid)
 			{
@@ -1113,10 +1113,10 @@ 
 					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.$param.'">';
 					print img_delete();
 					print '</a>';
-			    }
+				}
 			}
-        	print '</td>';
-        	if (! $i) $totalarray['nbfield']++;
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
 
 			print "</tr>\n";
 
@@ -1126,21 +1126,21 @@ 
 		// Show total line
 		if (isset($totalarray['totaldurationfield']) || isset($totalarray['totalvaluefield']))
 		{
-		    print '<tr class="liste_total">';
-		    $i=0;
-		    while ($i < $totalarray['nbfield'])
-		    {
-		        $i++;
-		        if ($i == 1)
-		        {
-		            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
-		            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-		        }
-		        elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'],'allhourmin').'</td>';
-		        elseif ($totalarray['totalvaluefield'] == $i) print '<td align="right">'.price($totalarray['totalvalue']).'</td>';
-		        else print '<td></td>';
-		    }
-		    print '</tr>';
+			print '<tr class="liste_total">';
+			$i=0;
+			while ($i < $totalarray['nbfield'])
+			{
+				$i++;
+				if ($i == 1)
+				{
+					if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
+					else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+				}
+				elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'],'allhourmin').'</td>';
+				elseif ($totalarray['totalvaluefield'] == $i) print '<td align="right">'.price($totalarray['totalvalue']).'</td>';
+				else print '<td></td>';
+			}
+			print '</tr>';
 		}
 
 		print '</tr>';

Spacing +273 added lines, -273 removed lines

@@ -35,99 +35,99 @@ 
 
 $langs->load('projects');
 
-$id=GETPOST('id','int');
-$projectid=GETPOST('projectid','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$cancel=GETPOST('cancel','alpha');
-$withproject=GETPOST('withproject','int');
-$project_ref=GETPOST('project_ref','alpha');
-
-$search_day=GETPOST('search_day','int');
-$search_month=GETPOST('search_month','int');
-$search_year=GETPOST('search_year','int');
-$search_datehour='';
-$search_datewithhour='';
-$search_note=GETPOST('search_note','alpha');
-$search_duration=GETPOST('search_duration','int');
-$search_value=GETPOST('search_value','int');
-$search_task_ref=GETPOST('search_task_ref','alpha');
-$search_task_label=GETPOST('search_task_label','alpha');
-$search_user=GETPOST('search_user','int');
+$id = GETPOST('id', 'int');
+$projectid = GETPOST('projectid', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
+$withproject = GETPOST('withproject', 'int');
+$project_ref = GETPOST('project_ref', 'alpha');
+
+$search_day = GETPOST('search_day', 'int');
+$search_month = GETPOST('search_month', 'int');
+$search_year = GETPOST('search_year', 'int');
+$search_datehour = '';
+$search_datewithhour = '';
+$search_note = GETPOST('search_note', 'alpha');
+$search_duration = GETPOST('search_duration', 'int');
+$search_value = GETPOST('search_value', 'int');
+$search_task_ref = GETPOST('search_task_ref', 'alpha');
+$search_task_label = GETPOST('search_task_label', 'alpha');
+$search_user = GETPOST('search_user', 'int');
 
 // Security check
-$socid=0;
+$socid = 0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 if (!$user->rights->projet->lire) accessforbidden();
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$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
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='t.task_date,t.task_datehour,t.rowid';
-if (! $sortorder) $sortorder='DESC';
+if (!$sortfield) $sortfield = 't.task_date,t.task_datehour,t.rowid';
+if (!$sortorder) $sortorder = 'DESC';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 //$object = new TaskTime($db);
-$hookmanager->initHooks(array('projecttaskcard','globalcard'));
+$hookmanager->initHooks(array('projecttaskcard', 'globalcard'));
 
 $object = new Task($db);
 $projectstatic = new Project($db);
 $extrafields_project = new ExtraFields($db);
 $extrafields_task = new ExtraFields($db);
 
-$extralabels_projet=$extrafields_project->fetch_name_optionals_label($projectstatic->table_element);
-$extralabels_task=$extrafields_task->fetch_name_optionals_label($object->table_element);
+$extralabels_projet = $extrafields_project->fetch_name_optionals_label($projectstatic->table_element);
+$extralabels_task = $extrafields_task->fetch_name_optionals_label($object->table_element);
 
 
 /*
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action=''; }
+if (GETPOST('cancel', 'alpha')) { $action = ''; }
 
-$parameters=array('socid'=>$socid, 'projectid'=>$projectid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('socid'=>$socid, 'projectid'=>$projectid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-	$search_day='';
-	$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;
-    $toselect='';
-    $search_array_options=array();
-    $action='';
+	$search_day = '';
+	$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;
+    $toselect = '';
+    $search_array_options = array();
+    $action = '';
 }
 
 if ($action == 'addtimespent' && $user->rights->projet->lire)
 {
-	$error=0;
+	$error = 0;
 
-	$timespent_durationhour = GETPOST('timespent_durationhour','int');
-	$timespent_durationmin = GETPOST('timespent_durationmin','int');
+	$timespent_durationhour = GETPOST('timespent_durationhour', 'int');
+	$timespent_durationmin = GETPOST('timespent_durationmin', 'int');
 	if (empty($timespent_durationhour) && empty($timespent_durationmin))
 	{
-		setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")), null, 'errors');
+		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Duration")), null, 'errors');
 		$error++;
 	}
 	if (empty($_POST["userid"]))
@@ -137,7 +137,7 @@ 
 		$error++;
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		if ($id || $ref)
 		{
@@ -145,7 +145,7 @@ 
 		}
 		else
 		{
-			$object->fetch(GETPOST('taskid','int'));
+			$object->fetch(GETPOST('taskid', 'int'));
 		}
 		$object->fetch_projet();
 
@@ -158,19 +158,19 @@ 
 		{
 			$object->timespent_note = $_POST["timespent_note"];
 			$object->progress = GETPOST('progress', 'int');
-			$object->timespent_duration = $_POST["timespent_durationhour"]*60*60;	// We store duration in seconds
-			$object->timespent_duration+= $_POST["timespent_durationmin"]*60;		// We store duration in seconds
+			$object->timespent_duration = $_POST["timespent_durationhour"] * 60 * 60; // We store duration in seconds
+			$object->timespent_duration += $_POST["timespent_durationmin"] * 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_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_date = dol_mktime(12, 0, 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 			}
 			$object->timespent_fk_user = $_POST["userid"];
-			$result=$object->addTimeSpent($user);
+			$result = $object->addTimeSpent($user);
 			if ($result >= 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
@@ -184,22 +184,22 @@ 
 	}
 	else
 	{
-		if (empty($id)) $action='createtime';
-		else $action='createtime';
+		if (empty($id)) $action = 'createtime';
+		else $action = 'createtime';
 	}
 }
 
-if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->lire)
+if ($action == 'updateline' && !$_POST["cancel"] && $user->rights->projet->lire)
 {
-	$error=0;
+	$error = 0;
 
 	if (empty($_POST["new_durationhour"]) && empty($_POST["new_durationmin"]))
 	{
-		setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")), null, 'errors');
+		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Duration")), null, 'errors');
 		$error++;
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$object->fetch($id, $ref);
 		// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
@@ -207,20 +207,20 @@ 
 		$object->timespent_id = $_POST["lineid"];
 		$object->timespent_note = $_POST["timespent_note_line"];
 		$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
+		$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
         {
-			$object->timespent_date = dol_mktime(GETPOST("timelinehour"),GETPOST("timelinemin"),0,GETPOST("timelinemonth"),GETPOST("timelineday"),GETPOST("timelineyear"));
+			$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			$object->timespent_withhour = 1;
         }
         else
 		{
-			$object->timespent_date = dol_mktime(12,0,0,GETPOST("timelinemonth"),GETPOST("timelineday"),GETPOST("timelineyear"));
+			$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 		}
 		$object->timespent_fk_user = $_POST["userid_line"];
 
-		$result=$object->updateTimeSpent($user);
+		$result = $object->updateTimeSpent($user);
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
@@ -233,13 +233,13 @@ 
 	}
 	else
 	{
-		$action='';
+		$action = '';
 	}
 }
 
 if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->lire)
 {
-	$object->fetchTimeSpent(GETPOST('lineid','int'));
+	$object->fetchTimeSpent(GETPOST('lineid', 'int'));
 	// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
 	$result = $object->delTimeSpent($user);
 
@@ -248,7 +248,7 @@ 
 		$langs->load("errors");
 		setEventMessages($langs->trans($object->error), null, 'errors');
 		$error++;
-		$action='';
+		$action = '';
 	}
 	else
 	{
@@ -257,28 +257,28 @@ 
 }
 
 // Retreive First Task ID of Project if withprojet is on to allow project prev next to work
-if (! empty($project_ref) && ! empty($withproject))
+if (!empty($project_ref) && !empty($withproject))
 {
-	if ($projectstatic->fetch(0,$project_ref) > 0)
+	if ($projectstatic->fetch(0, $project_ref) > 0)
 	{
-		$tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
+		$tasksarray = $object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
 		if (count($tasksarray) > 0)
 		{
-			$id=$tasksarray[0]->id;
+			$id = $tasksarray[0]->id;
 		}
 		else
 		{
-			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':'').(empty($mode)?'':'&mode='.$mode));
+			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
 	}
 }
 
 // To show all time lines for project
-$projectidforalltimes=0;
-if (GETPOST('projectid','none'))
+$projectidforalltimes = 0;
+if (GETPOST('projectid', 'none'))
 {
-	$projectidforalltimes=GETPOST('projectid','int');
+	$projectidforalltimes = GETPOST('projectid', 'int');
 }
 
 
@@ -286,66 +286,66 @@ 
  * View
  */
 
-llxHeader("",$langs->trans("Task"));
+llxHeader("", $langs->trans("Task"));
 
 $form = new Form($db);
 $formother = new FormOther($db);
 $formproject = new FormProjets($db);
 $userstatic = new User($db);
 
-if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
+if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 {
 	/*
 	 * Fiche projet en mode visu
  	 */
     if ($projectidforalltimes)
     {
-        $result=$projectstatic->fetch($projectidforalltimes);
-        if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
-        $res=$projectstatic->fetch_optionals();
+        $result = $projectstatic->fetch($projectidforalltimes);
+        if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+        $res = $projectstatic->fetch_optionals();
     }
     elseif ($object->fetch($id, $ref) >= 0)
 	{
-		$result=$projectstatic->fetch($object->fk_project);
-		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
-		$res=$projectstatic->fetch_optionals();
+		$result = $projectstatic->fetch($object->fk_project);
+		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+		$res = $projectstatic->fetch_optionals();
 
 		$object->project = clone $projectstatic;
     }
 
-    $userWrite = $projectstatic->restrictedProjectArea($user,'write');
+    $userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
 	if ($projectstatic->id > 0)
 	{
 		if ($withproject)
 		{
 			// Tabs for project
-			if (empty($id)) $tab='timespent';
-			else $tab='tasks';
-			$head=project_prepare_head($projectstatic);
-			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
+			if (empty($id)) $tab = 'timespent';
+			else $tab = 'tasks';
+			$head = project_prepare_head($projectstatic);
+			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
 
-			$param=($mode=='mine'?'&mode=mine':'');
+			$param = ($mode == 'mine' ? '&mode=mine' : '');
 
 			// Project card
 
             $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-            $morehtmlref='<div class="refidno">';
+            $morehtmlref = '<div class="refidno">';
             // Title
-            $morehtmlref.=$projectstatic->title;
+            $morehtmlref .= $projectstatic->title;
             // Thirdparty
             if ($projectstatic->thirdparty->id > 0)
             {
-                $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
+                $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
             }
-            $morehtmlref.='</div>';
+            $morehtmlref .= '</div>';
 
             // Define a complementary filter for search of next/prev ref.
-            if (! $user->rights->projet->all->lire)
+            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').")";
+                $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);
@@ -364,17 +364,17 @@ 
 
             // 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');
+            $start = dol_print_date($projectstatic->date_start, 'day');
+            print ($start ? $start : '?');
+            $end = dol_print_date($projectstatic->date_end, 'day');
             print ' - ';
-            print ($end?$end:'?');
+            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);
+            if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
             print '</td></tr>';
 
             // Other attributes
@@ -396,9 +396,9 @@ 
             print '</td></tr>';
 
             // Categories
-            if($conf->categorie->enabled) {
+            if ($conf->categorie->enabled) {
                 print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id,'project',1);
+                print $form->showCategories($projectstatic->id, 'project', 1);
                 print "</td></tr>";
             }
 
@@ -438,40 +438,40 @@ 
 
 	if (empty($projectidforalltimes))
 	{
-		$head=task_prepare_head($object);
+		$head = task_prepare_head($object);
 		dol_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 		if ($action == 'deleteline')
 		{
-			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);
+			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);
 		}
 
-		$param=($withproject?'&withproject=1':'');
-		$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
+		$param = ($withproject ? '&withproject=1' : '');
+		$linkback = $withproject ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>' : '';
 
-		if (! GETPOST('withproject') || empty($projectstatic->id))
+		if (!GETPOST('withproject') || empty($projectstatic->id))
 		{
-			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
-			$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 		}
-		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
+		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
-		$morehtmlref='';
+		$morehtmlref = '';
 
 		// 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").': ';
+	    	$morehtmlref .= $langs->trans("ThirdParty").': ';
 	    	if (is_object($projectstatic->thirdparty)) {
-	    		$morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+	    		$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
 	    	}
-		    $morehtmlref.='</div>';
+		    $morehtmlref .= '</div>';
 		}
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -484,17 +484,17 @@ 
 
 		// Date start - Date end
 		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-		$start = dol_print_date($object->date_start,'dayhour');
-		print ($start?$start:'?');
-		$end = dol_print_date($object->date_end,'dayhour');
+		$start = dol_print_date($object->date_start, 'dayhour');
+		print ($start ? $start : '?');
+		$end = dol_print_date($object->date_end, 'dayhour');
 		print ' - ';
-		print ($end?$end:'?');
+		print ($end ? $end : '?');
 		if ($object->hasDelay()) print img_warning("Late");
 		print '</td></tr>';
 
 		// Planned workload
 		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
-		print convertSecondToTime($object->planned_workload,'allhourmin');
+		print convertSecondToTime($object->planned_workload, 'allhourmin');
 		print '</td></tr>';
 
 		print '</table>';
@@ -514,8 +514,8 @@ 
 		print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td>';
 		if ($object->planned_workload)
 		{
-			$tmparray=$object->getSummaryOfTimeSpent();
-			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %';
+			$tmparray = $object->getSummaryOfTimeSpent();
+			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
 			else print '0 %';
 		}
 		else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
@@ -533,7 +533,7 @@ 
 
 		print '<!-- List of time spent for task -->'."\n";
 
-		$title=$langs->trans("ListTaskTimeForTask");
+		$title = $langs->trans("ListTaskTimeForTask");
 		//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
 		print load_fiche_titre($title, $linktocreatetime, 'title_generic.png');
 
@@ -567,18 +567,18 @@ 
 			// Date
 			print '<td class="maxwidthonsmartphone">';
 			//$newdate=dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
-			$newdate='';
-			print $form->select_date($newdate, 'time', ($conf->browser->layout == 'phone'?2:1), 1, 2, "timespent_date", 1, 0, 1);
+			$newdate = '';
+			print $form->select_date($newdate, 'time', ($conf->browser->layout == 'phone' ? 2 : 1), 1, 2, "timespent_date", 1, 0, 1);
 			print '</td>';
 
 			// Contributor
 			print '<td class="maxwidthonsmartphone">';
-			print img_object('','user','class="hideonsmartphone"');
-			$contactsoftask=$object->getListContactId('internal');
-			if (count($contactsoftask)>0)
+			print img_object('', 'user', 'class="hideonsmartphone"');
+			$contactsoftask = $object->getListContactId('internal');
+			if (count($contactsoftask) > 0)
 			{
-				$userid=$contactsoftask[0];
-				print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid), 'userid', 0, '', 0, '', $contactsoftask, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToTheTask"), 'maxwidth200');
+				$userid = $contactsoftask[0];
+				print $form->select_dolusers((GETPOST('userid') ?GETPOST('userid') : $userid), 'userid', 0, '', 0, '', $contactsoftask, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToTheTask"), 'maxwidth200');
 			}
 			else
 			{
@@ -588,17 +588,17 @@ 
 
 			// Note
 			print '<td>';
-			print '<textarea name="timespent_note" class="maxwidth100onsmartphone" rows="'.ROWS_2.'">'.($_POST['timespent_note']?$_POST['timespent_note']:'').'</textarea>';
+			print '<textarea name="timespent_note" class="maxwidth100onsmartphone" rows="'.ROWS_2.'">'.($_POST['timespent_note'] ? $_POST['timespent_note'] : '').'</textarea>';
 			print '</td>';
 
 			// Duration - Time spent
 			print '<td>';
-			print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text');
+			print $form->select_duration('timespent_duration', ($_POST['timespent_duration'] ? $_POST['timespent_duration'] : ''), 0, 'text');
 			print '</td>';
 
 			// Progress declared
 			print '<td class="nowrap">';
-			print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress,'progress');
+			print $formother->select_percent(GETPOST('progress') ?GETPOST('progress') : $object->progress, 'progress');
 			print '</td>';
 
 			print '<td align="center">';
@@ -618,9 +618,9 @@ 
 
 	if ($projectstatic->id > 0)
 	{
-		if ($action == 'deleteline' && ! empty($projectidforalltimes))
+		if ($action == 'deleteline' && !empty($projectidforalltimes))
 		{
-			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);
+			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
@@ -628,24 +628,24 @@ 
 	    $extrafields = new ExtraFields($db);
 
 	    // 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 = 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['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("AmountInvoiced"), 'checked'=>1, 'enabled'=>(empty($conf->global->PROJECT_BILL_TIME_SPENT)?0: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("AmountInvoiced"), 'checked'=>1, 'enabled'=>(empty($conf->global->PROJECT_BILL_TIME_SPENT) ? 0 : 1));
 	    // Extra fields
 	    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	    {
-	        foreach($extrafields->attribute_label as $key => $val)
+	        foreach ($extrafields->attribute_label as $key => $val)
 	        {
-				if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+				if (!empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key] < 0) ? 0 : 1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key]) != 3 && $extrafields->attribute_perms[$key]));
 	        }
 	    }
 
@@ -663,7 +663,7 @@ 
 		$sql .= ", ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
 		if (empty($projectidforalltimes)) $sql .= " AND t.fk_task =".$object->id;
-		else $sql.= " AND pt.fk_projet IN (".$projectidforalltimes.")";
+		else $sql .= " AND pt.fk_projet IN (".$projectidforalltimes.")";
 		if ($search_ref) $sql .= natural_search('c.ref', $search_ref);
 		if ($search_note) $sql .= natural_search('t.note', $search_note);
 		if ($search_task_ref) $sql .= natural_search('pt.ref', $search_task_ref);
@@ -672,15 +672,15 @@ 
 		if ($search_month > 0)
 		{
 			if ($search_year > 0 && empty($search_day))
-			$sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
-			else if ($search_year > 0 && ! empty($search_day))
-			$sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
+			$sql .= " AND t.task_datehour BETWEEN '".$db->idate(dol_get_first_day($search_year, $search_month, false))."' AND '".$db->idate(dol_get_last_day($search_year, $search_month, false))."'";
+			else if ($search_year > 0 && !empty($search_day))
+			$sql .= " AND t.task_datehour BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
 			else
-			$sql.= " AND date_format(t.task_datehour, '%m') = '".$db->escape($search_month)."'";
+			$sql .= " AND date_format(t.task_datehour, '%m') = '".$db->escape($search_month)."'";
 		}
 		else if ($search_year > 0)
 		{
-			$sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
+			$sql .= " AND t.task_datehour BETWEEN '".$db->idate(dol_get_first_day($search_year, 1, false))."' AND '".$db->idate(dol_get_last_day($search_year, 12, false))."'";
 		}
 
 		$sql .= $db->order($sortfield, $sortorder);
@@ -689,13 +689,13 @@ 
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			$totalnboflines=$num;
+			$totalnboflines = $num;
 
-			if (! empty($projectidforalltimes))
+			if (!empty($projectidforalltimes))
 			{
 				print '<!-- List of time spent for project -->'."\n";
 
-				$title=$langs->trans("ListTaskTimeUserProject");
+				$title = $langs->trans("ListTaskTimeUserProject");
 			    //$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("GoToListOfTasks").'</a>';
 			    //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
 			    print load_fiche_titre($title, $linktocreatetime, 'title_generic.png');
@@ -745,25 +745,25 @@ 
 			// Date
 			print '<td class="maxwidthonsmartphone">';
 			//$newdate=dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
-			$newdate='';
-			print $form->select_date($newdate, 'time', ($conf->browser->layout == 'phone'?2:1), 1, 2, "timespent_date", 1, 0, 1);
+			$newdate = '';
+			print $form->select_date($newdate, 'time', ($conf->browser->layout == 'phone' ? 2 : 1), 1, 2, "timespent_date", 1, 0, 1);
 			print '</td>';
 
 			// Task
 			print '<td class="maxwidthonsmartphone">';
-			$formproject->selectTasks(-1, GETPOST('taskid','int'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
+			$formproject->selectTasks(-1, GETPOST('taskid', 'int'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
 			print '</td>';
 
 			// Contributor
 			print '<td class="maxwidthonsmartphone">';
-			print img_object('','user','class="hideonsmartphone"');
-			$contactsofproject=$projectstatic->getListContactId('internal');
-			if (count($contactsofproject)>0)
+			print img_object('', 'user', 'class="hideonsmartphone"');
+			$contactsofproject = $projectstatic->getListContactId('internal');
+			if (count($contactsofproject) > 0)
 			{
-				if (in_array($user->id, $userid=$contactsofproject)) $userid = $user->id;
-				else $userid=$contactsofproject[0];
+				if (in_array($user->id, $userid = $contactsofproject)) $userid = $user->id;
+				else $userid = $contactsofproject[0];
 				if ($projectstatic->public) $contactsofproject = array();
-				print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');
+				print $form->select_dolusers((GETPOST('userid') ?GETPOST('userid') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');
 			}
 			else
 			{
@@ -773,17 +773,17 @@ 
 
 			// Note
 			print '<td>';
-			print '<textarea name="timespent_note" class="maxwidth100onsmartphone" rows="'.ROWS_2.'">'.($_POST['timespent_note']?$_POST['timespent_note']:'').'</textarea>';
+			print '<textarea name="timespent_note" class="maxwidth100onsmartphone" rows="'.ROWS_2.'">'.($_POST['timespent_note'] ? $_POST['timespent_note'] : '').'</textarea>';
 			print '</td>';
 
 			// Duration - Time spent
 			print '<td>';
-			print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text');
+			print $form->select_duration('timespent_duration', ($_POST['timespent_duration'] ? $_POST['timespent_duration'] : ''), 0, 'text');
 			print '</td>';
 
 			// Progress declared
 			print '<td class="nowrap">';
-			print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress,'progress');
+			print $formother->select_percent(GETPOST('progress') ?GETPOST('progress') : $object->progress, 'progress');
 			print '</td>';
 
 			print '<td align="center">';
@@ -798,35 +798,35 @@ 
 		}
 
 
-		$arrayofselected=is_array($toselect)?$toselect:array();
+		$arrayofselected = is_array($toselect) ? $toselect : array();
 
-		$param='';
-		if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$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);
+		$param = '';
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$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);
+		if ($id) $param .= '&id='.urlencode($id);
+		if ($projectid) $param .= '&projectid='.urlencode($projectid);
+		if ($withproject) $param .= '&withproject='.urlencode($withproject);
 
 
-		$arrayofmassactions =  array(
+		$arrayofmassactions = array(
 		    //'presend'=>$langs->trans("SendByMail"),
 		    //'builddoc'=>$langs->trans("PDFMerge"),
 		);
 		//if ($user->rights->projet->creer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-		if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-		$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+		if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+		$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'">';
@@ -845,86 +845,86 @@ 
 
 		$moreforfilter = '';
 
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 		else $moreforfilter = $hookmanager->resPrint;
 
-		if (! empty($moreforfilter))
+		if (!empty($moreforfilter))
 		{
 		    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
+		$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+		$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
         print '<div class="div-table-responsive">';
-		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+		print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 		// Fields title search
 		print '<tr class="liste_titre_filter">';
 		// Date
-		if (! empty($arrayfields['t.task_date']['checked']))
+		if (!empty($arrayfields['t.task_date']['checked']))
 		{
 			print '<td class="liste_titre">';
-			if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+			if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
 			print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-			$formother->select_year($search_year,'search_year',1, 20, 5);
+			$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($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>';
+            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($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>';
+        if (!empty($arrayfields['value']['checked'])) print '<td class="liste_titre"></td>';
         // Value billed
-        if (! empty($arrayfields['valuebilled']['checked'])) print '<td class="liste_titre"></td>';
+        if (!empty($arrayfields['valuebilled']['checked'])) print '<td class="liste_titre"></td>';
         /*
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 		*/
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields);
-		$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+		$parameters = array('arrayfields'=>$arrayfields);
+		$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
 		print '<td class="liste_titre center">';
-		$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+		$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
 		print $searchpicto;
 		print '</td>';
 		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_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['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,'align="right"',$sortfield,$sortorder);
-		if (! empty($arrayfields['value']['checked']))            print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
-		if (! empty($arrayfields['valuebilled']['checked']))      print_liste_field_titre($arrayfields['valuebilled']['label'],$_SERVER['PHP_SELF'],'il.total_ht','',$param,'align="right"',$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, 'align="right"', $sortfield, $sortorder);
+		if (!empty($arrayfields['value']['checked']))            print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
+		if (!empty($arrayfields['valuebilled']['checked']))      print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, 'align="right"', $sortfield, $sortorder);
 		/*
     	// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 		*/
 	    // 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
+		$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"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch ');
+    	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center" width="80"', $sortfield, $sortorder, 'maxwidthsearch ');
 		print "</tr>\n";
 
 		$tasktmp = new Task($db);
@@ -935,39 +935,39 @@ 
 
 		$total = 0;
 		$totalvalue = 0;
-		$totalarray=array();
+		$totalarray = array();
 		foreach ($tasks as $task_time)
 		{
 
 			print '<tr class="oddeven">';
 
-			$date1=$db->jdate($task_time->task_date);
-			$date2=$db->jdate($task_time->task_datehour);
+			$date1 = $db->jdate($task_time->task_date);
+			$date2 = $db->jdate($task_time->task_datehour);
 
 			// Date
-			if (! empty($arrayfields['t.task_date']['checked']))
+			if (!empty($arrayfields['t.task_date']['checked']))
 			{
     			print '<td class="nowrap">';
     			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
     			{
     				if (empty($task_time->task_date_withhour))
     				{
-    					print $form->select_date(($date2?$date2:$date1),'timeline',3,3,2,"timespent_date",1,0,1);
+    					print $form->select_date(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0, 1);
     				}
-    				else print $form->select_date(($date2?$date2:$date1),'timeline',1,1,2,"timespent_date",1,0,1);
+    				else print $form->select_date(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0, 1);
     			}
     			else
     			{
-    				print dol_print_date(($date2?$date2:$date1),($task_time->task_date_withhour?'dayhour':'day'));
+    				print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
     			}
     			print '</td>';
-    			if (! $i) $totalarray['nbfield']++;
+    			if (!$i) $totalarray['nbfield']++;
 			}
 
 			// Task ref
-            if (! empty($arrayfields['t.task_ref']['checked']))
+            if (!empty($arrayfields['t.task_ref']['checked']))
             {
-        		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
+        		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
     			{
         			print '<td class="nowrap">';
         			$tasktmp->id = $task_time->fk_task;
@@ -975,54 +975,54 @@ 
         			$tasktmp->label = $task_time->label;
         			print $tasktmp->getNomUrl(1, 'withproject', 'time');
         			print '</td>';
-        			if (! $i) $totalarray['nbfield']++;
+        			if (!$i) $totalarray['nbfield']++;
     			}
             }
 
 			// Task label
-            if (! empty($arrayfields['t.task_label']['checked']))
+            if (!empty($arrayfields['t.task_label']['checked']))
             {
-        		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
+        		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 (!$i) $totalarray['nbfield']++;
     			}
             }
 
             // User
-            if (! empty($arrayfields['author']['checked']))
+            if (!empty($arrayfields['author']['checked']))
             {
                 print '<td>';
     			if ($_GET['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;
+    			    $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 {
+    				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->lastname = $task_time->lastname;
     				$userstatic->firstname 	= $task_time->firstname;
     				$userstatic->photo      = $task_time->photo;
     				print $userstatic->getNomUrl(-1);
     			}
     			print '</td>';
-    			if (! $i) $totalarray['nbfield']++;
+    			if (!$i) $totalarray['nbfield']++;
             }
 
 			// Note
-            if (! empty($arrayfields['t.note']['checked']))
+            if (!empty($arrayfields['t.note']['checked']))
             {
                 print '<td align="left">';
     			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
@@ -1034,49 +1034,49 @@ 
     				print dol_nl2br($task_time->note);
     			}
     			print '</td>';
-    			if (! $i) $totalarray['nbfield']++;
+    			if (!$i) $totalarray['nbfield']++;
             }
 
 			// Time spent
-            if (! empty($arrayfields['t.task_duration']['checked']))
+            if (!empty($arrayfields['t.task_duration']['checked']))
             {
     			print '<td align="right">';
     			if ($_GET['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');
+    				print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
     			}
     			else
     			{
-    				print convertSecondToTime($task_time->task_duration,'allhourmin');
+    				print convertSecondToTime($task_time->task_duration, 'allhourmin');
     			}
     			print '</td>';
-    			if (! $i) $totalarray['nbfield']++;
-    			if (! $i) $totalarray['totaldurationfield']=$totalarray['nbfield'];
+    			if (!$i) $totalarray['nbfield']++;
+    			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 align="right">';
 				$value = price2num($task_time->thm * $task_time->task_duration / 3600);
 				print price($value, 1, $langs, 1, -1, -1, $conf->currency);
 				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
-    			if (! $i) $totalarray['totalvaluefield']=$totalarray['nbfield'];
+				if (!$i) $totalarray['nbfield']++;
+    			if (!$i) $totalarray['totalvaluefield'] = $totalarray['nbfield'];
     			$totalarray['totalvalue'] += $value;
             }
 
             // Value billed
-            if (! empty($arrayfields['valuebilled']['checked']))
+            if (!empty($arrayfields['valuebilled']['checked']))
             {
             	print '<td align="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>';
-            	if (! $i) $totalarray['nbfield']++;
-            	if (! $i) $totalarray['totalvaluefield']=$totalarray['nbfield'];
+            	if (!$i) $totalarray['nbfield']++;
+            	if (!$i) $totalarray['totalvaluefield'] = $totalarray['nbfield'];
             	$totalarray['totalvaluebilled'] += $valuebilled;
             }
 
@@ -1086,8 +1086,8 @@ 
             */
 
 			// 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
+			$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
@@ -1116,7 +1116,7 @@ 
 			    }
 			}
         	print '</td>';
-        	if (! $i) $totalarray['nbfield']++;
+        	if (!$i) $totalarray['nbfield']++;
 
 			print "</tr>\n";
 
@@ -1127,7 +1127,7 @@ 
 		if (isset($totalarray['totaldurationfield']) || isset($totalarray['totalvaluefield']))
 		{
 		    print '<tr class="liste_total">';
-		    $i=0;
+		    $i = 0;
 		    while ($i < $totalarray['nbfield'])
 		    {
 		        $i++;
@@ -1136,7 +1136,7 @@ 
 		            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
 		            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
 		        }
-		        elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'],'allhourmin').'</td>';
+		        elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
 		        elseif ($totalarray['totalvaluefield'] == $i) print '<td align="right">'.price($totalarray['totalvalue']).'</td>';
 		        else print '<td></td>';
 		    }

Braces +290 added lines, -142 removed lines

@@ -59,7 +59,9 @@ 
 // Security check
 $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
@@ -69,8 +71,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='t.task_date,t.task_datehour,t.rowid';
-if (! $sortorder) $sortorder='DESC';
+if (! $sortfield) {
+	$sortfield='t.task_date,t.task_datehour,t.rowid';
+}
+if (! $sortorder) {
+	$sortorder='DESC';
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 //$object = new TaskTime($db);
@@ -93,14 +99,18 @@ 
 
 $parameters=array('socid'=>$socid, 'projectid'=>$projectid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) {
+	// All tests are required to be compatible with all browsers
 {
 	$search_day='';
+}
 	$search_month='';
 	$search_year='';
 	$search_date='';
@@ -142,8 +152,7 @@ 
 		if ($id || $ref)
 		{
 			$object->fetch($id, $ref);
-		}
-		else
+		} else
 		{
 			$object->fetch(GETPOST('taskid','int'));
 		}
@@ -153,19 +162,19 @@ 
 		{
 			setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
 			$error++;
-		}
-		else
+		} else
 		{
 			$object->timespent_note = $_POST["timespent_note"];
 			$object->progress = GETPOST('progress', 'int');
 			$object->timespent_duration = $_POST["timespent_durationhour"]*60*60;	// We store duration in seconds
 			$object->timespent_duration+= $_POST["timespent_durationmin"]*60;		// We store duration in seconds
-	        if (GETPOST("timehour") != '' && GETPOST("timehour") >= 0)	// If hour was entered
+	        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_withhour = 1;
+	        } else
 			{
 				$object->timespent_date = dol_mktime(12,0,0,GETPOST("timemonth"),GETPOST("timeday"),GETPOST("timeyear"));
 			}
@@ -174,18 +183,19 @@ 
 			if ($result >= 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			}
-			else
+			} else
 			{
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
 		}
-	}
-	else
+	} else
 	{
-		if (empty($id)) $action='createtime';
-		else $action='createtime';
+		if (empty($id)) {
+			$action='createtime';
+		} else {
+			$action='createtime';
+		}
 	}
 }
 
@@ -209,12 +219,13 @@ 
 		$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
+			$object->timespent_withhour = 1;
+        } else
 		{
 			$object->timespent_date = dol_mktime(12,0,0,GETPOST("timelinemonth"),GETPOST("timelineday"),GETPOST("timelineyear"));
 		}
@@ -224,14 +235,12 @@ 
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->trans($object->error), null, 'errors');
 			$error++;
 		}
-	}
-	else
+	} else
 	{
 		$action='';
 	}
@@ -249,8 +258,7 @@ 
 		setEventMessages($langs->trans($object->error), null, 'errors');
 		$error++;
 		$action='';
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	}
@@ -265,8 +273,7 @@ 
 		if (count($tasksarray) > 0)
 		{
 			$id=$tasksarray[0]->id;
-		}
-		else
+		} else
 		{
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':'').(empty($mode)?'':'&mode='.$mode));
 			exit;
@@ -301,13 +308,16 @@ 
     if ($projectidforalltimes)
     {
         $result=$projectstatic->fetch($projectidforalltimes);
-        if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+        if (! empty($projectstatic->socid)) {
+        	$projectstatic->fetch_thirdparty();
+        }
         $res=$projectstatic->fetch_optionals();
-    }
-    elseif ($object->fetch($id, $ref) >= 0)
+    } elseif ($object->fetch($id, $ref) >= 0)
 	{
 		$result=$projectstatic->fetch($object->fk_project);
-		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+		if (! empty($projectstatic->socid)) {
+			$projectstatic->fetch_thirdparty();
+		}
 		$res=$projectstatic->fetch_optionals();
 
 		$object->project = clone $projectstatic;
@@ -320,8 +330,11 @@ 
 		if ($withproject)
 		{
 			// Tabs for project
-			if (empty($id)) $tab='timespent';
-			else $tab='tasks';
+			if (empty($id)) {
+				$tab='timespent';
+			} else {
+				$tab='tasks';
+			}
 			$head=project_prepare_head($projectstatic);
 			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
 
@@ -358,8 +371,11 @@ 
 
             // Visibility
             print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-            if ($projectstatic->public) print $langs->trans('SharedProject');
-            else print $langs->trans('PrivateProject');
+            if ($projectstatic->public) {
+            	print $langs->trans('SharedProject');
+            } else {
+            	print $langs->trans('PrivateProject');
+            }
             print '</td></tr>';
 
             // Date start - end
@@ -369,12 +385,16 @@ 
             $end = dol_print_date($projectstatic->date_end,'day');
             print ' - ';
             print ($end?$end:'?');
-            if ($projectstatic->hasDelay()) print img_warning("Late");
+            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);
+            if (strcmp($projectstatic->budget_amount, '')) {
+            	print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
+            }
             print '</td></tr>';
 
             // Other attributes
@@ -422,13 +442,11 @@ 
     				if ($projectstatic->public || $userWrite > 0)
     			    {
     			    	$linktocreatetime = '<a class="butActionNew" href="'.$_SERVER['PHP_SELF'].'?withproject=1'.($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTimeSpent').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
-    			    }
-    			    else
+    			    } else
     			    {
     			    	$linktocreatetime = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTime').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
     			    }
-    			}
-    			else
+    			} else
     			{
     				$linktocreatetime = '<a class="butActionNewRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTime').'<span class="fa fa-plus-circle valignmiddle"></span></a>';
     			}
@@ -453,8 +471,9 @@ 
 		{
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
 			$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
+		} else {
+			$object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 		}
-		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 
 		$morehtmlref='';
 
@@ -489,7 +508,9 @@ 
 		$end = dol_print_date($object->date_end,'dayhour');
 		print ' - ';
 		print ($end?$end:'?');
-		if ($object->hasDelay()) print img_warning("Late");
+		if ($object->hasDelay()) {
+			print img_warning("Late");
+		}
 		print '</td></tr>';
 
 		// Planned workload
@@ -515,10 +536,14 @@ 
 		if ($object->planned_workload)
 		{
 			$tmparray=$object->getSummaryOfTimeSpent();
-			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %';
-			else print '0 %';
+			if ($tmparray['total_duration'] > 0) {
+				print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %';
+			} else {
+				print '0 %';
+			}
+		} else {
+			print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 		}
-		else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 		print '</td></tr>';
 
 		print '</table>';
@@ -579,8 +604,7 @@ 
 			{
 				$userid=$contactsoftask[0];
 				print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid), 'userid', 0, '', 0, '', $contactsoftask, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToTheTask"), 'maxwidth200');
-			}
-			else
+			} else
 			{
 				print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 			}
@@ -630,9 +654,11 @@ 
 	    // 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
+		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);
@@ -645,7 +671,9 @@ 
 	    {
 	        foreach($extrafields->attribute_label as $key => $val)
 	        {
-				if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+				if (! empty($extrafields->attribute_list[$key])) {
+					$arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+				}
 	        }
 	    }
 
@@ -662,23 +690,36 @@ 
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facturedet as il ON il.rowid = t.invoice_line_id";
 		$sql .= ", ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
-		if (empty($projectidforalltimes)) $sql .= " AND t.fk_task =".$object->id;
-		else $sql.= " AND pt.fk_projet IN (".$projectidforalltimes.")";
-		if ($search_ref) $sql .= natural_search('c.ref', $search_ref);
-		if ($search_note) $sql .= natural_search('t.note', $search_note);
-		if ($search_task_ref) $sql .= natural_search('pt.ref', $search_task_ref);
-		if ($search_task_label) $sql .= natural_search('pt.label', $search_task_label);
-		if ($search_user > 0) $sql .= natural_search('t.fk_user', $search_user);
+		if (empty($projectidforalltimes)) {
+			$sql .= " AND t.fk_task =".$object->id;
+		} else {
+			$sql.= " AND pt.fk_projet IN (".$projectidforalltimes.")";
+		}
+		if ($search_ref) {
+			$sql .= natural_search('c.ref', $search_ref);
+		}
+		if ($search_note) {
+			$sql .= natural_search('t.note', $search_note);
+		}
+		if ($search_task_ref) {
+			$sql .= natural_search('pt.ref', $search_task_ref);
+		}
+		if ($search_task_label) {
+			$sql .= natural_search('pt.label', $search_task_label);
+		}
+		if ($search_user > 0) {
+			$sql .= natural_search('t.fk_user', $search_user);
+		}
 		if ($search_month > 0)
 		{
-			if ($search_year > 0 && empty($search_day))
-			$sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
-			else if ($search_year > 0 && ! empty($search_day))
-			$sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
-			else
-			$sql.= " AND date_format(t.task_datehour, '%m') = '".$db->escape($search_month)."'";
-		}
-		else if ($search_year > 0)
+			if ($search_year > 0 && empty($search_day)) {
+						$sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+			} else if ($search_year > 0 && ! empty($search_day)) {
+						$sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
+			} else {
+						$sql.= " AND date_format(t.task_datehour, '%m') = '".$db->escape($search_month)."'";
+			}
+		} else if ($search_year > 0)
 		{
 			$sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
 		}
@@ -709,8 +750,7 @@ 
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 		}
@@ -760,12 +800,16 @@ 
 			$contactsofproject=$projectstatic->getListContactId('internal');
 			if (count($contactsofproject)>0)
 			{
-				if (in_array($user->id, $userid=$contactsofproject)) $userid = $user->id;
-				else $userid=$contactsofproject[0];
-				if ($projectstatic->public) $contactsofproject = array();
+				if (in_array($user->id, $userid=$contactsofproject)) {
+					$userid = $user->id;
+				} else {
+					$userid=$contactsofproject[0];
+				}
+				if ($projectstatic->public) {
+					$contactsofproject = array();
+				}
 				print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');
-			}
-			else
+			} else
 			{
 				print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 			}
@@ -801,23 +845,49 @@ 
 		$arrayofselected=is_array($toselect)?$toselect:array();
 
 		$param='';
-		if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$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);
+		if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param.='&contextpage='.$contextpage;
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param.='&limit='.$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);
+		if ($id) {
+			$param.='&id='.urlencode($id);
+		}
+		if ($projectid) {
+			$param.='&projectid='.urlencode($projectid);
+		}
+		if ($withproject) {
+			$param.='&withproject='.urlencode($withproject);
+		}
 
 
 		$arrayofmassactions =  array(
@@ -825,16 +895,23 @@ 
 		    //'builddoc'=>$langs->trans("PDFMerge"),
 		);
 		//if ($user->rights->projet->creer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-		if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+		if (in_array($massaction, array('presend','predelete'))) {
+			$arrayofmassactions=array();
+		}
 		$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'">';
-        if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+        if ($optioncss != '') {
+        	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+        }
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-		if ($action == 'editline') print '<input type="hidden" name="action" value="updateline">';
-		else print '<input type="hidden" name="action" value="list">';
+		if ($action == 'editline') {
+			print '<input type="hidden" name="action" value="updateline">';
+		} 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.'">';
@@ -847,8 +924,11 @@ 
 
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-		else $moreforfilter = $hookmanager->resPrint;
+		if (empty($reshook)) {
+			$moreforfilter .= $hookmanager->resPrint;
+		} else {
+			$moreforfilter = $hookmanager->resPrint;
+		}
 
 		if (! empty($moreforfilter))
 		{
@@ -869,26 +949,42 @@ 
 		if (! empty($arrayfields['t.task_date']['checked']))
 		{
 			print '<td class="liste_titre">';
-			if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+			if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+				print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+			}
 			print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
 			$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($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>';
+		}
+            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($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>';
+        if (! empty($arrayfields['value']['checked'])) {
+        	print '<td class="liste_titre"></td>';
+        }
         // Value billed
-        if (! empty($arrayfields['valuebilled']['checked'])) print '<td class="liste_titre"></td>';
+        if (! empty($arrayfields['valuebilled']['checked'])) {
+        	print '<td class="liste_titre"></td>';
+        }
         /*
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -905,17 +1001,33 @@ 
 		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_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['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['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,'align="right"',$sortfield,$sortorder);
-		if (! empty($arrayfields['value']['checked']))            print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
-		if (! empty($arrayfields['valuebilled']['checked']))      print_liste_field_titre($arrayfields['valuebilled']['label'],$_SERVER['PHP_SELF'],'il.total_ht','',$param,'align="right"',$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,'align="right"',$sortfield,$sortorder);
+		}
+		if (! empty($arrayfields['value']['checked'])) {
+			print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+		}
+		if (! empty($arrayfields['valuebilled']['checked'])) {
+			print_liste_field_titre($arrayfields['valuebilled']['label'],$_SERVER['PHP_SELF'],'il.total_ht','',$param,'align="right"',$sortfield,$sortorder);
+		}
 		/*
     	// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -953,41 +1065,51 @@ 
     				if (empty($task_time->task_date_withhour))
     				{
     					print $form->select_date(($date2?$date2:$date1),'timeline',3,3,2,"timespent_date",1,0,1);
+    				} else {
+    					print $form->select_date(($date2?$date2:$date1),'timeline',1,1,2,"timespent_date",1,0,1);
     				}
-    				else print $form->select_date(($date2?$date2:$date1),'timeline',1,1,2,"timespent_date",1,0,1);
-    			}
-    			else
+    			} else
     			{
     				print dol_print_date(($date2?$date2:$date1),($task_time->task_date_withhour?'dayhour':'day'));
     			}
     			print '</td>';
-    			if (! $i) $totalarray['nbfield']++;
+    			if (! $i) {
+    				$totalarray['nbfield']++;
+    			}
 			}
 
 			// Task ref
             if (! empty($arrayfields['t.task_ref']['checked']))
             {
-        		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
+        		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 (! $i) {
+        				$totalarray['nbfield']++;
+        			}
     			}
             }
 
 			// Task label
             if (! empty($arrayfields['t.task_label']['checked']))
             {
-        		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
+        		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 (! $i) {
+        				$totalarray['nbfield']++;
+        			}
     			}
             }
 
@@ -997,7 +1119,9 @@ 
                 print '<td>';
     			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
     			{
-			        if (empty($object->id)) $object->fetch($id);
+			        if (empty($object->id)) {
+			        	$object->fetch($id);
+			        }
     			    $contactsoftask=$object->getListContactId('internal');
     				if (!in_array($task_time->fk_user,$contactsoftask)) {
     					$contactsoftask[]=$task_time->fk_user;
@@ -1005,11 +1129,10 @@ 
     				if (count($contactsoftask)>0) {
     					print img_object('','user','class="hideonsmartphone"');
     					print $form->select_dolusers($task_time->fk_user,'userid_line',0,'',0,'',$contactsoftask);
-    				}else {
+    				} else {
     					print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
     				}
-    			}
-    			else
+    			} else
     			{
     				$userstatic->id         = $task_time->fk_user;
     				$userstatic->lastname	= $task_time->lastname;
@@ -1018,7 +1141,9 @@ 
     				print $userstatic->getNomUrl(-1);
     			}
     			print '</td>';
-    			if (! $i) $totalarray['nbfield']++;
+    			if (! $i) {
+    				$totalarray['nbfield']++;
+    			}
             }
 
 			// Note
@@ -1028,13 +1153,14 @@ 
     			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
     			{
     				print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-    			}
-    			else
+    			} else
     			{
     				print dol_nl2br($task_time->note);
     			}
     			print '</td>';
-    			if (! $i) $totalarray['nbfield']++;
+    			if (! $i) {
+    				$totalarray['nbfield']++;
+    			}
             }
 
 			// Time spent
@@ -1045,14 +1171,17 @@ 
     			{
     				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
+    			} else
     			{
     				print convertSecondToTime($task_time->task_duration,'allhourmin');
     			}
     			print '</td>';
-    			if (! $i) $totalarray['nbfield']++;
-    			if (! $i) $totalarray['totaldurationfield']=$totalarray['nbfield'];
+    			if (! $i) {
+    				$totalarray['nbfield']++;
+    			}
+    			if (! $i) {
+    				$totalarray['totaldurationfield']=$totalarray['nbfield'];
+    			}
     			$totalarray['totalduration'] += $task_time->task_duration;
             }
 
@@ -1063,8 +1192,12 @@ 
 				$value = price2num($task_time->thm * $task_time->task_duration / 3600);
 				print price($value, 1, $langs, 1, -1, -1, $conf->currency);
 				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
-    			if (! $i) $totalarray['totalvaluefield']=$totalarray['nbfield'];
+				if (! $i) {
+					$totalarray['nbfield']++;
+				}
+    			if (! $i) {
+    				$totalarray['totalvaluefield']=$totalarray['nbfield'];
+    			}
     			$totalarray['totalvalue'] += $value;
             }
 
@@ -1073,10 +1206,16 @@ 
             {
             	print '<td align="right">';
             	$valuebilled = price2num($task_time->total_ht);
-            	if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+            	if (isset($task_time->total_ht)) {
+            		print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+            	}
             	print '</td>';
-            	if (! $i) $totalarray['nbfield']++;
-            	if (! $i) $totalarray['totalvaluefield']=$totalarray['nbfield'];
+            	if (! $i) {
+            		$totalarray['nbfield']++;
+            	}
+            	if (! $i) {
+            		$totalarray['totalvaluefield']=$totalarray['nbfield'];
+            	}
             	$totalarray['totalvaluebilled'] += $valuebilled;
             }
 
@@ -1098,13 +1237,14 @@ 
 				print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 				print '<br>';
 				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-			}
-			else if ($user->rights->projet->lire || $user->rights->projet->all->creer)    // Read project and enter time consumed on assigned tasks
+			} else if ($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)
 				{
 					//$param = ($projectidforalltimes?'projectid='.$projectidforalltimes.'&amp;':'').'.($withproject?'&amp;withproject=1':'');
 					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>';
@@ -1116,7 +1256,9 @@ 
 			    }
 			}
         	print '</td>';
-        	if (! $i) $totalarray['nbfield']++;
+        	if (! $i) {
+        		$totalarray['nbfield']++;
+        	}
 
 			print "</tr>\n";
 
@@ -1133,12 +1275,18 @@ 
 		        $i++;
 		        if ($i == 1)
 		        {
-		            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
-		            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+		            if ($num < $limit && empty($offset)) {
+		            	print '<td align="left">'.$langs->trans("Total").'</td>';
+		            } else {
+		            	print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+		            }
+		        } elseif ($totalarray['totaldurationfield'] == $i) {
+		        	print '<td align="right">'.convertSecondToTime($totalarray['totalduration'],'allhourmin').'</td>';
+		        } elseif ($totalarray['totalvaluefield'] == $i) {
+		        	print '<td align="right">'.price($totalarray['totalvalue']).'</td>';
+		        } else {
+		        	print '<td></td>';
 		        }
-		        elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'],'allhourmin').'</td>';
-		        elseif ($totalarray['totalvaluefield'] == $i) print '<td align="right">'.price($totalarray['totalvalue']).'</td>';
-		        else print '<td></td>';
 		    }
 		    print '</tr>';
 		}

htdocs/admin/agenda_reminder.php

Indentation +71 added lines, -71 removed lines

@@ -27,7 +27,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $langs->loadLangs(array("admin","other","agenda"));
 
@@ -76,54 +76,54 @@ 
 if ($action == 'set')
 {
 	dolibarr_set_const($db, 'AGENDA_USE_EVENT_TYPE_DEFAULT', GETPOST('AGENDA_USE_EVENT_TYPE_DEFAULT'), 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
 }
 else if ($action == 'specimen')  // For orders
 {
-    $modele=GETPOST('module','alpha');
-
-    $commande = new CommandeFournisseur($db);
-    $commande->initAsSpecimen();
-    $commande->thirdparty=$specimenthirdparty;
-
-    // Search template files
-    $file=''; $classname=''; $filefound=0;
-    $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-    foreach($dirmodels as $reldir)
-    {
-    	$file=dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php",0);
-    	if (file_exists($file))
-    	{
-    		$filefound=1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
-
-    if ($filefound)
-    {
-    	require_once $file;
-
-    	$module = new $classname($db,$commande);
-
-    	if ($module->write_file($commande,$langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
-    		return;
-    	}
-    	else
-    	{
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    }
-    else
-    {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+	$modele=GETPOST('module','alpha');
+
+	$commande = new CommandeFournisseur($db);
+	$commande->initAsSpecimen();
+	$commande->thirdparty=$specimenthirdparty;
+
+	// Search template files
+	$file=''; $classname=''; $filefound=0;
+	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+	foreach($dirmodels as $reldir)
+	{
+		$file=dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php",0);
+		if (file_exists($file))
+		{
+			$filefound=1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db,$commande);
+
+		if ($module->write_file($commande,$langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
+			return;
+		}
+		else
+		{
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	}
+	else
+	{
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
@@ -138,7 +138,7 @@ 
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF',$conf->entity);
+		if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF',$conf->entity);
 	}
 }
 
@@ -209,31 +209,31 @@ 
 // AGENDA REMINDER BROWSER
 if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 {
-    print '<tr class="oddeven">'."\n";
-    print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER').'</td>'."\n";
-    print '<td align="center">&nbsp;</td>'."\n";
-    print '<td align="right">'."\n";
-
-    if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
-        print '</td></tr>'."\n";
-    } else {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
-        print '</td></tr>'."\n";
-
-        print '<tr class="oddeven">'."\n";
-        print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').'</td>'."\n";
-        print '<td align="center">&nbsp;</td>'."\n";
-        print '<td align="right">'."\n";
-
-        if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
-        } else {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
-        }
-
-        print '</td></tr>'."\n";
-    }
+	print '<tr class="oddeven">'."\n";
+	print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER').'</td>'."\n";
+	print '<td align="center">&nbsp;</td>'."\n";
+	print '<td align="right">'."\n";
+
+	if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+		print '</td></tr>'."\n";
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+		print '</td></tr>'."\n";
+
+		print '<tr class="oddeven">'."\n";
+		print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').'</td>'."\n";
+		print '<td align="center">&nbsp;</td>'."\n";
+		print '<td align="right">'."\n";
+
+		if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+		}
+
+		print '</td></tr>'."\n";
+	}
 }
 
 print '</table>';

Spacing +33 added lines, -33 removed lines

@@ -29,13 +29,13 @@ 
 if (!$user->admin)
     accessforbidden();
 
-$langs->loadLangs(array("admin","other","agenda"));
+$langs->loadLangs(array("admin", "other", "agenda"));
 
-$action = GETPOST('action','alpha');
-$value = GETPOST('value','alpha');
-$param = GETPOST('param','alpha');
-$cancel = GETPOST('cancel','alpha');
-$scandir = GETPOST('scandir','alpha');
+$action = GETPOST('action', 'alpha');
+$value = GETPOST('value', 'alpha');
+$param = GETPOST('param', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
+$scandir = GETPOST('scandir', 'alpha');
 $type = 'action';
 
 
@@ -45,10 +45,10 @@ 
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-	$code=$reg[1];
-	$value=(GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
+	$code = $reg[1];
+	$value = (GETPOST($code, 'alpha') ? GETPOST($code, 'alpha') : 1);
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
@@ -60,9 +60,9 @@ 
 	}
 }
 
-if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
+if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-	$code=$reg[1];
+	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
@@ -82,21 +82,21 @@ 
 }
 else if ($action == 'specimen')  // For orders
 {
-    $modele=GETPOST('module','alpha');
+    $modele = GETPOST('module', 'alpha');
 
     $commande = new CommandeFournisseur($db);
     $commande->initAsSpecimen();
-    $commande->thirdparty=$specimenthirdparty;
+    $commande->thirdparty = $specimenthirdparty;
 
     // Search template files
-    $file=''; $classname=''; $filefound=0;
-    $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-    foreach($dirmodels as $reldir)
+    $file = ''; $classname = ''; $filefound = 0;
+    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+    foreach ($dirmodels as $reldir)
     {
-    	$file=dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php",0);
+    	$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
     	if (file_exists($file))
     	{
-    		$filefound=1;
+    		$filefound = 1;
     		$classname = "pdf_".$modele;
     		break;
     	}
@@ -106,9 +106,9 @@ 
     {
     	require_once $file;
 
-    	$module = new $classname($db,$commande);
+    	$module = new $classname($db, $commande);
 
-    	if ($module->write_file($commande,$langs) > 0)
+    	if ($module->write_file($commande, $langs) > 0)
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
@@ -138,14 +138,14 @@ 
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF',$conf->entity);
+        if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF', $conf->entity);
 	}
 }
 
 // Set default model
 else if ($action == 'setdoc')
 {
-	if (dolibarr_set_const($db, "ACTION_EVENT_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	if (dolibarr_set_const($db, "ACTION_EVENT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
 		// La constante qui a ete lue en avant du nouveau set
 		// on passe donc par une variable pour avoir un affichage coherent
@@ -165,16 +165,16 @@ 
  * View
  */
 
-$formactions=new FormActions($db);
-$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+$formactions = new FormActions($db);
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 llxHeader();
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');
 
 
 
-$head=agenda_prepare_head();
+$head = agenda_prepare_head();
 
 dol_fiche_head($head, 'reminders', $langs->trans("Agenda"), -1, 'action');
 
@@ -198,10 +198,10 @@ 
 	print '<td align="right">'."\n";
 
 	if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_EMAIL">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_EMAIL">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
 		print '</td></tr>'."\n";
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_EMAIL">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_EMAIL">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
 		print '</td></tr>'."\n";
 	}
 }
@@ -215,10 +215,10 @@ 
     print '<td align="right">'."\n";
 
     if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
         print '</td></tr>'."\n";
     } else {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
         print '</td></tr>'."\n";
 
         print '<tr class="oddeven">'."\n";
@@ -227,9 +227,9 @@ 
         print '<td align="right">'."\n";
 
         if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
         } else {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
         }
 
         print '</td></tr>'."\n";

Braces +13 added lines, -15 removed lines

@@ -26,8 +26,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 
-if (!$user->admin)
+if (!$user->admin) {
     accessforbidden();
+}
 
 $langs->loadLangs(array("admin","other","agenda"));
 
@@ -53,8 +54,7 @@ 
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -67,8 +67,7 @@ 
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -79,10 +78,11 @@ 
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
-}
-else if ($action == 'specimen')  // For orders
+} else if ($action == 'specimen') {
+	// For orders
 {
     $modele=GETPOST('module','alpha');
+}
 
     $commande = new CommandeFournisseur($db);
     $commande->initAsSpecimen();
@@ -112,14 +112,12 @@ 
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
+    	} else
     	{
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
+    } else
     {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
@@ -131,14 +129,14 @@ 
 {
 	//print "sssd".$value;
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-else if ($action == 'del')
+} else if ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF',$conf->entity);
+        if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") {
+        	dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF',$conf->entity);
+        }
 	}
 }