alxarafe / alixar

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

Braces +12 added lines, -4 removed lines

@@ -101,16 +101,24 @@
 	$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++;
 

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

Braces +3 added lines, -1 removed lines

@@ -54,7 +54,9 @@
     $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++;
 

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

Braces +12 added lines, -4 removed lines

@@ -85,16 +85,24 @@
     $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++;
 	

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

Braces +327 added lines, -132 removed lines

@@ -48,7 +48,9 @@ 
 	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) {
+	    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	}
 	$head[$h][2] = 'contact';
 	$h++;
 
@@ -61,7 +63,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic=new Task($db);
 		$nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		if ($nbTasks > 0) {
+		    $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		}
 		$head[$h][2] = 'tasks';
 		$h++;
 
@@ -76,13 +80,18 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $nbTimeSpent=1;
+			if ($obj) {
+			    $nbTimeSpent=1;
+			}
+		} else {
+		    dol_print_error($db);
 		}
-		else dol_print_error($db);
 
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?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++;
 	}
@@ -107,11 +116,17 @@ 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+		if(!empty($object->note_private)) {
+		    $nbNote++;
+		}
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'notes';
 		$h++;
 	}
@@ -123,7 +138,9 @@ 
 	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -133,7 +150,9 @@ 
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		}
 		$head[$h][2] = 'project_comment';
 		$h++;
 	}
@@ -174,7 +193,9 @@ 
 	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$head[$h][1] = $langs->trans("TaskRessourceLinks");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) {
+	    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	}
 	$head[$h][2] = 'task_contact';
 	$h++;
 
@@ -189,13 +210,18 @@ 
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $nbTimeSpent=1;
+		if ($obj) {
+		    $nbTimeSpent=1;
+		}
+	} else {
+	    dol_print_error($db);
 	}
-	else dol_print_error($db);
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$head[$h][1] = $langs->trans("TimeSpent");
-	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+	if ($nbTimeSpent > 0) {
+	    $head[$h][1].= ' <span class="badge">...</span>';
+	}
 	$head[$h][2] = 'task_time';
 	$h++;
 
@@ -208,11 +234,17 @@ 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+		if(!empty($object->note_private)) {
+		    $nbNote++;
+		}
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'task_notes';
 		$h++;
 	}
@@ -224,7 +256,9 @@ 
 	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
 	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'task_document';
 	$h++;
 
@@ -234,7 +268,9 @@ 
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		}
 		$head[$h][2] = 'task_comment';
 		$h++;
 	}
@@ -261,7 +297,9 @@ 
 
 	$param='';
 	$param.=($mode?'&mode='.$mode:'');
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) {
+	    $param.='&search_usertoprocessid='.$fuser->id;
+	}
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
 	{
@@ -380,15 +418,20 @@ 
 
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0 && $level >= 0) $level = 0;              // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($parent == 0 && $level >= 0) {
+		    $level = 0;
+		}
+		// if $level = -1, we dont' use sublevel recursion, we show all lines
 
 		// Process line
 		// print "i:".$i."-".$lines[$i]->fk_project.'<br>';
 
-		if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($lines[$i]->fk_parent == $parent || $level < 0) {
+		    // if $level = -1, we dont' use sublevel recursion, we show all lines
 		{
 			// Show task line.
 			$showline=1;
+		}
 			$showlineingray=0;
 
 			// If there is filters to use
@@ -404,14 +447,12 @@ 
 					if ($foundtaskforuserdeeper > 0)
 					{
 						$showlineingray=1;		// We will show line but in gray
-					}
-					else
+					} else
 					{
 						$showline=0;			// No reason to show line
 					}
 				}
-			}
-			else
+			} else
 			{
 				// Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
 				// or into all other projects if user has permission to).
@@ -448,8 +489,11 @@ 
 					$projectstatic->ref=$lines[$i]->projectref;
 					$projectstatic->public=$lines[$i]->public;
 					$projectstatic->title=$lines[$i]->projectlabel;
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
-					else print $projectstatic->getNomUrl(1,'nolink');
+					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) {
+					    print $projectstatic->getNomUrl(1);
+					} else {
+					    print $projectstatic->getNomUrl(1,'nolink');
+					}
 					//if ($showlineingray) print '</i>';
 					print "</td>";
 
