alxarafe / alixar

dolibarr/htdocs/core/lib/asset.lib.php

Spacing +15 added lines, -15 removed lines

@@ -35,7 +35,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/setup.php';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
@@ -50,12 +50,12 @@ 
 	//); // to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin');
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_type_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_type_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsAssetsType");
 	$head[$h][2] = 'attributes_type';
 	$h++;
@@ -79,7 +79,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/card.php';
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -96,25 +96,25 @@ 
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->assets->dir_output . '/' . get_exdir($filename,2,0,1,$object,'assets'). '/'. 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->assets->dir_output.'/'.get_exdir($filename, 2, 0, 1, $object, 'assets').'/'.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.'/asset/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] = 'documents';
 	$h++;
 
 	$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.'/asset/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] = 'note';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
@@ -134,7 +134,7 @@ 
 {
 	global $langs, $conf, $user;
 
-	$h=0;
+	$h = 0;
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/asset/type.php?rowid='.$object->id;
@@ -146,9 +146,9 @@ 
 	// 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assettype');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assettype', 'remove');
 
 	return $head;
 }

dolibarr/htdocs/core/lib/vat.lib.php

Spacing +6 added lines, -6 removed lines

@@ -45,16 +45,16 @@ 
     // 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, $tab,'vat');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat');
 	
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->tax->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->tax->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[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$tab][2] = 'documents';
 	$tab++;
 
@@ -63,7 +63,7 @@ 
     $head[$tab][2] = 'info';
     $tab++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$tab,'vat','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat', 'remove');
 
     return $head;
 }

dolibarr/htdocs/core/lib/donation.lib.php

Spacing +13 added lines, -13 removed lines

@@ -33,10 +33,10 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/don/admin/donation.php';
+	$head[$h][0] = DOL_URL_ROOT.'/don/admin/donation.php';
 	$head[$h][1] = $langs->trans("Miscellaneous");
 	$head[$h][2] = 'general';
-	$h ++;
+	$h++;
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
@@ -44,7 +44,7 @@ 
 	// $this->tabs = array('entity:-tabname); to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'donation_admin');
 	
-	$head[$h][0] = DOL_URL_ROOT . '/don/admin/donation_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/don/admin/donation_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
 	$h++;
@@ -67,10 +67,10 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/don/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/don/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
-	$h ++;
+	$h++;
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
@@ -80,25 +80,25 @@ 
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->don->dir_output . '/' . get_exdir($filename,2,0,1,$object,'donation'). '/'. 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->don->dir_output.'/'.get_exdir($filename, 2, 0, 1, $object, 'donation').'/'.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.'/don/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] = 'documents';
 	$h++;
 
 	$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.'/don/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] = 'note';
 	$h++;
 	
-	$head[$h][0] = DOL_URL_ROOT . '/don/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/don/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;

dolibarr/htdocs/core/lib/trip.lib.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -43,19 +43,19 @@ 
 	// 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,'trip');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'trip');
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	$head[$h][2] = 'documents';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'trip','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'trip', 'remove');
 
 	return $head;
 }

dolibarr/htdocs/core/lib/categories.lib.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
  * @param	string	$type		Type of category
  * @return  array				Array of tabs to show
  */
-function categories_prepare_head($object,$type)
+function categories_prepare_head($object, $type)
 {
 	global $langs, $conf, $user;
 
@@ -49,7 +49,7 @@ 
 	$head[$h][2] = 'photos';
 	$h++;
 
-	if (! empty($conf->global->MAIN_MULTILANGS))
+	if (!empty($conf->global->MAIN_MULTILANGS))
 	{
     	$head[$h][0] = DOL_URL_ROOT.'/categories/traduction.php?id='.$object->id.'&type='.$type;
     	$head[$h][1] = $langs->trans("Translation");
@@ -61,9 +61,9 @@ 
     // 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,'categories_'.$type);
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'categories_'.$type);
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'categories_'.$type,'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'categories_'.$type, 'remove');
 
 	return $head;
 }
@@ -97,9 +97,9 @@ 
 	// 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,null,$head,$h,'categoriesadmin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'categoriesadmin');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'categoriesadmin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'categoriesadmin', 'remove');
 
 	return $head;
 }

dolibarr/htdocs/core/lib/project.lib.php

Spacing +355 added lines, -355 removed lines

@@ -45,10 +45,10 @@ 
 	$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++;
 
@@ -59,13 +59,13 @@ 
 		$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++;
 
-		$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";
@@ -76,20 +76,20 @@ 
 		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?withproject=1&projectid='.$object->id;
 		$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] = 'timespent';
 		$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");
@@ -101,29 +101,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++;
 
@@ -133,22 +133,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;
 }
@@ -166,20 +166,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";
@@ -189,13 +189,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++;
 
@@ -203,28 +203,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++;
 
@@ -232,14 +232,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;
 }
@@ -251,7 +251,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;
@@ -259,13 +259,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++;
@@ -273,7 +273,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++;
@@ -287,9 +287,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;
 }
@@ -313,7 +313,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");
@@ -325,7 +325,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;
 }
@@ -347,15 +347,15 @@ 
  * @param   string      $filterprogresscalc     filter text
  * @return	void
  */