@@ -465,8 +509,7 @@ 
 				if ($showlineingray)
 				{
 					print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
-				}
-				else
+				} else
 				{
 					$taskstatic->id=$lines[$i]->id;
 					$taskstatic->ref=$lines[$i]->ref;
@@ -477,14 +520,18 @@ 
 
 				// Title of task
 				print "<td>";
-				if ($showlineingray) print '<i>';
+				if ($showlineingray) {
+				    print '<i>';
+				}
 				//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
 				for ($k = 0 ; $k < $level ; $k++)
 				{
 					print "&nbsp; &nbsp; &nbsp;";
 				}
 				print $lines[$i]->label;
-				if ($showlineingray) print '</i>';
+				if ($showlineingray) {
+				    print '</i>';
+				}
 				//else print '</a>';
 				print "</td>\n";
 
@@ -500,13 +547,19 @@ 
 				$taskstatic->fk_statut = $lines[$i]->status;
 				$taskstatic->datee = $lines[$i]->date_end;
 				print dol_print_date($lines[$i]->date_end,'dayhour');
-				if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
+				if ($taskstatic->hasDelay()) {
+				    print img_warning($langs->trans("Late"));
+				}
 				print '</td>';
 
 				$plannedworkloadoutputformat='allhourmin';
 				$timespentoutputformat='allhourmin';
-				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) {
+				    $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+				}
+				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
+				    $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+				}
 
 				// Planned Workload (in working hours)
 				print '<td align="right">';
@@ -523,20 +576,32 @@ 
 
 				// Time spent
 				print '<td align="right">';
-				if ($showlineingray) print '<i>';
-				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
-				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
-				else print '--:--';
-				if ($showlineingray) print '</i>';
-				else print '</a>';
+				if ($showlineingray) {
+				    print '<i>';
+				} else {
+				    print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
+				}
+				if ($lines[$i]->duration) {
+				    print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
+				} else {
+				    print '--:--';
+				}
+				if ($showlineingray) {
+				    print '</i>';
+				} else {
+				    print '</a>';
+				}
 				print '</td>';
 
 				// Progress calculated (Note: ->duration is time spent)
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload || $lines[$i]->duration)
 				{
-					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
-					else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
+					if ($lines[$i]->planned_workload) {
+					    print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
+					} else {
+					    print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
+					}
 				}
 				print '</td>';
 
@@ -559,8 +624,11 @@ 
 						if (!empty($num)){
 							foreach ($tab as $contacttask){
 								//var_dump($contacttask);
-								if ($source == 'internal') $c = new User($db);
-								else $c = new Contact($db);
+								if ($source == 'internal') {
+								    $c = new User($db);
+								} else {
+								    $c = new Contact($db);
+								}
 								$c->fetch($contacttask['id']);
 								print $c->getNomUrl(1) . ' (' . $contacttask['libelle'] . ')' . '<br>';
 							}
@@ -577,21 +645,28 @@ 
 
 				print "</tr>\n";
 
-				if (! $showlineingray) $inc++;
+				if (! $showlineingray) {
+				    $inc++;
+				}
 
-				if ($level >= 0)    // Call sublevels
+				if ($level >= 0) {
+				    // Call sublevels
 				{
 					$level++;
-					if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
+				}
+					if ($lines[$i]->id) {
+					    projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
+					}
 					$level--;
 				}
 
 				$total_projectlinesa_spent += $lines[$i]->duration;
 				$total_projectlinesa_planned += $lines[$i]->planned_workload;
-				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
+				if ($lines[$i]->planned_workload) {
+				    $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
+				}
 			}
-		}
-		else
+		} else
 		{
 			//$level--;
 		}
@@ -601,7 +676,9 @@ 
 	{
 		print '<tr class="liste_total nodrag nodrop">';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
-		if ($showproject) print '<td></td><td></td>';
+		if ($showproject) {
+		    print '<td></td><td></td>';
+		}
 		print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';
@@ -609,12 +686,18 @@ 
 		print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+		if ($projectidfortotallink > 0) {
+		    print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+		}
 		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
-		if ($projectidfortotallink > 0) print '</a>';
+		if ($projectidfortotallink > 0) {
+		    print '</a>';
+		}
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+		if ($total_projectlinesa_planned) {
+		    print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+		}
 		print '</td>';
 		print '<td></td>';
 		// Contacts of task
@@ -622,7 +705,9 @@ 
 		{
 			print '<td></td>';
 		}
-		if ($addordertick) print '<td class="hideonsmartphone"></td>';
+		if ($addordertick) {
+		    print '<td class="hideonsmartphone"></td>';
+		}
 		print '</tr>';
 	}
 
@@ -660,11 +745,16 @@ 
 	$numlines=count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
+	if ($parent == 0) {
+	    // Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0 ;
+	}
+	$i < $numlines ; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) {
+			    $lineswithoutlevel0[]=$lines[$i];
+			}
 		}
 	}
 
@@ -676,7 +766,9 @@ 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0) $level = 0;
+		if ($parent == 0) {
+		    $level = 0;
+		}
 
 		//if ($lines[$i]->fk_task_parent == $parent)
 		//{
@@ -733,7 +825,9 @@ 
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+				    $oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven">'."\n";
 
@@ -755,17 +849,23 @@ 
 
 				// Thirdparty
 				print '<td class="tdoverflowmax100">';
-				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+				if ($thirdpartystatic->id > 0) {
+				    print $thirdpartystatic->getNomUrl(1, 'project', 10);
+				}
 				print '</td>';
 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+				    print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+				    print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -799,9 +899,13 @@ 
 				print '</td>';
 
 				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon']) {
+				    $cssonholiday.='onholidayallday ';
+				} elseif (! $isavailable[$preselectedday]['morning']) {
+				    $cssonholiday.='onholidaymorning ';
+				} elseif (! $isavailable[$preselectedday]['afternoon']) {
+				    $cssonholiday.='onholidayafternoon ';
+				}
 
 				// Duration
 				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
@@ -810,7 +914,9 @@ 
 				$totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
 
 				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				if ($dayWorkLoad > 0) {
+				    $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+				}
 
 				print convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
 
@@ -886,11 +992,16 @@ 
 	$numlines=count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
+	if ($parent == 0) {
+	    // Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0 ;
+	}
+	$i < $numlines ; $i++)
 		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+			if ($lines[$i]->fk_task_parent) {
+			    $lineswithoutlevel0[]=$lines[$i];
+			}
 		}
 	}
 
@@ -902,7 +1013,9 @@ 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0) $level = 0;
+		if ($parent == 0) {
+		    $level = 0;
+		}
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
@@ -911,10 +1024,12 @@ 
 			{
 				//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);
 
-				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases
+				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id])) {
+				    // we have no role on task and we request to hide such cases
 				{
 					continue;
 				}
+				}
 
 				// Break on a new project
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
@@ -955,7 +1070,9 @@ 
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="9">';
 					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
+					if ($thirdpartystatic->id > 0) {
+					    print ' - '.$thirdpartystatic->getNomUrl(1);
+					}
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -965,7 +1082,9 @@ 
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+				    $oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven">'."\n";
 
@@ -989,11 +1108,15 @@ 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+				    print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+				    print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->label;
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -1002,8 +1125,11 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
+				if ($lines[$i]->planned_workload) {
+				    print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				} else {
+				    print '--:--';
+				}
 				print '</td>';
 
 				// Progress declared %
@@ -1019,15 +1145,19 @@ 
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration,'allhourmin');
 					print '</a>';
+				} else {
+				    print '--:--';
 				}
-				else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
 				print '<td align="right">';
 				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
-				else print '--:--';
+				if ($tmptimespent['total_duration']) {
+				    print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				} else {
+				    print '--:--';
+				}
 				print "</td>\n";
 
 				$disabledproject=1;$disabledtask=1;
@@ -1053,9 +1183,13 @@ 
 				print '</td>';
 
 				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon']) {
+				    $cssonholiday.='onholidayallday ';
+				} elseif (! $isavailable[$preselectedday]['morning']) {
+				    $cssonholiday.='onholidaymorning ';
+				} elseif (! $isavailable[$preselectedday]['afternoon']) {
+				    $cssonholiday.='onholidayafternoon ';
+				}
 
 				global $daytoparse;
 				$tmparray = dol_getdate($daytoparse,true);	// detail of current day
@@ -1063,10 +1197,12 @@ 
 
 				global $numstartworkingday, $numendworkingday;
 				$cssweekend='';
-				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday) {
+				    // This is a day is not inside the setup of working days, so we use a week-end css.
 				{
 					$cssweekend='weekend';
 				}
+				}
 
 				// Duration
 				print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
@@ -1074,7 +1210,9 @@ 
 				$totalforeachday[$preselectedday]+=$dayWorkLoad;
 
 				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+				if ($dayWorkLoad > 0) {
+				    $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+				}
 
 				$idw = 0;
 
@@ -1104,11 +1242,14 @@ 
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
+   				if ((! $lines[$i]->public) && $disabledproject) {
+   				    print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				} else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					if ($fuser->id != $user->id) {
+   					    $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					}
 
    					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
@@ -1134,8 +1275,7 @@ 
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
+		} else
 		{
 			//$level--;
 		}
@@ -1175,11 +1315,16 @@ 
 	$lineswithoutlevel0=array();
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
+	if ($parent == 0) {
+	    // Always and only if at first level
 	{
-		for ($i = 0 ; $i < $numlines ; $i++)
+		for ($i = 0 ;
+	}
+	$i < $numlines ; $i++)
 		{
-		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+		   if ($lines[$i]->fk_task_parent) {
+		       $lineswithoutlevel0[]=$lines[$i];
+		   }
 		}
 	}
 
@@ -1192,7 +1337,9 @@ 
 
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
-		if ($parent == 0) $level = 0;
+		if ($parent == 0) {
+		    $level = 0;
+		}
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
@@ -1201,10 +1348,12 @@ 
 			{
 				//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);
 
-				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases
+				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id])) {
+				    // we have no role on task and we request to hide such cases
 				{
 					continue;
 				}
+				}
 
 				// Break on a new project
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
@@ -1244,7 +1393,9 @@ 
 					print '<tr class="oddeven trforbreak">'."\n";
 					print '<td colspan="13">';
 					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