-function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0, $projectidfortotallink=0, $filterprogresscalc='')
+function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0, $filterprogresscalc = '')
 {
 	global $user, $bc, $langs, $conf, $db;
 	global $projectstatic, $taskstatic;
 
-	$lastprojectid=0;
+	$lastprojectid = 0;
 
-	$projectsArrayId=explode(',',$projectsListId);
-	if ($filterprogresscalc!=='') {
+	$projectsArrayId = explode(',', $projectsListId);
+	if ($filterprogresscalc !== '') {
 		foreach ($lines as $key=>$line) {
 			if (!empty($line->planned_workload) && !empty($line->duration)) {
 				$filterprogresscalc = str_replace(' = ', ' == ', $filterprogresscalc);
@@ -364,23 +364,23 @@ 
 				}
 			}
 		}
-		$lines=array_values($lines);
+		$lines = array_values($lines);
 	}
 
-	$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>';
@@ -388,26 +388,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
 					}
 				}
 			}
@@ -418,12 +418,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;
 					}
 				}
 			}
@@ -434,7 +434,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";
@@ -444,18 +444,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>";
 				}
@@ -464,14 +464,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>';
 
@@ -479,7 +479,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;";
 				}
@@ -490,7 +490,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
@@ -499,19 +499,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;
@@ -524,8 +524,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>';
@@ -535,7 +535,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>';
@@ -549,20 +549,20 @@ 
 				print '</td>';
 
 				// Contacts of task
-				if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
+				if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
 				{
 					print '<td>';
-					foreach(array('internal','external') as $source)
+					foreach (array('internal', 'external') as $source)
 					{
-						$tab = $lines[$i]->liste_contact(-1,$source);
-						$num=count($tab);
-						if (!empty($num)){
-							foreach ($tab as $contacttask){
+						$tab = $lines[$i]->liste_contact(-1, $source);
+						$num = count($tab);
+						if (!empty($num)) {
+							foreach ($tab as $contacttask) {
 								//var_dump($contacttask);
 								if ($source == 'internal') $c = new User($db);
 								else $c = new Contact($db);
 								$c->fetch($contacttask['id']);
-								print $c->getNomUrl(1) . ' (' . $contacttask['libelle'] . ')' . '<br>';
+								print $c->getNomUrl(1).' ('.$contacttask['libelle'].')'.'<br>';
 							}
 						}
 					}
@@ -577,7 +577,7 @@ 
 
 				print "</tr>\n";
 
-				if (! $showlineingray) $inc++;
+				if (!$showlineingray) $inc++;
 
 				if ($level >= 0)    // Call sublevels
 				{
@@ -609,16 +609,16 @@ 
 		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>';
 		// Contacts of task
-		if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
+		if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
 		{
 			print '<td></td>';
 		}
@@ -647,48 +647,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;
@@ -699,31 +699,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 ' - ';
@@ -748,7 +748,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>";
@@ -761,11 +761,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;";
@@ -774,47 +774,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";
@@ -826,7 +826,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>';
@@ -873,41 +873,41 @@ 
  * @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);
 
@@ -919,7 +919,7 @@ 
 				// 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;
@@ -930,31 +930,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)
 					{
@@ -989,11 +989,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;";
@@ -1002,13 +1002,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
@@ -1017,7 +1017,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 '--:--';
@@ -1025,25 +1025,25 @@ 
 
 				// 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
@@ -1052,41 +1052,41 @@ 
 				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";
@@ -1098,19 +1098,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>';
 
@@ -1126,9 +1126,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);
@@ -1162,24 +1162,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];
 		}
 	}
 
@@ -1187,17 +1187,17 @@ 
 
 	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);
 
@@ -1209,7 +1209,7 @@ 
 				// 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;
 				}
 
@@ -1217,33 +1217,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)
 					{
@@ -1278,11 +1278,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>";
@@ -1292,13 +1292,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
@@ -1307,7 +1307,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 '--:--';
@@ -1315,80 +1315,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>';
 
@@ -1405,9 +1405,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);
@@ -1436,8 +1436,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)
@@ -1473,52 +1473,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))
 	{
@@ -1530,40 +1530,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)
@@ -1576,24 +1576,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);
@@ -1606,7 +1606,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);
@@ -1616,18 +1616,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);
@@ -1641,19 +1641,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>';
 					}
 				}
@@ -1671,7 +1671,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>';
@@ -1679,8 +1679,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>';

dolibarr/htdocs/core/lib/json.lib.php

Spacing +42 added lines, -42 removed lines

@@ -23,7 +23,7 @@ 
  * 		\ingroup	core
  */
 