+					if ($thirdpartystatic->id > 0) {
+					    print ' - '.$thirdpartystatic->getNomUrl(1);
+					}
 					if ($projectstatic->title)
 					{
 						print ' - ';
@@ -1254,7 +1405,9 @@ 
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+				    $oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven">'."\n";
 
@@ -1278,11 +1431,15 @@ 
 				// Ref
 				print '<td class="nowrap">';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+				    print "&nbsp;&nbsp;&nbsp;";
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0 ; $k < $level ; $k++) {
+				    print "&nbsp;&nbsp;&nbsp;";
+				}
 				//print $taskstatic->getNomUrl(0, 'withproject', 'time');
 				print $taskstatic->label;
 				//print "<br>";
@@ -1292,8 +1449,11 @@ 
 
 				// Planned Workload
 				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
+				if ($lines[$i]->planned_workload) {
+				    print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				} else {
+				    print '--:--';
+				}
 				print '</td>';
 
 				// Progress declared %
@@ -1309,15 +1469,19 @@ 
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration,'allhourmin');
 					print '</a>';
+				} else {
+				    print '--:--';
 				}
-				else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
 				print '<td align="right">';
 				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
-				else print '--:--';
+				if ($tmptimespent['total_duration']) {
+				    print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				} else {
+				    print '--:--';
+				}
 				print "</td>\n";
 
 				$disabledproject=1;$disabledtask=1;
@@ -1345,24 +1509,32 @@ 
 					$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
 					$cssonholiday='';
-					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon'])   $cssonholiday.='onholidayallday ';
-					elseif (! $isavailable[$tmpday]['morning'])   $cssonholiday.='onholidaymorning ';
-					elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon']) {
+					    $cssonholiday.='onholidayallday ';
+					} elseif (! $isavailable[$tmpday]['morning']) {
+					    $cssonholiday.='onholidaymorning ';
+					} elseif (! $isavailable[$tmpday]['afternoon']) {
+					    $cssonholiday.='onholidayafternoon ';
+					}
 
 					$tmparray=dol_getdate($tmpday);
 					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
 					$totalforeachday[$tmpday]+=$dayWorkLoad;
 
 					$alreadyspent='';
-					if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+					if ($dayWorkLoad > 0) {
+					    $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+					}
 					$alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
 
 					global $numstartworkingday, $numendworkingday;
 					$cssweekend='';
-					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday) {
+					    // This is a day is not inside the setup of working days, so we use a week-end css.
 					{
 						$cssweekend='weekend';
 					}
+					}
 
 					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
 					$placeholder='';
@@ -1382,11 +1554,14 @@ 
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
+   				if ((! $lines[$i]->public) && $disabledproject) {
+   				    print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				} else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					if ($fuser->id != $user->id) {
+   					    $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+   					}
 
    					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
@@ -1413,8 +1588,7 @@ 
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
+		} else
 		{
 			//$level--;
 		}
@@ -1453,7 +1627,9 @@ 
 			searchTaskInChild($inc, $lines[$i]->id, $lines, $taskrole);
 			//print 'Found inc='.$inc.'<br>';
 
-			if ($inc > 0) return $inc;
+			if ($inc > 0) {
+			    return $inc;
+			}
 		}
 	}
 
@@ -1487,7 +1663,9 @@ 
 	$project_year_filter=0;
 
 	$title=$langs->trans("Projects");
-	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+	if (strcmp($statut, '') && $statut >= 0) {
+	    $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+	}
 
 	$arrayidtypeofcontact=array();
 
@@ -1500,14 +1678,15 @@ 
 		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
 		$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-	}
-	else
+	} else
 	{
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
 	$sql.= " WHERE p.entity IN (".getEntity('project').")";
 	$sql.= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	if ($socid) {
+	    $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	}
 	if ($mytasks)
 	{
 		$sql.= " AND p.rowid = t.fk_projet";
@@ -1550,9 +1729,12 @@ 
 			$arrayidofprojects[$objp->projectid]=$objp->projectid;
 			$i++;
 		}
+	} else {
+	    dol_print_error($db);
+	}
+	if (empty($arrayidofprojects)) {
+	    $arrayidofprojects[0]=-1;
 	}
-	else dol_print_error($db);
-	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
 
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
@@ -1586,8 +1768,12 @@ 
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
 			print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+			if (! in_array('plannedworkload', $hiddenfields)) {
+			    print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
+			}
+			if (! in_array('declaredprogress', $hiddenfields)) {
+			    print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+			}
 		}
 		print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
 		print "</tr>\n";
@@ -1616,7 +1802,9 @@ 
 				print '<tr class="oddeven">';
 				print '<td>';
 				print $projectstatic->getNomUrl(1);
-				if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
+				if (! in_array('projectlabel', $hiddenfields)) {
+				    print '<br>'.dol_trunc($objp->title,24);
+				}
 				print '</td>';
 				print '<td>';
 				if ($objp->fk_soc > 0)