-if (! function_exists('json_encode'))
+if (!function_exists('json_encode'))
 {
 	/**
 	 * Implement json_encode for PHP that does not have module enabled.
@@ -49,14 +49,14 @@ 
 {
 	dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
 
-	$num=0;
+	$num = 0;
 	if (is_object($elements))	// Count number of properties for an object
 	{
-		foreach($elements as $key => $value) $num++;
+		foreach ($elements as $key => $value) $num++;
 	}
 	else
 	{
-	    $num=count($elements);
+	    $num = count($elements);
 	}
 	//var_dump($num);
 
@@ -64,16 +64,16 @@ 
 	if (is_numeric(key($elements)) && key($elements) == 0)
 	{
 		// indexed (list)
-		$keysofelements=array_keys($elements);	// Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
+		$keysofelements = array_keys($elements); // Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
 		$output = '[';
 		for ($i = 0, $last = ($num - 1); $i < $num; $i++)
 		{
-			if (! isset($elements[$keysofelements[$i]])) continue;
-			if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) $output.= json_encode($elements[$keysofelements[$i]]);
+			if (!isset($elements[$keysofelements[$i]])) continue;
+			if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) $output .= json_encode($elements[$keysofelements[$i]]);
 			else $output .= _val($elements[$keysofelements[$i]]);
-			if ($i !== $last) $output.= ',';
+			if ($i !== $last) $output .= ',';
 		}
-		$output.= ']';
+		$output .= ']';
 	}
 	else
 	{
@@ -81,18 +81,18 @@ 
 		$output = '{';
 		$last = $num - 1;
 		$i = 0;
-		$tmpelements=array();
-		if (is_array($elements)) $tmpelements=$elements;
-		if (is_object($elements)) $tmpelements=get_object_vars($elements);
-		foreach($tmpelements as $key => $value)
+		$tmpelements = array();
+		if (is_array($elements)) $tmpelements = $elements;
+		if (is_object($elements)) $tmpelements = get_object_vars($elements);
+		foreach ($tmpelements as $key => $value)
 		{
 			$output .= '"'.$key.'":';
-			if (is_array($value)) $output.= json_encode($value);
+			if (is_array($value)) $output .= json_encode($value);
 			else $output .= _val($value);
-			if ($i !== $last) $output.= ',';
+			if ($i !== $last) $output .= ',';
 			++$i;
 		}
-		$output.= '}';
+		$output .= '}';
 	}
 
 	// return
@@ -205,7 +205,7 @@ 
 	else  return 'null';
 }
 
-if (! function_exists('json_decode'))
+if (!function_exists('json_decode'))
 {
 	/**
 	 * Implement json_decode for PHP that does not support it
@@ -214,7 +214,7 @@ 
 	 * @param	bool	$assoc		False return an object, true return an array
 	 * @return 	mixed				Object or Array
 	 */
-	function json_decode($json, $assoc=false)
+	function json_decode($json, $assoc = false)
 	{
 		return dol_json_decode($json, $assoc);
 	}
@@ -229,40 +229,40 @@ 
  * @return 	mixed				Object or Array or false on error
  * @see json_decode()
  */
-function dol_json_decode($json, $assoc=false)
+function dol_json_decode($json, $assoc = false)
 {
 	dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
 
 	$comment = false;
 
-    $out='';
-	$strLength = strlen($json);    // Must stay strlen and not dol_strlen because we want technical length, not visible length
-	for ($i=0; $i<$strLength; $i++)
+    $out = '';
+	$strLength = strlen($json); // Must stay strlen and not dol_strlen because we want technical length, not visible length
+	for ($i = 0; $i < $strLength; $i++)
 	{
-		if (! $comment)
+		if (!$comment)
 		{
-			if (($json[$i] == '{') || ($json[$i] == '[')) $out.= 'array(';
-			else if (($json[$i] == '}') || ($json[$i] == ']')) $out.= ')';
-			else if ($json[$i] == ':') $out.= ' => ';
-			else $out.=$json[$i];
+			if (($json[$i] == '{') || ($json[$i] == '[')) $out .= 'array(';
+			else if (($json[$i] == '}') || ($json[$i] == ']')) $out .= ')';
+			else if ($json[$i] == ':') $out .= ' => ';
+			else $out .= $json[$i];
 		}
-		else $out.= $json[$i];
-		if ($json[$i] == '"' && $json[($i-1)]!="\\") $comment = !$comment;
+		else $out .= $json[$i];
+		if ($json[$i] == '"' && $json[($i - 1)] != "\\") $comment = !$comment;
 	}
 
-	$out=_unval($out);
+	$out = _unval($out);
 
 	// Return an array
 	if ($out != '') eval('$array = '.$out.';');
-	else $array=array();
+	else $array = array();
 
 	// Return an object
-	if (! $assoc)
+	if (!$assoc)
 	{
-		if (! empty($array))
+		if (!empty($array))
 		{
 			$object = false;
-			if (count($array)>0) {
+			if (count($array) > 0) {
 				$object = (object) array();
 			}
 			foreach ($array as $key => $value)
@@ -290,9 +290,9 @@ 
 	while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
 	{
 	    // single, escaped unicode character
-	    $utf16 = chr(hexdec($reg[1])) . chr(hexdec($reg[2]));
+	    $utf16 = chr(hexdec($reg[1])).chr(hexdec($reg[2]));
 	    $utf8  = utf162utf8($utf16);
-	    $val=preg_replace('/\\\u'.$reg[1].$reg[2].'/i',$utf8,$val);
+	    $val = preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);
 	}
 	return $val;
 }
@@ -310,13 +310,13 @@ 
 function utf162utf8($utf16)
 {
 	// oh please oh please oh please oh please oh please
-	if(function_exists('mb_convert_encoding')) {
+	if (function_exists('mb_convert_encoding')) {
 	    return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
 	}
 
 	$bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
 
-	switch(true) {
+	switch (true) {
     	case ((0x7F & $bytes) == $bytes):
     	// this case should never be reached, because we are in ASCII range
     	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -353,11 +353,11 @@ 
 function utf82utf16($utf8)
 {
 	// oh please oh please oh please oh please oh please
-	if(function_exists('mb_convert_encoding')) {
+	if (function_exists('mb_convert_encoding')) {
 	return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
 	}
 
-	switch(strlen($utf8)) {
+	switch (strlen($utf8)) {
 		case 1:
 	        	// this case should never be reached, because we are in ASCII range
 		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -366,12 +366,12 @@ 
 		case 2:
 		// return a UTF-16 character from a 2-byte UTF-8 char
 		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
+		return chr(0x07 & (ord($utf8{0}) >> 2)).chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
 
 		case 3:
 		// return a UTF-16 character from a 3-byte UTF-8 char
 		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
+		return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))).chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
 	}
 
 	// ignoring UTF-32 for now, sorry

dolibarr/htdocs/core/lib/doc.lib.php

Spacing +35 added lines, -35 removed lines

@@ -38,15 +38,15 @@ 
  *  @param  int			$issupplierline      Is it a line for a supplier object ?
  *  @return string       				     String with line
  */
-function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierline=0)
+function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
 {
 	global $db, $conf, $langs;
 
-	$idprod=$line->fk_product;
-	$label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:''));
-	$desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:''));
-	$ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
-	$note=(! empty($line->note)?$line->note:'');
+	$idprod = $line->fk_product;
+	$label = (!empty($line->label) ? $line->label : (!empty($line->libelle) ? $line->libelle : ''));
+	$desc = (!empty($line->desc) ? $line->desc : (!empty($line->description) ? $line->description : ''));
+	$ref_supplier = (!empty($line->ref_supplier) ? $line->ref_supplier : (!empty($line->ref_fourn) ? $line->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders
+	$note = (!empty($line->note) ? $line->note : '');
 
 	if ($issupplierline) $prodser = new ProductFournisseur($db);
 	else $prodser = new Product($db);
@@ -55,57 +55,57 @@ 
 	{
 		$prodser->fetch($idprod);
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
+		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
 		{
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label)     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note)        $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label)     $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note)        $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
 		}
 	}
 
 	// Description short of product line
-	$libelleproduitservice=$label;
+	$libelleproduitservice = $label;
 
 	// Description long of product line
 	if ($desc && ($desc != $label))
 	{
 		if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except)
 		{
-			$discount=new DiscountAbsolute($db);
+			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
-			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
 		}
 		elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
 		{
-		    $discount=new DiscountAbsolute($db);
+		    $discount = new DiscountAbsolute($db);
 		    $discount->fetch($line->fk_remise_except);
-		    $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
-		    $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref);
+		    $sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+		    $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 		    // Add date of deposit
-		    if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+		    if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
 		}
 		elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
 		{
-			$discount=new DiscountAbsolute($db);
+			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
 		}
 		elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
 		{
-			$discount=new DiscountAbsolute($db);
+			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
 		}
 		else
 		{
 			if ($idprod)
 			{
-				if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
+				if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
 			else
 			{
-				$libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
+				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
 		}
 	}
@@ -118,7 +118,7 @@ 
 		{
 			$prefix_prodserv = "";
 			$ref_prodserv = "";
-			if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
+			if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
 			{
 				if ($prodser->isService())
 				{
@@ -132,34 +132,34 @@ 
 
 			if (empty($hideref))
 			{
-				if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')';   // Show local ref and supplier ref
+				if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref
 				else $ref_prodserv = $prodser->ref; // Show local ref only
 
 				$ref_prodserv .= " - ";
 			}
 
-			$libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
+			$libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;
 		}
 	}
 
-	if (! empty($line->date_start) || ! empty($line->date_end))
+	if (!empty($line->date_start) || !empty($line->date_end))
 	{
-		$format='day';
+		$format = 'day';
 		// Show duration if exists
 		if ($line->date_start && $line->date_end)
 		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($line->date_start, $format, false, $outputlangs),dol_print_date($line->date_end, $format, false, $outputlangs)).')';
+			$period = '('.$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($line->date_start, $format, false, $outputlangs), dol_print_date($line->date_end, $format, false, $outputlangs)).')';
 		}
-		if ($line->date_start && ! $line->date_end)
+		if ($line->date_start && !$line->date_end)
 		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($line->date_start, $format, false, $outputlangs)).')';
+			$period = '('.$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($line->date_start, $format, false, $outputlangs)).')';
 		}
-		if (! $line->date_start && $line->date_end)
+		if (!$line->date_start && $line->date_end)
 		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($line->date_end, $format, false, $outputlangs)).')';
+			$period = '('.$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($line->date_end, $format, false, $outputlangs)).')';
 		}
 		//print '>'.$outputlangs->charset_output.','.$period;
-		$libelleproduitservice=dol_concatdesc($libelleproduitservice, $period);
+		$libelleproduitservice = dol_concatdesc($libelleproduitservice, $period);
 		//print $libelleproduitservice;
 	}
 

dolibarr/htdocs/core/lib/tax.lib.php

Spacing +381 added lines, -381 removed lines

@@ -50,16 +50,16 @@ 
     // 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,'tax');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->tax->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->tax->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.'/compta/sociales/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] = 'documents';
 	$h++;
 
@@ -68,7 +68,7 @@ 
     $head[$h][2] = 'info';
     $h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'tax','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove');
 
     return $head;
 }
@@ -88,136 +88,136 @@ 
  *  @param  int		$q           	Quarter
  *  @return array       			Array with details of VATs (per third parties), -1 if no accountancy module, -2 if not yet developped, -3 if error
  */