@@ -1630,11 +1818,15 @@ 
 				if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 				{
 					print '<td align="right">';
-					if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
+					if ($objp->opp_amount) {
+					    print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
+					}
 					print '</td>';
 					print '<td align="right">';
 					$code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
-					if ($code) print $langs->trans("OppStatus".$code);
+					if ($code) {
+					    print $langs->trans("OppStatus".$code);
+					}
 					print '</td>';
 				}
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
@@ -1679,15 +1871,18 @@ 
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
 			print '<td class="liste_total" align="right">'.$total_task.'</td>';
-			if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
-			if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+			if (! in_array('plannedworkload', $hiddenfields)) {
+			    print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
+			}
+			if (! in_array('declaredprogress', $hiddenfields)) {
+			    print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+			}
 		}
 		print '<td class="liste_total"></td>';
 		print '</tr>';
 
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}

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

Braces +60 added lines, -27 removed lines

@@ -50,11 +50,12 @@ 
 	dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
 
 	$num=0;
-	if (is_object($elements))	// Count number of properties for an object
+	if (is_object($elements)) {
+	    // Count number of properties for an object
 	{
 		foreach($elements as $key => $value) $num++;
 	}
-	else
+	} else
 	{
 	    $num=count($elements);
 	}
@@ -68,28 +69,43 @@ 
 		$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]]);
-			else $output .= _val($elements[$keysofelements[$i]]);
-			if ($i !== $last) $output.= ',';
+			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.= ',';
+			}
 		}
 		$output.= ']';
-	}
-	else
+	} else
 	{
 		// associative (object)
 		$output = '{';
 		$last = $num - 1;
 		$i = 0;
 		$tmpelements=array();
-		if (is_array($elements)) $tmpelements=$elements;
-		if (is_object($elements)) $tmpelements=get_object_vars($elements);
+		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);
-			else $output .= _val($value);
-			if ($i !== $last) $output.= ',';
+			if (is_array($value)) {
+			    $output.= json_encode($value);
+			} else {
+			    $output .= _val($value);
+			}
+			if ($i !== $last) {
+			    $output.= ',';
+			}
 			++$i;
 		}
 		$output.= '}';
@@ -198,12 +214,16 @@ 
 	    }
 
 	    return '"'.$ascii.'"';
+	} elseif (is_int($val)) {
+	    return sprintf('%d', $val);
+	} elseif (is_float($val)) {
+	    return sprintf('%F', $val);
+	} elseif (is_bool($val)) {
+	    return ($val ? 'true' : 'false');
+	} else {
+	    return 'null';
+	}
 	}
-	elseif (is_int($val)) return sprintf('%d', $val);
-	elseif (is_float($val)) return sprintf('%F', $val);
-	elseif (is_bool($val)) return ($val ? 'true' : 'false');
-	else  return 'null';
-}
 
 if (! function_exists('json_decode'))
 {
@@ -241,20 +261,31 @@ 
 	{
 		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);
 
 	// Return an array
-	if ($out != '') eval('$array = '.$out.';');
-	else $array=array();
+	if ($out != '') {
+	    eval('$array = '.$out.';');
+	} else {
+	    $array=array();
+	}
 
 	// Return an object
 	if (! $assoc)
@@ -267,7 +298,9 @@ 
 			}
 			foreach ($array as $key => $value)
 			{
-				if ($key) $object->{$key} = $value;
+				if ($key) {
+				    $object->{$key} = $value;
+				}
 			}
 
 			return $object;

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

Braces +37 added lines, -22 removed lines

@@ -48,8 +48,11 @@ 
 	$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);
+	if ($issupplierline) {
+	    $prodser = new ProductFournisseur($db);
+	} else {
+	    $prodser = new Product($db);
+	}
 
 	if ($idprod)
 	{
@@ -57,9 +60,15 @@ 
 		// 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($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"];
+			}
 		}
 	}
 
@@ -75,35 +84,34 @@ 
 			$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);
-		}
-		elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
+		} elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
 		{
 		    $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);
 		    // Add date of deposit
-		    if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
-		}
-		elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
+		    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->fetch($line->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
+		} elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
-		}
-		else
+		} else
 		{
 			if ($idprod)
 			{
-				if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
-			}
-			else
+				if (empty($hidedesc)) {
+				    $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
+				}
+			} else
 			{
 				$libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
 			}
@@ -118,13 +126,14 @@ 
 		{
 			$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())
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-				}
-				else
+			}
+				} else
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 				}
@@ -132,8 +141,14 @@ 
 
 			if (empty($hideref))
 			{
-				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
+				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 .= " - ";
 			}

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

Braces +278 added lines, -129 removed lines

@@ -59,7 +59,9 @@ 
     $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++;
 
@@ -154,28 +156,35 @@ 
     	$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)";
+    	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))."'";
-    	}
-    	else if ($y)
+    	} 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))."'";
     	}
-    	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)."'";
+    	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)";
+    	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
+    } 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,";
@@ -193,8 +202,11 @@ 
     	$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)";
+    	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";
@@ -203,22 +215,31 @@ 
     	{
     		$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)
+    	} 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))."'";
     	}