-function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $direction, $m=0, $q=0)
+function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $direction, $m = 0, $q = 0)
 {
     global $conf;
 
     // If we use date_start and date_end, we must not use $y, $m, $q
-    if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
+    if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
     {
     	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
     }
 
-    $list=array();
+    $list = array();
     if ($direction == 'sell')
     {
-    	$invoicetable='facture';
-    	$invoicedettable='facturedet';
-    	$fk_facture='fk_facture';
-    	$fk_facture2='fk_facture';
-    	$fk_payment='fk_paiement';
-    	$total_tva='total_tva';
-    	$paymenttable='paiement';
-    	$paymentfacturetable='paiement_facture';
-    	$invoicefieldref='ref';
+    	$invoicetable = 'facture';
+    	$invoicedettable = 'facturedet';
+    	$fk_facture = 'fk_facture';
+    	$fk_facture2 = 'fk_facture';
+    	$fk_payment = 'fk_paiement';
+    	$total_tva = 'total_tva';
+    	$paymenttable = 'paiement';
+    	$paymentfacturetable = 'paiement_facture';
+    	$invoicefieldref = 'ref';
     }
     if ($direction == 'buy')
     {
-    	$invoicetable='facture_fourn';
-    	$invoicedettable='facture_fourn_det';
-    	$fk_facture='fk_facture_fourn';
-    	$fk_facture2='fk_facturefourn';
-    	$fk_payment='fk_paiementfourn';
-    	$total_tva='tva';
-    	$paymenttable='paiementfourn';
-    	$paymentfacturetable='paiementfourn_facturefourn';
-    	$invoicefieldref='ref';
+    	$invoicetable = 'facture_fourn';
+    	$invoicedettable = 'facture_fourn_det';
+    	$fk_facture = 'fk_facture_fourn';
+    	$fk_facture2 = 'fk_facturefourn';
+    	$fk_payment = 'fk_paiementfourn';
+    	$total_tva = 'tva';
+    	$paymenttable = 'paiementfourn';
+    	$paymentfacturetable = 'paiementfourn_facturefourn';
+    	$invoicefieldref = 'ref';
     }
 
-    if ( strpos( $type, 'localtax' ) === 0 ) {
-    	$f_rate = $type . '_tx';
+    if (strpos($type, 'localtax') === 0) {
+    	$f_rate = $type.'_tx';
     } else {
     	$f_rate = 'tva_tx';
     }
 
-    $total_localtax1='total_localtax1';
-    $total_localtax2='total_localtax2';
+    $total_localtax1 = 'total_localtax1';
+    $total_localtax2 = 'total_localtax2';
 
 
     // CAS DES BIENS/PRODUITS
 
     // Define sql request
-    $sql='';
+    $sql = '';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
     	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
     {
     	// Count on delivery date (use invoice date as delivery is unknown)
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " 0 as payment_id, 0 as payment_amount";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+    	$sql .= " 0 as payment_id, 0 as payment_amount";
+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+    	$sql .= " WHERE f.entity = ".$conf->entity;
+    	$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+    	else $sql .= " AND f.type IN (0,1,2,3,5)";
+    	$sql .= " AND f.rowid = d.".$fk_facture;
+    	$sql .= " AND s.rowid = f.fk_soc";
     	if ($y && $m)
     	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
     	}
     	else if ($y)
     	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
     	}
-    	if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 0";                              // Limit to products
-    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture;
+    	if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+    	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+    	$sql .= " AND (d.product_type = 0"; // Limit to products
+    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql.= " pa.datep as datep";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql.= " AND pa.rowid = pf.".$fk_payment;
+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+    	$sql .= " pa.datep as datep";
+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+    	$sql .= " WHERE f.entity = ".$conf->entity;
+    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+    	else $sql .= " AND f.type IN (0,1,2,3,5)";
+    	$sql .= " AND f.rowid = d.".$fk_facture;
+    	$sql .= " AND s.rowid = f.fk_soc";
+    	$sql .= " AND pf.".$fk_facture2." = f.rowid";
+    	$sql .= " AND pa.rowid = pf.".$fk_payment;
     	if ($y && $m)
     	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
     	}
     	else if ($y)
     	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
     	}
-    	if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 0";                              // Limit to products
-    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+    	$sql .= " AND (d.product_type = 0"; // Limit to products
+    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
-    if (! $sql) return -1;
+    if (!$sql) return -1;
     if ($sql == 'TODO') return -2;
     if ($sql != 'TODO')
     {
@@ -227,17 +227,17 @@ 
     	if ($resql)
     	{
     		$company_id = -1;
-    		$oldrowid='';
-    		while($assoc = $db->fetch_array($resql))
+    		$oldrowid = '';
+    		while ($assoc = $db->fetch_array($resql))
     		{
-    			if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
-    			if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
-    			if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
-    			if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
+    			if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
+    			if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
+    			if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
+    			if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
 
     			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
     			{
-    				$oldrowid=$assoc['rowid'];
+    				$oldrowid = $assoc['rowid'];
     				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
     				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
     				$list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];
@@ -262,7 +262,7 @@ 
     			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
     			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
     			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    			$list[$assoc['company_id']]['localtax2_list'][]  = $assoc['total_localtax2'];
+    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
 
     			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
     			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
@@ -285,90 +285,90 @@ 
     // CAS DES SERVICES
 
     // Define sql request
-    $sql='';
+    $sql = '';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
     	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
     {
     	// Count on invoice date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " 0 as payment_id, 0 as payment_amount";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+    	$sql .= " 0 as payment_id, 0 as payment_amount";
+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+    	$sql .= " WHERE f.entity = ".$conf->entity;
+    	$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+    	else $sql .= " AND f.type IN (0,1,2,3,5)";
+    	$sql .= " AND f.rowid = d.".$fk_facture;
+    	$sql .= " AND s.rowid = f.fk_soc";
     	if ($y && $m)
     	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
     	}
     	else if ($y)
     	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
     	}
-    	if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 1";                              // Limit to services
-    	$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture;
+    	if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+    	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+    	$sql .= " AND (d.product_type = 1"; // Limit to services
+    	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql.= " pa.datep as datep";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql.= " AND pa.rowid = pf.".$fk_payment;
+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+    	$sql .= " pa.datep as datep";
+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+    	$sql .= " WHERE f.entity = ".$conf->entity;
+    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+    	else $sql .= " AND f.type IN (0,1,2,3,5)";
+    	$sql .= " AND f.rowid = d.".$fk_facture;
+    	$sql .= " AND s.rowid = f.fk_soc";
+    	$sql .= " AND pf.".$fk_facture2." = f.rowid";
+    	$sql .= " AND pa.rowid = pf.".$fk_payment;
     	if ($y && $m)
     	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
     	}
     	else if ($y)
     	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
     	}
-    	if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 1";                              		// Limit to services
-    	$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+    	$sql .= " AND (d.product_type = 1"; // Limit to services
+    	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
-    if (! $sql)
+    if (!$sql)
     {
-    	dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-    	return -1;  // -1 = Not accountancy module enabled
+    	dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+    	return -1; // -1 = Not accountancy module enabled
     }
     if ($sql == 'TODO') return -2; // -2 = Feature not yet available
     if ($sql != 'TODO')