-    	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)."'";
+    	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)";
+    	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 == 'TODO') return -2;
+    if (! $sql) {
+        return -1;
+    }
+    if ($sql == 'TODO') {
+        return -2;
+    }
     if ($sql != 'TODO')
     {
     	dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
@@ -230,14 +251,24 @@ 
     		$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
+    			if ($assoc['rowid'] != $oldrowid) {
+    			    // Si rupture sur d.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'];
@@ -273,8 +304,7 @@ 
 
     			$company_id = $assoc['company_id'];
     		}
-    	}
-    	else
+    	} else
     	{
     		dol_print_error($db);
     		return -3;
@@ -302,28 +332,35 @@ 
     	$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)";
+    	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))."'";
-    	}
-    	else if ($y)
+    	} 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))."'";
     	}
-    	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)."'";
+    	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)";
+    	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
+    } 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,";
@@ -341,8 +378,11 @@ 
     	$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)";
+    	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";
@@ -351,17 +391,22 @@ 
     	{
     		$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)
+    	} 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))."'";
     	}
-    	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)."'";
+    	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)";
+    	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";
     }
 
@@ -370,7 +415,10 @@ 
     	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') {
+        return -2;
+    }
+    // -2 = Feature not yet available
     if ($sql != 'TODO')
     {
     	dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
@@ -381,14 +429,24 @@ 
     		$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
+    			if ($assoc['rowid'] != $oldrowid) {
+    			    // Si rupture sur d.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'];
@@ -424,8 +482,7 @@ 
 
     			$company_id = $assoc['company_id'];
     		}
-    	}
-    	else
+    	} else
     	{
     		dol_print_error($db);
     		return -3;
@@ -435,10 +492,12 @@ 
 
     // CASE OF EXPENSE REPORT
 
-    if ($direction == 'buy')		// buy only for expense reports
+    if ($direction == 'buy') {
+        // buy only for expense reports
     {
     	// Define sql request
     	$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,";
@@ -455,17 +514,22 @@ 
     	{
     		$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)
+    	} 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))."'";
     	}
-    	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)."'";
+    	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)";
+    	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)
@@ -473,7 +537,10 @@ 
     		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') {
+    	    return -2;
+    	}
+    	// -2 = Feature not yet available
     	if ($sql != 'TODO')
     	{
     		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
@@ -484,14 +551,24 @@ 
     			$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
+    				if ($assoc['rowid'] != $oldrowid) {
+    				    // Si rupture sur d.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'];
@@ -528,8 +605,7 @@ 
 
     				$company_id = $assoc['company_id'];
     			}
-    		}
-    		else
+    		} else
     		{
     			dol_print_error($db);
     			return -3;
@@ -579,8 +655,7 @@ 
         $paymenttable='paiement';
         $paymentfacturetable='paiement_facture';
         $invoicefieldref='ref';
-    }
-    else
+    } else
     {
         $invoicetable='facture_fourn';
         $invoicedettable='facture_fourn_det';
@@ -623,28 +698,35 @@ 
         $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)";
+        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))."'";
-        }
-        else if ($y)
+        } 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))."'";
         }
-        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)."'";
+        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)";
+        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
+    } 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,";
@@ -662,8 +744,11 @@ 
     	$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)";
+    	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";
@@ -672,22 +757,31 @@ 
     	{
     		$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)
+    	} 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))."'";
     	}
-    	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)."'";
+    	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)";
+    	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 == 'TODO') return -2;
+    if (! $sql) {
+        return -1;
+    }
+    if ($sql == 'TODO') {
+        return -2;
+    }
     if ($sql != 'TODO')
     {
         dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
@@ -700,14 +794,24 @@ 
             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
+                if ($assoc['rowid'] != $oldrowid) {
+                    // Si rupture sur d.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'];
@@ -742,8 +846,7 @@ 
 
                 $rate = $assoc['rate'];
             }
-        }
-        else
+        } else
         {
             dol_print_error($db);
             return -3;
@@ -771,28 +874,35 @@ 
         $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)";
+        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))."'";
-        }
-        else if ($y)
+        } 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))."'";
         }
-        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)."'";
+        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)";
+        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
+    } 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,";
@@ -810,8 +920,11 @@ 
         $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)";
+        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";
@@ -820,17 +933,22 @@ 
         {
             $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)
+        } 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))."'";
         }
-        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)."'";
+        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)";
+        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";
     }
 
@@ -839,7 +957,10 @@ 
         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') {
+        return -2;
+    }
+    // -2 = Feature not yet available
     if ($sql != 'TODO')
     {
         dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
@@ -851,14 +972,24 @@ 
             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
+                if ($assoc['rowid'] != $oldrowid) {
+                    // Si rupture sur d.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'];
@@ -893,8 +1024,7 @@ 
 
                 $rate = $assoc['rate'];
             }
-        }
-        else
+        } else
         {
             dol_print_error($db);
             return -3;
@@ -904,10 +1034,12 @@ 
 
     // CASE OF EXPENSE REPORT
 
-	if ($direction == 'buy')		// buy only for expense reports
+	if ($direction == 'buy') {
+	    // buy only for expense reports
 	{
 		// Define sql request
 		$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,";
@@ -924,17 +1056,22 @@ 
 		{
 			$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)
+		} 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))."'";
 		}