@@ -378,17 +378,17 @@ 
     	if ($resql)
     	{
     		$company_id = -1;
-    		$oldrowid='';
-    		while($assoc = $db->fetch_array($resql))
+    		$oldrowid = '';
+    		while ($assoc = $db->fetch_array($resql))
     		{
-    			if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
-    			if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
-    			if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
-    			if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
+    			if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
+    			if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
+    			if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
+    			if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
 
     			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
     			{
-    				$oldrowid=$assoc['rowid'];
+    				$oldrowid = $assoc['rowid'];
     				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
     				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
     				$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
@@ -438,40 +438,40 @@ 
     if ($direction == 'buy')		// buy only for expense reports
     {
     	// Define sql request
-    	$sql='';
+    	$sql = '';
 
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
-    	$sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
-    	$sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
-    	$sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
-    	$sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
-    	$sql.= " WHERE e.entity = " . $conf->entity;
-    	$sql.= " AND e.fk_statut in (6)";
+    	$sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+    	$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+    	$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+    	$sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+    	$sql .= " WHERE e.entity = ".$conf->entity;
+    	$sql .= " AND e.fk_statut in (6)";
     	if ($y && $m)
     	{
-    		$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+    		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
     	}
     	else if ($y)
     	{
-    		$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+    		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
     	}
-    	if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = -1";
-    	$sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
-    	$sql.= " ORDER BY e.rowid";
-
-    	if (! $sql)
+    	if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+    	if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+    	$sql .= " AND (d.product_type = -1";
+    	$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+    	$sql .= " ORDER BY e.rowid";
+
+    	if (!$sql)
     	{
-    		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-    		return -1;  // -1 = Not accountancy module enabled
+    		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+    		return -1; // -1 = Not accountancy module enabled
     	}
     	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
     	if ($sql != 'TODO')
@@ -481,18 +481,18 @@ 
     		if ($resql)
     		{
     			$company_id = -1;
-    			$oldrowid='';
-    			while($assoc = $db->fetch_array($resql))
+    			$oldrowid = '';
+    			while ($assoc = $db->fetch_array($resql))
     			{
-    				if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
-    				if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
-    				if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
-    				if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
+    				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
+    				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
+    				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
+    				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
 
     				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
     				{
-    					$oldrowid=$assoc['rowid'];
-    					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+    					$oldrowid = $assoc['rowid'];
+    					$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
     					$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
     					$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
     					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
@@ -556,137 +556,137 @@ 
  *  @param  int		$m           	Month
  *  @return array       			Array with details of VATs (per rate), -1 if no accountancy module, -2 if not yet developped, -3 if error
  */
-function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $direction, $m=0)
+function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $direction, $m = 0)
 {
     global $conf;
 
     // If we use date_start and date_end, we must not use $y, $m, $q
-    if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
+    if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
     {
     	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
     }
 
-    $list=array();
+    $list = array();
 
     if ($direction == 'sell')
     {
-        $invoicetable='facture';
-        $invoicedettable='facturedet';
-        $fk_facture='fk_facture';
-        $fk_facture2='fk_facture';
-        $fk_payment='fk_paiement';
-        $total_tva='total_tva';
-        $paymenttable='paiement';
-        $paymentfacturetable='paiement_facture';
-        $invoicefieldref='ref';
+        $invoicetable = 'facture';
+        $invoicedettable = 'facturedet';
+        $fk_facture = 'fk_facture';
+        $fk_facture2 = 'fk_facture';
+        $fk_payment = 'fk_paiement';
+        $total_tva = 'total_tva';
+        $paymenttable = 'paiement';
+        $paymentfacturetable = 'paiement_facture';
+        $invoicefieldref = 'ref';
     }
     else
     {
-        $invoicetable='facture_fourn';
-        $invoicedettable='facture_fourn_det';
-        $fk_facture='fk_facture_fourn';
-        $fk_facture2='fk_facturefourn';
-        $fk_payment='fk_paiementfourn';
-        $total_tva='tva';
-        $paymenttable='paiementfourn';
-        $paymentfacturetable='paiementfourn_facturefourn';
-        $invoicefieldref='ref';
+        $invoicetable = 'facture_fourn';
+        $invoicedettable = 'facture_fourn_det';
+        $fk_facture = 'fk_facture_fourn';
+        $fk_facture2 = 'fk_facturefourn';
+        $fk_payment = 'fk_paiementfourn';
+        $total_tva = 'tva';
+        $paymenttable = 'paiementfourn';
+        $paymentfacturetable = 'paiementfourn_facturefourn';
+        $invoicefieldref = 'ref';
     }
 
-	if ( strpos( $type, 'localtax' ) === 0 ) {
-		$f_rate = $type . '_tx';
+	if (strpos($type, 'localtax') === 0) {
+		$f_rate = $type.'_tx';
 	} else {
 		$f_rate = 'tva_tx';
 	}
 
-	$total_localtax1='total_localtax1';
-	$total_localtax2='total_localtax2';
+	$total_localtax1 = 'total_localtax1';
+	$total_localtax2 = 'total_localtax2';
 
 
     // CAS DES BIENS/PRODUITS
 
     // Define sql request
-    $sql='';
+    $sql = '';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
     	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
     {
         // Count on delivery date (use invoice date as delivery is unknown)
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-        $sql.= " d.date_start as date_start, d.date_end as date_end,";
-        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-        $sql.= " 0 as payment_id, 0 as payment_amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
-        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-        $sql.= " WHERE f.entity = " . $conf->entity;
-        $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-        else $sql.= " AND f.type IN (0,1,2,3,5)";
-        $sql.= " AND f.rowid = d.".$fk_facture;
-        $sql.= " AND s.rowid = f.fk_soc";
+        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql .= " d.date_start as date_start, d.date_end as date_end,";
+        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql .= " 0 as payment_id, 0 as payment_amount";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql .= " WHERE f.entity = ".$conf->entity;
+        $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+        else $sql .= " AND f.type IN (0,1,2,3,5)";
+        $sql .= " AND f.rowid = d.".$fk_facture;
+        $sql .= " AND s.rowid = f.fk_soc";
         if ($y && $m)
         {
-            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
         }
         else if ($y)
         {
-            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
         }
-        if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-        $sql.= " AND (d.product_type = 0";                              // Limit to products
-        $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-        $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+        if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+        if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+        $sql .= " AND (d.product_type = 0"; // Limit to products
+        $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql .= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql.= " pa.datep as datep";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql.= " AND pa.rowid = pf.".$fk_payment;
+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+    	$sql .= " pa.datep as datep";
+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+    	$sql .= " WHERE f.entity = ".$conf->entity;
+    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+    	else $sql .= " AND f.type IN (0,1,2,3,5)";
+    	$sql .= " AND f.rowid = d.".$fk_facture;
+    	$sql .= " AND s.rowid = f.fk_soc";
+    	$sql .= " AND pf.".$fk_facture2." = f.rowid";
+    	$sql .= " AND pa.rowid = pf.".$fk_payment;
     	if ($y && $m)
     	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
     	}
     	else if ($y)
     	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
     	}
-    	if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 0";                              // Limit to products
-    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+    	$sql .= " AND (d.product_type = 0"; // Limit to products
+    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
-    if (! $sql) return -1;
+    if (!$sql) return -1;
     if ($sql == 'TODO') return -2;
     if ($sql != 'TODO')
     {
@@ -696,18 +696,18 @@ 
         if ($resql)
         {
             $rate = -1;
-            $oldrowid='';
-            while($assoc = $db->fetch_array($resql))
+            $oldrowid = '';
+            while ($assoc = $db->fetch_array($resql))
             {
             	// Code to avoid warnings when array entry not defined
-            	if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
-                if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
-                if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
-                if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
+            	if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
+                if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
+                if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
+                if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
 
                 if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
                 {
-                    $oldrowid=$assoc['rowid'];
+                    $oldrowid = $assoc['rowid'];
                     $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
                     $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
                     $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
@@ -754,90 +754,90 @@ 
     // CAS DES SERVICES
 
     // Define sql request
-    $sql='';
+    $sql = '';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
     	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
     {
         // Count on invoice date
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-        $sql.= " d.date_start as date_start, d.date_end as date_end,";
-        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-        $sql.= " 0 as payment_id, 0 as payment_amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
-        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-        $sql.= " WHERE f.entity = " . $conf->entity;
-        $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-		else $sql.= " AND f.type IN (0,1,2,3,5)";
-        $sql.= " AND f.rowid = d.".$fk_facture;
-        $sql.= " AND s.rowid = f.fk_soc";
+        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql .= " d.date_start as date_start, d.date_end as date_end,";
+        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql .= " 0 as payment_id, 0 as payment_amount";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql .= " WHERE f.entity = ".$conf->entity;
+        $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+        $sql .= " AND f.rowid = d.".$fk_facture;
+        $sql .= " AND s.rowid = f.fk_soc";
         if ($y && $m)
         {
-            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
         }
         else if ($y)
         {
-            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
         }
-        if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-        $sql.= " AND (d.product_type = 1";                              // Limit to services
-        $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-        $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+        if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+        if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+        $sql .= " AND (d.product_type = 1"; // Limit to services
+        $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql .= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
         // Count on payments date
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-        $sql.= " d.date_start as date_start, d.date_end as date_end,";
-        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-        $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-        $sql.= " pa.datep as datep";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-        $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
-        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-        $sql.= " WHERE f.entity = " . $conf->entity;
-        $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-		else $sql.= " AND f.type IN (0,1,2,3,5)";
-        $sql.= " AND f.rowid = d.".$fk_facture;
-        $sql.= " AND s.rowid = f.fk_soc";
-        $sql.= " AND pf.".$fk_facture2." = f.rowid";
-        $sql.= " AND pa.rowid = pf.".$fk_payment;
+        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql .= " d.date_start as date_start, d.date_end as date_end,";
+        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+        $sql .= " pa.datep as datep";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+        $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+        $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql .= " WHERE f.entity = ".$conf->entity;
+        $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+        $sql .= " AND f.rowid = d.".$fk_facture;
+        $sql .= " AND s.rowid = f.fk_soc";
+        $sql .= " AND pf.".$fk_facture2." = f.rowid";
+        $sql .= " AND pa.rowid = pf.".$fk_payment;
         if ($y && $m)
         {
-            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+            $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+            $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
         }
         else if ($y)
         {
-            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+            $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+            $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
         }
-        if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
-        if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-        $sql.= " AND (d.product_type = 1";                              		// Limit to services
-        $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-        $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+        if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+        if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+        $sql .= " AND (d.product_type = 1"; // Limit to services
+        $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
-    if (! $sql)
+    if (!$sql)
     {
-        dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-        return -1;  // -1 = Not accountancy module enabled
+        dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+        return -1; // -1 = Not accountancy module enabled
     }
     if ($sql == 'TODO') return -2; // -2 = Feature not yet available
     if ($sql != 'TODO')
@@ -847,18 +847,18 @@ 
         if ($resql)
         {
             $rate = -1;
-            $oldrowid='';
-            while($assoc = $db->fetch_array($resql))
+            $oldrowid = '';
+            while ($assoc = $db->fetch_array($resql))
             {
             	// Code to avoid warnings when array entry not defined
-            	if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
-                if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
-				if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
-                if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
+            	if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
+                if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
+				if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
+                if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
 
                 if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
                 {
-                    $oldrowid=$assoc['rowid'];
+                    $oldrowid = $assoc['rowid'];
                     $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
                     $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
                     $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
@@ -907,40 +907,40 @@ 
 	if ($direction == 'buy')		// buy only for expense reports
 	{
 		// Define sql request
-		$sql='';
+		$sql = '';
 
 		// Count on payments date
 		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
-		$sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
-		$sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
-		$sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
-		$sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
-		$sql.= " WHERE e.entity = " . $conf->entity;
-		$sql.= " AND e.fk_statut in (6)";
+		$sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+		$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+		$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+		$sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+		$sql .= " WHERE e.entity = ".$conf->entity;
+		$sql .= " AND e.fk_statut in (6)";
 		if ($y && $m)
 		{
-			$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-			$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
 		}
 		else if ($y)
 		{
-			$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-			$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")";
-		if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-		$sql.= " AND (d.product_type = -1";
-		$sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
-		if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
-		$sql.= " ORDER BY e.rowid";
-
-		if (! $sql)
+		if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = -1";
+		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
+		if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		$sql .= " ORDER BY e.rowid";
+
+		if (!$sql)
 		{
-			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-			return -1;  // -1 = Not accountancy module enabled
+			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+			return -1; // -1 = Not accountancy module enabled
 		}
 		if ($sql == 'TODO') return -2; // -2 = Feature not yet available
 		if ($sql != 'TODO')
@@ -950,20 +950,20 @@ 
 			if ($resql)
 			{
 				$rate = -1;
-				$oldrowid='';
-				while($assoc = $db->fetch_array($resql))
+				$oldrowid = '';
+				while ($assoc = $db->fetch_array($resql))
 				{
 					// Code to avoid warnings when array entry not defined
-					if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
-					if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
-					if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
-					if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
+					if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
+					if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
+					if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
+					if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
 
 					if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
 					{
-						$oldrowid=$assoc['rowid'];
+						$oldrowid = $assoc['rowid'];
 						$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-                        $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
+                        $list[$assoc['rate']]['vat'] += $assoc['total_vat'];
 						$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
 						$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
 					}