-		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)."'";
+		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)";
+		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)
@@ -942,7 +1079,10 @@ 
 			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') {
+		    return -2;
+		}
+		// -2 = Feature not yet available
 		if ($sql != 'TODO')
 		{
 			dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
@@ -954,14 +1094,24 @@ 
 				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
+					if ($assoc['rowid'] != $oldrowid) {
+					    // Si rupture sur d.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'];
@@ -997,8 +1147,7 @@ 
 
 					$rate = $assoc['rate'];
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($db);
 				return -3;

dolibarr/htdocs/core/lib/ajax.lib.php

Braces +36 added lines, -14 removed lines

@@ -45,13 +45,19 @@ 
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
 {
-    if (empty($minLength)) $minLength=1;
+    if (empty($minLength)) {
+        $minLength=1;
+    }
 
     $dataforrenderITem='ui-autocomplete';
     $dataforitem='ui-autocomplete-item';
     // Allow two constant to use other values for backward compatibility
-    if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) $dataforrenderITem=constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');
-    if (defined('JS_QUERY_AUTOCOMPLETE_ITEM'))       $dataforitem=constant('JS_QUERY_AUTOCOMPLETE_ITEM');
+    if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) {
+        $dataforrenderITem=constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');
+    }
+    if (defined('JS_QUERY_AUTOCOMPLETE_ITEM')) {
+        $dataforitem=constant('JS_QUERY_AUTOCOMPLETE_ITEM');
+    }
 
     // Input search_htmlname is original field
     // Input htmlname is a second input field used when using ajax autocomplete.
@@ -377,13 +383,23 @@ 
 
 	// select2 disabled for smartphones with standard browser.
 	// TODO With select2 v4, it seems ok, except that responsive style on table become crazy when scrolling at end of array)
-	if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') return '';
+	if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') {
+	    return '';
+	}
 
-	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
-	if (empty($conf->use_javascript_ajax)) return '';
-	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
+	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) {
+	    return '';
+	}
+	if (empty($conf->use_javascript_ajax)) {
+	    return '';
+	}
+	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) {
+	    return '';
+	}
 
-	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0;
+	if (empty($minLengthToAutocomplete)) {
+	    $minLengthToAutocomplete=0;
+	}
 
     $tmpplugin='select2';
     $msg="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
@@ -410,10 +426,13 @@ 
 					},
 					dropdownCssClass: \'ui-dialog\'
 				})';
-	if ($forcefocus) $msg.= '.select2(\'focus\')';
+	if ($forcefocus) {
+	    $msg.= '.select2(\'focus\')';
+	}
 	$msg.= ';'."\n";
 
-	if (is_array($events) && count($events))    // If an array of js events to do were provided.
+	if (is_array($events) && count($events)) {
+	    // If an array of js events to do were provided.
 	{
 		$msg.= '
 			jQuery("#'.$htmlname.'").change(function () {
@@ -463,6 +482,7 @@ 
 				);
 			}';
 	}
+	}
 
 	$msg.= '});'."\n";
     $msg.= "</script>\n";
@@ -488,10 +508,12 @@ 
 
 	if (empty($conf->use_javascript_ajax))
 	{
-		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>';
-	}
-	else
+		if (empty($conf->global->$code)) {
+		    print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		} else {
+		    print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+		}
+	} else
 	{
 		$out= "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script type="text/javascript">

dolibarr/htdocs/core/lib/invoice2.lib.php

Braces +104 added lines, -46 removed lines

@@ -60,8 +60,11 @@ 
 	}
 	if (in_array('date',$filter))
 	{
-		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-		else $sqlwhere.=" AND";
+		if (empty($sqlwhere)) {
+		    $sqlwhere=' WHERE ';
+		} else {
+		    $sqlwhere.=" AND";
+		}
 		$sqlwhere.= " f.fk_statut > 0";
 		$sqlwhere.= " AND f.datef >= '".$db->idate($dateafterdate)."'";
 		$sqlwhere.= " AND f.datef <= '".$db->idate($datebeforedate)."'";
@@ -70,17 +73,25 @@ 
 	if (in_array('nopayment',$filter))
 	{
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-		else $sqlwhere.=" AND";
+		if (empty($sqlwhere)) {
+		    $sqlwhere=' WHERE ';
+		} else {
+		    $sqlwhere.=" AND";
+		}
 		$sqlwhere.= " f.fk_statut > 0";
 		$sqlwhere.= " AND pf.fk_paiement IS NULL";
 	}
 	if (in_array('payments',$filter) || in_array('bank',$filter))
 	{
 		$sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		if (in_array('bank',$filter)) $sql.= ", ".MAIN_DB_PREFIX."bank as b";
-		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-		else $sqlwhere.=" AND";
+		if (in_array('bank',$filter)) {
+		    $sql.= ", ".MAIN_DB_PREFIX."bank as b";
+		}
+		if (empty($sqlwhere)) {
+		    $sqlwhere=' WHERE ';
+		} else {
+		    $sqlwhere.=" AND";
+		}
 		$sqlwhere.= " f.fk_statut > 0";
 		$sqlwhere.= " AND f.rowid = pf.fk_facture";
 		$sqlwhere.= " AND pf.fk_paiement = p.rowid";
@@ -98,41 +109,62 @@ 
 	}
 	if (in_array('nodeposit',$filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' type <> 3';
 	}
 	if (in_array('noreplacement',$filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' type <> 1';
 	}
 	if (in_array('nocreditnote',$filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' type <> 2';
 	}
 	if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')';
 	}
 	if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')';
 	}
-	if ($sqlwhere) $sql.=$sqlwhere;
-	if ($sqlorder) $sql.=$sqlorder;
+	if ($sqlwhere) {
+	    $sql.=$sqlwhere;
+	}
+	if ($sqlorder) {
+	    $sql.=$sqlorder;
+	}
 
 	//print $sql; exit;
 	dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG);
 
-	if ($usestdout) print '--- start'."\n";
+	if ($usestdout) {
+	    print '--- start'."\n";
+	}
 
 	// Start of transaction
 	//$db->begin();
@@ -175,11 +207,14 @@ 
 					$filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
 					if ($regenerate || ! dol_is_file($filename))
 					{
-	            	    if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+	            	    if ($usestdout) {
+	            	        print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+	            	    }
 	    				$result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
-					}
-					else {
-					    if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
+					} else {
+					    if ($usestdout) {
+					        print "PDF for invoice ".$obj->ref." already exists\n";
+					    }
 					}
 
 					// Add file into files array
@@ -189,8 +224,11 @@ 
 				if ($result <= 0)
 				{
 					$error++;
-					if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n";
-					else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR);
+					if ($usestdout) {
+					    print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n";
+					} else {
+					    dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR);
+					}
 				}
 
 	            $cpt++;
@@ -203,8 +241,11 @@ 
 	        $page_hauteur = $formatarray['height'];
 	        $format = array($page_largeur,$page_hauteur);
 
-	        if ($usestdout) print "Using output PDF format ".join('x',$format)."\n";
-	        else dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR);
+	        if ($usestdout) {
+	            print "Using output PDF format ".join('x',$format)."\n";
+	        } else {
+	            dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR);
+	        }
 
 
 	        // Now, build a merged files with all files in $files array
@@ -219,14 +260,19 @@ 
 	        }
 	        $pdf->SetFont(pdf_getPDFFont($langs));
 
-	        if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
+	        if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) {
+	            $pdf->SetCompression(false);
+	        }
 			//$pdf->SetCompression(false);
 
 			// Add all others
 			foreach($files as $file)
 			{
-	            if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
-	            else dol_syslog("Merge PDF file for invoice ".$file);
+	            if ($usestdout) {
+	                print "Merge PDF file for invoice ".$file."\n";
+	            } else {
+	                dol_syslog("Merge PDF file for invoice ".$file);
+	            }
 
 				// Charge un document PDF depuis un fichier.
 				$pagecount = $pdf->setSourceFile($file);
@@ -244,40 +290,52 @@ 
 
 			// Save merged file
 			$filename=$fileprefix;
-			if (empty($filename)) $filename='mergedpdf';
-			if (! empty($filesuffix)) $filename.='_'.$filesuffix;
+			if (empty($filename)) {
+			    $filename='mergedpdf';
+			}
+			if (! empty($filesuffix)) {
+			    $filename.='_'.$filesuffix;
+			}
 			$file=$diroutputpdf.'/'.$filename.'.pdf';
 
 			if (! $error && $pagecount)
 			{
 				$pdf->Output($file,'F');
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 			}
 
 			if ($usestdout)
 			{
-				if (! $error) print "Merged PDF has been built in ".$file."\n";
-				else print "Can't build PDF ".$file."\n";
+				if (! $error) {
+				    print "Merged PDF has been built in ".$file."\n";
+				} else {
+				    print "Can't build PDF ".$file."\n";
+				}
 			}
 
 			$result = 1;
-	    }
-	    else
+	    } else
 	    {
-	        if ($usestdout) print "No invoices found for criteria.\n";
-	        else dol_syslog("No invoices found for criteria");
+	        if ($usestdout) {
+	            print "No invoices found for criteria.\n";
+	        } else {
+	            dol_syslog("No invoices found for criteria");
+	        }
 	        $result = 0;
 	    }
-	}
-	else
+	} else
 	{
 	    dol_print_error($db);
 	    dol_syslog("scripts/invoices/rebuild_merge.php: Error");
 	    $error++;
 	}
 
-	if ($error) return -1;
-	else return $result;
-}
+	if ($error) {
+	    return -1;
+	} else {
+	    return $result;
+	}
+	}